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

Improved code to send session tag with timestamp to influxdb

This commit is contained in:
Paul Dino Jones 2023-02-17 11:26:10 +00:00
parent c16a758e94
commit 9908326ac5
2 changed files with 34 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,13 +15,15 @@
#define DEFAULT_UPDATE_RATE 100 #define DEFAULT_UPDATE_RATE 100
#define ADDRESS "tcp://localhost:1883" #define ADDRESS "tcp://mqtt.brak:1883"
#define CLIENTID "gilles" #define CLIENTID "gilles"
#define TOPIC "telemetry" #define TOPIC "telemetry"
//#define PAYLOAD "Hello, MQTT!" //#define PAYLOAD "Hello, MQTT!"
#define QOS 0 #define QOS 0
#define TIMEOUT 10000L #define TIMEOUT 10000L
char datestring[30];
WINDOW* win1; WINDOW* win1;
WINDOW* win2; WINDOW* win2;
WINDOW* win3; WINDOW* win3;
@ -109,6 +111,15 @@ char * removeSpacesFromStr(char *string)
return string; return string;
} }
void update_date()
{
time_t rawtime;
struct tm * timeinfo;
time ( &rawtime );
timeinfo = localtime ( &rawtime );
sprintf(datestring, "%.24s", asctime (timeinfo));
}
int looper(Simulator simulator, Parameters* p) int looper(Simulator simulator, Parameters* p)
{ {
@ -116,21 +127,12 @@ int looper(Simulator simulator, Parameters* p)
SimMap* simmap = malloc(sizeof(SimMap)); SimMap* simmap = malloc(sizeof(SimMap));
int error = siminit(simdata, simmap, simulator); int error = siminit(simdata, simmap, simulator);
if (error != GILLES_ERROR_NONE) if (error != GILLES_ERROR_NONE)
{ {
slogf("Fatal error getting simulator data"); slogf("Fatal error getting simulator data");
return error; return error;
} }
time_t rawtime;
struct tm * timeinfo;
time ( &rawtime );
timeinfo = localtime ( &rawtime );
char datestring[30];
sprintf(datestring, "%s", asctime (timeinfo));
char *newdatestring = removeSpacesFromStr(datestring);
curses_init(); curses_init();
timeout(DEFAULT_UPDATE_RATE); timeout(DEFAULT_UPDATE_RATE);
@ -146,7 +148,7 @@ int looper(Simulator simulator, Parameters* p)
// Create a new MQTT client // Create a new MQTT client
MQTTClient_create(&client, ADDRESS, CLIENTID, MQTTClient_create(&client, ADDRESS, CLIENTID,
MQTTCLIENT_PERSISTENCE_NONE, NULL); MQTTCLIENT_PERSISTENCE_NONE, NULL);
// Connect to the MQTT server // Connect to the MQTT server
if (mqtt == true) if (mqtt == true)
@ -162,20 +164,30 @@ int looper(Simulator simulator, Parameters* p)
} }
int go = true; int go = true;
char lastsimstatus = false;
while (go == true) while (go == true)
{ {
simdatamap(simdata, simmap, simulator); simdatamap(simdata, simmap, simulator);
if (mqtt_connected == true) char* newdatestring;
char simstatus = (simdata->simstatus > 0) ? true : false;
if (simdata->simstatus > 0 && simstatus != lastsimstatus)
{ {
char payloads[5][40]; update_date();
sprintf(payloads[0], "gas, lap=%i, session=%s, %04f", simdata->lap, newdatestring, simdata->gas); newdatestring = removeSpacesFromStr(datestring);
sprintf(payloads[1], "brake, lap=%i, session=%s, %04f", simdata->lap, newdatestring, simdata->brake); }
sprintf(payloads[2], "steer, lap=%i, session=%s, %04f", simdata->lap, newdatestring, simdata->brake); lastsimstatus = simstatus;
sprintf(payloads[3], "gear, lap=%i, session=%s, %04i", simdata->lap, newdatestring, simdata->gear);
sprintf(payloads[4], "speed, lap=%i, session=%s, %04i", simdata->lap, newdatestring, simdata->velocity);
for (int k =0; k < 6; k++) if (mqtt_connected == true && simdata->simstatus > 0)
{
char payloads[5][60];
sprintf(payloads[0], "telemetry,lap=%i,session=%s gas=%04f", simdata->lap, newdatestring, simdata->gas);
sprintf(payloads[1], "telemetry,lap=%i,session=%s brake=%04f", simdata->lap, newdatestring, simdata->brake);
sprintf(payloads[2], "telemetry,lap=%i,session=%s steer=%04f", simdata->lap, newdatestring, simdata->brake);
sprintf(payloads[3], "telemetry,lap=%i,session=%s gear=%04i", simdata->lap, newdatestring, simdata->gear);
sprintf(payloads[4], "telemetry,lap=%i,session=%s speed=%04i", simdata->lap, newdatestring, simdata->velocity);
for (int k =0; k < 5; k++)
{ {
pubmsg.payload = payloads[k]; pubmsg.payload = payloads[k];
pubmsg.payloadlen = strlen(payloads[k]); pubmsg.payloadlen = strlen(payloads[k]);

2
src/gilles/simulatorapi/simapi

@ -1 +1 @@
Subproject commit 85c063eac3c8a30f8806976b675d4d77aa8d5176 Subproject commit f2526e83dbbd8e53256195cf443d40b004b1e925