Merge branch 'main' into feat/magnetometer-toggle

SlimeVR · Oct 30, 2024 · e515fb7 · e515fb7
2 parents 0b9b067 + b278bcf
commit e515fb7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/debug.h b/src/debug.h
@@ -89,7 +89,7 @@
 // Not recommended for production
 #define ENABLE_INSPECTION false
 
-#define FIRMWARE_BUILD_NUMBER 17
+#define PROTOCOL_VERSION 17
 #define FIRMWARE_VERSION "0.4.0"
 
 #endif // SLIMEVR_DEBUG_H_
diff --git a/src/network/connection.cpp b/src/network/connection.cpp
@@ -417,7 +417,7 @@ void Connection::sendTrackerDiscovery() {
 	MUST(sendInt(0));
 	MUST(sendInt(0));
 	MUST(sendInt(0));
-	MUST(sendInt(FIRMWARE_BUILD_NUMBER));
+	MUST(sendInt(PROTOCOL_VERSION));
 	MUST(sendShortString(FIRMWARE_VERSION));
 	// MAC address string
 	MUST(sendBytes(mac, 6));

diff --git a/src/serial/serialcommands.cpp b/src/serial/serialcommands.cpp
@@ -124,10 +124,10 @@ namespace SerialCommands {
 
     void printState() {
         logger.info(
-            "SlimeVR Tracker, board: %d, hardware: %d, build: %d, firmware: %s, address: %s, mac: %s, status: %d, wifi state: %d",
+            "SlimeVR Tracker, board: %d, hardware: %d, protocol: %d, firmware: %s, address: %s, mac: %s, status: %d, wifi state: %d",
             BOARD,
             HARDWARE_MCU,
-            FIRMWARE_BUILD_NUMBER,
+            PROTOCOL_VERSION,
             FIRMWARE_VERSION,
             WiFiNetwork::getAddress().toString().c_str(),
             WiFi.macAddress().c_str(),
@@ -205,10 +205,10 @@ namespace SerialCommands {
 
         if (parser->equalCmdParam(1, "TEST")) {
             logger.info(
-                "[TEST] Board: %d, hardware: %d, build: %d, firmware: %s, address: %s, mac: %s, status: %d, wifi state: %d",
+                "[TEST] Board: %d, hardware: %d, protocol: %d, firmware: %s, address: %s, mac: %s, status: %d, wifi state: %d",
                 BOARD,
                 HARDWARE_MCU,
-                FIRMWARE_BUILD_NUMBER,
+                PROTOCOL_VERSION,
                 FIRMWARE_VERSION,
                 WiFiNetwork::getAddress().toString().c_str(),
                 WiFi.macAddress().c_str(),