diff --git a/proto b/proto index 943c3c24e..e68763737 160000 --- a/proto +++ b/proto @@ -1 +1 @@ -Subproject commit 943c3c24ec1e5116536cdabe31f496cb5b58a18e +Subproject commit e68763737e3345ebf12c4776c84d27d83e1e9e1a diff --git a/src/mesh/NodeDB.cpp b/src/mesh/NodeDB.cpp index 96d7cc307..35f54fa72 100644 --- a/src/mesh/NodeDB.cpp +++ b/src/mesh/NodeDB.cpp @@ -228,7 +228,7 @@ void NodeDB::init() strncpy(myNodeInfo.firmware_version, optstr(APP_VERSION), sizeof(myNodeInfo.firmware_version)); // hw_model is no longer stored in myNodeInfo (as of 1.2.11) - we now store it as an enum in nodeinfo - myNodeInfo.hw_model[0] = '\0'; + myNodeInfo.hw_model_deprecated[0] = '\0'; // strncpy(myNodeInfo.hw_model, HW_VENDOR, sizeof(myNodeInfo.hw_model)); resetRadioConfig(); // If bogus settings got saved, then fix them diff --git a/src/mesh/generated/mesh.pb.h b/src/mesh/generated/mesh.pb.h index 3c923ad6c..5f4f9bf35 100644 --- a/src/mesh/generated/mesh.pb.h +++ b/src/mesh/generated/mesh.pb.h @@ -102,7 +102,7 @@ typedef struct _MyNodeInfo { bool has_gps; uint32_t num_bands; char region[12]; - char hw_model[16]; + char hw_model_deprecated[16]; char firmware_version[12]; CriticalErrorCode error_code; uint32_t error_address; @@ -260,7 +260,7 @@ extern "C" { #define MyNodeInfo_has_gps_tag 2 #define MyNodeInfo_num_bands_tag 3 #define MyNodeInfo_region_tag 4 -#define MyNodeInfo_hw_model_tag 5 +#define MyNodeInfo_hw_model_deprecated_tag 5 #define MyNodeInfo_firmware_version_tag 6 #define MyNodeInfo_error_code_tag 7 #define MyNodeInfo_error_address_tag 8 @@ -381,7 +381,7 @@ X(a, STATIC, SINGULAR, UINT32, my_node_num, 1) \ X(a, STATIC, SINGULAR, BOOL, has_gps, 2) \ X(a, STATIC, SINGULAR, UINT32, num_bands, 3) \ X(a, STATIC, SINGULAR, STRING, region, 4) \ -X(a, STATIC, SINGULAR, STRING, hw_model, 5) \ +X(a, STATIC, SINGULAR, STRING, hw_model_deprecated, 5) \ X(a, STATIC, SINGULAR, STRING, firmware_version, 6) \ X(a, STATIC, SINGULAR, UENUM, error_code, 7) \ X(a, STATIC, SINGULAR, UINT32, error_address, 8) \