diff --git a/CHANGELOG.md b/CHANGELOG.md index e3ab86d04..8caf5a4c6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ All notable changes to this project will be documented in this file. ## [14.5.0.2] ### Added - Berry load `.tapp` files in `/.extensions/` then in `/` (#23113) +- Support Vango Technologies V924x ultralow power, single-phase, power measurement (#23127) ### Breaking Changed - Berry remove `Leds.create_matrix` from the standard library waiting for reimplementation (#23114) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 6093f8747..b9a684b66 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -116,6 +116,7 @@ The latter links can be used for OTA upgrades too like ``OtaUrl https://ota.tasm ## Changelog v14.5.0.2 ### Added +- Support Vango Technologies V924x ultralow power, single-phase, power measurement [#23127](https://github.com/arendst/Tasmota/issues/23127) - Allow acl in mqtt when client certificate is in use with `#define USE_MQTT_CLIENT_CERT` [#22998](https://github.com/arendst/Tasmota/issues/22998) - Berry experimental driver for AXP2101 for M5Core2v1.1 [#23039](https://github.com/arendst/Tasmota/issues/23039) - Berry `tasmota.when_network_up()` and simplified Matter using it [#23057](https://github.com/arendst/Tasmota/issues/23057) diff --git a/tasmota/include/tasmota_template.h b/tasmota/include/tasmota_template.h index f6b68cf3b..946dffea0 100644 --- a/tasmota/include/tasmota_template.h +++ b/tasmota/include/tasmota_template.h @@ -1010,8 +1010,8 @@ const uint16_t kGpioNiceList[] PROGMEM = { AGPIO(GPIO_BL6523_RX), // BL6523 based Watt meter Serial interface #endif #ifdef USE_V9240 - AGPIO(GPIO_V9240_RX), // Serial V9240 interface - AGPIO(GPIO_V9240_TX), // Serial V9240 interface + AGPIO(GPIO_V9240_TX), // Serial V9240 interface + AGPIO(GPIO_V9240_RX), // Serial V9240 interface #endif #endif // USE_ENERGY_SENSOR diff --git a/tasmota/my_user_config.h b/tasmota/my_user_config.h index 307ac8e52..257275f85 100644 --- a/tasmota/my_user_config.h +++ b/tasmota/my_user_config.h @@ -950,7 +950,7 @@ // #define IEM3000_IEM3155 // Compatibility fix for Iem3155 (changes Power and Energy total readout) //#define USE_WE517 // Add support for Orno WE517-Modbus energy monitor (+1k code) //#define USE_MODBUS_ENERGY // Add support for generic modbus energy monitor using a user file in rule space (+5k) -//#define USE_V9240 // Add support for v9240 +//#define USE_V9240 // Add support for Vango Technologies V924x ultralow power, single-phase, power measurement (+12k) // -- Low level interface devices ----------------- #define USE_DHT // Add support for DHT11, AM2301 (DHT21, DHT22, AM2302, AM2321) and SI7021 Temperature and Humidity sensor (1k6 code) diff --git a/tasmota/tasmota_support/support_features.ino b/tasmota/tasmota_support/support_features.ino index 8dc6a5e4e..0f70a3c2a 100644 --- a/tasmota/tasmota_support/support_features.ino +++ b/tasmota/tasmota_support/support_features.ino @@ -944,7 +944,7 @@ constexpr uint32_t feature[] = { 0x00002000 | // xdrv_77_wizmote.ino #endif #if defined(USE_ENERGY_SENSOR) && defined(USE_V9240) - 0x00004000 | // xnrg_25_v9240.ino + 0x00004000 | // xnrg_25_v9240.ino #endif // 0x00008000 | // // 0x00010000 | // diff --git a/tasmota/tasmota_xnrg_energy/xnrg_25_v9240.ino b/tasmota/tasmota_xnrg_energy/xnrg_25_v9240.ino index ac6445aa0..e9a15f121 100644 --- a/tasmota/tasmota_xnrg_energy/xnrg_25_v9240.ino +++ b/tasmota/tasmota_xnrg_energy/xnrg_25_v9240.ino @@ -1,16 +1,20 @@ /* xnrg_25_v9240.ino - v9240 energy sensor support for Tasmota -*/ + SPDX-FileCopyrightText: 2025 Ivan Chopa (@aquaforum) + SPDX-License-Identifier: GPL-3.0-only +*/ #ifdef USE_ENERGY_SENSOR #ifdef USE_V9240 +/*********************************************************************************************\ + * Support the Vango Technologies V924x ULTRALOW POWER, UART, SINGLE-PHASE, POWER MEASUREMENT IC +\*********************************************************************************************/ #define XNRG_25 25 #include -#include #define V9240_SERIAL_BAUDRATE 19200 @@ -64,9 +68,6 @@ namespace Address } ; - - - // register structures union SysSts // 0x0CA diff --git a/tools/decode-status.py b/tools/decode-status.py index fc1e750be..ff90a8631 100755 --- a/tools/decode-status.py +++ b/tools/decode-status.py @@ -311,7 +311,7 @@ a_features = [[ "USE_MAGIC_SWITCH","USE_PIPSOLAR","USE_GPIO_VIEWER","USE_AMSX915", "USE_SPI_LORA","USE_SPL06_007","USE_QMP6988","USE_WOOLIIS", "USE_HX711_M5SCALES","USE_RX8010","USE_PCF85063","USE_ESP32_TWAI", - "USE_C8_CO2_5K","","","", + "USE_C8_CO2_5K","USE_WIZMOTE","USE_V9240","", "","","","", "","","","", "","","","", @@ -343,7 +343,7 @@ else: obj = json.load(fp) def StartDecode(): - print ("\n*** decode-status.py v14.4.1.4 by Theo Arends and Jacek Ziolkowski ***") + print ("\n*** decode-status.py v14.5.0.2 by Theo Arends and Jacek Ziolkowski ***") # print("Decoding\n{}".format(obj))