enable forwarding of alertmessages from app, to enable broadcasting t…

…o CAN bus
autosportlabs · Jul 24, 2021 · 43beddc · 43beddc
1 parent 3c296b3
commit 43beddc
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,6 @@
+= 2.18.4 =
+* Enable pit-to-car alert message CAN bus broadcast for app-based telemetry
+
 = 2.18.2 =
 * Predictive Timer: Fix time jumping at the end of a lap
 * OBDII: match PID responses to the configured CAN mapping ID, to account for standard as well as extended mapping responses

diff --git a/src/drivers/alertmsg_can_drv.c b/src/drivers/alertmsg_can_drv.c
@@ -57,7 +57,7 @@ void alertmsg_can_send_message(const struct alertmessage *alertmsg)
         }
         msg.addressValue = address;
         if (!CAN_tx_msg(ALERTMSG_CAN_BUS, &msg, DEFAULT_CAN_TIMEOUT)) {
-                pr_warning_str_msg(_LOG_PFX "Failed sending CAN alertmsg segment 1 ", message_text);
+                pr_warning_str_msg(_LOG_PFX "Failed sending CAN alertmsg segment 1: ", message_text);
         }
 
         /* Send the second 1/2 of the alert message */
@@ -66,6 +66,6 @@ void alertmsg_can_send_message(const struct alertmessage *alertmsg)
         }
         msg.addressValue = address + 1;
         if (!CAN_tx_msg(ALERTMSG_CAN_BUS, &msg, DEFAULT_CAN_TIMEOUT)) {
-                pr_warning_str_msg(_LOG_PFX "Failed sending CAN alertmsg segment 2", message_text);
+                pr_warning_str_msg(_LOG_PFX "Failed sending CAN alertmsg segment 2: ", message_text);
         }
 }
diff --git a/src/logger/loggerApi.c b/src/logger/loggerApi.c
@@ -377,15 +377,20 @@ int api_alertmessage(struct Serial *serial, const jsmntok_t *json)
         struct api_event event;
         event.source=serial;
         event.type = ApiEventType_Alertmessage;
+        bool forward_message = true;
         jsmn_exists_set_val_string(json, "message", event.data.alertmsg.message, MAX_ALERTMESSAGE_LENGTH, true);
         jsmn_exists_set_val_int(json, "id", &event.data.alertmsg.id);
         jsmn_exists_set_val_int(json, "priority", &event.data.alertmsg.priority);
-
-        /* Broadcast to other connections */
-        api_event_process_callbacks(&event);
+        jsmn_exists_set_val_bool(json, "fwd", &forward_message);
 
         /* Broadcast CAN message for alertmessage */
         alertmsg_can_send_message(&event.data.alertmsg);
+
+        if (forward_message) {
+                /* Broadcast to other connections */
+                api_event_process_callbacks(&event);
+        }
+
         return API_SUCCESS_NO_RETURN;
 }