paul
/
gilles
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix formatting on new code

This commit is contained in:
Paul Dino Jones 2024-01-25 03:49:15 +00:00
parent 66e9049891
commit 18faa3a65a
5 changed files with 602 additions and 556 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/gilles/gameloop/browseloop.c
View File

@ -377,7 +377,8 @@ void* browseloop(Parameters* p, char* datadir)
{ {
wclear(bwin1); wclear(bwin1);
switch(screen) { switch(screen)
{
case SESSIONS_SCREEN: case SESSIONS_SCREEN:
@ -506,10 +507,12 @@ void* browseloop(Parameters* p, char* datadir)
{ {
//stint_useid = lapsdb.rows[i-1].rows; //stint_useid = lapsdb.rows[i-1].rows;
if ( lapsdb.rows[i-1].lap_id == selection1 ) { if ( lapsdb.rows[i-1].lap_id == selection1 )
{
mvwaddnstr(bwin1, 4+i, bwiny/7 - 4, " 1 ", 3); mvwaddnstr(bwin1, 4+i, bwiny/7 - 4, " 1 ", 3);
} }
else if ( lapsdb.rows[i-1].lap_id == selection2 ) else
if ( lapsdb.rows[i-1].lap_id == selection2 )
{ {
mvwaddnstr(bwin1, 4+i, bwiny/7 - 4, " 2 ", 3); mvwaddnstr(bwin1, 4+i, bwiny/7 - 4, " 2 ", 3);
@ -554,7 +557,8 @@ void* browseloop(Parameters* p, char* datadir)
} }
if (ch == 'b') if (ch == 'b')
{ {
switch(screen) { switch(screen)
{
case STINTS_SCREEN: case STINTS_SCREEN:
action = 2; action = 2;
@ -572,7 +576,8 @@ void* browseloop(Parameters* p, char* datadir)
} }
if (ch == 'e') if (ch == 'e')
{ {
switch(screen) { switch(screen)
{
case SESSIONS_SCREEN: case SESSIONS_SCREEN:
action = 3; action = 3;

17
src/gilles/gameloop/gameloop.c
View File

@ -171,7 +171,8 @@ int mainloop(Parameters* p)
getSim(simdata, simmap, &p->simon, &p->sim); getSim(simdata, simmap, &p->simon, &p->sim);
if (p->simon == true) { if (p->simon == true)
{
p->program_state = 1; p->program_state = 1;
if (p->cli == true) if (p->cli == true)
{ {
@ -319,7 +320,8 @@ void* looper(void* thargs)
wclear(win3); wclear(win3);
wclear(win4); wclear(win4);
{ // window 1 car diagnostics {
// window 1 car diagnostics
char spacer[14]; char spacer[14];
sprintf(spacer, "\n"); sprintf(spacer, "\n");
@ -474,7 +476,8 @@ void* looper(void* thargs)
rectangle(18, 18, 22, 22); // right rear rectangle(18, 18, 22, 22); // right rear
} }
{ // window 2 session info {
// window 2 session info
char spacer[14]; char spacer[14];
sprintf(spacer, "\n"); sprintf(spacer, "\n");
@ -537,7 +540,8 @@ void* looper(void* thargs)
wattrset(win2, COLOR_PAIR(1)); wattrset(win2, COLOR_PAIR(1));
} }
{ // window 3 basic timing and scoring {
// window 3 basic timing and scoring
char spacer[14]; char spacer[14];
sprintf(spacer, "\n"); sprintf(spacer, "\n");
@ -602,7 +606,8 @@ void* looper(void* thargs)
wattrset(win3, COLOR_PAIR(1)); wattrset(win3, COLOR_PAIR(1));
} }
{ // window 4 live standings timing and scoring {
// window 4 live standings timing and scoring
char spacer[14]; char spacer[14];
sprintf(spacer, "\n"); sprintf(spacer, "\n");
waddstr(win4, spacer); waddstr(win4, spacer);
@ -637,8 +642,10 @@ void* looper(void* thargs)
for(i=0; i<displaycars; i++) for(i=0; i<displaycars; i++)
{ {
if((ihold+1)==simdata->cars[i].pos) if((ihold+1)==simdata->cars[i].pos)
{
break; break;
} }
}
wattrset(win4, COLOR_PAIR(2)); wattrset(win4, COLOR_PAIR(2));
int maxstrlen = 20; int maxstrlen = 20;

49
src/gilles/gameloop/hoeldb.c
View File

@ -20,19 +20,23 @@ int getLastInsertID(struct _h_connection* conn)
return id; return id;
} }
void get_row_results(struct _h_result result, DBField* fields, void* rows, size_t rowsize) { void get_row_results(struct _h_result result, DBField* fields, void* rows, size_t rowsize)
{
int col, row, i; int col, row, i;
char buf[64]; char buf[64];
//sess->hasdata = true; //sess->hasdata = true;
//sess->rows = result.nb_rows; //sess->rows = result.nb_rows;
slogi("rows: %d, col: %d", result.nb_rows, result.nb_columns); slogi("rows: %d, col: %d", result.nb_rows, result.nb_columns);
char* aaa = (char*) rows; char* aaa = (char*) rows;
for (row = 0; row<result.nb_rows; row++) { for (row = 0; row<result.nb_rows; row++)
{
char* aa = (char*)aaa + (rowsize * row); char* aa = (char*)aaa + (rowsize * row);
for (col=0; col<result.nb_columns; col++) { for (col=0; col<result.nb_columns; col++)
{
char* a = (char*) aa + fields[col].offset; char* a = (char*) aa + fields[col].offset;
switch(result.data[row][col].type) { switch(result.data[row][col].type)
{
case HOEL_COL_TYPE_INT: case HOEL_COL_TYPE_INT:
int bb = ((struct _h_type_int*)result.data[row][col].t_data)->value; int bb = ((struct _h_type_int*)result.data[row][col].t_data)->value;
*(int*) a = bb; *(int*) a = bb;
@ -46,9 +50,11 @@ void get_row_results(struct _h_result result, DBField* fields, void* rows, size_
memcpy(a, ddd, fields[col].size); memcpy(a, ddd, fields[col].size);
break; break;
case HOEL_COL_TYPE_BLOB: case HOEL_COL_TYPE_BLOB:
for (i=0; i<((struct _h_type_blob *)result.data[row][col].t_data)->length; i++) { for (i=0; i<((struct _h_type_blob*)result.data[row][col].t_data)->length; i++)
{
printf("%c", *((char*)(((struct _h_type_blob*)result.data[row][col].t_data)->value+i))); printf("%c", *((char*)(((struct _h_type_blob*)result.data[row][col].t_data)->value+i)));
if (i%80 == 0 && i>0) { if (i%80 == 0 && i>0)
{
printf("\n"); printf("\n");
} }
} }
@ -139,7 +145,9 @@ int getlaps(struct _h_connection* conn, const char* sessionname, LapDbo* laps, i
laps->rows = malloc(sizeof(LapRowData) * result.nb_rows); laps->rows = malloc(sizeof(LapRowData) * result.nb_rows);
get_row_results(result, laps->fields, laps->rows, sizeof(LapRowData)); get_row_results(result, laps->fields, laps->rows, sizeof(LapRowData));
h_clean_result(&result); h_clean_result(&result);
} else { }
else
{
sloge("Error executing query %s returned %i", query, errcode); sloge("Error executing query %s returned %i", query, errcode);
free(query); free(query);
return -1; return -1;
@ -166,7 +174,8 @@ int gettrack(struct _h_connection* conn, const char* trackname)
h_free(where_clause); h_free(where_clause);
int track_config = -1; int track_config = -1;
// Test query execution result // Test query execution result
if (res == H_OK) { if (res == H_OK)
{
// Print result // Print result
//char* dump = json_dumps(j_result, JSON_INDENT(2)); //char* dump = json_dumps(j_result, JSON_INDENT(2));
//slogi("json select result is\n%s", dump); //slogi("json select result is\n%s", dump);
@ -182,7 +191,9 @@ int gettrack(struct _h_connection* conn, const char* trackname)
// Deallocate data result // Deallocate data result
//free(dump); //free(dump);
} else { }
else
{
sloge("Error executing select query %s: %d", qq, res); sloge("Error executing select query %s: %d", qq, res);
} }
json_decref(j_result); json_decref(j_result);
@ -208,7 +219,8 @@ int getdriver(struct _h_connection* conn, const char* driver_name)
h_free(where_clause); h_free(where_clause);
int driver_id = -1; int driver_id = -1;
// Test query execution result // Test query execution result
if (res == H_OK) { if (res == H_OK)
{
// Print result // Print result
char* dump = json_dumps(j_result, JSON_INDENT(2)); char* dump = json_dumps(j_result, JSON_INDENT(2));
slogt("json select result is\n%s", dump); slogt("json select result is\n%s", dump);
@ -217,13 +229,16 @@ int getdriver(struct _h_connection* conn, const char* driver_name)
{ {
slogw("no driver by this name"); slogw("no driver by this name");
} }
else { else
{
json_t* jj = json_array_get(j_result, index1-1); json_t* jj = json_array_get(j_result, index1-1);
driver_id = json_integer_value(json_object_get(jj, "driver_id")); driver_id = json_integer_value(json_object_get(jj, "driver_id"));
} }
// Deallocate data result // Deallocate data result
free(dump); free(dump);
} else { }
else
{
sloge("Error executing select query %s: %d", qq, res); sloge("Error executing select query %s: %d", qq, res);
} }
json_decref(j_result); json_decref(j_result);
@ -248,7 +263,8 @@ int getcar(struct _h_connection* conn, const char* carname)
int car_id = -1; int car_id = -1;
// Test query execution result // Test query execution result
if (res == H_OK) { if (res == H_OK)
{
// Print result // Print result
char* dump = json_dumps(j_result, JSON_INDENT(2)); char* dump = json_dumps(j_result, JSON_INDENT(2));
slogt("json select result is\n%s", dump); slogt("json select result is\n%s", dump);
@ -257,13 +273,16 @@ int getcar(struct _h_connection* conn, const char* carname)
{ {
slogw("no car by this name"); slogw("no car by this name");
} }
else { else
{
json_t* jj = json_array_get(j_result, index1-1); json_t* jj = json_array_get(j_result, index1-1);
car_id = json_integer_value(json_object_get(jj, "car_id")); car_id = json_integer_value(json_object_get(jj, "car_id"));
} }
// Deallocate data result // Deallocate data result
free(dump); free(dump);
} else { }
else
{
sloge("Error executing select query %s: %d", qq, res); sloge("Error executing select query %s: %d", qq, res);
} }
json_decref(j_result); json_decref(j_result);

39
src/gilles/gameloop/telemetry.c
View File

@ -12,7 +12,8 @@
#include "../helper/confighelper.h" #include "../helper/confighelper.h"
#include "../slog/slog.h" #include "../slog/slog.h"
int telem_result(struct _h_result result, int doublefields, int intfields, int* intarrays, double* doublearrays) { int telem_result(struct _h_result result, int doublefields, int intfields, int* intarrays, double* doublearrays)
{
int col, row, i; int col, row, i;
char buf[64]; char buf[64];
slogt("rows: %d, col: %d", result.nb_rows, result.nb_columns); slogt("rows: %d, col: %d", result.nb_rows, result.nb_columns);
@ -27,9 +28,12 @@ int telem_result(struct _h_result result, int doublefields, int intfields, int*
int intarrayoffset = 0; int intarrayoffset = 0;
int doublearrayoffset = 0; int doublearrayoffset = 0;
for (row = 0; row<result.nb_rows; row++) { for (row = 0; row<result.nb_rows; row++)
for (col=0; col<result.nb_columns; col++) { {
switch(result.data[row][col].type) { for (col=0; col<result.nb_columns; col++)
{
switch(result.data[row][col].type)
{
case HOEL_COL_TYPE_INT: case HOEL_COL_TYPE_INT:
int cc = ((struct _h_type_int*)result.data[row][col].t_data)->value; int cc = ((struct _h_type_int*)result.data[row][col].t_data)->value;
if (col == 1) if (col == 1)
@ -156,13 +160,16 @@ int dumptelemetrytofile(struct _h_connection* conn, char* datadir, int lap1id, i
struct _h_data* data; struct _h_data* data;
char* query = malloc(150 * sizeof(char)); char* query = malloc(150 * sizeof(char));
sprintf(query, "SELECT lap_id, points FROM %s WHERE %s=%i", "telemetry", "lap_id", lap1id); sprintf(query, "SELECT lap_id, points FROM %s WHERE %s=%i", "telemetry", "lap_id", lap1id);
if (h_query_select(conn, query, &result) == H_OK) { if (h_query_select(conn, query, &result) == H_OK)
{
//laps->rows = malloc(sizeof(LapRowData) * result.nb_rows); //laps->rows = malloc(sizeof(LapRowData) * result.nb_rows);
//get_row_results(result, laps->fields, laps->rows, sizeof(LapRowData)); //get_row_results(result, laps->fields, laps->rows, sizeof(LapRowData));
points = telem_result(result, 3, 3, NULL, NULL); points = telem_result(result, 3, 3, NULL, NULL);
//get_stint_result(result, stint); //get_stint_result(result, stint);
h_clean_result(&result); h_clean_result(&result);
} else { }
else
{
printf("Error executing query\n"); printf("Error executing query\n");
} }
free(query); free(query);
@ -177,13 +184,16 @@ int dumptelemetrytofile(struct _h_connection* conn, char* datadir, int lap1id, i
struct _h_data* data1; struct _h_data* data1;
char* query1 = malloc(150 * sizeof(char)); char* query1 = malloc(150 * sizeof(char));
sprintf(query1, "SELECT lap_id, points, speed, gear, rpms, brake, accel, steer FROM %s WHERE %s=%i", "telemetry", "lap_id", lap1id); sprintf(query1, "SELECT lap_id, points, speed, gear, rpms, brake, accel, steer FROM %s WHERE %s=%i", "telemetry", "lap_id", lap1id);
if (h_query_select(conn, query1, &result1) == H_OK) { if (h_query_select(conn, query1, &result1) == H_OK)
{
//laps->rows = malloc(sizeof(LapRowData) * result.nb_rows); //laps->rows = malloc(sizeof(LapRowData) * result.nb_rows);
//get_row_results(result, laps->fields, laps->rows, sizeof(LapRowData)); //get_row_results(result, laps->fields, laps->rows, sizeof(LapRowData));
points = telem_result(result1, intfields, doublefields, intarrays1, doublearrays1); points = telem_result(result1, intfields, doublefields, intarrays1, doublearrays1);
//get_stint_result(result, stint); //get_stint_result(result, stint);
h_clean_result(&result1); h_clean_result(&result1);
} else { }
else
{
printf("Error executing query\n"); printf("Error executing query\n");
} }
free(query1); free(query1);
@ -192,13 +202,16 @@ int dumptelemetrytofile(struct _h_connection* conn, char* datadir, int lap1id, i
struct _h_data* data2; struct _h_data* data2;
char* query2 = malloc(150 * sizeof(char)); char* query2 = malloc(150 * sizeof(char));
sprintf(query2, "SELECT lap_id, points, speed, gear, rpms, brake, accel, steer FROM %s WHERE %s=%i", "telemetry", "lap_id", lap2id); sprintf(query2, "SELECT lap_id, points, speed, gear, rpms, brake, accel, steer FROM %s WHERE %s=%i", "telemetry", "lap_id", lap2id);
if (h_query_select(conn, query2, &result2) == H_OK) { if (h_query_select(conn, query2, &result2) == H_OK)
{
//laps->rows = malloc(sizeof(LapRowData) * result.nb_rows); //laps->rows = malloc(sizeof(LapRowData) * result.nb_rows);
//get_row_results(result, laps->fields, laps->rows, sizeof(LapRowData)); //get_row_results(result, laps->fields, laps->rows, sizeof(LapRowData));
points = telem_result(result2, intfields, doublefields, intarrays2, doublearrays2); points = telem_result(result2, intfields, doublefields, intarrays2, doublearrays2);
//get_stint_result(result, stint); //get_stint_result(result, stint);
h_clean_result(&result2); h_clean_result(&result2);
} else { }
else
{
printf("Error executing query\n"); printf("Error executing query\n");
} }
free(query2); free(query2);
@ -234,7 +247,8 @@ void print_bytes(void *ptr, int size)
char* ppp = &output[0]; char* ppp = &output[0];
unsigned char* p = ptr; unsigned char* p = ptr;
int i; int i;
for (i=0; i<size; i++) { for (i=0; i<size; i++)
{
slogt("%02hhX", p[i]); slogt("%02hhX", p[i]);
ppp += sprintf(ppp, "%02X", p[i]); ppp += sprintf(ppp, "%02X", p[i]);
//snprintf(pp, (size*2)+1, "%s%02hhX", pp, p[i]); //snprintf(pp, (size*2)+1, "%s%02hhX", pp, p[i]);
@ -251,7 +265,8 @@ int updatetelemetry(struct _h_connection* conn, int telemid, int size, const cha
char* ppp = &output[0]; char* ppp = &output[0];
unsigned char* p = data; unsigned char* p = data;
int i; int i;
for (i=0; i<size; i++) { for (i=0; i<size; i++)
{
ppp += sprintf(ppp, "%02hhX", p[i]); ppp += sprintf(ppp, "%02hhX", p[i]);
//snprintf(pp, (size*2)+1, "%s%02hhX", pp, p[i]); //snprintf(pp, (size*2)+1, "%s%02hhX", pp, p[i]);
} }