From 76ac0ed5401b577a464dd4895c50019afac3e11c Mon Sep 17 00:00:00 2001 From: Mit4el Date: Fri, 17 Nov 2023 23:04:42 +0300 Subject: [PATCH] new Pzem004t_v2 with IoTUart --- src/modules/exec/TelegramLT/modinfo.json | 1 + src/modules/sensors/Bme280/modinfo.json | 3 + .../sensors/Pzem004t_v2/PZEMSensor.cpp | 315 ++++++++++++++++++ src/modules/sensors/Pzem004t_v2/PZEMSensor.h | 51 +++ src/modules/sensors/Pzem004t_v2/Pzem004t.cpp | 315 ++++++++++++++++++ src/modules/sensors/Pzem004t_v2/modinfo.json | 155 +++++++++ 6 files changed, 840 insertions(+) create mode 100644 src/modules/sensors/Pzem004t_v2/PZEMSensor.cpp create mode 100644 src/modules/sensors/Pzem004t_v2/PZEMSensor.h create mode 100644 src/modules/sensors/Pzem004t_v2/Pzem004t.cpp create mode 100644 src/modules/sensors/Pzem004t_v2/modinfo.json diff --git a/src/modules/exec/TelegramLT/modinfo.json b/src/modules/exec/TelegramLT/modinfo.json index 4f2ce19d..706338c3 100644 --- a/src/modules/exec/TelegramLT/modinfo.json +++ b/src/modules/exec/TelegramLT/modinfo.json @@ -56,6 +56,7 @@ "esp32cam_4mb": [], "esp32_16mb": [], "esp32s2_4mb": [], + "esp32c3m_4mb":[], "esp8266_4mb": [], "esp8266_16mb": [], "esp8266_1mb": [], diff --git a/src/modules/sensors/Bme280/modinfo.json b/src/modules/sensors/Bme280/modinfo.json index c8b114da..53df6b2c 100644 --- a/src/modules/sensors/Bme280/modinfo.json +++ b/src/modules/sensors/Bme280/modinfo.json @@ -89,6 +89,9 @@ "esp32cam_4mb": [ "adafruit/Adafruit BME280 Library" ], + "esp32c3m_4mb":[ + "adafruit/Adafruit BME280 Library" + ], "esp8266_4mb": [ "adafruit/Adafruit BME280 Library" ], diff --git a/src/modules/sensors/Pzem004t_v2/PZEMSensor.cpp b/src/modules/sensors/Pzem004t_v2/PZEMSensor.cpp new file mode 100644 index 00000000..c8924410 --- /dev/null +++ b/src/modules/sensors/Pzem004t_v2/PZEMSensor.cpp @@ -0,0 +1,315 @@ +#include "PZEMSensor.h" + +#include + +#define REG_VOLTAGE 0x0000 +#define REG_CURRENT_L 0x0001 +#define REG_CURRENT_H 0X0002 +#define REG_POWER_L 0x0003 +#define REG_POWER_H 0x0004 +#define REG_ENERGY_L 0x0005 +#define REG_ENERGY_H 0x0006 +#define REG_FREQUENCY 0x0007 +#define REG_PF 0x0008 +#define REG_ALARM 0x0009 +#define CMD_RHR 0x03 +#define CMD_RIR 0X04 +#define CMD_WSR 0x06 +#define CMD_CAL 0x41 +#define CMD_REST 0x42 +#define WREG_ALARM_THR 0x0001 +#define WREG_ADDR 0x0002 +#define UPDATE_TIME 200 +#define RESPONSE_SIZE 32 +#define READ_TIMEOUT 100 +#define PZEM_BAUD_RATE 9600 + +#define DEBUG +// Debugging function; +void printBuf(uint8_t *buffer, uint16_t len) { +#ifdef DEBUG + for (uint16_t i = 0; i < len; i++) { + char temp[6]; + sprintf(temp, "%.2x ", buffer[i]); + Serial.print(temp); + } + Serial.println(); +#endif +} + +PZEMSensor::PZEMSensor(Stream *port, uint16_t addr) { + _serial = port; + _addr = addr; + init(); +} + +PZEM_Info *PZEMSensor::values(bool &online) { + // Update vales if necessary + if (!refresh()) { + _values = PZEM_Info(); + online = false; + } else { + online = true; + } + return &_values; +} + +/*! + * PZEM004Tv30::sendCmd8 + * + * Prepares the 8 byte command buffer and sends + * + * @param[in] cmd - Command to send (position 1) + * @param[in] rAddr - Register address (postion 2-3) + * @param[in] val - Register value to write (positon 4-5) + * @param[in] check - perform a simple read check after write + * + * @return success + */ +bool PZEMSensor::sendCmd8(uint8_t cmd, uint16_t rAddr, uint16_t val, bool check, uint16_t slave_addr) { + uint8_t sendBuffer[8]; // Send buffer + uint8_t respBuffer[8]; // Response buffer (only used when check is true) + + if ((slave_addr == 0xFFFF) || + (slave_addr < 0x01) || + (slave_addr > 0xF7)) { + slave_addr = _addr; + } + + sendBuffer[0] = slave_addr; // Set slave address + sendBuffer[1] = cmd; // Set command + + sendBuffer[2] = (rAddr >> 8) & 0xFF; // Set high byte of register address + sendBuffer[3] = (rAddr)&0xFF; // Set low byte =//= + + sendBuffer[4] = (val >> 8) & 0xFF; // Set high byte of register value + sendBuffer[5] = (val)&0xFF; // Set low byte =//= + + setCRC(sendBuffer, 8); // Set CRC of frame + + _serial->write(sendBuffer, 8); // send frame + + if (check) { + if (!recieve(respBuffer, 8)) { // if check enabled, read the response + return false; + } + + // Check if response is same as send + for (uint8_t i = 0; i < 8; i++) { + if (sendBuffer[i] != respBuffer[i]) + return false; + } + } + return true; +} + +bool PZEMSensor::setAddress(uint8_t addr) { + if (addr < 0x01 || addr > 0xF7) // sanity check + return false; + + // Write the new address to the address register + if (!sendCmd8(CMD_WSR, WREG_ADDR, addr, true)) + return false; + + _addr = addr; // If successful, update the current slave address + + return true; +} + +uint8_t PZEMSensor::getAddress() { + return _addr; +} + +bool PZEMSensor::setPowerAlarm(uint16_t watts) { + if (watts > 25000) { // Sanitych check + watts = 25000; + } + + // Write the watts threshold to the Alarm register + if (!sendCmd8(CMD_WSR, WREG_ALARM_THR, watts, true)) + return false; + + return true; +} + +bool PZEMSensor::getPowerAlarm() { + if (!refresh()) // Update vales if necessary + return NAN; // Update did not work, return NAN + + return _values.alarms != 0x0000; +} + +void PZEMSensor::init() { + if (_addr < 0x01 || _addr > 0xF8) { + // Sanity check of address + _addr = PZEM_DEFAULT_ADDR; + } + // Set initial lastRed time so that we read right away + _lastRead = 0; + _lastRead -= UPDATE_TIME; +} + +bool PZEMSensor::refresh() { + static uint8_t response[25]; + if (_lastRead + UPDATE_TIME > millis()) { + return true; + } + // Read 10 registers starting at 0x00 (no check) + sendCmd8(CMD_RIR, 0x00, 0x0A, false); + if (recieve(response, 25) != 25) { // Something went wrong + return false; + } + // Update the current values + _values.voltage = ((uint32_t)response[3] << 8 | // Raw voltage in 0.1V + (uint32_t)response[4]) / + 10.0; + + _values.current = ((uint32_t)response[5] << 8 | // Raw current in 0.001A + (uint32_t)response[6] | + (uint32_t)response[7] << 24 | + (uint32_t)response[8] << 16) / + 1000.0; + + _values.power = ((uint32_t)response[9] << 8 | // Raw power in 0.1W + (uint32_t)response[10] | + (uint32_t)response[11] << 24 | + (uint32_t)response[12] << 16) / + 10.0; + + _values.energy = ((uint32_t)response[13] << 8 | // Raw Energy in 1Wh + (uint32_t)response[14] | + (uint32_t)response[15] << 24 | + (uint32_t)response[16] << 16) / + 1000.0; + + _values.freq = ((uint32_t)response[17] << 8 | // Raw Frequency in 0.1Hz + (uint32_t)response[18]) / + 10.0; + + _values.pf = ((uint32_t)response[19] << 8 | // Raw pf in 0.01 + (uint32_t)response[20]) / + 100.0; + + _values.alarms = ((uint32_t)response[21] << 8 | // Raw alarm value + (uint32_t)response[22]); + + // Record current time as _lastRead + _lastRead = millis(); + return true; +} + +bool PZEMSensor::reset() { + uint8_t buffer[] = {0x00, CMD_REST, 0x00, 0x00}; + uint8_t reply[5]; + buffer[0] = _addr; + + setCRC(buffer, 4); + _serial->write(buffer, 4); + + uint16_t length = recieve(reply, 5); + + if (length == 0 || length == 5) { + return false; + } + + return true; +} + +uint16_t PZEMSensor::recieve(uint8_t *resp, uint16_t len) { + ((SoftwareSerial *)_serial)->listen(); // Start software serial listen + unsigned long startTime = millis(); // Start time for Timeout + uint8_t index = 0; // Bytes we have read + while ((index < len) && (millis() - startTime < READ_TIMEOUT)) { + if (_serial->available() > 0) { + uint8_t c = (uint8_t)_serial->read(); + resp[index++] = c; + } + } + // Check CRC with the number of bytes read + if (!checkCRC(resp, index)) { + return 0; + } + return index; +} + +bool PZEMSensor::checkCRC(const uint8_t *buf, uint16_t len) { + if (len <= 2) // Sanity check + return false; + + uint16_t crc = CRC16(buf, len - 2); // Compute CRC of data + return ((uint16_t)buf[len - 2] | (uint16_t)buf[len - 1] << 8) == crc; +} + +void PZEMSensor::setCRC(uint8_t *buf, uint16_t len) { + if (len <= 2) // Sanity check + return; + + uint16_t crc = CRC16(buf, len - 2); // CRC of data + + // Write high and low byte to last two positions + buf[len - 2] = crc & 0xFF; // Low byte first + buf[len - 1] = (crc >> 8) & 0xFF; // High byte second +} + +// Pre computed CRC table +static const uint16_t crcTable[] PROGMEM = { + 0X0000, 0XC0C1, 0XC181, 0X0140, 0XC301, 0X03C0, 0X0280, 0XC241, + 0XC601, 0X06C0, 0X0780, 0XC741, 0X0500, 0XC5C1, 0XC481, 0X0440, + 0XCC01, 0X0CC0, 0X0D80, 0XCD41, 0X0F00, 0XCFC1, 0XCE81, 0X0E40, + 0X0A00, 0XCAC1, 0XCB81, 0X0B40, 0XC901, 0X09C0, 0X0880, 0XC841, + 0XD801, 0X18C0, 0X1980, 0XD941, 0X1B00, 0XDBC1, 0XDA81, 0X1A40, + 0X1E00, 0XDEC1, 0XDF81, 0X1F40, 0XDD01, 0X1DC0, 0X1C80, 0XDC41, + 0X1400, 0XD4C1, 0XD581, 0X1540, 0XD701, 0X17C0, 0X1680, 0XD641, + 0XD201, 0X12C0, 0X1380, 0XD341, 0X1100, 0XD1C1, 0XD081, 0X1040, + 0XF001, 0X30C0, 0X3180, 0XF141, 0X3300, 0XF3C1, 0XF281, 0X3240, + 0X3600, 0XF6C1, 0XF781, 0X3740, 0XF501, 0X35C0, 0X3480, 0XF441, + 0X3C00, 0XFCC1, 0XFD81, 0X3D40, 0XFF01, 0X3FC0, 0X3E80, 0XFE41, + 0XFA01, 0X3AC0, 0X3B80, 0XFB41, 0X3900, 0XF9C1, 0XF881, 0X3840, + 0X2800, 0XE8C1, 0XE981, 0X2940, 0XEB01, 0X2BC0, 0X2A80, 0XEA41, + 0XEE01, 0X2EC0, 0X2F80, 0XEF41, 0X2D00, 0XEDC1, 0XEC81, 0X2C40, + 0XE401, 0X24C0, 0X2580, 0XE541, 0X2700, 0XE7C1, 0XE681, 0X2640, + 0X2200, 0XE2C1, 0XE381, 0X2340, 0XE101, 0X21C0, 0X2080, 0XE041, + 0XA001, 0X60C0, 0X6180, 0XA141, 0X6300, 0XA3C1, 0XA281, 0X6240, + 0X6600, 0XA6C1, 0XA781, 0X6740, 0XA501, 0X65C0, 0X6480, 0XA441, + 0X6C00, 0XACC1, 0XAD81, 0X6D40, 0XAF01, 0X6FC0, 0X6E80, 0XAE41, + 0XAA01, 0X6AC0, 0X6B80, 0XAB41, 0X6900, 0XA9C1, 0XA881, 0X6840, + 0X7800, 0XB8C1, 0XB981, 0X7940, 0XBB01, 0X7BC0, 0X7A80, 0XBA41, + 0XBE01, 0X7EC0, 0X7F80, 0XBF41, 0X7D00, 0XBDC1, 0XBC81, 0X7C40, + 0XB401, 0X74C0, 0X7580, 0XB541, 0X7700, 0XB7C1, 0XB681, 0X7640, + 0X7200, 0XB2C1, 0XB381, 0X7340, 0XB101, 0X71C0, 0X7080, 0XB041, + 0X5000, 0X90C1, 0X9181, 0X5140, 0X9301, 0X53C0, 0X5280, 0X9241, + 0X9601, 0X56C0, 0X5780, 0X9741, 0X5500, 0X95C1, 0X9481, 0X5440, + 0X9C01, 0X5CC0, 0X5D80, 0X9D41, 0X5F00, 0X9FC1, 0X9E81, 0X5E40, + 0X5A00, 0X9AC1, 0X9B81, 0X5B40, 0X9901, 0X59C0, 0X5880, 0X9841, + 0X8801, 0X48C0, 0X4980, 0X8941, 0X4B00, 0X8BC1, 0X8A81, 0X4A40, + 0X4E00, 0X8EC1, 0X8F81, 0X4F40, 0X8D01, 0X4DC0, 0X4C80, 0X8C41, + 0X4400, 0X84C1, 0X8581, 0X4540, 0X8701, 0X47C0, 0X4680, 0X8641, + 0X8201, 0X42C0, 0X4380, 0X8341, 0X4100, 0X81C1, 0X8081, 0X4040}; + +uint16_t PZEMSensor::CRC16(const uint8_t *data, uint16_t len) { + uint8_t nTemp; // CRC table index + uint16_t crc = 0xFFFF; // Default value + + while (len--) { + nTemp = *data++ ^ crc; + crc >>= 8; + crc ^= (uint16_t)pgm_read_word(&crcTable[nTemp]); + } + return crc; +} + +bool PZEMSensor::search() { + bool ret = false; + static uint8_t response[7]; + for (uint16_t addr = 0x01; addr <= 0xF8; addr++) { + sendCmd8(CMD_RIR, 0x00, 0x01, false, addr); + if (recieve(response, 7) != 7) { + // Something went wrong + continue; + } else { + Serial.println("Pzem " + String(addr)); + ret = true; + } + } + return ret; +} diff --git a/src/modules/sensors/Pzem004t_v2/PZEMSensor.h b/src/modules/sensors/Pzem004t_v2/PZEMSensor.h new file mode 100644 index 00000000..d76dfc5c --- /dev/null +++ b/src/modules/sensors/Pzem004t_v2/PZEMSensor.h @@ -0,0 +1,51 @@ +#pragma once + +#include +#include + +#define PZEM_DEFAULT_ADDR 0xF8 + +struct PZEM_Info { + float voltage; + float current; + float power; + float energy; + float freq; + float pf; + uint16_t alarms; + PZEM_Info() : voltage{0}, current{0}, power{0}, energy{0}, freq{0}, pf{0}, alarms{0} {}; +}; + +class PZEMSensor { + public: + PZEMSensor(Stream *serial, uint16_t addr = PZEM_DEFAULT_ADDR); + + ~PZEMSensor(); + PZEM_Info *values(bool &online); + bool setAddress(uint8_t addr); + uint8_t getAddress(); + bool setPowerAlarm(uint16_t watts); + bool getPowerAlarm(); + bool reset(); + bool search(); + // Get most up to date values from device registers and cache them + bool refresh(); + void updateSerial(Stream *serial) {_serial = serial;} + + private: + void init(void); + + private: + PZEM_Info _values; // Measured values + Stream *_serial; // Serial interface + bool _isSoft; // Is serial interface software + uint8_t _addr; // Device address + uint64_t _lastRead; // Last time values were updated + + void init(uint8_t addr); // Init common to all constructors + uint16_t recieve(uint8_t *resp, uint16_t len); // Receive len bytes into a buffer + bool sendCmd8(uint8_t cmd, uint16_t rAddr, uint16_t val, bool check = false, uint16_t slave_addr = 0xFFFF); // Send 8 byte command + void setCRC(uint8_t *buf, uint16_t len); // Set the CRC for a buffer + bool checkCRC(const uint8_t *buf, uint16_t len); // Check CRC of buffer + uint16_t CRC16(const uint8_t *data, uint16_t len); // Calculate CRC of buffer +}; diff --git a/src/modules/sensors/Pzem004t_v2/Pzem004t.cpp b/src/modules/sensors/Pzem004t_v2/Pzem004t.cpp new file mode 100644 index 00000000..10d92dea --- /dev/null +++ b/src/modules/sensors/Pzem004t_v2/Pzem004t.cpp @@ -0,0 +1,315 @@ + +#include "Global.h" +#include "classes/IoTItem.h" + +#include "PZEMSensor.h" +//#include "modules/sensors/UART/Uart.h" +#include "classes/IoTUart.h" +#include + +// глобальные списки необходимы для хранения объектов об экземплярах Pzem . Ключ - адрес +std::map pzemSensorArray; +//PZEMContainer _pzemCntr; +Stream* _myUARTpzem = nullptr; + +PZEMSensor* getPzemSensor(String addr) { + if (pzemSensorArray.find(addr) == pzemSensorArray.end()) + return nullptr; + return pzemSensorArray[addr]; +} + +class Pzem004v : public IoTItem { + private: + String addr; + PZEMSensor* pzem = nullptr; + + public: + Pzem004v(String parameters) : IoTItem(parameters) { + jsonRead(parameters, "addr", addr); + pzem = getPzemSensor(addr); + } + + void doByInterval() { + if (pzem) { + bool online = false; + value.valD = pzem->values(online)->voltage; + if (online) { + regEvent(value.valD, "Pzem V"); + } else { + regEvent(NAN, "Pzem V"); + SerialPrint("E", "Pzem", "V error", _id); + } + } else { + regEvent(NAN, "Pzem"); + SerialPrint("E", "Pzem", "initialization error", _id); + // Запросим pzem, если он не был создан из-за отсутствия UART, если в конфигурации не в правильном порядке + pzem = getPzemSensor(addr); + } + } + + ~Pzem004v(){}; +}; + +class Pzem004a : public IoTItem { + private: + String addr; + PZEMSensor* pzem = nullptr; + + public: + Pzem004a(String parameters) : IoTItem(parameters) { + jsonRead(parameters, "addr", addr); + pzem = getPzemSensor(addr); + } + + void doByInterval() { + if (pzem) { + bool online = false; + value.valD = pzem->values(online)->current; + if (online) { + regEvent(value.valD, "Pzem A"); + } else { + regEvent(NAN, "Pzem A"); + SerialPrint("E", "Pzem", "A error", _id); + } + } else { + regEvent(NAN, "Pzem"); + SerialPrint("E", "Pzem", "initialization error", _id); + pzem = getPzemSensor(addr); + } + } + + ~Pzem004a(){}; +}; + +class Pzem004w : public IoTItem { + private: + String addr; + PZEMSensor* pzem = nullptr; + + public: + Pzem004w(String parameters) : IoTItem(parameters) { + jsonRead(parameters, "addr", addr); + pzem = getPzemSensor(addr); + } + + void doByInterval() { + if (pzem) { + bool online = false; + value.valD = pzem->values(online)->power; + if (online) { + regEvent(value.valD, "Pzem W"); + } else { + regEvent(NAN, "Pzem W"); + SerialPrint("E", "Pzem", "W error", _id); + } + } else { + regEvent(NAN, "Pzem"); + SerialPrint("E", "Pzem", "initialization error", _id); + pzem = getPzemSensor(addr); + } + } + + ~Pzem004w(){}; +}; + +class Pzem004wh : public IoTItem { + private: + String addr; + PZEMSensor* pzem = nullptr; + + public: + Pzem004wh(String parameters) : IoTItem(parameters) { + jsonRead(parameters, "addr", addr); + pzem = getPzemSensor(addr); + } + + void doByInterval() { + if (pzem) { + bool online = false; + value.valD = pzem->values(online)->energy; + if (online) { + regEvent(value.valD, "Pzem Wh"); + } else { + regEvent(NAN, "Pzem Wh"); + SerialPrint("E", "Pzem", "Wh error", _id); + } + } else { + regEvent(NAN, "Pzem"); + SerialPrint("E", "Pzem", "initialization error", _id); + pzem = getPzemSensor(addr); + } + } + + ~Pzem004wh(){}; +}; + +class Pzem004hz : public IoTItem { + private: + String addr; + PZEMSensor* pzem = nullptr; + + public: + Pzem004hz(String parameters) : IoTItem(parameters) { + jsonRead(parameters, "addr", addr); + pzem = getPzemSensor(addr); + } + + void doByInterval() { + if (pzem) { + bool online = false; + value.valD = pzem->values(online)->freq; + if (online) { + regEvent(value.valD, "Pzem Hz"); + } else { + regEvent(NAN, "Pzem Hz"); + SerialPrint("E", "Pzem", "Hz error", _id); + } + } else { + regEvent(NAN, "Pzem"); + SerialPrint("E", "Pzem", "initialization error", _id); + pzem = getPzemSensor(addr); + } + } + + ~Pzem004hz(){}; +}; + +class Pzem004pf : public IoTItem { + private: + String addr; + PZEMSensor* pzem = nullptr; + + public: + Pzem004pf(String parameters) : IoTItem(parameters) { + jsonRead(parameters, "addr", addr); + pzem = getPzemSensor(addr); + } + + void doByInterval() { + if (pzem) { + bool online = false; + value.valD = pzem->values(online)->pf; + if (online) { + regEvent(value.valD, "Pzem Pf"); + } else { + regEvent(NAN, "Pzem Pf"); + SerialPrint("E", "Pzem", "Pf error", _id); + } + } else { + regEvent(NAN, "Pzem"); + SerialPrint("E", "Pzem", "initialization error", _id); + pzem = getPzemSensor(addr); + } + } + + ~Pzem004pf(){}; +}; + +class Pzem004cmd : public IoTItem { + private: + String addr; + // int changeaddr; + // String setaddr; + // int reset; + PZEMSensor* pzem = nullptr; + + public: + Pzem004cmd(String parameters) : IoTItem(parameters) { + jsonRead(parameters, F("addr"), addr); + // jsonRead(parameters, F("changeaddr"), changeaddr); + // jsonRead(parameters, F("setaddr"), setaddr); + // jsonRead(parameters, F("reset"), reset); + + pzem = getPzemSensor(addr); + } + + void doByInterval() { + if (pzem) { + } + } + + void onModuleOrder(String &key, String &value) { + if (pzem) { + if (key == "changeaddr") { + if (pzem->setAddress(hexStringToUint8(value))) { + SerialPrint("i", "Pzem", "address set: " + value); + } else { + SerialPrint("i", "Pzem", "set adress error: " + value); + } + + } else if (key == "reset") { + if (pzem->reset()) { + SerialPrint("i", "Pzem", "reset done"); + } else { + SerialPrint("i", "Pzem", "reset error"); + } + } + } + } + + ~Pzem004cmd(){}; +}; + +class Pzem004uart : public IoTUart { + public: + Pzem004uart(String parameters) : IoTUart(parameters) { + _myUARTpzem = _myUART; + //Обновим везде Uart, если в конфигурации не в правильном порядке + for (auto it = pzemSensorArray.begin(); it != pzemSensorArray.end(); it ++) + { + if (it->second == nullptr){ + it->second = new PZEMSensor(_myUARTpzem, hexStringToUint8(it->first)); + // SerialPrint("i", "Pzem", "create pzemSensor"); + } + it->second->updateSerial(_myUARTpzem); + // SerialPrint("i", "Pzem", "update serial pzemuart"); + } + } + + ~Pzem004uart(){}; +}; + + + +void* getAPI_Pzem004_v2(String subtype, String param) { + + if (subtype == F("Pzem004v") || subtype == F("Pzem004a") || subtype == F("Pzem004w") + || subtype == F("Pzem004wh") || subtype == F("Pzem004hz") || subtype == F("Pzem004pf") + || subtype == F("Pzem004cmd") ) + { + SerialPrint("i", "Pzem", "create constructor"+ subtype); + String addr; + jsonRead(param, "addr", addr); + if (_myUARTpzem) { + if (pzemSensorArray.find(addr) == pzemSensorArray.end()) { + pzemSensorArray[addr] = new PZEMSensor(_myUARTpzem, hexStringToUint8(addr)); + // SerialPrint("i", "Pzem", "create map"); + } else { // Обновление UART нужно для смены пинов для уже созданных объектов в map + pzemSensorArray[addr]->updateSerial(_myUARTpzem); + // SerialPrint("i", "Pzem", "create serial constructor"); + } + }else{// если нет UART, то и библиотеку pzem создаем пустой, что бы потом обновить при создании uart + pzemSensorArray[addr] = nullptr; + } + } + + if (subtype == F("Pzem004v")) { + return new Pzem004v(param); + } else if (subtype == F("Pzem004a")) { + return new Pzem004a(param); + } else if (subtype == F("Pzem004w")) { + return new Pzem004w(param); + } else if (subtype == F("Pzem004wh")) { + return new Pzem004wh(param); + } else if (subtype == F("Pzem004hz")) { + return new Pzem004hz(param); + } else if (subtype == F("Pzem004pf")) { + return new Pzem004pf(param); + } else if (subtype == F("Pzem004cmd")) { + return new Pzem004cmd(param); + } else if (subtype == F("Pzem004uart")) { + return new Pzem004uart(param); + } else { + return nullptr; + } +} diff --git a/src/modules/sensors/Pzem004t_v2/modinfo.json b/src/modules/sensors/Pzem004t_v2/modinfo.json new file mode 100644 index 00000000..679ee617 --- /dev/null +++ b/src/modules/sensors/Pzem004t_v2/modinfo.json @@ -0,0 +1,155 @@ +{ + "menuSection": "sensors", + "configItem": [ + { + "global": 0, + "name": "PZEM 004t Напряжение", + "type": "Reading", + "subtype": "Pzem004v", + "id": "v", + "widget": "anydataVlt", + "page": "PZEM", + "descr": "Напряжение", + "int": 15, + "addr": "0xF8", + "round": 1 + }, + { + "global": 0, + "name": "PZEM 004t Сила тока", + "type": "Reading", + "subtype": "Pzem004a", + "id": "a", + "widget": "anydataAmp", + "page": "PZEM", + "descr": "Сила тока", + "int": 15, + "addr": "0xF8", + "round": 1 + }, + { + "global": 0, + "name": "PZEM 004t Мощность", + "type": "Reading", + "subtype": "Pzem004w", + "id": "w", + "widget": "anydataWt", + "page": "PZEM", + "descr": "Мощность", + "int": 15, + "addr": "0xF8", + "round": 1 + }, + { + "global": 0, + "name": "PZEM 004t Энергия", + "type": "Reading", + "subtype": "Pzem004wh", + "id": "wh", + "widget": "anydataWth", + "page": "PZEM", + "descr": "Энергия", + "int": 15, + "addr": "0xF8", + "round": 1 + }, + { + "global": 0, + "name": "PZEM 004t Частота", + "type": "Reading", + "subtype": "Pzem004hz", + "id": "hz", + "widget": "anydataHtz", + "page": "PZEM", + "descr": "Частота", + "int": 15, + "addr": "0xF8", + "round": 1 + }, + { + "global": 0, + "name": "PZEM 004t Косинус", + "type": "Reading", + "subtype": "Pzem004pf", + "id": "pf", + "widget": "anydata", + "page": "PZEM", + "descr": "Косинус F", + "int": 15, + "addr": "0xF8", + "round": 1 + }, + { + "global": 0, + "name": "PZEM настройка", + "type": "Reading", + "subtype": "Pzem004cmd", + "id": "set", + "widget": "nil", + "page": "", + "descr": "", + "int": 15, + "addr": "0xF8", + "btn-changeaddr": "0x01", + "btn-reset": "" + }, + { + "global": 0, + "name": "PZEM uart", + "type": "Reading", + "subtype": "Pzem004uart", + "id": "upzem", + "widget": "nil", + "page": "", + "descr": "", + "tx": 17, + "rx": 16, + "line": 2, + "speed": 9600 + } + ], + "about": { + "authorName": "Dmitry Borisenko, v2 - Mit4bmw", + "authorContact": "https://t.me/Dmitry_Borisenko", + "authorGit": "https://github.com/DmitryBorisenko33", + "specialThanks": "Serghei Crasnicov @Serghei63", + "moduleName": "Pzem004_v2", + "moduleVersion": "2.0", + "usedRam": { + "esp32_4mb": 15, + "esp8266_4mb": 15 + }, + "subTypes": [ + "Pzem004v", + "Pzem004a", + "Pzem004w", + "Pzem004wh", + "Pzem004hz", + "Pzem004pf", + "Pzem004cmd", + "Pzem004uart" + ], + "title": "Счетчик электроэнергии PZEM 004 t версии 3.0 (с модбасом)", + "moduleDesc": "Считает потраченную электроэнергию, измеряет напряжение, частоту, силу тока и прочие параметры. Возможно подключение трех счетчиков к одной esp для трехфазных сетей. Для этого нужно настроить разные адреса modbus в платах pzem. Для работы обязателен модуль Pzem004uart", + "propInfo": { + "addr": "Адрес modbus", + "int": "Количество секунд между опросами датчика. Желателно устанавливать одинаковые интервалы для параметров (для одного адреса Pzem) что опрос происходил один раз, остальные из 500мс буфера.", + "btn-changeaddr": " Будет установлен адрес указанный в setaddr. Смотрите в логе результат: [i] Pzem address set: 0x01 Новый адрес который нужно назначить", + "btn-reset": "pzem будет сброшен к нулю. Смотрите в логе результат: [i] Pzem reset done" + } + }, + "defActive": true, + "usedLibs": { + "esp32_4mb": [], + "esp32_4mb3f": [], + "esp32cam_4mb": [], + "esp32c3m_4mb": [], + "esp8266_4mb": [], + "esp8266_1mb": [], + "esp8266_1mb_ota": [], + "esp8285_1mb": [], + "esp8285_1mb_ota": [], + "esp8266_2mb": [], + "esp8266_2mb_ota": [] + } +} \ No newline at end of file