From 0b503d70fc1d9d17dd48ea1ed739198f44bebce0 Mon Sep 17 00:00:00 2001 From: xx Date: Sun, 9 Jun 2024 10:58:39 +0200 Subject: [PATCH] Set firmware version via global define, so that it can be overwritten by the CI pipeline --- firmware/esp32/gdoor/src/defines.h | 1 + firmware/esp32/gdoor/src/mqtt_helper.cpp | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/firmware/esp32/gdoor/src/defines.h b/firmware/esp32/gdoor/src/defines.h index 9d0ae02..880bc2c 100644 --- a/firmware/esp32/gdoor/src/defines.h +++ b/firmware/esp32/gdoor/src/defines.h @@ -18,6 +18,7 @@ #define DEFINES_H // GDoor +#define GDOOR_VERSION "dev" #define MAX_WORDLEN 25 // RX Statemachine diff --git a/firmware/esp32/gdoor/src/mqtt_helper.cpp b/firmware/esp32/gdoor/src/mqtt_helper.cpp index 772fdbc..429ab31 100644 --- a/firmware/esp32/gdoor/src/mqtt_helper.cpp +++ b/firmware/esp32/gdoor/src/mqtt_helper.cpp @@ -131,12 +131,12 @@ R"""( "icon": "mdi:door", "value_template": "{{ value_json.action }}", "device": { -"sw_version": "3.0", "name": "GDoor Adapter", "manufacturer": "GDoor Project", )""" ""; - + + message += "\"sw_version\": \"" + String(GDOOR_VERSION) + "\","; message += "\"model\": \"ESP32 (" + mac + ")\","; message += "\"configuration_url\": \"http://" + ip + "\","; message += "\"ids\": \"gdoor_" + mac_clean + "\"";