From 4503bac78a6a8f067209b30d8dd92f215ff2f69c Mon Sep 17 00:00:00 2001 From: Theo Arends <11044339+arendst@users.noreply.github.com> Date: Wed, 11 Aug 2021 18:43:11 +0200 Subject: [PATCH] Prep influxdb support --- tasmota/settings.h | 13 +++---------- tasmota/settings.ino | 2 +- tasmota/tasmota.h | 1 + 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/tasmota/settings.h b/tasmota/settings.h index 96be4f64d..7de698b91 100644 --- a/tasmota/settings.h +++ b/tasmota/settings.h @@ -247,7 +247,7 @@ typedef union { uint32_t telegram_echo_enable : 1; // bit 2 (v9.4.0.3) - CMND_TMSTATE 4/5 - Enable Telegram echo uint32_t range_extender : 1; // bit 3 (v9.5.0.5) - CMND_RGXSTATE - Enable range extender uint32_t range_extender_napt : 1; // bit 4 (v9.5.0.5) - CMND_RGXNAPT - Enable range extender NAPT - uint32_t sonoff_l1_music_sync : 1; // bit 5 (v9.5.0.5) - CMND_MUSICSYNC - Enable sync to music + uint32_t sonoff_l1_music_sync : 1; // bit 5 (v9.5.0.5) - CMND_L1MUSICSYNC - Enable sync to music uint32_t spare06 : 1; // bit 6 uint32_t spare07 : 1; // bit 7 uint32_t spare08 : 1; // bit 8 @@ -583,11 +583,9 @@ typedef struct { uint8_t switchmode[MAX_SWITCHES_SET]; // 4A9 uint8_t free_4c5[5]; // 4C5 - uint8_t ex_interlock[4]; // 4CA MAX_INTERLOCKS = MAX_RELAYS / 2 (Legacy) - uint8_t free_4ce[2]; // 4CE - + uint16_t influxdb_port; // 4CE power_t interlock[MAX_INTERLOCKS_SET]; // 4D0 MAX_INTERLOCKS = MAX_RELAYS / 2 uint8_t free_508[36]; // 508 @@ -643,7 +641,6 @@ typedef struct { uint16_t baudrate; // 778 uint16_t sbaudrate; // 77A EnergyUsage energy_usage; // 77C - uint32_t sensors[2][4]; // 794 Disable individual (0) sensor drivers / (1) GUI sensor output uint32_t energy_kWhtotal_time; // 7B4 unsigned long weight_item; // 7B8 Weight of one item in gram * 10 @@ -654,9 +651,7 @@ typedef struct { unsigned long energy_frequency_calibration; // 7C8 Also used by HX711 to save last weight uint16_t web_refresh; // 7CC char script_pram[5][10]; // 7CE - char rules[MAX_RULE_SETS][MAX_RULE_SIZE]; // 800 Uses 512 bytes in v5.12.0m, 3 x 512 bytes in v5.14.0b - TuyaFnidDpidMap tuya_fnid_map[MAX_TUYA_FUNCTIONS]; // E00 32 bytes uint16_t ina226_r_shunt[4]; // E20 uint16_t ina226_i_fs[4]; // E28 @@ -692,9 +687,7 @@ typedef struct { uint8_t webserver; // ECD uint8_t weblog_level; // ECE uint8_t mqtt_fingerprint[2][20]; // ECF - - uint8_t ex_adc_param_type; // EF7 Free since 9.0.0.1 - + uint8_t influxdb_version; // EF7 SOBitfield4 flag4; // EF8 uint16_t mqtt_port; // EFC uint8_t serial_config; // EFE diff --git a/tasmota/settings.ino b/tasmota/settings.ino index d5f5e2b4d..30f1c0cda 100644 --- a/tasmota/settings.ino +++ b/tasmota/settings.ino @@ -1334,7 +1334,7 @@ void SettingsDelta(void) { if (Settings->version < 0x09000002) { char parameters[32]; snprintf_P(parameters, sizeof(parameters), PSTR("%d,%d,%d,%d,%d"), - Settings->ex_adc_param_type, Settings->sensors[0][0], Settings->sensors[0][1], (int)Settings->sensors[0][2], Settings->mbflag2.data); + Settings->influxdb_version, Settings->sensors[0][0], Settings->sensors[0][1], (int)Settings->sensors[0][2], Settings->mbflag2.data); SettingsUpdateText(SET_ADC_PARAM1, parameters); } #endif // ESP8266 diff --git a/tasmota/tasmota.h b/tasmota/tasmota.h index 86f2143b6..433efd0da 100644 --- a/tasmota/tasmota.h +++ b/tasmota/tasmota.h @@ -369,6 +369,7 @@ enum SettingsTextIndex { SET_OTAURL, #endif // ESP32 SET_SHD_PARAM, SET_RGX_SSID, SET_RGX_PASSWORD, + SET_INFLUXDB_HOST, SET_INFLUXDB_PORT, SET_INFLUXDB_ORG, SET_INFLUXDB_TOKEN, SET_INFLUXDB_BUCKET, SET_MAX }; enum SpiInterfaces { SPI_NONE, SPI_MOSI, SPI_MISO, SPI_MOSI_MISO };