diff --git a/esp32_device/.vscode/settings.json b/esp32_device/.vscode/settings.json index bef44a6..08b0bb0 100644 --- a/esp32_device/.vscode/settings.json +++ b/esp32_device/.vscode/settings.json @@ -53,6 +53,7 @@ "sync_response.h": "c", "gpio.h": "c", "esp_system.h": "c", - "relays.h": "c" + "relays.h": "c", + "esp_app_desc.h": "c" } } diff --git a/esp32_device/main/constants.h b/esp32_device/main/constants.h index 1f730eb..5ba9567 100644 --- a/esp32_device/main/constants.h +++ b/esp32_device/main/constants.h @@ -5,11 +5,6 @@ */ #define DEV_REFERENCE "Wt32-Eth01" -/** - * Device version - */ -#define DEV_VERSION "0.0.1" - /** * Backend unsecure API URL */ diff --git a/esp32_device/main/main.c b/esp32_device/main/main.c index d0416fb..3548b5d 100755 --- a/esp32_device/main/main.c +++ b/esp32_device/main/main.c @@ -1,6 +1,7 @@ #include #include "esp_system.h" #include "esp_log.h" +#include "esp_app_desc.h" #include "dev_name.h" #include "storage.h" @@ -20,7 +21,7 @@ void app_main(void) system_show_free_memory(); - ESP_LOGI(TAG, "SolarEnergy WT32-ETH01 device"); + ESP_LOGI(TAG, "SolarEnergy WT32-ETH01 device version %s", esp_app_get_description()->version); // Turn off all relays relays_turn_off_all(); diff --git a/esp32_device/main/secure_api.c b/esp32_device/main/secure_api.c index e5c8e17..e80a033 100644 --- a/esp32_device/main/secure_api.c +++ b/esp32_device/main/secure_api.c @@ -14,6 +14,7 @@ #include "relays.h" #include "esp_log.h" +#include "esp_app_desc.h" static const char *TAG = "secure_api"; @@ -118,11 +119,13 @@ fail: */ static cJSON *genDevInfo() { + const esp_app_desc_t *desc = esp_app_get_description(); + cJSON *json = cJSON_CreateObject(); if (!json) return NULL; cJSON_AddStringToObject(json, "reference", DEV_REFERENCE); - cJSON_AddStringToObject(json, "version", DEV_VERSION); + cJSON_AddStringToObject(json, "version", desc->version); cJSON_AddNumberToObject(json, "max_relays", relays_count()); return json; } diff --git a/esp32_device/version.txt b/esp32_device/version.txt new file mode 100644 index 0000000..afaf360 --- /dev/null +++ b/esp32_device/version.txt @@ -0,0 +1 @@ +1.0.0 \ No newline at end of file