diff --git a/tasmota/tasmota_xdrv_driver/xdrv_01_9_webserver.ino b/tasmota/tasmota_xdrv_driver/xdrv_01_9_webserver.ino index 32e53c92a..83692a06c 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_01_9_webserver.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_01_9_webserver.ino @@ -3689,7 +3689,7 @@ void CmndCors(void) * Interface \*********************************************************************************************/ -bool Xdrv01(uint8_t function) +bool Xdrv01(uint32_t function) { bool result = false; diff --git a/tasmota/tasmota_xdrv_driver/xdrv_02_9_mqtt.ino b/tasmota/tasmota_xdrv_driver/xdrv_02_9_mqtt.ino index a4b8b08e2..678d148f1 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_02_9_mqtt.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_02_9_mqtt.ino @@ -2003,7 +2003,7 @@ void MqttSaveSettings(void) { * Interface \*********************************************************************************************/ -bool Xdrv02(uint8_t function) +bool Xdrv02(uint32_t function) { bool result = false; diff --git a/tasmota/tasmota_xdrv_driver/xdrv_03_energy.ino b/tasmota/tasmota_xdrv_driver/xdrv_03_energy.ino index cef329705..9807fd5f4 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_03_energy.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_03_energy.ino @@ -1384,7 +1384,7 @@ void EnergyShow(bool json) { * Interface \*********************************************************************************************/ -bool Xdrv03(uint8_t function) +bool Xdrv03(uint32_t function) { bool result = false; @@ -1420,7 +1420,7 @@ bool Xdrv03(uint8_t function) return result; } -bool Xsns03(uint8_t function) +bool Xsns03(uint32_t function) { bool result = false; diff --git a/tasmota/tasmota_xdrv_driver/xdrv_04_light.ino b/tasmota/tasmota_xdrv_driver/xdrv_04_light.ino index 538da6b09..a3d00b3f7 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_04_light.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_04_light.ino @@ -3395,7 +3395,7 @@ void CmndUndocA(void) * Interface \*********************************************************************************************/ -bool Xdrv04(uint8_t function) +bool Xdrv04(uint32_t function) { bool result = false; diff --git a/tasmota/tasmota_xdrv_driver/xdrv_05_irremote.ino b/tasmota/tasmota_xdrv_driver/xdrv_05_irremote.ino index ba403f72f..0996484b5 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_05_irremote.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_05_irremote.ino @@ -416,7 +416,7 @@ void IrRemoteCmndResponse(uint32_t error) * Interface \*********************************************************************************************/ -bool Xdrv05(uint8_t function) +bool Xdrv05(uint32_t function) { bool result = false; diff --git a/tasmota/tasmota_xdrv_driver/xdrv_05_irremote_full.ino b/tasmota/tasmota_xdrv_driver/xdrv_05_irremote_full.ino index a74270de2..4ffb34a2c 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_05_irremote_full.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_05_irremote_full.ino @@ -852,7 +852,7 @@ void IrInit(void) { * Interface \*********************************************************************************************/ -bool Xdrv05(uint8_t function) +bool Xdrv05(uint32_t function) { bool result = false; diff --git a/tasmota/tasmota_xdrv_driver/xdrv_06_snfbridge.ino b/tasmota/tasmota_xdrv_driver/xdrv_06_snfbridge.ino index c3aa42bd8..a928d8140 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_06_snfbridge.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_06_snfbridge.ino @@ -128,6 +128,9 @@ uint8_t rf_erase_flash(void) { } err = c2_device_erase(); if (err != C2_SUCCESS) { + +// AddLog(LOG_LEVEL_DEBUG, PSTR("RFB: Device erase error %d"), err); + if (i < 3) { c2_reset(); // Reset RF chip and try again } else { @@ -535,7 +538,7 @@ void SonoffBridgeWebGetArg(void) { * Interface \*********************************************************************************************/ -bool Xdrv06(uint8_t function) +bool Xdrv06(uint32_t function) { bool result = false; diff --git a/tasmota/tasmota_xdrv_driver/xdrv_07_domoticz.ino b/tasmota/tasmota_xdrv_driver/xdrv_07_domoticz.ino index 7687ac644..6fa70cfc4 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_07_domoticz.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_07_domoticz.ino @@ -641,7 +641,7 @@ void DomoticzSaveSettings(void) { * Interface \*********************************************************************************************/ -bool Xdrv07(uint8_t function) { +bool Xdrv07(uint32_t function) { bool result = false; if (Settings->flag.mqtt_enabled) { // SetOption3 - Enable MQTT diff --git a/tasmota/tasmota_xdrv_driver/xdrv_08_serial_bridge.ino b/tasmota/tasmota_xdrv_driver/xdrv_08_serial_bridge.ino index 3dd8ee554..bcc34a4a8 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_08_serial_bridge.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_08_serial_bridge.ino @@ -284,7 +284,7 @@ void CmndSSerialConfig(void) { * Interface \*********************************************************************************************/ -bool Xdrv08(uint8_t function) { +bool Xdrv08(uint32_t function) { bool result = false; if (FUNC_PRE_INIT == function) { diff --git a/tasmota/tasmota_xdrv_driver/xdrv_09_timers.ino b/tasmota/tasmota_xdrv_driver/xdrv_09_timers.ino index 8c1fd530e..8575cf685 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_09_timers.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_09_timers.ino @@ -946,7 +946,7 @@ void TimerSaveSettings(void) * Interface \*********************************************************************************************/ -bool Xdrv09(uint8_t function) +bool Xdrv09(uint32_t function) { bool result = false; diff --git a/tasmota/tasmota_xdrv_driver/xdrv_10_rules.ino b/tasmota/tasmota_xdrv_driver/xdrv_10_rules.ino index 49342df27..6f9003d70 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_10_rules.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_10_rules.ino @@ -2441,7 +2441,7 @@ float map_double(float x, float in_min, float in_max, float out_min, float out_m * Interface \*********************************************************************************************/ -bool Xdrv10(uint8_t function) +bool Xdrv10(uint32_t function) { bool result = false; diff --git a/tasmota/tasmota_xdrv_driver/xdrv_10_scripter.ino b/tasmota/tasmota_xdrv_driver/xdrv_10_scripter.ino index 66d699bab..6ffbe65fb 100755 --- a/tasmota/tasmota_xdrv_driver/xdrv_10_scripter.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_10_scripter.ino @@ -11116,7 +11116,7 @@ void script_add_subpage(uint8_t num) { -bool Xdrv10(uint8_t function) +bool Xdrv10(uint32_t function) { bool result = false; glob_script_mem.event_handeled = false; diff --git a/tasmota/tasmota_xdrv_driver/xdrv_11_knx.ino b/tasmota/tasmota_xdrv_driver/xdrv_11_knx.ino index 33ba550b1..b8573cb3f 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_11_knx.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_11_knx.ino @@ -1298,7 +1298,7 @@ void CmndKnxCb(void) * Interface \*********************************************************************************************/ -bool Xdrv11(uint8_t function) +bool Xdrv11(uint32_t function) { bool result = false; switch (function) { diff --git a/tasmota/tasmota_xdrv_driver/xdrv_99_debug.ino b/tasmota/tasmota_xdrv_driver/xdrv_127_debug.ino similarity index 98% rename from tasmota/tasmota_xdrv_driver/xdrv_99_debug.ino rename to tasmota/tasmota_xdrv_driver/xdrv_127_debug.ino index 61896a610..fe6caaf91 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_99_debug.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_127_debug.ino @@ -1,5 +1,5 @@ /* - xdrv_99_debug.ino - debug support for Tasmota + xdrv_127_debug.ino - debug support for Tasmota Copyright (C) 2021 Theo Arends @@ -32,7 +32,7 @@ * Needs file zzzz_debug.ino due to DEFINE processing \*********************************************************************************************/ -#define XDRV_99 99 +#define XDRV_127 127 #ifndef CPU_LOAD_CHECK #define CPU_LOAD_CHECK 1 // Seconds between each CPU_LOAD log @@ -46,6 +46,7 @@ #define D_CMND_CFGDUMP "CfgDump" #define D_CMND_CFGPEEK "CfgPeek" #define D_CMND_CFGPOKE "CfgPoke" +#define D_CMND_SHOWHEAP "ShowHeap" #define D_CMND_CFGXOR "CfgXor" #define D_CMND_CPUCHECK "CpuChk" #define D_CMND_EXCEPTION "Exception" @@ -62,6 +63,11 @@ const char kDebugCommands[] PROGMEM = "|" // No prefix D_CMND_MEMDUMP "|" D_CMND_CFGDUMP "|" D_CMND_CFGPEEK "|" D_CMND_CFGPOKE "|" +#ifdef ESP8266 +#ifdef UMM_INLINE_METRICS + D_CMND_SHOWHEAP "|" +#endif +#endif #ifdef USE_WEBSERVER D_CMND_CFGXOR "|" #endif @@ -77,6 +83,11 @@ const char kDebugCommands[] PROGMEM = "|" // No prefix void (* const DebugCommand[])(void) PROGMEM = { &CmndMemDump, &CmndCfgDump, &CmndCfgPeek, &CmndCfgPoke, +#ifdef ESP8266 +#ifdef UMM_INLINE_METRICS + &CmndShowHeap, +#endif +#endif #ifdef USE_WEBSERVER &CmndCfgXor, #endif @@ -355,7 +366,6 @@ void DebugDump(uint32_t start, uint32_t size) { } } - void DebugCfgDump(char* parms) { uint32_t CFG_COLS = 16; @@ -522,6 +532,15 @@ void CmndCfgPoke(void) ResponseCmndDone(); } +#ifdef ESP8266 +#ifdef UMM_INLINE_METRICS +void CmndShowHeap(void) { + system_show_malloc(); + ResponseCmndDone(); +} +#endif +#endif + #ifdef USE_WEBSERVER void CmndCfgXor(void) { @@ -709,7 +728,7 @@ void CmndI2cClock(void) * Interface \*********************************************************************************************/ -bool Xdrv99(uint8_t function) +bool Xdrv127(uint32_t function) { bool result = false; diff --git a/tasmota/tasmota_xdrv_driver/xdrv_12_discovery.ino b/tasmota/tasmota_xdrv_driver/xdrv_12_discovery.ino index 25632cd32..a7cbe6c6e 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_12_discovery.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_12_discovery.ino @@ -298,7 +298,7 @@ void CmndTasDiscover(void) { * Interface \*********************************************************************************************/ -bool Xdrv12(uint8_t function) { +bool Xdrv12(uint32_t function) { bool result = false; if (Settings->flag.mqtt_enabled) { // SetOption3 - Enable MQTT diff --git a/tasmota/tasmota_xdrv_driver/xdrv_12_home_assistant.ino b/tasmota/tasmota_xdrv_driver/xdrv_12_home_assistant.ino index e9e976acb..531d8463e 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_12_home_assistant.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_12_home_assistant.ino @@ -1271,7 +1271,7 @@ void HassLwtSubscribe(bool hasslwt) * Interface \*********************************************************************************************/ -bool Xdrv12(uint8_t function) +bool Xdrv12(uint32_t function) { bool result = false; bool hasslwt = HOME_ASSISTANT_LWT_SUBSCRIBE; diff --git a/tasmota/tasmota_xdrv_driver/xdrv_13_display.ino b/tasmota/tasmota_xdrv_driver/xdrv_13_display.ino index 99033c4e1..f7cb20fc1 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_13_display.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_13_display.ino @@ -2787,7 +2787,7 @@ void AddValue(uint8_t num,float fval) { * Interface \*********************************************************************************************/ -bool Xdrv13(uint8_t function) +bool Xdrv13(uint32_t function) { bool result = false; diff --git a/tasmota/tasmota_xdrv_driver/xdrv_14_mp3.ino b/tasmota/tasmota_xdrv_driver/xdrv_14_mp3.ino index 88eff7dec..625f0359c 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_14_mp3.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_14_mp3.ino @@ -395,7 +395,7 @@ if (PinUsed(GPIO_MP3_DFR562_BUSY)) // optional MP3 player busy pi * Interface \*********************************************************************************************/ -bool Xdrv14(uint8_t function) +bool Xdrv14(uint32_t function) { bool result = false; diff --git a/tasmota/tasmota_xdrv_driver/xdrv_15_pca9685.ino b/tasmota/tasmota_xdrv_driver/xdrv_15_pca9685.ino index 9f6cee154..8f82432c2 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_15_pca9685.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_15_pca9685.ino @@ -207,7 +207,7 @@ void PCA9685_OutputTelemetry(bool telemetry) } } -bool Xdrv15(uint8_t function) +bool Xdrv15(uint32_t function) { if (!I2cEnabled(XI2C_01)) { return false; } diff --git a/tasmota/tasmota_xdrv_driver/xdrv_16_tuyamcu.ino b/tasmota/tasmota_xdrv_driver/xdrv_16_tuyamcu.ino index 5743facb4..35ef17ccc 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_16_tuyamcu.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_16_tuyamcu.ino @@ -1535,7 +1535,7 @@ void TuyaAddButton(void) { #ifdef USE_ENERGY_SENSOR -bool Xnrg32(uint8_t function) +bool Xnrg32(uint32_t function) { bool result = false; @@ -1556,7 +1556,7 @@ bool Xnrg32(uint8_t function) } #endif // USE_ENERGY_SENSOR -bool Xdrv16(uint8_t function) { +bool Xdrv16(uint32_t function) { bool result = false; if (FUNC_MODULE_INIT == function) { diff --git a/tasmota/tasmota_xdrv_driver/xdrv_17_rcswitch.ino b/tasmota/tasmota_xdrv_driver/xdrv_17_rcswitch.ino index acf033c85..68077778e 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_17_rcswitch.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_17_rcswitch.ino @@ -229,7 +229,7 @@ void CmndRfTimeOut(void) { * Interface \*********************************************************************************************/ -bool Xdrv17(uint8_t function) +bool Xdrv17(uint32_t function) { bool result = false; diff --git a/tasmota/tasmota_xdrv_driver/xdrv_18_armtronix_dimmers.ino b/tasmota/tasmota_xdrv_driver/xdrv_18_armtronix_dimmers.ino index 185cb98c0..674ee9b3c 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_18_armtronix_dimmers.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_18_armtronix_dimmers.ino @@ -164,7 +164,7 @@ void ArmtronixSetWifiLed(void) * Interface \*********************************************************************************************/ -bool Xdrv18(uint8_t function) +bool Xdrv18(uint32_t function) { bool result = false; diff --git a/tasmota/tasmota_xdrv_driver/xdrv_19_ps16dz_dimmer.ino b/tasmota/tasmota_xdrv_driver/xdrv_19_ps16dz_dimmer.ino index 9c2d0a23e..d23058b39 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_19_ps16dz_dimmer.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_19_ps16dz_dimmer.ino @@ -206,7 +206,7 @@ bool PS16DZModuleSelected(void) * Interface \*********************************************************************************************/ -bool Xdrv19(uint8_t function) +bool Xdrv19(uint32_t function) { bool result = false; diff --git a/tasmota/tasmota_xdrv_driver/xdrv_20_hue.ino b/tasmota/tasmota_xdrv_driver/xdrv_20_hue.ino index 734b0c0dd..30db910b5 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_20_hue.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_20_hue.ino @@ -1149,7 +1149,7 @@ void HandleHueApi(String *path) * Interface \*********************************************************************************************/ -bool Xdrv20(uint8_t function) +bool Xdrv20(uint32_t function) { bool result = false; diff --git a/tasmota/tasmota_xdrv_driver/xdrv_21_wemo.ino b/tasmota/tasmota_xdrv_driver/xdrv_21_wemo.ino index f0521aeea4..1bcd0b9ab 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_21_wemo.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_21_wemo.ino @@ -342,7 +342,7 @@ void HandleUpnpSetupWemo(void) * Interface \*********************************************************************************************/ -bool Xdrv21(uint8_t function) +bool Xdrv21(uint32_t function) { bool result = false; diff --git a/tasmota/tasmota_xdrv_driver/xdrv_21_wemo_multi.ino b/tasmota/tasmota_xdrv_driver/xdrv_21_wemo_multi.ino index 145e3e8c5..bf242d0f4 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_21_wemo_multi.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_21_wemo_multi.ino @@ -427,7 +427,7 @@ void WemoRespondToMSearch(int echo_type) { * Interface \*********************************************************************************************/ -bool Xdrv21(uint8_t function) +bool Xdrv21(uint32_t function) { bool result = false; diff --git a/tasmota/tasmota_xdrv_driver/xdrv_22_sonoff_ifan.ino b/tasmota/tasmota_xdrv_driver/xdrv_22_sonoff_ifan.ino index 992e0a31f..618cda1ab 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_22_sonoff_ifan.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_22_sonoff_ifan.ino @@ -244,7 +244,7 @@ void SonoffIfanUpdate(void) * Interface \*********************************************************************************************/ -bool Xdrv22(uint8_t function) +bool Xdrv22(uint32_t function) { bool result = false; diff --git a/tasmota/tasmota_xdrv_driver/xdrv_23_zigbee_A_impl.ino b/tasmota/tasmota_xdrv_driver/xdrv_23_zigbee_A_impl.ino index f3ab5af77..4f44a8115 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_23_zigbee_A_impl.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_23_zigbee_A_impl.ino @@ -2377,7 +2377,7 @@ void ZigbeeShowMap(void) { * Interface \*********************************************************************************************/ -bool Xdrv23(uint8_t function) { +bool Xdrv23(uint32_t function) { if (TasmotaGlobal.gpio_optiona.enable_ccloader) { return false; } bool result = false; diff --git a/tasmota/tasmota_xdrv_driver/xdrv_24_buzzer.ino b/tasmota/tasmota_xdrv_driver/xdrv_24_buzzer.ino index 3921589f3..81dcc1dc7 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_24_buzzer.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_24_buzzer.ino @@ -229,7 +229,7 @@ void CmndBuzzer(void) { * Interface \*********************************************************************************************/ -bool Xdrv24(uint8_t function) { +bool Xdrv24(uint32_t function) { bool result = false; if (Buzzer.active) { diff --git a/tasmota/tasmota_xdrv_driver/xdrv_25_A4988_Stepper.ino b/tasmota/tasmota_xdrv_driver/xdrv_25_A4988_Stepper.ino index 50e9997b1..ca8a2a421 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_25_A4988_Stepper.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_25_A4988_Stepper.ino @@ -119,7 +119,7 @@ void CmndSetRPM(void) { /*********************************************************************************************\ * Interface \*********************************************************************************************/ -bool Xdrv25(uint8_t function) +bool Xdrv25(uint32_t function) { bool result = false; if (PinUsed(GPIO_A4988_DIR) && PinUsed(GPIO_A4988_STP)) { diff --git a/tasmota/tasmota_xdrv_driver/xdrv_26_ariluxrf.ino b/tasmota/tasmota_xdrv_driver/xdrv_26_ariluxrf.ino index 50441c1c8..8cad4cf56 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_26_ariluxrf.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_26_ariluxrf.ino @@ -170,7 +170,7 @@ void AriluxRfDisable(void) * Interface \*********************************************************************************************/ -bool Xdrv26(uint8_t function) +bool Xdrv26(uint32_t function) { bool result = false; diff --git a/tasmota/tasmota_xdrv_driver/xdrv_27_shutter.ino b/tasmota/tasmota_xdrv_driver/xdrv_27_shutter.ino index d92d82025..17b2215af 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_27_shutter.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_27_shutter.ino @@ -1718,7 +1718,7 @@ void CmndShutterTiltIncDec(void) * Interface \*********************************************************************************************/ -bool Xdrv27(uint8_t function) +bool Xdrv27(uint32_t function) { bool result = false; diff --git a/tasmota/tasmota_xdrv_driver/xdrv_28_pcf8574.ino b/tasmota/tasmota_xdrv_driver/xdrv_28_pcf8574.ino index 7954acd62..25e0018fc 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_28_pcf8574.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_28_pcf8574.ino @@ -308,7 +308,7 @@ void Pcf8574SaveSettings(void) * Interface \*********************************************************************************************/ -bool Xdrv28(uint8_t function) +bool Xdrv28(uint32_t function) { if (!I2cEnabled(XI2C_02)) { return false; } diff --git a/tasmota/tasmota_xdrv_driver/xdrv_29_deepsleep.ino b/tasmota/tasmota_xdrv_driver/xdrv_29_deepsleep.ino index 27377eeea..a607fa0e9 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_29_deepsleep.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_29_deepsleep.ino @@ -205,7 +205,7 @@ void CmndDeepsleepTime(void) * Interface \*********************************************************************************************/ -bool Xdrv29(uint8_t function) +bool Xdrv29(uint32_t function) { bool result = false; diff --git a/tasmota/tasmota_xdrv_driver/xdrv_30_exs_dimmer.ino b/tasmota/tasmota_xdrv_driver/xdrv_30_exs_dimmer.ino index 7b3f4bcd2..3dfdcda73 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_30_exs_dimmer.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_30_exs_dimmer.ino @@ -585,7 +585,7 @@ void CmndExsState(void) * Interface */ -bool Xdrv30(uint8_t function) +bool Xdrv30(uint32_t function) { bool result = false; diff --git a/tasmota/tasmota_xdrv_driver/xdrv_31_tasmota_client.ino b/tasmota/tasmota_xdrv_driver/xdrv_31_tasmota_client.ino index d47f39b43..04ede81b3 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_31_tasmota_client.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_31_tasmota_client.ino @@ -531,7 +531,7 @@ void TasmotaClient_ProcessIn(void) { * Interface \*********************************************************************************************/ -bool Xdrv31(uint8_t function) { +bool Xdrv31(uint32_t function) { bool result = false; switch (function) { diff --git a/tasmota/tasmota_xdrv_driver/xdrv_32_hotplug.ino b/tasmota/tasmota_xdrv_driver/xdrv_32_hotplug.ino index 8a055911a..d5dba3b3c 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_32_hotplug.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_32_hotplug.ino @@ -80,7 +80,7 @@ void CmndHotPlugTime(void) * Interface \*********************************************************************************************/ -bool Xdrv32(uint8_t function) +bool Xdrv32(uint32_t function) { bool result = false; diff --git a/tasmota/tasmota_xdrv_driver/xdrv_33_nrf24l01.ino b/tasmota/tasmota_xdrv_driver/xdrv_33_nrf24l01.ino index dfe690de2..83381d203 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_33_nrf24l01.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_33_nrf24l01.ino @@ -80,7 +80,7 @@ void NRF24Detect(void) { * Interface \*********************************************************************************************/ -bool Xdrv33(uint8_t function) { +bool Xdrv33(uint32_t function) { bool result = false; if (FUNC_INIT == function) { diff --git a/tasmota/tasmota_xdrv_driver/xdrv_34_wemos_motor_v1.ino b/tasmota/tasmota_xdrv_driver/xdrv_34_wemos_motor_v1.ino index b38a863e1..4b25b714d 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_34_wemos_motor_v1.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_34_wemos_motor_v1.ino @@ -268,7 +268,7 @@ void WMotorV2command(uint8_t *data, uint8_t len) // process V2 request * Interface \*********************************************************************************************/ -bool Xdrv34(uint8_t function) +bool Xdrv34(uint32_t function) { if (!I2cEnabled(XI2C_44)) { return false; } diff --git a/tasmota/tasmota_xdrv_driver/xdrv_35_pwm_dimmer.ino b/tasmota/tasmota_xdrv_driver/xdrv_35_pwm_dimmer.ino index 4a8587dc8..5ce566548 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_35_pwm_dimmer.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_35_pwm_dimmer.ino @@ -790,7 +790,7 @@ void CmndPWMDimmerPWMs(void) * Interface \*********************************************************************************************/ -bool Xdrv35(uint8_t function) +bool Xdrv35(uint32_t function) { bool result = false; diff --git a/tasmota/tasmota_xdrv_driver/xdrv_36_keeloq.ino b/tasmota/tasmota_xdrv_driver/xdrv_36_keeloq.ino index 1ea0f3bfc..13b700920 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_36_keeloq.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_36_keeloq.ino @@ -261,7 +261,7 @@ void KeeloqInit() /*********************************************************************************************\ * Interface \*********************************************************************************************/ -bool Xdrv36(uint8_t function) +bool Xdrv36(uint32_t function) { if (!PinUsed(GPIO_CC1101_GDO0) || !PinUsed(GPIO_CC1101_GDO2)) { return false; } diff --git a/tasmota/tasmota_xdrv_driver/xdrv_37_sonoff_d1.ino b/tasmota/tasmota_xdrv_driver/xdrv_37_sonoff_d1.ino index a153f3351..adc34e0bf 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_37_sonoff_d1.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_37_sonoff_d1.ino @@ -173,7 +173,7 @@ bool SonoffD1ModuleSelected(void) * Interface \*********************************************************************************************/ -bool Xdrv37(uint8_t function) +bool Xdrv37(uint32_t function) { bool result = false; diff --git a/tasmota/tasmota_xdrv_driver/xdrv_38_ping.ino b/tasmota/tasmota_xdrv_driver/xdrv_38_ping.ino index 4390bd1d9..acf6181e3 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_38_ping.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_38_ping.ino @@ -365,7 +365,7 @@ void CmndPing(void) { * Interface \*********************************************************************************************/ -bool Xdrv38(uint8_t function) +bool Xdrv38(uint32_t function) { bool result = false; diff --git a/tasmota/tasmota_xdrv_driver/xdrv_39_thermostat.ino b/tasmota/tasmota_xdrv_driver/xdrv_39_thermostat.ino index 4d341fd4d..ca1f39ec7 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_39_thermostat.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_39_thermostat.ino @@ -2084,7 +2084,7 @@ void ThermostatShow(uint8_t ctr_output, bool json) * Interface \*********************************************************************************************/ -bool Xdrv39(uint8_t function) +bool Xdrv39(uint32_t function) { bool result = false; uint8_t ctr_output; diff --git a/tasmota/tasmota_xdrv_driver/xdrv_40_telegram.ino b/tasmota/tasmota_xdrv_driver/xdrv_40_telegram.ino index 56d0d882d..a511cdf2d 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_40_telegram.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_40_telegram.ino @@ -476,7 +476,7 @@ void CmndTmSend(void) { * Interface \*********************************************************************************************/ -bool Xdrv40(uint8_t function) +bool Xdrv40(uint32_t function) { bool result = false; diff --git a/tasmota/tasmota_xdrv_driver/xdrv_41_tcp_bridge.ino b/tasmota/tasmota_xdrv_driver/xdrv_41_tcp_bridge.ino index d0b3de1f9..b5c4a0789 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_41_tcp_bridge.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_41_tcp_bridge.ino @@ -277,7 +277,7 @@ void CmndTCPConnect(void) { * Interface \*********************************************************************************************/ -bool Xdrv41(uint8_t function) +bool Xdrv41(uint32_t function) { bool result = false; diff --git a/tasmota/tasmota_xdrv_driver/xdrv_42_0_i2s_audio.ino b/tasmota/tasmota_xdrv_driver/xdrv_42_0_i2s_audio.ino index 26ad5412c..e6031ce31 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_42_0_i2s_audio.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_42_0_i2s_audio.ino @@ -679,7 +679,7 @@ void i2s_mp3_loop(void); void i2s_mp3_init(void); void MP3ShowStream(void); -bool Xdrv42(uint8_t function) { +bool Xdrv42(uint32_t function) { bool result = false; switch (function) { diff --git a/tasmota/tasmota_xdrv_driver/xdrv_43_mlx90640.ino b/tasmota/tasmota_xdrv_driver/xdrv_43_mlx90640.ino index 833340c90..d13dd4416 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_43_mlx90640.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_43_mlx90640.ino @@ -591,7 +591,7 @@ void MLX90640Show(uint8_t json) * Interface \*********************************************************************************************/ -bool Xdrv43(uint8_t function) +bool Xdrv43(uint32_t function) { bool result = false; diff --git a/tasmota/tasmota_xdrv_driver/xdrv_44_miel_hvac.ino b/tasmota/tasmota_xdrv_driver/xdrv_44_miel_hvac.ino index e5f37fbc1..60ea83e5a 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_44_miel_hvac.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_44_miel_hvac.ino @@ -1285,7 +1285,7 @@ static void (*const miel_hvac_cmnds[])(void) PROGMEM = { #endif }; -bool Xdrv44(uint8_t function) { +bool Xdrv44(uint32_t function) { bool result = false; struct miel_hvac_softc *sc = miel_hvac_sc; diff --git a/tasmota/tasmota_xdrv_driver/xdrv_45_shelly_dimmer.ino b/tasmota/tasmota_xdrv_driver/xdrv_45_shelly_dimmer.ino index d1f317bfc..6476fa172 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_45_shelly_dimmer.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_45_shelly_dimmer.ino @@ -831,7 +831,7 @@ void CmndShdWarmupTime(void) \*********************************************************************************************/ #ifdef USE_ENERGY_SENSOR -bool Xnrg31(uint8_t function) { +bool Xnrg31(uint32_t function) { bool result = false; if (Shd.present) { @@ -852,7 +852,7 @@ bool Xnrg31(uint8_t function) { * Driver Interface \*********************************************************************************************/ -bool Xdrv45(uint8_t function) { +bool Xdrv45(uint32_t function) { bool result = false; if (FUNC_MODULE_INIT == function) { diff --git a/tasmota/tasmota_xdrv_driver/xdrv_46_ccloader.ino b/tasmota/tasmota_xdrv_driver/xdrv_46_ccloader.ino index e8986df36..ab37d271a 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_46_ccloader.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_46_ccloader.ino @@ -671,7 +671,7 @@ void CCLoadershow(bool json) { * Interface \*********************************************************************************************/ -bool Xdrv46(uint8_t function) { +bool Xdrv46(uint32_t function) { if (!TasmotaGlobal.gpio_optiona.enable_ccloader) { return false; } bool result = false; diff --git a/tasmota/tasmota_xdrv_driver/xdrv_47_ftc532.ino b/tasmota/tasmota_xdrv_driver/xdrv_47_ftc532.ino index 2e1e26ac7..220ab6078 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_47_ftc532.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_47_ftc532.ino @@ -215,7 +215,7 @@ void ftc532_publish(void) { * Interface \*********************************************************************************************/ -bool Xdrv47(uint8_t function) { +bool Xdrv47(uint32_t function) { bool result = false; if (FUNC_INIT == function) { diff --git a/tasmota/tasmota_xdrv_driver/xdrv_48_timeprop.ino b/tasmota/tasmota_xdrv_driver/xdrv_48_timeprop.ino index 934501079..ab11f6c52 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_48_timeprop.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_48_timeprop.ino @@ -224,7 +224,7 @@ bool TimepropCommand() #define XDRV_48 48 -bool Xdrv48(byte function) { +bool Xdrv48(uint32_t function) { bool result = false; switch (function) { diff --git a/tasmota/tasmota_xdrv_driver/xdrv_49_pid.ino b/tasmota/tasmota_xdrv_driver/xdrv_49_pid.ino index 581016470..dcc226cd2 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_49_pid.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_49_pid.ino @@ -420,7 +420,7 @@ void PIDRun(void) { #define XDRV_49 49 -bool Xdrv49(byte function) { +bool Xdrv49(uint32_t function) { bool result = false; switch (function) { diff --git a/tasmota/tasmota_xdrv_driver/xdrv_50_filesystem.ino b/tasmota/tasmota_xdrv_driver/xdrv_50_filesystem.ino index ab66a5bec..db60d2e74 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_50_filesystem.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_50_filesystem.ino @@ -1109,7 +1109,7 @@ void UfsEditorUpload(void) { * Interface \*********************************************************************************************/ -bool Xdrv50(uint8_t function) { +bool Xdrv50(uint32_t function) { bool result = false; switch (function) { diff --git a/tasmota/tasmota_xdrv_driver/xdrv_51_bs814a2.ino b/tasmota/tasmota_xdrv_driver/xdrv_51_bs814a2.ino index aa1abc4bb..5199b3919 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_51_bs814a2.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_51_bs814a2.ino @@ -166,7 +166,7 @@ void bs814_publish(void) { * Interface \*********************************************************************************************/ -bool Xdrv51(uint8_t function) { +bool Xdrv51(uint32_t function) { bool result = false; if (FUNC_INIT == function) { diff --git a/tasmota/tasmota_xdrv_driver/xdrv_52_9_berry.ino b/tasmota/tasmota_xdrv_driver/xdrv_52_9_berry.ino index d28e0e41e..7bb20821c 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_52_9_berry.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_52_9_berry.ino @@ -715,7 +715,7 @@ void HandleBerryConsole(void) /*********************************************************************************************\ * Interface \*********************************************************************************************/ -bool Xdrv52(uint8_t function) +bool Xdrv52(uint32_t function) { bool result = false; diff --git a/tasmota/tasmota_xdrv_driver/xdrv_53_projector_ctrl.ino b/tasmota/tasmota_xdrv_driver/xdrv_53_projector_ctrl.ino index be0af2e5a..dc31523df 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_53_projector_ctrl.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_53_projector_ctrl.ino @@ -439,7 +439,7 @@ projector_ctrl_set_power(struct projector_ctrl_softc_s *sc) * Interface \*********************************************************************************************/ -bool Xdrv53(uint8_t function) { +bool Xdrv53(uint32_t function) { bool result; struct projector_ctrl_softc_s *sc; diff --git a/tasmota/tasmota_xdrv_driver/xdrv_54_lvgl.ino b/tasmota/tasmota_xdrv_driver/xdrv_54_lvgl.ino index 3c6ad507a..26fa7bbcb 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_54_lvgl.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_54_lvgl.ino @@ -433,7 +433,7 @@ void start_lvgl(const char * uconfig) { /*********************************************************************************************\ * Interface \*********************************************************************************************/ -bool Xdrv54(uint8_t function) +bool Xdrv54(uint32_t function) { bool result = false; diff --git a/tasmota/tasmota_xdrv_driver/xdrv_55_touch.ino b/tasmota/tasmota_xdrv_driver/xdrv_55_touch.ino index 7ce4b1fed..3a23b965e 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_55_touch.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_55_touch.ino @@ -459,7 +459,7 @@ void TS_RotConvert(int16_t *x, int16_t *y) { /*********************************************************************************************\ * Interface \*********************************************************************************************/ -bool Xdrv55(uint8_t function) { +bool Xdrv55(uint32_t function) { bool result = false; switch (function) { diff --git a/tasmota/tasmota_xdrv_driver/xdrv_56_rtc_chips.ino b/tasmota/tasmota_xdrv_driver/xdrv_56_rtc_chips.ino index 0de267656..01de30b39 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_56_rtc_chips.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_56_rtc_chips.ino @@ -432,7 +432,7 @@ void CmndRtcNtpServer(void) { * Interface \*********************************************************************************************/ -bool Xdrv56(uint8_t function) { +bool Xdrv56(uint32_t function) { bool result = false; #ifdef RTC_NTP_SERVER diff --git a/tasmota/tasmota_xdrv_driver/xdrv_57_9_tasmesh.ino b/tasmota/tasmota_xdrv_driver/xdrv_57_9_tasmesh.ino index d309b4d59..5395da2f7 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_57_9_tasmesh.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_57_9_tasmesh.ino @@ -814,7 +814,7 @@ void CmndMeshInterval(void) { * Interface \*********************************************************************************************/ -bool Xdrv57(uint8_t function) { +bool Xdrv57(uint32_t function) { bool result = false; switch (function) { diff --git a/tasmota/tasmota_xdrv_driver/xdrv_58_range_extender.ino b/tasmota/tasmota_xdrv_driver/xdrv_58_range_extender.ino index 7fb999063..0b0e382ce 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_58_range_extender.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_58_range_extender.ino @@ -344,7 +344,7 @@ void rngxSetupNAPT(void) * Interface \*********************************************************************************************/ -bool Xdrv58(uint8_t function) +bool Xdrv58(uint32_t function) { bool result = false; diff --git a/tasmota/tasmota_xdrv_driver/xdrv_59_influxdb.ino b/tasmota/tasmota_xdrv_driver/xdrv_59_influxdb.ino index d98011399..ea95998ea 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_59_influxdb.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_59_influxdb.ino @@ -561,7 +561,7 @@ void CmndInfluxDbPeriod(void) { * Interface \*********************************************************************************************/ -bool Xdrv59(uint8_t function) { +bool Xdrv59(uint32_t function) { bool result = false; if (FUNC_PRE_INIT == function) { diff --git a/tasmota/tasmota_xdrv_driver/xdrv_60_shift595.ino b/tasmota/tasmota_xdrv_driver/xdrv_60_shift595.ino index 4e816fc7e..d18410afb 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_60_shift595.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_60_shift595.ino @@ -98,7 +98,7 @@ void CmndShift595Devices(void) { * Interface \*********************************************************************************************/ -bool Xdrv60(uint8_t function) { +bool Xdrv60(uint32_t function) { bool result = false; if (FUNC_PRE_INIT == function) { diff --git a/tasmota/tasmota_xdrv_driver/xdrv_61_ds3502.ino b/tasmota/tasmota_xdrv_driver/xdrv_61_ds3502.ino index a8d05f6b4..0b158bdef 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_61_ds3502.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_61_ds3502.ino @@ -73,7 +73,7 @@ void CmndWiper(void) { * Interface \*********************************************************************************************/ -bool Xdrv61(uint8_t function) { +bool Xdrv61(uint32_t function) { if (!I2cEnabled(XI2C_67)) { return false; } bool result = false; diff --git a/tasmota/tasmota_xdrv_driver/xdrv_62_improv.ino b/tasmota/tasmota_xdrv_driver/xdrv_62_improv.ino index 6dc0abb68..4b3a15154 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_62_improv.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_62_improv.ino @@ -340,7 +340,7 @@ void ImprovInit(void) { * Interface \*********************************************************************************************/ -bool Xdrv62(uint8_t function) { +bool Xdrv62(uint32_t function) { bool result = false; switch (function) { diff --git a/tasmota/tasmota_xdrv_driver/xdrv_63_modbus_bridge.ino b/tasmota/tasmota_xdrv_driver/xdrv_63_modbus_bridge.ino index 31b1c7a19..7dfa2a116 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_63_modbus_bridge.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_63_modbus_bridge.ino @@ -1119,7 +1119,7 @@ void CmndModbusTCPConnect(void) * Interface \*********************************************************************************************/ -bool Xdrv63(uint8_t function) +bool Xdrv63(uint32_t function) { bool result = false; diff --git a/tasmota/tasmota_xdrv_driver/xdrv_79_esp32_ble.ino b/tasmota/tasmota_xdrv_driver/xdrv_79_esp32_ble.ino index 196c53d27..7060671a6 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_79_esp32_ble.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_79_esp32_ble.ino @@ -3583,7 +3583,7 @@ int ExtRestartBLEIfEnabled(){ return 0; } -bool Xdrv79(uint8_t function) +bool Xdrv79(uint32_t function) { //if (!Settings->flag5.mi32_enable) { return false; } // SetOption115 - Enable ESP32 BLE BLE diff --git a/tasmota/tasmota_xdrv_driver/xdrv_81_esp32_webcam.ino b/tasmota/tasmota_xdrv_driver/xdrv_81_esp32_webcam.ino index 11e57f2c4..c03031c56 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_81_esp32_webcam.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_81_esp32_webcam.ino @@ -1422,7 +1422,7 @@ void WcStatsShow(void) { * Interface \*********************************************************************************************/ -bool Xdrv81(uint8_t function) { +bool Xdrv81(uint32_t function) { bool result = false; switch (function) { diff --git a/tasmota/tasmota_xdrv_driver/xdrv_82_esp32_ethernet.ino b/tasmota/tasmota_xdrv_driver/xdrv_82_esp32_ethernet.ino index 525e878cc..922d44abc 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_82_esp32_ethernet.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_82_esp32_ethernet.ino @@ -297,7 +297,7 @@ void CmndEthSetIpConfig(void) { * Interface \*********************************************************************************************/ -bool Xdrv82(uint8_t function) { +bool Xdrv82(uint32_t function) { bool result = false; switch (function) { diff --git a/tasmota/tasmota_xdrv_driver/xdrv_83_esp32_watch.ino b/tasmota/tasmota_xdrv_driver/xdrv_83_esp32_watch.ino index 14ce4eb12..e318d2251 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_83_esp32_watch.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_83_esp32_watch.ino @@ -434,7 +434,7 @@ bool TTGO_button(void) { * Interface \*********************************************************************************************/ -bool Xdrv83(uint8_t function) { +bool Xdrv83(uint32_t function) { bool result = false; switch (function) { diff --git a/tasmota/tasmota_xdrv_driver/xdrv_85_esp32_ble_eq3_trv.ino b/tasmota/tasmota_xdrv_driver/xdrv_85_esp32_ble_eq3_trv.ino index 0af5add13..67103ce35 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_85_esp32_ble_eq3_trv.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_85_esp32_ble_eq3_trv.ino @@ -1745,7 +1745,7 @@ void EQ3DiscoveryOneEQ3(){ * Interface \*********************************************************************************************/ -bool Xdrv85(uint8_t function) +bool Xdrv85(uint32_t function) { bool result = false; diff --git a/tasmota/tasmota_xdrv_driver/xdrv_86_esp32_sonoff_spm.ino b/tasmota/tasmota_xdrv_driver/xdrv_86_esp32_sonoff_spm.ino index aa0d8ace2..058f83813 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_86_esp32_sonoff_spm.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_86_esp32_sonoff_spm.ino @@ -2631,7 +2631,7 @@ void CmndSSPMPowerOnState(void) { * Interface \*********************************************************************************************/ -bool Xdrv86(uint8_t function) { +bool Xdrv86(uint32_t function) { bool result = false; if (FUNC_INIT == function) { diff --git a/tasmota/tasmota_xdrv_driver/xdrv_87_esp32_sonoff_tm1621.ino b/tasmota/tasmota_xdrv_driver/xdrv_87_esp32_sonoff_tm1621.ino index 8c31aa1a5..70926f5ff 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_87_esp32_sonoff_tm1621.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_87_esp32_sonoff_tm1621.ino @@ -566,7 +566,7 @@ void CmndDspSpeed(void) { * Interface \*********************************************************************************************/ -bool Xdrv87(uint8_t function) { +bool Xdrv87(uint32_t function) { bool result = false; if (FUNC_INIT == function) { diff --git a/tasmota/tasmota_xdrv_driver/xdrv_88_esp32_shelly_pro.ino b/tasmota/tasmota_xdrv_driver/xdrv_88_esp32_shelly_pro.ino index a822b04c9..9642163ce 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_88_esp32_shelly_pro.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_88_esp32_shelly_pro.ino @@ -147,7 +147,7 @@ void ShellyProLedLinkWifiOff(void) { * Interface \*********************************************************************************************/ -bool Xdrv88(uint8_t function) { +bool Xdrv88(uint32_t function) { bool result = false; if (FUNC_PRE_INIT == function) { diff --git a/tasmota/tasmota_xdrv_driver/xdrv_89_esp32_dali.ino b/tasmota/tasmota_xdrv_driver/xdrv_89_esp32_dali.ino index 0a247a2bd..d1fbeee5c 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_89_esp32_dali.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_89_esp32_dali.ino @@ -556,7 +556,7 @@ bool DaliJsonParse() * Interface \*********************************************************************************************/ -bool Xdrv89(uint8_t function) +bool Xdrv89(uint32_t function) { bool result = false; diff --git a/tasmota/tasmota_xdrv_driver/xdrv_90_dingtian_relay.ino b/tasmota/tasmota_xdrv_driver/xdrv_90_dingtian_relay.ino index 05a1fb1b3..16ae49dda 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_90_dingtian_relay.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_90_dingtian_relay.ino @@ -179,7 +179,7 @@ void DingtianShow(bool json) * Interface \*********************************************************************************************/ -bool Xdrv90(uint8_t function) { +bool Xdrv90(uint32_t function) { bool result = false; if (FUNC_PRE_INIT == function) { diff --git a/tasmota/tasmota_xdrv_driver/xdrv_98_file_settings_demo.ino b/tasmota/tasmota_xdrv_driver/xdrv_98_file_settings_demo.ino index e4459aeb7..f53fd65e0 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_98_file_settings_demo.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_98_file_settings_demo.ino @@ -174,7 +174,7 @@ void DrvDemoSettingsSave(void) { * Interface \*********************************************************************************************/ -bool Xdrv98(uint8_t function) { +bool Xdrv98(uint32_t function) { bool result = false; switch (function) { diff --git a/tasmota/tasmota_xdsp_display/xdsp_01_lcd.ino b/tasmota/tasmota_xdsp_display/xdsp_01_lcd.ino index d7ec6ac2a..2dff946f2 100644 --- a/tasmota/tasmota_xdsp_display/xdsp_01_lcd.ino +++ b/tasmota/tasmota_xdsp_display/xdsp_01_lcd.ino @@ -197,7 +197,7 @@ void LcdRefresh(void) // Every second * Interface \*********************************************************************************************/ -bool Xdsp01(uint8_t function) +bool Xdsp01(uint32_t function) { if (!I2cEnabled(XI2C_03)) { return false; } diff --git a/tasmota/tasmota_xdsp_display/xdsp_02_ssd1306.ino b/tasmota/tasmota_xdsp_display/xdsp_02_ssd1306.ino index 0d1fc27e2..5f9657069 100644 --- a/tasmota/tasmota_xdsp_display/xdsp_02_ssd1306.ino +++ b/tasmota/tasmota_xdsp_display/xdsp_02_ssd1306.ino @@ -167,8 +167,7 @@ void Ssd1306Refresh(void) // Every second * Interface \*********************************************************************************************/ -bool Xdsp02(byte function) -{ +bool Xdsp02(uint32_t function) { if (!I2cEnabled(XI2C_04)) { return false; } bool result = false; diff --git a/tasmota/tasmota_xdsp_display/xdsp_03_matrix.ino b/tasmota/tasmota_xdsp_display/xdsp_03_matrix.ino index 09d8b8587..c314d4982 100644 --- a/tasmota/tasmota_xdsp_display/xdsp_03_matrix.ino +++ b/tasmota/tasmota_xdsp_display/xdsp_03_matrix.ino @@ -333,7 +333,7 @@ void MatrixRefresh(void) // Every second * Interface \*********************************************************************************************/ -bool Xdsp03(uint8_t function) +bool Xdsp03(uint32_t function) { if (!I2cEnabled(XI2C_05)) { return false; } diff --git a/tasmota/tasmota_xdsp_display/xdsp_04_ili9341.ino b/tasmota/tasmota_xdsp_display/xdsp_04_ili9341.ino index 3b6a8de9f..96dae6558 100644 --- a/tasmota/tasmota_xdsp_display/xdsp_04_ili9341.ino +++ b/tasmota/tasmota_xdsp_display/xdsp_04_ili9341.ino @@ -366,7 +366,7 @@ void ILI9341_Refresh(void) { // Every second /*********************************************************************************************\ * Interface \*********************************************************************************************/ -bool Xdsp04(uint8_t function) +bool Xdsp04(uint32_t function) { bool result = false; diff --git a/tasmota/tasmota_xdsp_display/xdsp_05_epaper_29.ino b/tasmota/tasmota_xdsp_display/xdsp_05_epaper_29.ino index 54a3eac8a..46f8dabe2 100644 --- a/tasmota/tasmota_xdsp_display/xdsp_05_epaper_29.ino +++ b/tasmota/tasmota_xdsp_display/xdsp_05_epaper_29.ino @@ -178,7 +178,7 @@ void EpdRefresh29(void) // Every second * Interface \*********************************************************************************************/ -bool Xdsp05(uint8_t function) +bool Xdsp05(uint32_t function) { bool result = false; diff --git a/tasmota/tasmota_xdsp_display/xdsp_06_epaper_42.ino b/tasmota/tasmota_xdsp_display/xdsp_06_epaper_42.ino index d0baef8ab..f8f59bd7f 100644 --- a/tasmota/tasmota_xdsp_display/xdsp_06_epaper_42.ino +++ b/tasmota/tasmota_xdsp_display/xdsp_06_epaper_42.ino @@ -118,7 +118,7 @@ void EpdRefresh42() // Every second * Interface \*********************************************************************************************/ -bool Xdsp06(uint8_t function) +bool Xdsp06(uint32_t function) { bool result = false; diff --git a/tasmota/tasmota_xdsp_display/xdsp_07_sh1106.ino b/tasmota/tasmota_xdsp_display/xdsp_07_sh1106.ino index a8434f820..689e2273c 100644 --- a/tasmota/tasmota_xdsp_display/xdsp_07_sh1106.ino +++ b/tasmota/tasmota_xdsp_display/xdsp_07_sh1106.ino @@ -165,7 +165,7 @@ void SH1106Refresh(void) // Every second * Interface \*********************************************************************************************/ -bool Xdsp07(uint8_t function) +bool Xdsp07(uint32_t function) { if (!I2cEnabled(XI2C_06)) { return false; } diff --git a/tasmota/tasmota_xdsp_display/xdsp_09_SSD1351.ino b/tasmota/tasmota_xdsp_display/xdsp_09_SSD1351.ino index 8a30ad2c8..ffb47f425 100644 --- a/tasmota/tasmota_xdsp_display/xdsp_09_SSD1351.ino +++ b/tasmota/tasmota_xdsp_display/xdsp_09_SSD1351.ino @@ -153,7 +153,7 @@ void SSD1351Refresh(void) { // Every second * Interface \*********************************************************************************************/ -bool Xdsp09(uint8_t function) { +bool Xdsp09(uint32_t function) { bool result = false; if (FUNC_DISPLAY_INIT_DRIVER == function) { diff --git a/tasmota/tasmota_xdsp_display/xdsp_10_RA8876.ino b/tasmota/tasmota_xdsp_display/xdsp_10_RA8876.ino index 80c5b4f0f..33b4fc438 100644 --- a/tasmota/tasmota_xdsp_display/xdsp_10_RA8876.ino +++ b/tasmota/tasmota_xdsp_display/xdsp_10_RA8876.ino @@ -297,7 +297,7 @@ Serial.print("Text test took "); Serial.print(elapsedtime); Serial.println(" ms" /*********************************************************************************************\ * Interface \*********************************************************************************************/ -bool Xdsp10(uint8_t function) +bool Xdsp10(uint32_t function) { bool result = false; diff --git a/tasmota/tasmota_xdsp_display/xdsp_11_sevenseg.ino b/tasmota/tasmota_xdsp_display/xdsp_11_sevenseg.ino index f2c48adb9..bb8792259 100644 --- a/tasmota/tasmota_xdsp_display/xdsp_11_sevenseg.ino +++ b/tasmota/tasmota_xdsp_display/xdsp_11_sevenseg.ino @@ -422,7 +422,7 @@ void SevensegRefresh(void) // Every second * Interface \*********************************************************************************************/ -bool Xdsp11(uint8_t function) +bool Xdsp11(uint32_t function) { if (!I2cEnabled(XI2C_47)) { return false; } diff --git a/tasmota/tasmota_xdsp_display/xdsp_12_ST7789.ino b/tasmota/tasmota_xdsp_display/xdsp_12_ST7789.ino index 6553fc6a1..2b3c818ae 100644 --- a/tasmota/tasmota_xdsp_display/xdsp_12_ST7789.ino +++ b/tasmota/tasmota_xdsp_display/xdsp_12_ST7789.ino @@ -176,7 +176,7 @@ st7789_ctouch_counter++; /*********************************************************************************************\ * Interface \*********************************************************************************************/ -bool Xdsp12(uint8_t function) +bool Xdsp12(uint32_t function) { bool result = false; diff --git a/tasmota/tasmota_xdsp_display/xdsp_14_SSD1331.ino b/tasmota/tasmota_xdsp_display/xdsp_14_SSD1331.ino index 3d531d229..e455a66ce 100644 --- a/tasmota/tasmota_xdsp_display/xdsp_14_SSD1331.ino +++ b/tasmota/tasmota_xdsp_display/xdsp_14_SSD1331.ino @@ -169,7 +169,7 @@ void SSD1331Refresh(void) { // Every second * Interface \*********************************************************************************************/ -bool Xdsp14(uint8_t function) { +bool Xdsp14(uint32_t function) { bool result = false; if (FUNC_DISPLAY_INIT_DRIVER == function) { diff --git a/tasmota/tasmota_xdsp_display/xdsp_15_tm1637.ino b/tasmota/tasmota_xdsp_display/xdsp_15_tm1637.ino index 144921527..0deb8d4a8 100644 --- a/tasmota/tasmota_xdsp_display/xdsp_15_tm1637.ino +++ b/tasmota/tasmota_xdsp_display/xdsp_15_tm1637.ino @@ -1284,7 +1284,7 @@ void TM1637Refresh(void) * Interface \*********************************************************************************************/ -bool Xdsp15(uint8_t function) +bool Xdsp15(uint32_t function) { bool result = false; diff --git a/tasmota/tasmota_xdsp_display/xdsp_16_esp32_epaper_47.ino b/tasmota/tasmota_xdsp_display/xdsp_16_esp32_epaper_47.ino index bc6473efe..15b79955c 100644 --- a/tasmota/tasmota_xdsp_display/xdsp_16_esp32_epaper_47.ino +++ b/tasmota/tasmota_xdsp_display/xdsp_16_esp32_epaper_47.ino @@ -278,7 +278,7 @@ void EPD47_CheckTouch(void) { * Interface \*********************************************************************************************/ -bool Xdsp16(uint8_t function) +bool Xdsp16(uint32_t function) { bool result = false; diff --git a/tasmota/tasmota_xdsp_display/xdsp_17_universal.ino b/tasmota/tasmota_xdsp_display/xdsp_17_universal.ino index 6a1f970da..3a24870d4 100644 --- a/tasmota/tasmota_xdsp_display/xdsp_17_universal.ino +++ b/tasmota/tasmota_xdsp_display/xdsp_17_universal.ino @@ -481,7 +481,7 @@ void UDISP_Refresh(void) // Every second * Interface \*********************************************************************************************/ -bool Xdsp17(uint8_t function) { +bool Xdsp17(uint32_t function) { bool result = false; if (FUNC_DISPLAY_INIT_DRIVER == function) { diff --git a/tasmota/tasmota_xdsp_display/xdsp_18_berry_display.ino b/tasmota/tasmota_xdsp_display/xdsp_18_berry_display.ino index 11875692e..98ace0f0c 100644 --- a/tasmota/tasmota_xdsp_display/xdsp_18_berry_display.ino +++ b/tasmota/tasmota_xdsp_display/xdsp_18_berry_display.ino @@ -26,7 +26,7 @@ * Interface \*********************************************************************************************/ -bool Xdsp18(uint8_t function) { +bool Xdsp18(uint32_t function) { bool result = false; switch (function) { diff --git a/tasmota/tasmota_xdsp_display/xdsp_19_max7219_matrix.ino b/tasmota/tasmota_xdsp_display/xdsp_19_max7219_matrix.ino index 3e1a5c258..fca13278b 100644 --- a/tasmota/tasmota_xdsp_display/xdsp_19_max7219_matrix.ino +++ b/tasmota/tasmota_xdsp_display/xdsp_19_max7219_matrix.ino @@ -305,7 +305,7 @@ bool MAX7291Matrix_showTime() #endif // USE_DISPLAY_MODES1TO5 -bool Xdsp19(uint8_t function) +bool Xdsp19(uint32_t function) { bool result = false; diff --git a/tasmota/tasmota_xlgt_light/xlgt_01_ws2812.ino b/tasmota/tasmota_xlgt_light/xlgt_01_ws2812.ino index 715851e4c..e7a65a5ee 100644 --- a/tasmota/tasmota_xlgt_light/xlgt_01_ws2812.ino +++ b/tasmota/tasmota_xlgt_light/xlgt_01_ws2812.ino @@ -771,7 +771,7 @@ void CmndWidth(void) * Interface \*********************************************************************************************/ -bool Xlgt01(uint8_t function) +bool Xlgt01(uint32_t function) { bool result = false; diff --git a/tasmota/tasmota_xlgt_light/xlgt_02_my92x1.ino b/tasmota/tasmota_xlgt_light/xlgt_02_my92x1.ino index ef23c3c9c..ec72df8d8 100644 --- a/tasmota/tasmota_xlgt_light/xlgt_02_my92x1.ino +++ b/tasmota/tasmota_xlgt_light/xlgt_02_my92x1.ino @@ -148,7 +148,7 @@ void My92x1ModuleSelected(void) * Interface \*********************************************************************************************/ -bool Xlgt02(uint8_t function) +bool Xlgt02(uint32_t function) { bool result = false; diff --git a/tasmota/tasmota_xlgt_light/xlgt_03_sm16716.ino b/tasmota/tasmota_xlgt_light/xlgt_03_sm16716.ino index b1d4207b8..407ed67b9 100644 --- a/tasmota/tasmota_xlgt_light/xlgt_03_sm16716.ino +++ b/tasmota/tasmota_xlgt_light/xlgt_03_sm16716.ino @@ -170,7 +170,7 @@ void Sm16716ModuleSelected(void) * Interface \*********************************************************************************************/ -bool Xlgt03(uint8_t function) +bool Xlgt03(uint32_t function) { bool result = false; diff --git a/tasmota/tasmota_xlgt_light/xlgt_04_sm2135.ino b/tasmota/tasmota_xlgt_light/xlgt_04_sm2135.ino index a9f49c3d1..0c9b86ef0 100644 --- a/tasmota/tasmota_xlgt_light/xlgt_04_sm2135.ino +++ b/tasmota/tasmota_xlgt_light/xlgt_04_sm2135.ino @@ -70,7 +70,7 @@ enum Sm2135Color { SM2135_WCGRB, // 1 (4064) - Action LSC GRB (20mA) an SM2135_WCBGR15W, // 6 (4069) - BGR (45mA) and CW (60mA) SM2135_WCBRG_SETALL, // 7 (4070) - Fitop 10W RGBCCT BRG (15mA) and CW (40mA) SM2135_RESERVED_8, // 8 (4071) - Reserved - currently fallsback to 2 - SM2135_WCGRB_ALL, // 9 (4072) - GRB (20mA) and CW (15mA) like 1 but reset either RGB or CW + SM2135_WCGRB_ALL, // 9 (4072) - Qualitel GRB (20mA) and CW (15mA) like 1 but reset either RGB or CW SM2135_WCBGR_ALL // 10 (4073) - BGR (20mA) and CW (15mA) like 2 but reset either RGB or CW }; @@ -227,7 +227,7 @@ void Sm2135ModuleSelected(void) Sm2135.clk = Pin(GPIO_SM2135_CLK); Sm2135.data = Pin(GPIO_SM2135_DAT, GPIO_ANY); - // See #define MAX_SM2135_DAT 7 in tasmota_template.h + // See #define MAX_SM2135_DAT 10 in tasmota_template.h Sm2135.model = GetPin(Sm2135.data) - AGPIO(GPIO_SM2135_DAT); // 0 .. 9 // Legacy support of model selection @@ -271,7 +271,7 @@ void Sm2135ModuleSelected(void) * Interface \*********************************************************************************************/ -bool Xlgt04(uint8_t function) +bool Xlgt04(uint32_t function) { bool result = false; diff --git a/tasmota/tasmota_xlgt_light/xlgt_05_sonoff_l1.ino b/tasmota/tasmota_xlgt_light/xlgt_05_sonoff_l1.ino index 080bc9c7a..8e793761f 100644 --- a/tasmota/tasmota_xlgt_light/xlgt_05_sonoff_l1.ino +++ b/tasmota/tasmota_xlgt_light/xlgt_05_sonoff_l1.ino @@ -399,7 +399,7 @@ void CmndMusicSync(void) { * Interface \*********************************************************************************************/ -bool Xlgt05(uint8_t function) +bool Xlgt05(uint32_t function) { bool result = false; diff --git a/tasmota/tasmota_xlgt_light/xlgt_06_electriq_moodl.ino b/tasmota/tasmota_xlgt_light/xlgt_06_electriq_moodl.ino index f6bef1ff5..da984ab05 100644 --- a/tasmota/tasmota_xlgt_light/xlgt_06_electriq_moodl.ino +++ b/tasmota/tasmota_xlgt_light/xlgt_06_electriq_moodl.ino @@ -82,7 +82,7 @@ void ElectriqMoodLModuleSelected(void) * Interface \*********************************************************************************************/ -bool Xlgt06(uint8_t function) +bool Xlgt06(uint32_t function) { bool result = false; diff --git a/tasmota/tasmota_xlgt_light/xlgt_07_lsc_mcsl.ino b/tasmota/tasmota_xlgt_light/xlgt_07_lsc_mcsl.ino index d7c9bbfd2..75bbd7102 100644 --- a/tasmota/tasmota_xlgt_light/xlgt_07_lsc_mcsl.ino +++ b/tasmota/tasmota_xlgt_light/xlgt_07_lsc_mcsl.ino @@ -294,7 +294,7 @@ void LscMcWebGetArg(void) { * Interface \*********************************************************************************************/ -bool Xlgt07(uint8_t function) +bool Xlgt07(uint32_t function) { bool result = false; diff --git a/tasmota/tasmota_xlgt_light/xlgt_08_bp5758d.ino b/tasmota/tasmota_xlgt_light/xlgt_08_bp5758d.ino index a0499bac8..8bcee5894 100644 --- a/tasmota/tasmota_xlgt_light/xlgt_08_bp5758d.ino +++ b/tasmota/tasmota_xlgt_light/xlgt_08_bp5758d.ino @@ -187,7 +187,7 @@ void Bp5758dModuleSelected(void) * Interface \*********************************************************************************************/ -bool Xlgt08(uint8_t function) +bool Xlgt08(uint32_t function) { bool result = false; diff --git a/tasmota/tasmota_xlgt_light/xlgt_09_sm2335.ino b/tasmota/tasmota_xlgt_light/xlgt_09_sm2335.ino index eb4c8f035..9d09f2068 100644 --- a/tasmota/tasmota_xlgt_light/xlgt_09_sm2335.ino +++ b/tasmota/tasmota_xlgt_light/xlgt_09_sm2335.ino @@ -157,7 +157,7 @@ void SM2335ModuleSelected(void) * Interface \*********************************************************************************************/ -bool Xlgt09(uint8_t function) +bool Xlgt09(uint32_t function) { bool result = false; diff --git a/tasmota/tasmota_xlgt_light/xlgt_10_bp1658cj.ino b/tasmota/tasmota_xlgt_light/xlgt_10_bp1658cj.ino index c241e796d..d9ec3e194 100644 --- a/tasmota/tasmota_xlgt_light/xlgt_10_bp1658cj.ino +++ b/tasmota/tasmota_xlgt_light/xlgt_10_bp1658cj.ino @@ -160,7 +160,7 @@ void BP1658CJModuleSelected(void) * Interface \*********************************************************************************************/ -bool Xlgt10(uint8_t function) +bool Xlgt10(uint32_t function) { bool result = false; diff --git a/tasmota/tasmota_xnrg_energy/xnrg_01_hlw8012.ino b/tasmota/tasmota_xnrg_energy/xnrg_01_hlw8012.ino index d28347af5..cfbd76d94 100644 --- a/tasmota/tasmota_xnrg_energy/xnrg_01_hlw8012.ino +++ b/tasmota/tasmota_xnrg_energy/xnrg_01_hlw8012.ino @@ -312,7 +312,7 @@ bool HlwCommand(void) { * Interface \*********************************************************************************************/ -bool Xnrg01(uint8_t function) { +bool Xnrg01(uint32_t function) { bool result = false; switch (function) { diff --git a/tasmota/tasmota_xnrg_energy/xnrg_02_cse7766.ino b/tasmota/tasmota_xnrg_energy/xnrg_02_cse7766.ino index 6717304cf..fd2ccc11e 100644 --- a/tasmota/tasmota_xnrg_energy/xnrg_02_cse7766.ino +++ b/tasmota/tasmota_xnrg_energy/xnrg_02_cse7766.ino @@ -279,7 +279,7 @@ bool CseCommand(void) { * Interface \*********************************************************************************************/ -bool Xnrg02(uint8_t function) { +bool Xnrg02(uint32_t function) { bool result = false; switch (function) { diff --git a/tasmota/tasmota_xnrg_energy/xnrg_03_pzem004t.ino b/tasmota/tasmota_xnrg_energy/xnrg_03_pzem004t.ino index a9df4cd0b..7e6dc699b 100644 --- a/tasmota/tasmota_xnrg_energy/xnrg_03_pzem004t.ino +++ b/tasmota/tasmota_xnrg_energy/xnrg_03_pzem004t.ino @@ -279,7 +279,7 @@ bool PzemCommand(void) * Interface \*********************************************************************************************/ -bool Xnrg03(uint8_t function) +bool Xnrg03(uint32_t function) { bool result = false; diff --git a/tasmota/tasmota_xnrg_energy/xnrg_04_mcp39f501.ino b/tasmota/tasmota_xnrg_energy/xnrg_04_mcp39f501.ino index 807176c64..631fe9919 100644 --- a/tasmota/tasmota_xnrg_energy/xnrg_04_mcp39f501.ino +++ b/tasmota/tasmota_xnrg_energy/xnrg_04_mcp39f501.ino @@ -647,7 +647,7 @@ bool McpCommand(void) * Interface \*********************************************************************************************/ -bool Xnrg04(uint8_t function) +bool Xnrg04(uint32_t function) { bool result = false; diff --git a/tasmota/tasmota_xnrg_energy/xnrg_05_pzem_ac.ino b/tasmota/tasmota_xnrg_energy/xnrg_05_pzem_ac.ino index 21c50a4ff..0648525c9 100644 --- a/tasmota/tasmota_xnrg_energy/xnrg_05_pzem_ac.ino +++ b/tasmota/tasmota_xnrg_energy/xnrg_05_pzem_ac.ino @@ -149,7 +149,7 @@ bool PzemAcCommand(void) * Interface \*********************************************************************************************/ -bool Xnrg05(uint8_t function) +bool Xnrg05(uint32_t function) { bool result = false; diff --git a/tasmota/tasmota_xnrg_energy/xnrg_06_pzem_dc.ino b/tasmota/tasmota_xnrg_energy/xnrg_06_pzem_dc.ino index 1c6841154..d1336ca08 100644 --- a/tasmota/tasmota_xnrg_energy/xnrg_06_pzem_dc.ino +++ b/tasmota/tasmota_xnrg_energy/xnrg_06_pzem_dc.ino @@ -147,7 +147,7 @@ bool PzemDcCommand(void) * Interface \*********************************************************************************************/ -bool Xnrg06(uint8_t function) +bool Xnrg06(uint32_t function) { bool result = false; diff --git a/tasmota/tasmota_xnrg_energy/xnrg_07_ade7953.ino b/tasmota/tasmota_xnrg_energy/xnrg_07_ade7953.ino index 0cef9b6ab..f30619274 100644 --- a/tasmota/tasmota_xnrg_energy/xnrg_07_ade7953.ino +++ b/tasmota/tasmota_xnrg_energy/xnrg_07_ade7953.ino @@ -764,7 +764,7 @@ bool Ade7953Command(void) { * Interface \*********************************************************************************************/ -bool Xnrg07(uint8_t function) { +bool Xnrg07(uint32_t function) { if (!I2cEnabled(XI2C_07) && (SPI_MOSI_MISO != TasmotaGlobal.spi_enabled)) { return false; } bool result = false; diff --git a/tasmota/tasmota_xnrg_energy/xnrg_08_sdm120.ino b/tasmota/tasmota_xnrg_energy/xnrg_08_sdm120.ino index 5a54e1083..dbd2462cb 100644 --- a/tasmota/tasmota_xnrg_energy/xnrg_08_sdm120.ino +++ b/tasmota/tasmota_xnrg_energy/xnrg_08_sdm120.ino @@ -261,7 +261,7 @@ void Sdm220Show(bool json) { * Interface \*********************************************************************************************/ -bool Xnrg08(uint8_t function) +bool Xnrg08(uint32_t function) { bool result = false; diff --git a/tasmota/tasmota_xnrg_energy/xnrg_09_dds2382.ino b/tasmota/tasmota_xnrg_energy/xnrg_09_dds2382.ino index 885f966d6..329c58f51 100644 --- a/tasmota/tasmota_xnrg_energy/xnrg_09_dds2382.ino +++ b/tasmota/tasmota_xnrg_energy/xnrg_09_dds2382.ino @@ -110,7 +110,7 @@ void Dds2382DrvInit(void) * Interface \*********************************************************************************************/ -bool Xnrg09(uint8_t function) +bool Xnrg09(uint32_t function) { bool result = false; diff --git a/tasmota/tasmota_xnrg_energy/xnrg_10_sdm630.ino b/tasmota/tasmota_xnrg_energy/xnrg_10_sdm630.ino index 717ded0e8..dcbd2ea40 100644 --- a/tasmota/tasmota_xnrg_energy/xnrg_10_sdm630.ino +++ b/tasmota/tasmota_xnrg_energy/xnrg_10_sdm630.ino @@ -235,7 +235,7 @@ void Sdm630DrvInit(void) * Interface \*********************************************************************************************/ -bool Xnrg10(uint8_t function) +bool Xnrg10(uint32_t function) { bool result = false; diff --git a/tasmota/tasmota_xnrg_energy/xnrg_11_ddsu666.ino b/tasmota/tasmota_xnrg_energy/xnrg_11_ddsu666.ino index cad411916..59b4cb88a 100644 --- a/tasmota/tasmota_xnrg_energy/xnrg_11_ddsu666.ino +++ b/tasmota/tasmota_xnrg_energy/xnrg_11_ddsu666.ino @@ -152,7 +152,7 @@ void Ddsu666DrvInit(void) * Interface \*********************************************************************************************/ -bool Xnrg11(uint8_t function) +bool Xnrg11(uint32_t function) { bool result = false; diff --git a/tasmota/tasmota_xnrg_energy/xnrg_12_solaxX1.ino b/tasmota/tasmota_xnrg_energy/xnrg_12_solaxX1.ino index f454b1c06..c57fdd8d2 100644 --- a/tasmota/tasmota_xnrg_energy/xnrg_12_solaxX1.ino +++ b/tasmota/tasmota_xnrg_energy/xnrg_12_solaxX1.ino @@ -582,7 +582,7 @@ void solaxX1_Show(bool json) * Interface \*********************************************************************************************/ -bool Xnrg12(uint8_t function) +bool Xnrg12(uint32_t function) { bool result = false; diff --git a/tasmota/tasmota_xnrg_energy/xnrg_13_fif_le01mr.ino b/tasmota/tasmota_xnrg_energy/xnrg_13_fif_le01mr.ino index a064a5178..8fa11f7ef 100644 --- a/tasmota/tasmota_xnrg_energy/xnrg_13_fif_le01mr.ino +++ b/tasmota/tasmota_xnrg_energy/xnrg_13_fif_le01mr.ino @@ -282,7 +282,7 @@ void FifLEShow(bool json) { * Interface \*********************************************************************************************/ -bool Xnrg13(uint8_t function) +bool Xnrg13(uint32_t function) { bool result = false; diff --git a/tasmota/tasmota_xnrg_energy/xnrg_14_bl09xx.ino b/tasmota/tasmota_xnrg_energy/xnrg_14_bl09xx.ino index 740029725..9287bab21 100644 --- a/tasmota/tasmota_xnrg_energy/xnrg_14_bl09xx.ino +++ b/tasmota/tasmota_xnrg_energy/xnrg_14_bl09xx.ino @@ -404,7 +404,7 @@ void Bl09XXShow(bool json) { * Interface \*********************************************************************************************/ -bool Xnrg14(uint8_t function) { +bool Xnrg14(uint32_t function) { bool result = false; switch (function) { diff --git a/tasmota/tasmota_xnrg_energy/xnrg_15_teleinfo.ino b/tasmota/tasmota_xnrg_energy/xnrg_15_teleinfo.ino index a17361047..1a739084f 100644 --- a/tasmota/tasmota_xnrg_energy/xnrg_15_teleinfo.ino +++ b/tasmota/tasmota_xnrg_energy/xnrg_15_teleinfo.ino @@ -1064,7 +1064,7 @@ void TInfoShow(bool json) /*********************************************************************************************\ * Interface \*********************************************************************************************/ -bool Xnrg15(uint8_t function) +bool Xnrg15(uint32_t function) { bool result = false; switch (function) diff --git a/tasmota/tasmota_xnrg_energy/xnrg_16_iem3000.ino b/tasmota/tasmota_xnrg_energy/xnrg_16_iem3000.ino index 10e3a5de1..fa25d2048 100644 --- a/tasmota/tasmota_xnrg_energy/xnrg_16_iem3000.ino +++ b/tasmota/tasmota_xnrg_energy/xnrg_16_iem3000.ino @@ -203,7 +203,7 @@ void Iem3000DrvInit(void) * Interface \*********************************************************************************************/ -bool Xnrg16(uint8_t function) +bool Xnrg16(uint32_t function) { bool result = false; diff --git a/tasmota/tasmota_xnrg_energy/xnrg_17_ornowe517.ino b/tasmota/tasmota_xnrg_energy/xnrg_17_ornowe517.ino index 53c748ea2..117dab094 100644 --- a/tasmota/tasmota_xnrg_energy/xnrg_17_ornowe517.ino +++ b/tasmota/tasmota_xnrg_energy/xnrg_17_ornowe517.ino @@ -211,7 +211,7 @@ void We517DrvInit(void) * Interface \*********************************************************************************************/ -bool Xnrg17(uint8_t function) +bool Xnrg17(uint32_t function) { bool result = false; diff --git a/tasmota/tasmota_xnrg_energy/xnrg_18_sdm72.ino b/tasmota/tasmota_xnrg_energy/xnrg_18_sdm72.ino index d93732386..61a00ee4f 100644 --- a/tasmota/tasmota_xnrg_energy/xnrg_18_sdm72.ino +++ b/tasmota/tasmota_xnrg_energy/xnrg_18_sdm72.ino @@ -207,7 +207,7 @@ void Sdm72Show(bool json) { * Interface \*********************************************************************************************/ -bool Xnrg18(uint8_t function) +bool Xnrg18(uint32_t function) { bool result = false; diff --git a/tasmota/tasmota_xnrg_energy/xnrg_19_cse7761.ino b/tasmota/tasmota_xnrg_energy/xnrg_19_cse7761.ino index 5a282bc50..71e675e1b 100644 --- a/tasmota/tasmota_xnrg_energy/xnrg_19_cse7761.ino +++ b/tasmota/tasmota_xnrg_energy/xnrg_19_cse7761.ino @@ -668,7 +668,7 @@ bool Cse7761Command(void) { * Interface \*********************************************************************************************/ -bool Xnrg19(uint8_t function) { +bool Xnrg19(uint32_t function) { bool result = false; switch (function) { diff --git a/tasmota/tasmota_xnrg_energy/xnrg_21_sdm230.ino b/tasmota/tasmota_xnrg_energy/xnrg_21_sdm230.ino index 1c34c893d..e9607ab11 100644 --- a/tasmota/tasmota_xnrg_energy/xnrg_21_sdm230.ino +++ b/tasmota/tasmota_xnrg_energy/xnrg_21_sdm230.ino @@ -267,7 +267,7 @@ void Sdm230Show(bool json) { * Interface \*********************************************************************************************/ -bool Xnrg21(uint8_t function) +bool Xnrg21(uint32_t function) { bool result = false; diff --git a/tasmota/tasmota_xnrg_energy/xnrg_22_bl6523.ino b/tasmota/tasmota_xnrg_energy/xnrg_22_bl6523.ino index c87fd2a30..2bdd3eff4 100644 --- a/tasmota/tasmota_xnrg_energy/xnrg_22_bl6523.ino +++ b/tasmota/tasmota_xnrg_energy/xnrg_22_bl6523.ino @@ -330,7 +330,7 @@ void Bl6523DrvInit(void) * Interface \*********************************************************************************************/ -bool Xnrg22(uint8_t function) +bool Xnrg22(uint32_t function) { bool result = false; diff --git a/tasmota/tasmota_xnrg_energy/xnrg_23_ade7880.ino b/tasmota/tasmota_xnrg_energy/xnrg_23_ade7880.ino index 08e987f0c..181fbd9ed 100644 --- a/tasmota/tasmota_xnrg_energy/xnrg_23_ade7880.ino +++ b/tasmota/tasmota_xnrg_energy/xnrg_23_ade7880.ino @@ -755,7 +755,7 @@ void Ade7880Show(bool json) { * Interface \*********************************************************************************************/ -bool Xnrg23(uint8_t function) { +bool Xnrg23(uint32_t function) { if (!I2cEnabled(XI2C_65)) { return false; } bool result = false; diff --git a/tasmota/tasmota_xnrg_energy/xnrg_29_modbus.ino b/tasmota/tasmota_xnrg_energy/xnrg_29_modbus.ino index 33a3b81bc..6f78aa48a 100644 --- a/tasmota/tasmota_xnrg_energy/xnrg_29_modbus.ino +++ b/tasmota/tasmota_xnrg_energy/xnrg_29_modbus.ino @@ -773,7 +773,7 @@ void EnergyModbusShow(bool json) { * Interface \*********************************************************************************************/ -bool Xnrg29(uint8_t function) { +bool Xnrg29(uint32_t function) { bool result = false; switch (function) { diff --git a/tasmota/tasmota_xnrg_energy/xnrg_30_dummy.ino b/tasmota/tasmota_xnrg_energy/xnrg_30_dummy.ino index 021003e3a..8a1abd304 100644 --- a/tasmota/tasmota_xnrg_energy/xnrg_30_dummy.ino +++ b/tasmota/tasmota_xnrg_energy/xnrg_30_dummy.ino @@ -159,7 +159,7 @@ void NrgDummyDrvInit(void) { * Interface \*********************************************************************************************/ -bool Xnrg30(uint8_t function) { +bool Xnrg30(uint32_t function) { bool result = false; switch (function) { diff --git a/tasmota/tasmota_xsns_sensor/xsns_01_counter.ino b/tasmota/tasmota_xsns_sensor/xsns_01_counter.ino index 20c0ecc81..0ebb8663e 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_01_counter.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_01_counter.ino @@ -395,7 +395,7 @@ void CmndCounterDebounceHigh(void) * Interface \*********************************************************************************************/ -bool Xsns01(uint8_t function) +bool Xsns01(uint32_t function) { bool result = false; diff --git a/tasmota/tasmota_xsns_sensor/xsns_02_analog.ino b/tasmota/tasmota_xsns_sensor/xsns_02_analog.ino index 81f562584..8c6464aea 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_02_analog.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_02_analog.ino @@ -841,7 +841,7 @@ void CmndAdcParam(void) { * Interface \*********************************************************************************************/ -bool Xsns02(uint8_t function) { +bool Xsns02(uint32_t function) { bool result = false; switch (function) { diff --git a/tasmota/tasmota_xsns_sensor/xsns_04_snfsc.ino b/tasmota/tasmota_xsns_sensor/xsns_04_snfsc.ino index 545c39e7a..16bc77212 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_04_snfsc.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_04_snfsc.ino @@ -148,7 +148,7 @@ void SonoffScShow(bool json) * Interface \*********************************************************************************************/ -bool Xsns04(uint8_t function) +bool Xsns04(uint32_t function) { bool result = false; diff --git a/tasmota/tasmota_xsns_sensor/xsns_05_ds18x20.ino b/tasmota/tasmota_xsns_sensor/xsns_05_ds18x20.ino index 8c5ae975e..74ccc478e 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_05_ds18x20.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_05_ds18x20.ino @@ -611,7 +611,7 @@ void CmndDSAlias(void) { * Interface \*********************************************************************************************/ -bool Xsns05(uint8_t function) { +bool Xsns05(uint32_t function) { bool result = false; if (PinUsed(GPIO_DSB, GPIO_ANY)) { diff --git a/tasmota/tasmota_xsns_sensor/xsns_05_esp32_ds18x20.ino b/tasmota/tasmota_xsns_sensor/xsns_05_esp32_ds18x20.ino index 2346cbe96..310f9d5da 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_05_esp32_ds18x20.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_05_esp32_ds18x20.ino @@ -325,7 +325,7 @@ void CmndDSAlias(void) { * Interface \*********************************************************************************************/ -bool Xsns05(uint8_t function) { +bool Xsns05(uint32_t function) { bool result = false; if (PinUsed(GPIO_DSB, GPIO_ANY)) { diff --git a/tasmota/tasmota_xsns_sensor/xsns_06_dht_v5.ino b/tasmota/tasmota_xsns_sensor/xsns_06_dht_v5.ino index 62a7d84ae..bab1efaec 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_06_dht_v5.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_06_dht_v5.ino @@ -296,7 +296,7 @@ void DhtShow(bool json) { * Interface \*********************************************************************************************/ -bool Xsns06(uint8_t function) { +bool Xsns06(uint32_t function) { bool result = false; if (dht_active) { diff --git a/tasmota/tasmota_xsns_sensor/xsns_06_dht_v6.ino b/tasmota/tasmota_xsns_sensor/xsns_06_dht_v6.ino index a2bf67350..c2160b512 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_06_dht_v6.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_06_dht_v6.ino @@ -371,7 +371,7 @@ void DhtShow(bool json) { * Interface \*********************************************************************************************/ -bool Xsns06(uint8_t function) { +bool Xsns06(uint32_t function) { bool result = false; if (dht_active) { diff --git a/tasmota/tasmota_xsns_sensor/xsns_06_esp32_dht.ino b/tasmota/tasmota_xsns_sensor/xsns_06_esp32_dht.ino index 1472b7b53..eb902577a 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_06_esp32_dht.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_06_esp32_dht.ino @@ -130,7 +130,7 @@ void DhtShow(bool json) { * Interface \*********************************************************************************************/ -bool Xsns06(uint8_t function) { +bool Xsns06(uint32_t function) { bool result = false; if (dht_active) { diff --git a/tasmota/tasmota_xsns_sensor/xsns_07_sht1x.ino b/tasmota/tasmota_xsns_sensor/xsns_07_sht1x.ino index 4d571960c..e420eea1b 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_07_sht1x.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_07_sht1x.ino @@ -184,7 +184,7 @@ void ShtShow(bool json) { * Interface \*********************************************************************************************/ -bool Xsns07(uint8_t function) { +bool Xsns07(uint32_t function) { if (!I2cEnabled(XI2C_08)) { return false; } bool result = false; diff --git a/tasmota/tasmota_xsns_sensor/xsns_08_htu21.ino b/tasmota/tasmota_xsns_sensor/xsns_08_htu21.ino index 0b9c652ae..c9b535ffd 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_08_htu21.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_08_htu21.ino @@ -255,7 +255,7 @@ void HtuShow(bool json) * Interface \*********************************************************************************************/ -bool Xsns08(uint8_t function) +bool Xsns08(uint32_t function) { if (!I2cEnabled(XI2C_09)) { return false; } diff --git a/tasmota/tasmota_xsns_sensor/xsns_09_bmp.ino b/tasmota/tasmota_xsns_sensor/xsns_09_bmp.ino index 6846af7ae..503b8ff3e 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_09_bmp.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_09_bmp.ino @@ -645,7 +645,7 @@ void BMP_EnterSleep(void) * Interface \*********************************************************************************************/ -bool Xsns09(uint8_t function) +bool Xsns09(uint32_t function) { if (!I2cEnabled(XI2C_10)) { return false; } diff --git a/tasmota/tasmota_xsns_sensor/xsns_100_ina3221.ino b/tasmota/tasmota_xsns_sensor/xsns_100_ina3221.ino index 2b3571946..3ea91a9a2 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_100_ina3221.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_100_ina3221.ino @@ -418,7 +418,7 @@ void Ina3221Show(bool json) * Interface \*********************************************************************************************/ -bool Xsns100(uint8_t function) +bool Xsns100(uint32_t function) { if (!I2cEnabled(XI2C_72)) { return false; } diff --git a/tasmota/tasmota_xsns_sensor/xsns_10_bh1750.ino b/tasmota/tasmota_xsns_sensor/xsns_10_bh1750.ino index c67b0e24e..521defe68 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_10_bh1750.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_10_bh1750.ino @@ -193,7 +193,7 @@ void Bh1750Show(bool json) { * Interface \*********************************************************************************************/ -bool Xsns10(uint8_t function) { +bool Xsns10(uint32_t function) { if (!I2cEnabled(XI2C_11)) { return false; } bool result = false; diff --git a/tasmota/tasmota_xsns_sensor/xsns_11_veml6070.ino b/tasmota/tasmota_xsns_sensor/xsns_11_veml6070.ino index cb24554ad..59547b037 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_11_veml6070.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_11_veml6070.ino @@ -294,7 +294,7 @@ void Veml6070Show(bool json) * Interface \*********************************************************************************************/ -bool Xsns11(uint8_t function) +bool Xsns11(uint32_t function) { if (!I2cEnabled(XI2C_12)) { return false; } diff --git a/tasmota/tasmota_xsns_sensor/xsns_127_esp32_sensors.ino b/tasmota/tasmota_xsns_sensor/xsns_127_esp32_sensors.ino index 6da0baaca..c50d9a82d 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_127_esp32_sensors.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_127_esp32_sensors.ino @@ -126,7 +126,7 @@ void Esp32SensorShow(bool json) { * Interface \*********************************************************************************************/ -bool Xsns127(uint8_t function) { +bool Xsns127(uint32_t function) { bool result = false; switch (function) { diff --git a/tasmota/tasmota_xsns_sensor/xsns_12_ads1115.ino b/tasmota/tasmota_xsns_sensor/xsns_12_ads1115.ino index 052625249..98397babe 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_12_ads1115.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_12_ads1115.ino @@ -331,7 +331,7 @@ bool ADS1115_Command(void) * Interface \*********************************************************************************************/ -bool Xsns12(uint8_t function) +bool Xsns12(uint32_t function) { if (!I2cEnabled(XI2C_13)) { return false; } diff --git a/tasmota/tasmota_xsns_sensor/xsns_13_ina219.ino b/tasmota/tasmota_xsns_sensor/xsns_13_ina219.ino index 50e9a39e5..92a679e92 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_13_ina219.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_13_ina219.ino @@ -369,7 +369,7 @@ void Ina219Show(bool json) * Interface \*********************************************************************************************/ -bool Xsns13(uint8_t function) +bool Xsns13(uint32_t function) { if (!I2cEnabled(XI2C_14)) { return false; } diff --git a/tasmota/tasmota_xsns_sensor/xsns_14_sht3x.ino b/tasmota/tasmota_xsns_sensor/xsns_14_sht3x.ino index b073020e8..24dd17394 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_14_sht3x.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_14_sht3x.ino @@ -155,7 +155,7 @@ void Sht3xShow(bool json) { * Interface \*********************************************************************************************/ -bool Xsns14(uint8_t function) { +bool Xsns14(uint32_t function) { if (!I2cEnabled(XI2C_15)) { return false; } bool result = false; diff --git a/tasmota/tasmota_xsns_sensor/xsns_15_mhz19.ino b/tasmota/tasmota_xsns_sensor/xsns_15_mhz19.ino index 67745ddb4..3d89ff470 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_15_mhz19.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_15_mhz19.ino @@ -362,7 +362,7 @@ void MhzShow(bool json) * Interface \*********************************************************************************************/ -bool Xsns15(uint8_t function) +bool Xsns15(uint32_t function) { bool result = false; diff --git a/tasmota/tasmota_xsns_sensor/xsns_16_tsl2561.ino b/tasmota/tasmota_xsns_sensor/xsns_16_tsl2561.ino index d0674c522..357522cfb 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_16_tsl2561.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_16_tsl2561.ino @@ -116,7 +116,7 @@ void Tsl2561Show(bool json) * Interface \*********************************************************************************************/ -bool Xsns16(uint8_t function) +bool Xsns16(uint32_t function) { if (!I2cEnabled(XI2C_16)) { return false; } diff --git a/tasmota/tasmota_xsns_sensor/xsns_17_senseair.ino b/tasmota/tasmota_xsns_sensor/xsns_17_senseair.ino index de7d5a89b..a2a20196c 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_17_senseair.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_17_senseair.ino @@ -173,7 +173,7 @@ void SenseairShow(bool json) * Interface \*********************************************************************************************/ -bool Xsns17(uint8_t function) +bool Xsns17(uint32_t function) { bool result = false; diff --git a/tasmota/tasmota_xsns_sensor/xsns_18_pms5003.ino b/tasmota/tasmota_xsns_sensor/xsns_18_pms5003.ino index d1bdf5599..7a403fdb6 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_18_pms5003.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_18_pms5003.ino @@ -363,7 +363,7 @@ void PmsShow(bool json) * Interface \*********************************************************************************************/ -bool Xsns18(uint8_t function) +bool Xsns18(uint32_t function) { bool result = false; diff --git a/tasmota/tasmota_xsns_sensor/xsns_19_mgs.ino b/tasmota/tasmota_xsns_sensor/xsns_19_mgs.ino index 5334c5c48..519c48b0a 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_19_mgs.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_19_mgs.ino @@ -89,7 +89,7 @@ void MGSShow(bool json) * Interface \*********************************************************************************************/ -bool Xsns19(uint8_t function) +bool Xsns19(uint32_t function) { if (!I2cEnabled(XI2C_17)) { return false; } diff --git a/tasmota/tasmota_xsns_sensor/xsns_20_novasds.ino b/tasmota/tasmota_xsns_sensor/xsns_20_novasds.ino index 71a4b1c77..faa3cd3f9 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_20_novasds.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_20_novasds.ino @@ -249,7 +249,7 @@ void NovaSdsShow(bool json) * Interface \*********************************************************************************************/ -bool Xsns20(uint8_t function) +bool Xsns20(uint32_t function) { bool result = false; diff --git a/tasmota/tasmota_xsns_sensor/xsns_21_sgp30.ino b/tasmota/tasmota_xsns_sensor/xsns_21_sgp30.ino index a2509da94..7c4217da3 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_21_sgp30.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_21_sgp30.ino @@ -143,7 +143,7 @@ void Sgp30Show(bool json) * Interface \*********************************************************************************************/ -bool Xsns21(uint8_t function) +bool Xsns21(uint32_t function) { if (!I2cEnabled(XI2C_18)) { return false; } diff --git a/tasmota/tasmota_xsns_sensor/xsns_22_sr04.ino b/tasmota/tasmota_xsns_sensor/xsns_22_sr04.ino index df1764430..01f5a22a9 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_22_sr04.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_22_sr04.ino @@ -209,7 +209,7 @@ void Sr04Show(bool json) { * Interface \*********************************************************************************************/ -bool Xsns22(uint8_t function) { +bool Xsns22(uint32_t function) { bool result = false; if (SR04.type) { diff --git a/tasmota/tasmota_xsns_sensor/xsns_24_si1145.ino b/tasmota/tasmota_xsns_sensor/xsns_24_si1145.ino index 393211a9b..0f4df82e5 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_24_si1145.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_24_si1145.ino @@ -369,7 +369,7 @@ void Si1145Show(bool json) * Interface \*********************************************************************************************/ -bool Xsns24(uint8_t function) +bool Xsns24(uint32_t function) { if (!I2cEnabled(XI2C_19)) { return false; } diff --git a/tasmota/tasmota_xsns_sensor/xsns_26_lm75ad.ino b/tasmota/tasmota_xsns_sensor/xsns_26_lm75ad.ino index 03501b9a1..b8c271180 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_26_lm75ad.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_26_lm75ad.ino @@ -100,7 +100,7 @@ void LM75ADShow(bool json) * Interface \*********************************************************************************************/ -bool Xsns26(uint8_t function) +bool Xsns26(uint32_t function) { if (!I2cEnabled(XI2C_20)) { return false; } diff --git a/tasmota/tasmota_xsns_sensor/xsns_27_apds9960.ino b/tasmota/tasmota_xsns_sensor/xsns_27_apds9960.ino index 6c868a4be..64b6864a6 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_27_apds9960.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_27_apds9960.ino @@ -1992,7 +1992,7 @@ bool APDS9960CommandSensor(void) { * Interface \*********************************************************************************************/ -bool Xsns27(uint8_t function) { +bool Xsns27(uint32_t function) { if (!I2cEnabled(XI2C_21)) { return false; } bool result = false; diff --git a/tasmota/tasmota_xsns_sensor/xsns_28_tm1638.ino b/tasmota/tasmota_xsns_sensor/xsns_28_tm1638.ino index 2c3e32707..8a0cdb8f8 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_28_tm1638.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_28_tm1638.ino @@ -198,7 +198,7 @@ void TmShow(bool json) * Interface \*********************************************************************************************/ -bool Xsns28(uint8_t function) +bool Xsns28(uint32_t function) { bool result = false; diff --git a/tasmota/tasmota_xsns_sensor/xsns_29_mcp230xx.ino b/tasmota/tasmota_xsns_sensor/xsns_29_mcp230xx.ino index 64d5b1700..f158b79f6 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_29_mcp230xx.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_29_mcp230xx.ino @@ -903,7 +903,7 @@ void MCP230xx_SwitchRelay() { Interface \*********************************************************************************************/ -bool Xsns29(uint8_t function) +bool Xsns29(uint32_t function) { if (!I2cEnabled(XI2C_22)) { return false; } diff --git a/tasmota/tasmota_xsns_sensor/xsns_30_mpr121.ino b/tasmota/tasmota_xsns_sensor/xsns_30_mpr121.ino index 24a0cbdd7..015b121a6 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_30_mpr121.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_30_mpr121.ino @@ -386,7 +386,7 @@ void Mpr121Show(struct mpr121 *pS, uint8_t function) } } // if->running } // for-loop i -} // void Mpr121Show(uint8_t function) +} // void Mpr121Show(uint32_t function) /*********************************************************************************************\ * Interface @@ -407,7 +407,7 @@ void Mpr121Show(struct mpr121 *pS, uint8_t function) * @post None. * */ -bool Xsns30(uint8_t function) +bool Xsns30(uint32_t function) { if (!I2cEnabled(XI2C_23)) { return false; } diff --git a/tasmota/tasmota_xsns_sensor/xsns_31_ccs811.ino b/tasmota/tasmota_xsns_sensor/xsns_31_ccs811.ino index c0525a909..4b59c99b1 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_31_ccs811.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_31_ccs811.ino @@ -105,7 +105,7 @@ void CCS811Show(bool json) * Interface \*********************************************************************************************/ -bool Xsns31(uint8_t function) +bool Xsns31(uint32_t function) { if (!I2cEnabled(XI2C_24)) { return false; } diff --git a/tasmota/tasmota_xsns_sensor/xsns_31_ccs811_v2.ino b/tasmota/tasmota_xsns_sensor/xsns_31_ccs811_v2.ino index 735ebdbf9..2f16406f7 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_31_ccs811_v2.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_31_ccs811_v2.ino @@ -306,7 +306,7 @@ void CCS811Show(bool json) * Interface \*********************************************************************************************/ -bool Xsns31(uint8_t function) +bool Xsns31(uint32_t function) { if (!I2cEnabled(XI2C_24)) { return false; } diff --git a/tasmota/tasmota_xsns_sensor/xsns_32_mpu6050.ino b/tasmota/tasmota_xsns_sensor/xsns_32_mpu6050.ino index eaa4018ac..0aa43ea10 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_32_mpu6050.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_32_mpu6050.ino @@ -248,7 +248,7 @@ void MPU_6050Show(bool json) * Interface \*********************************************************************************************/ -bool Xsns32(uint8_t function) +bool Xsns32(uint32_t function) { if (!I2cEnabled(XI2C_25)) { return false; } diff --git a/tasmota/tasmota_xsns_sensor/xsns_33_qmc5883l.ino b/tasmota/tasmota_xsns_sensor/xsns_33_qmc5883l.ino index 7c640a737..f024da374 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_33_qmc5883l.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_33_qmc5883l.ino @@ -283,7 +283,7 @@ void QMC5883L_Show(uint8_t json) { * Interface \*********************************************************************************************/ -bool Xsns33(byte function) { +bool Xsns33(uint32_t function) { if (!I2cEnabled(XI2C_71)) { return false; } if (FUNC_INIT == function) { diff --git a/tasmota/tasmota_xsns_sensor/xsns_34_hx711.ino b/tasmota/tasmota_xsns_sensor/xsns_34_hx711.ino index 8a051949a..a12cce716 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_34_hx711.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_34_hx711.ino @@ -574,7 +574,7 @@ void HandleHxAction(void) { * Interface \*********************************************************************************************/ -bool Xsns34(uint8_t function) { +bool Xsns34(uint32_t function) { bool result = false; if (Hx.type) { diff --git a/tasmota/tasmota_xsns_sensor/xsns_35_tx20.ino b/tasmota/tasmota_xsns_sensor/xsns_35_tx20.ino index 3e1cfd25b..a128f2fe3 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_35_tx20.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_35_tx20.ino @@ -581,7 +581,7 @@ void Tx2xShow(bool json) * Interface \*********************************************************************************************/ -bool Xsns35(uint8_t function) +bool Xsns35(uint32_t function) { bool result = false; diff --git a/tasmota/tasmota_xsns_sensor/xsns_36_mgc3130.ino b/tasmota/tasmota_xsns_sensor/xsns_36_mgc3130.ino index 73961c753..39e84608a 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_36_mgc3130.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_36_mgc3130.ino @@ -599,7 +599,7 @@ bool MGC3130CommandSensor() * Interface \*********************************************************************************************/ -bool Xsns36(uint8_t function) +bool Xsns36(uint32_t function) { if (!I2cEnabled(XI2C_27)) { return false; } diff --git a/tasmota/tasmota_xsns_sensor/xsns_37_rfsensor.ino b/tasmota/tasmota_xsns_sensor/xsns_37_rfsensor.ino index 25db41a0c..aa3d8b6d1 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_37_rfsensor.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_37_rfsensor.ino @@ -649,7 +649,7 @@ void RfSnsShow(bool json) * Interface \*********************************************************************************************/ -bool Xsns37(uint8_t function) +bool Xsns37(uint32_t function) { bool result = false; diff --git a/tasmota/tasmota_xsns_sensor/xsns_38_az7798.ino b/tasmota/tasmota_xsns_sensor/xsns_38_az7798.ino index 1aed89816..ad6cf6f66 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_38_az7798.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_38_az7798.ino @@ -297,7 +297,7 @@ void AzShow(bool json) * Interface \*********************************************************************************************/ -bool Xsns38(uint8_t function) +bool Xsns38(uint32_t function) { bool result = false; diff --git a/tasmota/tasmota_xsns_sensor/xsns_39_max31855.ino b/tasmota/tasmota_xsns_sensor/xsns_39_max31855.ino index 1b7bca1b3..13b0450b2 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_39_max31855.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_39_max31855.ino @@ -169,7 +169,7 @@ void MAX31855_Show(bool Json) { * Interface \*********************************************************************************************/ -bool Xsns39(uint8_t function) +bool Xsns39(uint32_t function) { bool result = false; diff --git a/tasmota/tasmota_xsns_sensor/xsns_40_pn532.ino b/tasmota/tasmota_xsns_sensor/xsns_40_pn532.ino index 4c39f4342..dee669dd5 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_40_pn532.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_40_pn532.ino @@ -758,7 +758,7 @@ void PN532_Show(void) { * Interface \*********************************************************************************************/ -bool Xsns40(uint8_t function) { +bool Xsns40(uint32_t function) { bool result = false; if (FUNC_INIT == function) { diff --git a/tasmota/tasmota_xsns_sensor/xsns_41_max44009.ino b/tasmota/tasmota_xsns_sensor/xsns_41_max44009.ino index 0b1a4fb5a..2d13c6275 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_41_max44009.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_41_max44009.ino @@ -139,7 +139,7 @@ void Max4409Show(bool json) * Interface \*********************************************************************************************/ -bool Xsns41(uint8_t function) +bool Xsns41(uint32_t function) { if (!I2cEnabled(XI2C_28)) { return false; } diff --git a/tasmota/tasmota_xsns_sensor/xsns_42_scd30.ino b/tasmota/tasmota_xsns_sensor/xsns_42_scd30.ino index 60057b2b1..f67416bd2 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_42_scd30.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_42_scd30.ino @@ -320,7 +320,7 @@ void Scd30Show(bool json) { * Interface \*********************************************************************************************/ -bool Xsns42(byte function) { +bool Xsns42(uint32_t function) { if (!I2cEnabled(XI2C_29)) { return false; } bool result = false; diff --git a/tasmota/tasmota_xsns_sensor/xsns_43_hre.ino b/tasmota/tasmota_xsns_sensor/xsns_43_hre.ino index 6ceddf43c..a288de135 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_43_hre.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_43_hre.ino @@ -257,7 +257,7 @@ void hreShow(boolean json) /*********************************************************************************************\ * Interface \*********************************************************************************************/ -bool Xsns43(byte function) +bool Xsns43(uint32_t function) { // If we don't have pins assigned give up quickly. if (!PinUsed(GPIO_HRE_CLOCK) || !PinUsed(GPIO_HRE_DATA)) { return false; } diff --git a/tasmota/tasmota_xsns_sensor/xsns_44_sps30.ino b/tasmota/tasmota_xsns_sensor/xsns_44_sps30.ino index 1af0a7127..016f7ef9b 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_44_sps30.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_44_sps30.ino @@ -284,7 +284,7 @@ bool SPS30_cmd(void) * Interface \*********************************************************************************************/ -bool Xsns44(byte function) +bool Xsns44(uint32_t function) { if (!I2cEnabled(XI2C_30)) { return false; } diff --git a/tasmota/tasmota_xsns_sensor/xsns_45_vl53l0x.ino b/tasmota/tasmota_xsns_sensor/xsns_45_vl53l0x.ino index 84eda3ef6..55882066c 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_45_vl53l0x.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_45_vl53l0x.ino @@ -229,7 +229,7 @@ void Vl53l0Show(boolean json) { * Interface \*********************************************************************************************/ -bool Xsns45(byte function) { +bool Xsns45(uint32_t function) { if (!I2cEnabled(XI2C_31)) { return false; } bool result = false; diff --git a/tasmota/tasmota_xsns_sensor/xsns_46_MLX90614.ino b/tasmota/tasmota_xsns_sensor/xsns_46_MLX90614.ino index 5cb7f65cf..c93ec08b5 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_46_MLX90614.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_46_MLX90614.ino @@ -137,7 +137,7 @@ uint8_t MLX90614_crc8(uint8_t *addr, uint8_t len) * Interface \*********************************************************************************************/ -bool Xsns46(byte function) +bool Xsns46(uint32_t function) { if (!I2cEnabled(XI2C_32)) { return false; } diff --git a/tasmota/tasmota_xsns_sensor/xsns_47_max31865.ino b/tasmota/tasmota_xsns_sensor/xsns_47_max31865.ino index efbd27179..9a8bc0b03 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_47_max31865.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_47_max31865.ino @@ -387,7 +387,7 @@ void MAX31865_Show(bool Json) { * Interface \*********************************************************************************************/ -bool Xsns47(uint8_t function) +bool Xsns47(uint32_t function) { bool result = false; diff --git a/tasmota/tasmota_xsns_sensor/xsns_48_chirp.ino b/tasmota/tasmota_xsns_sensor/xsns_48_chirp.ino index b5e3db4e2..1782a59df 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_48_chirp.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_48_chirp.ino @@ -519,7 +519,7 @@ bool ChirpCmd(void) { * Interface \*********************************************************************************************/ -bool Xsns48(uint8_t function) +bool Xsns48(uint32_t function) { if (!I2cEnabled(XI2C_33)) { return false; } diff --git a/tasmota/tasmota_xsns_sensor/xsns_50_paj7620.ino b/tasmota/tasmota_xsns_sensor/xsns_50_paj7620.ino index 8a8db26c5..4374476bd 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_50_paj7620.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_50_paj7620.ino @@ -422,7 +422,7 @@ bool PAJ7620CommandSensor(void) * Interface \*********************************************************************************************/ -bool Xsns50(uint8_t function) +bool Xsns50(uint32_t function) { if (!I2cEnabled(XI2C_34)) { return false; } diff --git a/tasmota/tasmota_xsns_sensor/xsns_51_rdm6300.ino b/tasmota/tasmota_xsns_sensor/xsns_51_rdm6300.ino index a277e7d65..5a929524d 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_51_rdm6300.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_51_rdm6300.ino @@ -145,7 +145,7 @@ void RDM6300Show(void) { * Interface \*********************************************************************************************/ -bool Xsns51(byte function) { +bool Xsns51(uint32_t function) { bool result = false; switch (function) { diff --git a/tasmota/tasmota_xsns_sensor/xsns_52_esp32_ibeacon_ble.ino b/tasmota/tasmota_xsns_sensor/xsns_52_esp32_ibeacon_ble.ino index e68cd9013..9a96ea794 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_52_esp32_ibeacon_ble.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_52_esp32_ibeacon_ble.ino @@ -562,7 +562,7 @@ void ibeacon_mqtt(const char *mac,const char *rssi,const char *uid,const char *m * Interface \*********************************************************************************************/ -bool Xsns52(byte function) +bool Xsns52(uint32_t function) { bool result = false; diff --git a/tasmota/tasmota_xsns_sensor/xsns_52_ibeacon.ino b/tasmota/tasmota_xsns_sensor/xsns_52_ibeacon.ino index 473d2e05d..411e82e21 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_52_ibeacon.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_52_ibeacon.ino @@ -969,7 +969,7 @@ void ibeacon_mqtt(const char *mac,const char *rssi,const char *uid,const char *m * Interface \*********************************************************************************************/ -bool Xsns52(byte function) +bool Xsns52(uint32_t function) { bool result = false; diff --git a/tasmota/tasmota_xsns_sensor/xsns_53_sml.ino b/tasmota/tasmota_xsns_sensor/xsns_53_sml.ino index 451044a8e..6f53b8990 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_53_sml.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_53_sml.ino @@ -3785,7 +3785,7 @@ void SML_CounterSaveState(void) { * Interface \*********************************************************************************************/ -bool Xsns53(byte function) { +bool Xsns53(uint32_t function) { bool result = false; switch (function) { case FUNC_INIT: diff --git a/tasmota/tasmota_xsns_sensor/xsns_54_ina226.ino b/tasmota/tasmota_xsns_sensor/xsns_54_ina226.ino index 4961de5bd..9df7e9b15 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_54_ina226.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_54_ina226.ino @@ -529,7 +529,7 @@ void Ina226Show(bool json) * @post None. * */ -bool Xsns54(byte callback_id) +bool Xsns54(uint32_t callback_id) { if (!I2cEnabled(XI2C_35)) { return false; } diff --git a/tasmota/tasmota_xsns_sensor/xsns_55_hih_series.ino b/tasmota/tasmota_xsns_sensor/xsns_55_hih_series.ino index 4f6cc0648..df866a5ed 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_55_hih_series.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_55_hih_series.ino @@ -104,7 +104,7 @@ void Hih6Show(bool json) * Interface \*********************************************************************************************/ -bool Xsns55(uint8_t function) +bool Xsns55(uint32_t function) { if (!I2cEnabled(XI2C_36)) { return false; } diff --git a/tasmota/tasmota_xsns_sensor/xsns_56_hpma.ino b/tasmota/tasmota_xsns_sensor/xsns_56_hpma.ino index c400fba1e..0c1918b49 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_56_hpma.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_56_hpma.ino @@ -113,7 +113,7 @@ void HpmaShow(bool json) * Interface \*********************************************************************************************/ -bool Xsns56(uint8_t function) +bool Xsns56(uint32_t function) { bool result = false; diff --git a/tasmota/tasmota_xsns_sensor/xsns_57_tsl2591.ino b/tasmota/tasmota_xsns_sensor/xsns_57_tsl2591.ino index 1ec7a6838..57d70f992 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_57_tsl2591.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_57_tsl2591.ino @@ -94,7 +94,7 @@ void Tsl2591Show(bool json) * Interface \*********************************************************************************************/ -bool Xsns57(uint8_t function) +bool Xsns57(uint32_t function) { if (!I2cEnabled(XI2C_40)) { return false; } diff --git a/tasmota/tasmota_xsns_sensor/xsns_58_dht12.ino b/tasmota/tasmota_xsns_sensor/xsns_58_dht12.ino index 559d9931b..dec917b9c 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_58_dht12.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_58_dht12.ino @@ -98,7 +98,7 @@ void Dht12Show(bool json) * Interface \*********************************************************************************************/ -bool Xsns58(uint8_t function) +bool Xsns58(uint32_t function) { if (!I2cEnabled(XI2C_41)) { return false; } diff --git a/tasmota/tasmota_xsns_sensor/xsns_59_ds1624.ino b/tasmota/tasmota_xsns_sensor/xsns_59_ds1624.ino index 6f62b8540..de9f9d1d2 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_59_ds1624.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_59_ds1624.ino @@ -203,7 +203,7 @@ void DS1624Show(bool json) * Interface \*********************************************************************************************/ -bool Xsns59(uint8_t function) +bool Xsns59(uint32_t function) { if (!I2cEnabled(XI2C_42)) { return false; } diff --git a/tasmota/tasmota_xsns_sensor/xsns_60_GPS.ino b/tasmota/tasmota_xsns_sensor/xsns_60_GPS.ino index edf3d9c81..0bf0b5e9e 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_60_GPS.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_60_GPS.ino @@ -878,7 +878,7 @@ bool UBXCmd(void) * Interface \*********************************************************************************************/ -bool Xsns60(uint8_t function) +bool Xsns60(uint32_t function) { bool result = false; diff --git a/tasmota/tasmota_xsns_sensor/xsns_61_MI_NRF24.ino b/tasmota/tasmota_xsns_sensor/xsns_61_MI_NRF24.ino index f5f61e4e3..e6e4b60ec 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_61_MI_NRF24.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_61_MI_NRF24.ino @@ -1966,7 +1966,7 @@ void MINRFShow(bool json) * Interface \*********************************************************************************************/ -bool Xsns61(uint8_t function) +bool Xsns61(uint32_t function) { bool result = false; if (NRF24.chipType) { diff --git a/tasmota/tasmota_xsns_sensor/xsns_62_MI_HM10.ino b/tasmota/tasmota_xsns_sensor/xsns_62_MI_HM10.ino index 0e5a3bc03..b9334cf96 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_62_MI_HM10.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_62_MI_HM10.ino @@ -2302,7 +2302,7 @@ void HM10Show(bool json) * Interface \*********************************************************************************************/ -bool Xsns62(uint8_t function) +bool Xsns62(uint32_t function) { bool result = false; diff --git a/tasmota/tasmota_xsns_sensor/xsns_62_esp32_mi.ino b/tasmota/tasmota_xsns_sensor/xsns_62_esp32_mi.ino index 145ce7dc4..ead1c2260 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_62_esp32_mi.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_62_esp32_mi.ino @@ -2333,7 +2333,7 @@ int ExtStopBLE(){ * Interface \*********************************************************************************************/ -bool Xsns62(uint8_t function) +bool Xsns62(uint32_t function) { if (!Settings->flag5.mi32_enable) { return false; } // SetOption115 - Enable ESP32 MI32 BLE diff --git a/tasmota/tasmota_xsns_sensor/xsns_62_esp32_mi_ble.ino b/tasmota/tasmota_xsns_sensor/xsns_62_esp32_mi_ble.ino index 0104dd58e..d1a0ebcb6 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_62_esp32_mi_ble.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_62_esp32_mi_ble.ino @@ -3530,7 +3530,7 @@ void MI32Show(bool json) \*********************************************************************************************/ #define WEB_HANDLE_MI32 "mikey" -bool Xsns62(uint8_t function) +bool Xsns62(uint32_t function) { // if (!Settings->flag5.mi32_enable) { return false; } // SetOption115 - Enable ESP32 MI32 BLE // return false; diff --git a/tasmota/tasmota_xsns_sensor/xsns_63_aht1x.ino b/tasmota/tasmota_xsns_sensor/xsns_63_aht1x.ino index 315930c0b..7a9397f0e 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_63_aht1x.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_63_aht1x.ino @@ -188,7 +188,7 @@ void AHT1XShow(bool json) { * Interface \*********************************************************************************************/ -bool Xsns63(uint8_t function) +bool Xsns63(uint32_t function) { if (!I2cEnabled(XI2C_43)) { return false; } bool result = false; diff --git a/tasmota/tasmota_xsns_sensor/xsns_64_hrxl.ino b/tasmota/tasmota_xsns_sensor/xsns_64_hrxl.ino index 422279cfe..727778fe1 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_64_hrxl.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_64_hrxl.ino @@ -82,7 +82,7 @@ void HRXLShow(bool json) { * Interface \*********************************************************************************************/ -bool Xsns64(uint8_t function) { +bool Xsns64(uint32_t function) { if (FUNC_INIT == function) { HRXLInit(); } diff --git a/tasmota/tasmota_xsns_sensor/xsns_65_hdc1080.ino b/tasmota/tasmota_xsns_sensor/xsns_65_hdc1080.ino index 96a7be484..3d0f5ef29 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_65_hdc1080.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_65_hdc1080.ino @@ -277,7 +277,7 @@ void HdcShow(bool json) { * Interface \*********************************************************************************************/ -bool Xsns65(uint8_t function) +bool Xsns65(uint32_t function) { if (!I2cEnabled(XI2C_45)) { // AddLog(LOG_LEVEL_DEBUG, PSTR("Xsns65: I2C driver not enabled for this device.")); diff --git a/tasmota/tasmota_xsns_sensor/xsns_66_iAQ.ino b/tasmota/tasmota_xsns_sensor/xsns_66_iAQ.ino index 0cbf17276..55b391a3a 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_66_iAQ.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_66_iAQ.ino @@ -124,7 +124,7 @@ void IAQ_Show(uint8_t json) * Interface \*********************************************************************************************/ -bool Xsns66(byte function) +bool Xsns66(uint32_t function) { if (!I2cEnabled(XI2C_46)) { return false; } diff --git a/tasmota/tasmota_xsns_sensor/xsns_67_as3935.ino b/tasmota/tasmota_xsns_sensor/xsns_67_as3935.ino index 766ae77c3..2ae4d49a9 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_67_as3935.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_67_as3935.ino @@ -826,7 +826,7 @@ void AH3935Show(bool json) { * Interface \*********************************************************************************************/ -bool Xsns67(uint8_t function) { +bool Xsns67(uint32_t function) { if (!I2cEnabled(XI2C_48)) { return false; } bool result = false; if (FUNC_INIT == function) { diff --git a/tasmota/tasmota_xsns_sensor/xsns_68_windmeter.ino b/tasmota/tasmota_xsns_sensor/xsns_68_windmeter.ino index 2768b5eaf..81bd3f2ff 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_68_windmeter.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_68_windmeter.ino @@ -314,7 +314,7 @@ bool Xsns68Cmnd(void) * Interface \*********************************************************************************************/ -bool Xsns68(uint8_t function) +bool Xsns68(uint32_t function) { bool result = false; if (PinUsed(GPIO_WINDMETER_SPEED)) { diff --git a/tasmota/tasmota_xsns_sensor/xsns_69_opentherm.ino b/tasmota/tasmota_xsns_sensor/xsns_69_opentherm.ino index e8960de76..d18f51635 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_69_opentherm.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_69_opentherm.ino @@ -581,7 +581,7 @@ void sns_opentherm_blor_cmd(void) * Interface \*********************************************************************************************/ -bool Xsns69(uint8_t function) +bool Xsns69(uint32_t function) { bool result = false; if (FUNC_INIT == function) diff --git a/tasmota/tasmota_xsns_sensor/xsns_70_veml6075.ino b/tasmota/tasmota_xsns_sensor/xsns_70_veml6075.ino index 69fd074f5..e26e72b77 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_70_veml6075.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_70_veml6075.ino @@ -272,7 +272,7 @@ void VEML6075Show(bool json) * Interface \*********************************************************************************************/ -bool Xsns70(uint8_t function) +bool Xsns70(uint32_t function) { if (!I2cEnabled(XI2C_49)) { return false; } diff --git a/tasmota/tasmota_xsns_sensor/xsns_71_veml7700.ino b/tasmota/tasmota_xsns_sensor/xsns_71_veml7700.ino index a4bf12905..e78488dcf 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_71_veml7700.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_71_veml7700.ino @@ -171,7 +171,7 @@ bool VEML7700Cmd(void) { * Interface \*********************************************************************************************/ -bool Xsns71(uint8_t function) +bool Xsns71(uint32_t function) { if (!I2cEnabled(XI2C_50)) { return false; } diff --git a/tasmota/tasmota_xsns_sensor/xsns_72_mcp9808.ino b/tasmota/tasmota_xsns_sensor/xsns_72_mcp9808.ino index 95716f9e9..0f864bac4 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_72_mcp9808.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_72_mcp9808.ino @@ -103,7 +103,7 @@ void MCP9808Show(bool json) { * Interface \*********************************************************************************************/ -bool Xsns72(uint8_t function) +bool Xsns72(uint32_t function) { if (!I2cEnabled(XI2C_51)) { return false; } bool result = false; diff --git a/tasmota/tasmota_xsns_sensor/xsns_73_hp303b.ino b/tasmota/tasmota_xsns_sensor/xsns_73_hp303b.ino index 1ee39f0ca..a4310397f 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_73_hp303b.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_73_hp303b.ino @@ -142,7 +142,7 @@ void HP303B_Show(bool json) { * Interface \*********************************************************************************************/ -bool Xsns73(uint8_t function) +bool Xsns73(uint32_t function) { if (!I2cEnabled(XI2C_52)) { return false; } diff --git a/tasmota/tasmota_xsns_sensor/xsns_74_lmt01.ino b/tasmota/tasmota_xsns_sensor/xsns_74_lmt01.ino index eade01b2d..edfa00d3b 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_74_lmt01.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_74_lmt01.ino @@ -108,7 +108,7 @@ void LMT01_Show(bool Json) { * Interface \*********************************************************************************************/ -bool Xsns74(uint8_t function) +bool Xsns74(uint32_t function) { bool result = false; diff --git a/tasmota/tasmota_xsns_sensor/xsns_75_prometheus.ino b/tasmota/tasmota_xsns_sensor/xsns_75_prometheus.ino index f08c730b0..1914881e3 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_75_prometheus.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_75_prometheus.ino @@ -298,7 +298,7 @@ void HandleMetrics(void) { JsonParserObject Object3 = value2.getObject(); for (auto key3 : Object3) { const char *value = key3.getValue().getStr(nullptr); - if (value != nullptr && (isdigit(value[0]) || (value[0] == '-') || (value[0] == '.'))) { + if (value != nullptr && isdigit(value[0])) { String sensor = FormatMetricName(key2.getStr()); String type = FormatMetricName(key3.getStr()); @@ -311,7 +311,7 @@ void HandleMetrics(void) { } } else { const char *value = value2.getStr(nullptr); - if (value != nullptr && (isdigit(value[0]) || (value[0] == '-') || (value[0] == '.'))) { + if (value != nullptr && isdigit(value[0])) { String sensor = FormatMetricName(key1.getStr()); String type = FormatMetricName(key2.getStr()); if (strcmp(type.c_str(), "totalstarttime") != 0) { // this metric causes Prometheus of fail @@ -336,7 +336,7 @@ void HandleMetrics(void) { const char *value = value1.getStr(nullptr); String sensor = FormatMetricName(key1.getStr()); - if (value != nullptr && (isdigit(value[0]) || (value[0] == '-') || (value[0] == '.')) && strcmp(sensor.c_str(), "time") != 0) { //remove false 'time' metric + if (value != nullptr && isdigit(value[0] && strcmp(sensor.c_str(), "time") != 0)) { //remove false 'time' metric WritePromMetricStr(PSTR("sensors"), kPromMetricGauge, value, PSTR("sensor"), sensor.c_str(), nullptr); @@ -352,7 +352,7 @@ void HandleMetrics(void) { * Interface \*********************************************************************************************/ -bool Xsns75(uint8_t function) { +bool Xsns75(uint32_t function) { bool result = false; switch (function) { diff --git a/tasmota/tasmota_xsns_sensor/xsns_76_dyp.ino b/tasmota/tasmota_xsns_sensor/xsns_76_dyp.ino index 9c4124fe8..9aa3ecaa2 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_76_dyp.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_76_dyp.ino @@ -111,7 +111,7 @@ void DYPShow(bool json) { * Interface \*********************************************************************************************/ -bool Xsns76(uint8_t function) { +bool Xsns76(uint32_t function) { if (FUNC_INIT == function) { DYPInit(); } diff --git a/tasmota/tasmota_xsns_sensor/xsns_77_vl53l1x.ino b/tasmota/tasmota_xsns_sensor/xsns_77_vl53l1x.ino index 0f30076a5..b6a88538a 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_77_vl53l1x.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_77_vl53l1x.ino @@ -158,7 +158,7 @@ void Vl53l1Show(bool json) { * Interface \*********************************************************************************************/ -bool Xsns77(uint8_t function) { +bool Xsns77(uint32_t function) { if (!I2cEnabled(XI2C_54)) { return false; } bool result = false; diff --git a/tasmota/tasmota_xsns_sensor/xsns_78_xezo.ino b/tasmota/tasmota_xsns_sensor/xsns_78_xezo.ino index 60b3cd8e4..488ba78c2 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_78_xezo.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_78_xezo.ino @@ -306,7 +306,7 @@ private: // The main driver is the same for all devices. // What changes is the implementation of the class itself -bool Xsns78(uint8_t function) +bool Xsns78(uint32_t function) { if (!I2cEnabled(XI2C_55)) { return false; diff --git a/tasmota/tasmota_xsns_sensor/xsns_79_as608.ino b/tasmota/tasmota_xsns_sensor/xsns_79_as608.ino index fba9e8afc..4b8115d1d 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_79_as608.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_79_as608.ino @@ -294,7 +294,7 @@ void CmndFpCount(void) { * Interface \*********************************************************************************************/ -bool Xsns79(uint8_t function) { +bool Xsns79(uint32_t function) { bool result = false; if (FUNC_INIT == function) { diff --git a/tasmota/tasmota_xsns_sensor/xsns_80_mfrc522.ino b/tasmota/tasmota_xsns_sensor/xsns_80_mfrc522.ino index 3ad92f4d9..7cb2daf93 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_80_mfrc522.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_80_mfrc522.ino @@ -160,7 +160,7 @@ bool RC522Command(void) { * Interface \*********************************************************************************************/ -bool Xsns80(uint8_t function) { +bool Xsns80(uint32_t function) { bool result = false; if (FUNC_INIT == function) { diff --git a/tasmota/tasmota_xsns_sensor/xsns_81_seesaw_soil.ino b/tasmota/tasmota_xsns_sensor/xsns_81_seesaw_soil.ino index 15a8bff66..429c43856 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_81_seesaw_soil.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_81_seesaw_soil.ino @@ -328,7 +328,7 @@ void seeSoilName(int no, char *name, int len) // generates a sensor name * Interface \*********************************************************************************************/ -bool Xsns81(uint8_t function) +bool Xsns81(uint32_t function) { if (!I2cEnabled(XI2C_56)) { return false; } bool result = false; diff --git a/tasmota/tasmota_xsns_sensor/xsns_82_wiegand.ino b/tasmota/tasmota_xsns_sensor/xsns_82_wiegand.ino index 9908e7a55..e0247ead3 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_82_wiegand.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_82_wiegand.ino @@ -617,7 +617,7 @@ const char kWiegandCommands[] PROGMEM = "Wie|" // No prefix * Interface \*********************************************************************************************/ -bool Xsns82(byte function) { +bool Xsns82(uint32_t function) { bool result = false; if (FUNC_INIT == function) { diff --git a/tasmota/tasmota_xsns_sensor/xsns_83_neopool.ino b/tasmota/tasmota_xsns_sensor/xsns_83_neopool.ino index 6865f38cb..6e40008fd 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_83_neopool.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_83_neopool.ino @@ -2559,7 +2559,7 @@ void CmndNeopoolIONRes(void) * Interface \*********************************************************************************************/ -bool Xsns83(uint8_t function) +bool Xsns83(uint32_t function) { bool result = false; diff --git a/tasmota/tasmota_xsns_sensor/xsns_84_tof10120.ino b/tasmota/tasmota_xsns_sensor/xsns_84_tof10120.ino index 36bd30842..8292f67b7 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_84_tof10120.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_84_tof10120.ino @@ -109,7 +109,7 @@ void Tof10120Show(bool json) { * Interface \*********************************************************************************************/ -bool Xsns84(uint8_t function) { +bool Xsns84(uint32_t function) { if (!I2cEnabled(XI2C_57)) { return false; } bool result = false; diff --git a/tasmota/tasmota_xsns_sensor/xsns_85_mpu6886.ino b/tasmota/tasmota_xsns_sensor/xsns_85_mpu6886.ino index 5b650a198..c80820180 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_85_mpu6886.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_85_mpu6886.ino @@ -103,7 +103,7 @@ void MPU_Every_Second(void) { * Interface \*********************************************************************************************/ -bool Xsns85(uint8_t function) { +bool Xsns85(uint32_t function) { if (!I2cEnabled(XI2C_58)) { return false; } bool result = false; diff --git a/tasmota/tasmota_xsns_sensor/xsns_86_tfminiplus.ino b/tasmota/tasmota_xsns_sensor/xsns_86_tfminiplus.ino index 6b7963f90..ea32fcb22 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_86_tfminiplus.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_86_tfminiplus.ino @@ -211,7 +211,7 @@ void TfmpShow(bool json) { * Interface \*********************************************************************************************/ -bool Xsns86(byte callback_id) +bool Xsns86(uint32_t callback_id) { bool result = false; if (FUNC_INIT == callback_id) diff --git a/tasmota/tasmota_xsns_sensor/xsns_87_can_sniffer.ino b/tasmota/tasmota_xsns_sensor/xsns_87_can_sniffer.ino index 6d4f733be..db4c62c3e 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_87_can_sniffer.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_87_can_sniffer.ino @@ -191,7 +191,7 @@ void MCP2515_Read() { * Interface \*********************************************************************************************/ -bool Xsns87(uint8_t function) { +bool Xsns87(uint32_t function) { bool result = false; if (FUNC_INIT == function) { diff --git a/tasmota/tasmota_xsns_sensor/xsns_87_mcp2515.ino b/tasmota/tasmota_xsns_sensor/xsns_87_mcp2515.ino index ceb3cce07..3fe523ad4 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_87_mcp2515.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_87_mcp2515.ino @@ -407,7 +407,7 @@ void MCP2515_Show(bool Json) { * Interface \*********************************************************************************************/ -bool Xsns87(uint8_t function) +bool Xsns87(uint32_t function) { bool result = false; diff --git a/tasmota/tasmota_xsns_sensor/xsns_88_am2320.ino b/tasmota/tasmota_xsns_sensor/xsns_88_am2320.ino index cb177987b..2d07d2061 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_88_am2320.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_88_am2320.ino @@ -166,7 +166,7 @@ void Am2320Show(bool json) * Interface \*********************************************************************************************/ -bool Xsns88(uint8_t function) +bool Xsns88(uint32_t function) { if (!I2cEnabled(XI2C_60)) { return false; } diff --git a/tasmota/tasmota_xsns_sensor/xsns_89_t67xx.ino b/tasmota/tasmota_xsns_sensor/xsns_89_t67xx.ino index 8b018f88c..34f4787a3 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_89_t67xx.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_89_t67xx.ino @@ -297,7 +297,7 @@ T67XX t67xx; * Interface \*********************************************************************************************/ -bool Xsns89(uint8_t function) +bool Xsns89(uint32_t function) { uint16_t ppm = 0; if (!I2cEnabled(XI2C_61)) diff --git a/tasmota/tasmota_xsns_sensor/xsns_90_hrg15.ino b/tasmota/tasmota_xsns_sensor/xsns_90_hrg15.ino index 0743d8902..0f062c6ed 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_90_hrg15.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_90_hrg15.ino @@ -218,7 +218,7 @@ bool Rg15Command(void) { * Interface \*********************************************************************************************/ -bool Xsns90(uint8_t function) { +bool Xsns90(uint32_t function) { bool result = false; if (FUNC_INIT == function) { diff --git a/tasmota/tasmota_xsns_sensor/xsns_91_vindriktning.ino b/tasmota/tasmota_xsns_sensor/xsns_91_vindriktning.ino index 8e88bb596..3248ea7f6 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_91_vindriktning.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_91_vindriktning.ino @@ -165,7 +165,7 @@ void VindriktningShow(bool json) { * Interface \*********************************************************************************************/ -bool Xsns91(uint8_t function) { +bool Xsns91(uint32_t function) { bool result = false; if (Vindriktning.type) { diff --git a/tasmota/tasmota_xsns_sensor/xsns_92_scd40.ino b/tasmota/tasmota_xsns_sensor/xsns_92_scd40.ino index 252914d31..9689585d3 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_92_scd40.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_92_scd40.ino @@ -459,7 +459,7 @@ void Scd40Show(bool json) * Interface \*********************************************************************************************/ -bool Xsns92(byte function) +bool Xsns92(uint32_t function) { if (!I2cEnabled(XI2C_62)) { return false; } diff --git a/tasmota/tasmota_xsns_sensor/xsns_93_hm330x.ino b/tasmota/tasmota_xsns_sensor/xsns_93_hm330x.ino index a64141507..e18ae6de8 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_93_hm330x.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_93_hm330x.ino @@ -322,7 +322,7 @@ void HM330XShow(bool json) * Interface \*********************************************************************************************/ -bool Xsns93(byte function) +bool Xsns93(uint32_t function) { if (!I2cEnabled(XI2C_63)) { return false; } diff --git a/tasmota/tasmota_xsns_sensor/xsns_94_hdc2010.ino b/tasmota/tasmota_xsns_sensor/xsns_94_hdc2010.ino index 8717b6d90..197bed50b 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_94_hdc2010.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_94_hdc2010.ino @@ -175,7 +175,7 @@ void Hdc2010SetMeasurementConfig() { * Interface \*********************************************************************************************/ -bool Xsns94(uint8_t function) +bool Xsns94(uint32_t function) { if (!I2cEnabled(XI2C_64)) { return false; diff --git a/tasmota/tasmota_xsns_sensor/xsns_95_cm110x.ino b/tasmota/tasmota_xsns_sensor/xsns_95_cm110x.ino index 17c090c10..931b83c4c 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_95_cm110x.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_95_cm110x.ino @@ -432,7 +432,7 @@ void CM11Show(bool json) * Interface \*********************************************************************************************/ -bool Xsns95(uint8_t function) +bool Xsns95(uint32_t function) { bool result = false; diff --git a/tasmota/tasmota_xsns_sensor/xsns_96_flowratemeter.ino b/tasmota/tasmota_xsns_sensor/xsns_96_flowratemeter.ino index 16a635e9e..e1c5fb6dd 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_96_flowratemeter.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_96_flowratemeter.ino @@ -347,7 +347,7 @@ bool FlowRateMeterCommand(void) { * Interface \*********************************************************************************************/ -bool Xsns96(uint8_t function) +bool Xsns96(uint32_t function) { bool result = false; diff --git a/tasmota/tasmota_xsns_sensor/xsns_97_hyt.ino b/tasmota/tasmota_xsns_sensor/xsns_97_hyt.ino index c8b84320e..8bdcbe782 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_97_hyt.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_97_hyt.ino @@ -98,7 +98,7 @@ void HYT_Show(bool json) { * Interface \*********************************************************************************************/ -bool Xsns97(uint8_t function) { +bool Xsns97(uint32_t function) { if (!I2cEnabled(XI2C_68)) { return false; } bool result = false; diff --git a/tasmota/tasmota_xsns_sensor/xsns_98_sgp40.ino b/tasmota/tasmota_xsns_sensor/xsns_98_sgp40.ino index 093136626..b25555bba 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_98_sgp40.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_98_sgp40.ino @@ -139,7 +139,7 @@ void Sgp40Show(bool json) * Interface \*********************************************************************************************/ -bool Xsns98(uint8_t function) +bool Xsns98(uint32_t function) { if (!I2cEnabled(XI2C_69)) { return false; } diff --git a/tasmota/tasmota_xsns_sensor/xsns_99_luxv30b.ino b/tasmota/tasmota_xsns_sensor/xsns_99_luxv30b.ino index 3c3cd89e9..d299e485d 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_99_luxv30b.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_99_luxv30b.ino @@ -121,7 +121,7 @@ class LuxV30b { void Detect(); bool Found(); void Read(); - void Show(uint8_t function); + void Show(uint32_t function); private: float Lux(); bool _found; @@ -164,7 +164,7 @@ float LuxV30b::Lux() { return ((float)_lux * 1.4) / 1000; } -void LuxV30b::Show(uint8_t function) { +void LuxV30b::Show(uint32_t function) { // if (0 < Lux()) { if (_lux) { char lux[FLOATSZ]; @@ -190,7 +190,7 @@ LuxV30b Luxv30b; * Interface \*********************************************************************************************/ -bool Xsns99(uint8_t function) { +bool Xsns99(uint32_t function) { if (!I2cEnabled(XI2C_70)) { return false; } bool result = false; diff --git a/tasmota/tasmota_xx2c_global/xdrv_interface.ino b/tasmota/tasmota_xx2c_global/xdrv_interface.ino index dcf763935..247e7adb2 100644 --- a/tasmota/tasmota_xx2c_global/xdrv_interface.ino +++ b/tasmota/tasmota_xx2c_global/xdrv_interface.ino @@ -18,9 +18,9 @@ */ #ifdef XFUNC_PTR_IN_ROM -bool (* const xdrv_func_ptr[])(uint8_t) PROGMEM = { // Driver Function Pointers +bool (* const xdrv_func_ptr[])(uint32_t) PROGMEM = { // Driver Function Pointers #else -bool (* const xdrv_func_ptr[])(uint8_t) = { // Driver Function Pointers +bool (* const xdrv_func_ptr[])(uint32_t) = { // Driver Function Pointers #endif #ifdef XDRV_01 @@ -1063,8 +1063,7 @@ const uint8_t kXdrvList[] = { /*********************************************************************************************/ -void XsnsDriverState(void) -{ +void XsnsDriverState(void) { ResponseAppend_P(PSTR(",\"Drivers\":\"")); // Use string for future enable/disable signal for (uint32_t i = 0; i < sizeof(kXdrvList); i++) { #ifdef XFUNC_PTR_IN_ROM @@ -1099,8 +1098,7 @@ bool XdrvRulesProcess(bool teleperiod) { } #ifdef USE_DEBUG_DRIVER -void ShowFreeMem(const char *where) -{ +void ShowFreeMem(const char *where) { char stemp[30]; snprintf_P(stemp, sizeof(stemp), where); XdrvMailbox.data = stemp; @@ -1112,8 +1110,7 @@ void ShowFreeMem(const char *where) * Function call to single xdrv \*********************************************************************************************/ -bool XdrvCallDriver(uint32_t driver, uint8_t Function) -{ +bool XdrvCallDriver(uint32_t driver, uint32_t function) { for (uint32_t x = 0; x < xdrv_present; x++) { #ifdef XFUNC_PTR_IN_ROM uint32_t listed = pgm_read_byte(kXdrvList + x); @@ -1121,7 +1118,7 @@ bool XdrvCallDriver(uint32_t driver, uint8_t Function) uint32_t listed = kXdrvList[x]; #endif if (driver == listed) { - return xdrv_func_ptr[x](Function); + return xdrv_func_ptr[x](function); } } return false; @@ -1131,11 +1128,10 @@ bool XdrvCallDriver(uint32_t driver, uint8_t Function) * Function call to all xdrv \*********************************************************************************************/ -bool XdrvCall(uint8_t Function) -{ +bool XdrvCall(uint32_t function) { bool result = false; -// DEBUG_TRACE_LOG(PSTR("DRV: %d"), Function); +// DEBUG_TRACE_LOG(PSTR("DRV: %d"), function); uint32_t profile_driver_start = millis(); @@ -1143,7 +1139,7 @@ bool XdrvCall(uint8_t Function) uint32_t profile_function_start = millis(); - result = xdrv_func_ptr[x](Function); + result = xdrv_func_ptr[x](function); #ifdef USE_PROFILE_FUNCTION #ifdef XFUNC_PTR_IN_ROM @@ -1151,25 +1147,25 @@ bool XdrvCall(uint8_t Function) #else uint32_t index = kXdrvList[x]; #endif - PROFILE_FUNCTION("drv", index, Function, profile_function_start); + PROFILE_FUNCTION("drv", index, function, profile_function_start); #endif // USE_PROFILE_FUNCTION - if (result && ((FUNC_COMMAND == Function) || - (FUNC_COMMAND_DRIVER == Function) || - (FUNC_MQTT_DATA == Function) || - (FUNC_RULES_PROCESS == Function) || - (FUNC_BUTTON_PRESSED == Function) || - (FUNC_SERIAL == Function) || - (FUNC_MODULE_INIT == Function) || - (FUNC_SET_CHANNELS == Function) || - (FUNC_PIN_STATE == Function) || - (FUNC_SET_DEVICE_POWER == Function) + if (result && ((FUNC_COMMAND == function) || + (FUNC_COMMAND_DRIVER == function) || + (FUNC_MQTT_DATA == function) || + (FUNC_RULES_PROCESS == function) || + (FUNC_BUTTON_PRESSED == function) || + (FUNC_SERIAL == function) || + (FUNC_MODULE_INIT == function) || + (FUNC_SET_CHANNELS == function) || + (FUNC_PIN_STATE == function) || + (FUNC_SET_DEVICE_POWER == function) )) { break; } } - PROFILE_DRIVER("drv", Function, profile_driver_start); + PROFILE_DRIVER("drv", function, profile_driver_start); return result; } diff --git a/tasmota/tasmota_xx2c_global/xdsp_interface.ino b/tasmota/tasmota_xx2c_global/xdsp_interface.ino index d404e169e..06808ca18 100644 --- a/tasmota/tasmota_xx2c_global/xdsp_interface.ino +++ b/tasmota/tasmota_xx2c_global/xdsp_interface.ino @@ -20,9 +20,9 @@ #ifdef USE_DISPLAY #ifdef XFUNC_PTR_IN_ROM -bool (* const xdsp_func_ptr[])(uint8_t) PROGMEM = { // Display Function Pointers +bool (* const xdsp_func_ptr[])(uint32_t) PROGMEM = { // Display Function Pointers #else -bool (* const xdsp_func_ptr[])(uint8_t) = { // Display Function Pointers +bool (* const xdsp_func_ptr[])(uint32_t) = { // Display Function Pointers #endif #ifdef XDSP_01 @@ -177,21 +177,19 @@ const uint8_t xdsp_present = sizeof(xdsp_func_ptr) / sizeof(xdsp_func_ptr[0]); * FUNC_DISPLAY_DRAW_STRING \*********************************************************************************************/ -uint8_t XdspPresent(void) -{ +uint8_t XdspPresent(void) { return xdsp_present; } -bool XdspCall(uint8_t Function) -{ +bool XdspCall(uint32_t function) { bool result = false; - DEBUG_TRACE_LOG(PSTR("DSP: %d"), Function); + DEBUG_TRACE_LOG(PSTR("DSP: %d"), function); for (uint32_t x = 0; x < xdsp_present; x++) { - result = xdsp_func_ptr[x](Function); + result = xdsp_func_ptr[x](function); - if (result && (FUNC_DISPLAY_MODEL == Function)) { + if (result && (FUNC_DISPLAY_MODEL == function)) { break; } } diff --git a/tasmota/tasmota_xx2c_global/xlgt_interface.ino b/tasmota/tasmota_xx2c_global/xlgt_interface.ino index 4ef1928f8..f96cda4df 100644 --- a/tasmota/tasmota_xx2c_global/xlgt_interface.ino +++ b/tasmota/tasmota_xx2c_global/xlgt_interface.ino @@ -20,9 +20,9 @@ #ifdef USE_LIGHT #ifdef XFUNC_PTR_IN_ROM -bool (* const xlgt_func_ptr[])(uint8_t) PROGMEM = { // Light driver Function Pointers +bool (* const xlgt_func_ptr[])(uint32_t) PROGMEM = { // Light driver Function Pointers #else -bool (* const xlgt_func_ptr[])(uint8_t) = { // Light driver Function Pointers +bool (* const xlgt_func_ptr[])(uint32_t) = { // Light driver Function Pointers #endif #ifdef XLGT_01 @@ -94,8 +94,7 @@ const uint8_t xlgt_present = sizeof(xlgt_func_ptr) / sizeof(xlgt_func_ptr[0]); uint8_t xlgt_active = 0; -bool XlgtCall(uint8_t function) -{ +bool XlgtCall(uint32_t function) { DEBUG_TRACE_LOG(PSTR("LGT: %d"), function); if (FUNC_MODULE_INIT == function) { diff --git a/tasmota/tasmota_xx2c_global/xnrg_interface.ino b/tasmota/tasmota_xx2c_global/xnrg_interface.ino index de019675c..60c45a5d1 100644 --- a/tasmota/tasmota_xx2c_global/xnrg_interface.ino +++ b/tasmota/tasmota_xx2c_global/xnrg_interface.ino @@ -20,9 +20,9 @@ #ifdef USE_ENERGY_SENSOR #ifdef XFUNC_PTR_IN_ROM -bool (* const xnrg_func_ptr[])(uint8_t) PROGMEM = { // Energy driver Function Pointers +bool (* const xnrg_func_ptr[])(uint32_t) PROGMEM = { // Energy driver Function Pointers #else -bool (* const xnrg_func_ptr[])(uint8_t) = { // Energy driver Function Pointers +bool (* const xnrg_func_ptr[])(uint32_t) = { // Energy driver Function Pointers #endif #ifdef XNRG_01 @@ -158,8 +158,7 @@ const uint8_t xnrg_present = sizeof(xnrg_func_ptr) / sizeof(xnrg_func_ptr[0]); uint8_t xnrg_active = 0; -bool XnrgCall(uint8_t function) -{ +bool XnrgCall(uint32_t function) { DEBUG_TRACE_LOG(PSTR("NRG: %d"), function); if (FUNC_PRE_INIT == function) { diff --git a/tasmota/tasmota_xx2c_global/xsns_interface.ino b/tasmota/tasmota_xx2c_global/xsns_interface.ino index c4477447a..71f3dceb4 100644 --- a/tasmota/tasmota_xx2c_global/xsns_interface.ino +++ b/tasmota/tasmota_xx2c_global/xsns_interface.ino @@ -18,9 +18,9 @@ */ #ifdef XFUNC_PTR_IN_ROM -bool (* const xsns_func_ptr[])(uint8_t) PROGMEM = { // Sensor Function Pointers for simple implementation of sensors +bool (* const xsns_func_ptr[])(uint32_t) PROGMEM = { // Sensor Function Pointers for simple implementation of sensors #else -bool (* const xsns_func_ptr[])(uint8_t) = { // Sensor Function Pointers for simple implementation of sensors +bool (* const xsns_func_ptr[])(uint32_t) = { // Sensor Function Pointers for simple implementation of sensors #endif #ifdef XSNS_01 @@ -1094,7 +1094,7 @@ void XsnsSensorState(uint32_t sensor_list) { * Function call to all xsns \*********************************************************************************************/ -bool XsnsNextCall(uint8_t Function, uint8_t &xsns_index) { +bool XsnsNextCall(uint32_t function, uint8_t &xsns_index) { if (0 == xsns_present) { xsns_index = 0; return false; @@ -1103,28 +1103,28 @@ bool XsnsNextCall(uint8_t Function, uint8_t &xsns_index) { xsns_index++; if (xsns_index == xsns_present) { xsns_index = 0; } uint32_t max_disabled = xsns_present; - while ((!XsnsEnabled(0, xsns_index) || ((FUNC_WEB_SENSOR == Function) && !XsnsEnabled(1, xsns_index))) && max_disabled--) { // Perform at least one sensor + while ((!XsnsEnabled(0, xsns_index) || ((FUNC_WEB_SENSOR == function) && !XsnsEnabled(1, xsns_index))) && max_disabled--) { // Perform at least one sensor xsns_index++; if (xsns_index == xsns_present) { xsns_index = 0; } } - return xsns_func_ptr[xsns_index](Function); + return xsns_func_ptr[xsns_index](function); } -bool XsnsCall(uint8_t Function) { +bool XsnsCall(uint32_t function) { bool result = false; -// DEBUG_TRACE_LOG(PSTR("SNS: %d"), Function); +// DEBUG_TRACE_LOG(PSTR("SNS: %d"), function); uint32_t profile_driver_start = millis(); for (uint32_t x = 0; x < xsns_present; x++) { if (XsnsEnabled(0, x)) { // Skip disabled sensor - if ((FUNC_WEB_SENSOR == Function) && !XsnsEnabled(1, x)) { continue; } // Skip web info for disabled sensors + if ((FUNC_WEB_SENSOR == function) && !XsnsEnabled(1, x)) { continue; } // Skip web info for disabled sensors uint32_t profile_function_start = millis(); - result = xsns_func_ptr[x](Function); + result = xsns_func_ptr[x](function); #ifdef USE_PROFILE_FUNCTION #ifdef XFUNC_PTR_IN_ROM @@ -1132,19 +1132,19 @@ bool XsnsCall(uint8_t Function) { #else uint32_t index = kXsnsList[x]; #endif - PROFILE_FUNCTION("sns", index, Function, profile_function_start); + PROFILE_FUNCTION("sns", index, function, profile_function_start); #endif // USE_PROFILE_FUNCTION - if (result && ((FUNC_COMMAND == Function) || - (FUNC_PIN_STATE == Function) || - (FUNC_COMMAND_SENSOR == Function) + if (result && ((FUNC_COMMAND == function) || + (FUNC_PIN_STATE == function) || + (FUNC_COMMAND_SENSOR == function) )) { break; } } } - PROFILE_DRIVER("sns", Function, profile_driver_start); + PROFILE_DRIVER("sns", function, profile_driver_start); return result; } diff --git a/tasmota/tasmota_xx2c_global/xx2c_interface.ino b/tasmota/tasmota_xx2c_global/xx2c_interface.ino index 5827c259b..33e7041d3 100644 --- a/tasmota/tasmota_xx2c_global/xx2c_interface.ino +++ b/tasmota/tasmota_xx2c_global/xx2c_interface.ino @@ -412,13 +412,11 @@ const uint8_t kI2cList[] = { /*********************************************************************************************/ -bool I2cEnabled(uint32_t i2c_index) -{ +bool I2cEnabled(uint32_t i2c_index) { return (TasmotaGlobal.i2c_enabled && bitRead(Settings->i2c_drivers[i2c_index / 32], i2c_index % 32)); } -void I2cDriverState(void) -{ +void I2cDriverState(void) { ResponseAppend_P(PSTR("\"")); // Use string for enable/disable signal for (uint32_t i = 0; i < sizeof(kI2cList); i++) { #ifdef XFUNC_PTR_IN_ROM