Rename MG_OTA_FIRMWARE_VERSION -> MG_FIRMWARE_VERSION, rw612 nits

src/mdash.c

@@ -97,7 +97,7 @@ static void mg_mdash_rpc_get_info(struct mg_rpc_req *r) {
               "{%m:%m,%m:%llu,%m:%m,%m:\"mws.%d\",%m:{%m:true,"
               "%m:{%m:\"0x%08lx\",%m:\"0x%08lx\",%m:\"0x%08lx\"},"
               "%m:{%m:\"0x%08lx\",%m:%m}}}",
-              MG_ESC("fw_version"), MG_ESC(MG_MDASH_FIRMWARE_VERSION),
+              MG_ESC("fw_version"), MG_ESC(MG_FIRMWARE_VERSION),
               MG_ESC("uptime"), (uint64_t) (mg_millis() / 1000),
               MG_ESC("reboot_reason"),
               MG_ESC(mg_health_reason_str(mg_health_reason())), MG_ESC("arch"),
@@ -110,7 +110,7 @@ static void mg_mdash_rpc_get_info(struct mg_rpc_req *r) {
               (uint8_t *) &data[3]);
   } else {
     mg_rpc_ok(r, "{%m:%m,%m:%llu,%m:%m,%m:\"mws.%d\",%m:{%m:false}}",
-              MG_ESC("fw_version"), MG_ESC(MG_MDASH_FIRMWARE_VERSION),
+              MG_ESC("fw_version"), MG_ESC(MG_FIRMWARE_VERSION),
               MG_ESC("uptime"), (uint64_t) (mg_millis() / 1000),
               MG_ESC("reboot_reason"),
               MG_ESC(mg_health_reason_str(mg_health_reason())), MG_ESC("arch"),

src/mdash.h

@@ -12,10 +12,6 @@
 #define MG_MDASH_KEY ""
 #endif
 
-#ifndef MG_MDASH_FIRMWARE_VERSION
-#define MG_MDASH_FIRMWARE_VERSION "1.0.0"
-#endif
-
 #ifndef MG_ENABLE_MDASH
 #define MG_ENABLE_MDASH 0
 #endif

src/ota.c

@@ -13,7 +13,7 @@
 
 // Scannable version tag embedded in every firmware binary, for server-side
 // version extraction. The version string starts after the "MG_VERSION:" prefix.
-static const char s_fw_version[] = "MG_VERSION:" MG_OTA_FIRMWARE_VERSION;
+static const char s_fw_version[] = "MG_VERSION:" MG_FIRMWARE_VERSION;
 
 static bool s_autocommit_ok;  // True after OTA server confirms "same version"
 

src/ota.h

@@ -154,7 +154,7 @@ enum {
 // needs to be defined. Fetches metadata_url, which must
 // return a JSON object like:
 // { "version": "1.2.3", "url": "FIRMWARE_URL", "size": 324645 }
-// If the server version differs from MG_OTA_FIRMWARE_VERSION, downloads
+// If the server version differs from MG_FIRMWARE_VERSION, downloads
 // FIRMWARE_URL and performs the OTA update. fn is called on every outcome:
 // NULL on successful flash, "Same version" when already up to date, or an
 // error string on failure. Pass NULL to use the default handler which logs
@@ -181,8 +181,8 @@ void mg_ota_url_check(struct mg_mgr *mgr, const char *metadata_url,
 #endif
 
 // Firmware version for mg_ota_poll(). Settable in mongoose_config.h
-#ifndef MG_OTA_FIRMWARE_VERSION
-#define MG_OTA_FIRMWARE_VERSION "1.0.0"
+#ifndef MG_FIRMWARE_VERSION
+#define MG_FIRMWARE_VERSION "1.0.0"
 #endif
 
 // Maximum version string length