diff --git a/zephcore/app/CompanionMesh.cpp b/zephcore/app/CompanionMesh.cpp index 247ee5d..088944a 100644 --- a/zephcore/app/CompanionMesh.cpp +++ b/zephcore/app/CompanionMesh.cpp @@ -2233,7 +2233,7 @@ bool CompanionMesh::handleProtocolFrame(const uint8_t *data, size_t len) "CONFIG_ZEPHCORE_BOARD_NAME must fit in 40 bytes including null terminator"); static const uint8_t fw_build[12] = FIRMWARE_BUILD_DATE; static const uint8_t model[40] = CONFIG_ZEPHCORE_BOARD_NAME; - static const uint8_t version[20] = "v1.15.6-zephyr"; + static const uint8_t version[20] = "v1.15.9-zephyr"; uint8_t rsp[82]; rsp[0] = PACKET_DEVICE_INFO; rsp[1] = 12; // FIRMWARE_VER_CODE - v12 = CMD_SET_FLOOD_SCOPE_KEY [0x36, 0x01] unscoped variant diff --git a/zephcore/app/ObserverMesh.h b/zephcore/app/ObserverMesh.h index 4691744..689a800 100644 --- a/zephcore/app/ObserverMesh.h +++ b/zephcore/app/ObserverMesh.h @@ -19,7 +19,7 @@ #include "observer_creds.h" #ifndef FIRMWARE_VERSION - #define FIRMWARE_VERSION "v1.15.6-zephyr" + #define FIRMWARE_VERSION "v1.15.9-zephyr" #endif #ifndef FIRMWARE_BUILD_DATE diff --git a/zephcore/app/RepeaterMesh.h b/zephcore/app/RepeaterMesh.h index 9f1bfc4..cc75090 100644 --- a/zephcore/app/RepeaterMesh.h +++ b/zephcore/app/RepeaterMesh.h @@ -28,7 +28,7 @@ #endif #ifndef FIRMWARE_VERSION - #define FIRMWARE_VERSION "v1.15.6-zephyr" + #define FIRMWARE_VERSION "v1.15.9-zephyr" #endif #ifndef FIRMWARE_BUILD_DATE diff --git a/zephcore/app/RoomServerMesh.h b/zephcore/app/RoomServerMesh.h index 02e9827..2baf269 100644 --- a/zephcore/app/RoomServerMesh.h +++ b/zephcore/app/RoomServerMesh.h @@ -27,7 +27,7 @@ #include "RepeaterDataStore.h" #ifndef FIRMWARE_VERSION - #define FIRMWARE_VERSION "v1.15.6-zephyr" + #define FIRMWARE_VERSION "v1.15.9-zephyr" #endif #ifndef FIRMWARE_BUILD_DATE diff --git a/zephcore/boards/common/zephcore_common.conf b/zephcore/boards/common/zephcore_common.conf index 4cc94ee..26747d8 100644 --- a/zephcore/boards/common/zephcore_common.conf +++ b/zephcore/boards/common/zephcore_common.conf @@ -148,9 +148,9 @@ CONFIG_BT_DIS_MODEL_NUMBER=y CONFIG_BT_DIS_MODEL_NUMBER_STR="ZephCore" CONFIG_BT_DIS_FW_REV=y # Keep in sync with the version string in CompanionMesh.cpp CMD_DEVICE_QUERY -# response (the v1.15.6-zephyr literal). Phones that read DIS and phones +# response (the v1.15.9-zephyr literal). Phones that read DIS and phones # that query CMD_DEVICE_QUERY should see the same version. -CONFIG_BT_DIS_FW_REV_STR="v1.15.6-zephyr" +CONFIG_BT_DIS_FW_REV_STR="v1.15.9-zephyr" CONFIG_BT_DIS_SW_REV=y CONFIG_BT_DIS_SW_REV_STR="Zephyr" CONFIG_BT_DIS_PNP=n diff --git a/zephcore/src/main_companion.cpp b/zephcore/src/main_companion.cpp index 1057ef8..899cba9 100644 --- a/zephcore/src/main_companion.cpp +++ b/zephcore/src/main_companion.cpp @@ -581,7 +581,7 @@ public: void savePrefs() override { data_store.savePrefs(companion_mesh.prefs); } - const char* getFirmwareVer() override { return "v1.15.6-zephyr"; } + const char* getFirmwareVer() override { return "v1.15.9-zephyr"; } const char* getBuildDate() override { return FIRMWARE_BUILD_DATE; } const char* getRole() override { return "companion"; } bool formatFileSystem() override { return data_store.formatFileSystem(); }