topaLE
/
ahoy
mirror of https://github.com/lumapu/ahoy.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge pull request #124 from aschiffler/control 

Control
pull/126/head
lumapu 3 years ago
committed by GitHub
parent
375a1ca955 56cc481069
commit
f3e928244e
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 198 additions and 16 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      .gitignore
  2. 138
      tools/esp8266/app.cpp
  3. 2
      tools/esp8266/app.h
  4. 8
      tools/esp8266/defines.h
  5. 6
      tools/esp8266/hmInverter.h
  6. 33
      tools/esp8266/hmRadio.h
  7. 5
      tools/esp8266/main.cpp
  8. 1
      tools/esp8266/main.h
  9. 20
      tools/esp8266/mqtt.h

1
.gitignore
View File

@ -17,3 +17,4 @@ tools/esp8266/binaries
*.db
*.suo
*.ipch
tools/esp8266/.vscode/extensions.json

138
tools/esp8266/app.cpp
View File

@ -62,6 +62,7 @@ void app::setup(uint32_t timeout) {
mWeb->on("/hoymiles", std::bind(&app::showHoymiles, this));
mWeb->on("/livedata", std::bind(&app::showLiveData, this));
mWeb->on("/json", std::bind(&app::showJSON, this));
mWeb->on("/devcontrol", std::bind(&app::devControl, this));
if(mSettingsValid) {
mEep->read(ADDR_INV_INTERVAL, &mSendInterval);
@ -81,8 +82,10 @@ void app::setup(uint32_t timeout) {
if(0ULL != invSerial) {
iv = mSys->addInverter(name, invSerial, modPwr);
if(NULL != iv) {
DPRINTLN(DBG_INFO, F("add inverter: ") + String(name) + ", SN: " + String(invSerial, HEX));
mEep->read(ADDR_INV_PWR_LIM + (i * 2),&iv->powerLimit);
iv->devControlCmd = 11; // set active power limit
iv->devControlRequest = true; // set to true to update the active power limit from setup html page
DPRINTLN(DBG_INFO, F("add inverter: ") + String(name) + ", SN: " + String(invSerial, HEX) + ", Power Limit: " + String(iv->powerLimit));
for(uint8_t j = 0; j < 4; j++) {
mEep->read(ADDR_INV_CH_NAME + (i * 4 * MAX_NAME_LENGTH) + j * MAX_NAME_LENGTH, iv->chName[j], MAX_NAME_LENGTH);
}
@ -150,6 +153,7 @@ void app::setup(uint32_t timeout) {
mqttPort = 1883;
mMqtt.setup(mqttAddr, mqttTopic, mqttUser, mqttPwd, mqttDevName, mqttPort);
mMqtt.mClient->setCallback(std::bind(&app::cbMqtt, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3));
mMqttTicker = 0;
mSerialTicker = 0;
@ -206,7 +210,7 @@ void app::setup(uint32_t timeout) {
void app::loop(void) {
DPRINTLN(DBG_VERBOSE, F("app::loop"));
Main::loop();
mSys->Radio.loop();
yield();
@ -233,7 +237,7 @@ void app::loop(void) {
if(0 != len) {
Inverter<> *iv = mSys->findInverter(&p->packet[1]);
if(NULL != iv) {
if(NULL != iv && p->packet[0] == (0x15 + 0x80)) { // response from get all information command
uint8_t *pid = &p->packet[9];
if (*pid == 0x00) {
DPRINT(DBG_DEBUG, "fragment number zero received and ignored");
@ -252,6 +256,23 @@ void app::loop(void) {
}
}
}
if(NULL != iv && p->packet[0] == (0x51 + 0x80)) { // response from dev control command
DPRINTLN(DBG_INFO, F("Response from devcontrol received"));
iv->devControlRequest = false;
if (p->packet[12] != 11 && iv->devControlCmd == 11){
// set back to last accpted limit
mEep->read(ADDR_INV_PWR_LIM + iv->id * 2, &iv->powerLimit);
DPRINTLN(DBG_INFO, F("Inverter has not accepted power limit set point"));
}
if (p->packet[12] == 11 && iv->devControlCmd == 11){ // ok inverter accepted the set point copy it to dtu eeprom
// on every reboot the dtu sets the power limit acc to the value in eeprom
mEep->write(ADDR_INV_PWR_LIM + iv->id * 2,iv->powerLimit);
updateCrc();
mEep->commit();
DPRINTLN(DBG_INFO, F("Inverter has accepted power limit set point, written to dtu eeprom"));
iv->devControlCmd = 0xff; // set to none known command.
}
}
}
}
@ -359,8 +380,14 @@ void app::loop(void) {
yield();
if(mSerialDebug)
DPRINTLN(DBG_INFO, F("Requesting Inverter SN ") + String(iv->serial.u64, HEX));
mSys->Radio.sendTimePacket(iv->radioId.u64, mPayload[iv->id].ts);
mRxTicker = 0;
if(iv->devControlRequest){
if(mSerialDebug)
DPRINTLN(DBG_INFO, F("Devcontrol request ") + String(iv->devControlCmd) + F(" power limit ") + String(iv->powerLimit));
mSys->Radio.sendControlPacket(iv->radioId.u64,iv->devControlCmd ,uint16_t(iv->powerLimit));
} else {
mSys->Radio.sendTimePacket(iv->radioId.u64, mPayload[iv->id].ts);
mRxTicker = 0;
}
}
}
else if(mSerialDebug)
@ -502,10 +529,12 @@ void app::showSetup(void) {
uint64_t invSerial;
char name[MAX_NAME_LENGTH + 1] = {0};
uint16_t modPwr[4];
uint16_t invActivePowerLimit = -1;
for(uint8_t i = 0; i < MAX_NUM_INVERTERS; i ++) {
mEep->read(ADDR_INV_ADDR + (i * 8), &invSerial);
mEep->read(ADDR_INV_NAME + (i * MAX_NAME_LENGTH), name, MAX_NAME_LENGTH);
mEep->read(ADDR_INV_CH_PWR + (i * 2 * 4), modPwr, 4);
mEep->read(ADDR_INV_PWR_LIM + (i * 2),&invActivePowerLimit);
inv += F("<p class=\"subdes\">Inverter ") + String(i) + "</p>";
inv += F("<label for=\"inv") + String(i) + F("Addr\">Address</label>");
@ -519,6 +548,12 @@ void app::showSetup(void) {
inv += String(name);
inv += F("\"/ maxlength=\"") + String(MAX_NAME_LENGTH) + "\">";
inv += F("<label for=\"inv") + String(i) + F("ActivePowerLimit\">Active Power Limit (W)</label>");
inv += F("<input type=\"text\" class=\"text\" name=\"inv") + String(i) + F("ActivePowerLimit\" value=\"");
inv += String(invActivePowerLimit);
inv += F("\"/ maxlength=\"") + String(6) + "\">";
inv += F("<label for=\"inv") + String(i) + F("ModPwr0\" name=\"lbl") + String(i);
inv += F("ModPwr\">Max Module Power (Wp)</label>");
for(uint8_t j = 0; j < 4; j++) {
@ -610,6 +645,77 @@ void app::showErase() {
showReboot();
}
//-----------------------------------------------------------------------------
void app::cbMqtt(char* topic, byte* payload, unsigned int length) {
// callback handling on subscribed devcontrol topic
DPRINTLN(DBG_INFO, F("app::cbMqtt"));
// subcribed topics are mTopic + "/devcontrol/#" where # is <inverter_id>/<subcmd in dec>
// eg. mypvsolar/devcontrol/1/11 with payload "400" --> inverter 1 active power limit 400 Watt
const char *token = strtok(topic, "/");
while (token != NULL)
{
if (std::strcmp(token,"devcontrol")==0){
token = strtok(NULL, "/");
uint8_t iv_id = std::stoi(token);
if (iv_id >= 0 && iv_id <= MAX_NUM_INVERTERS){
Inverter<> *iv = this->mSys->getInverterByPos(iv_id);
if(NULL != iv) {
if (!iv->devControlRequest) { // still pending
token = strtok(NULL, "/");
uint8_t subcmd = std::stoi(token);
switch ( subcmd ){
case 11: // Active Power Control
if (true){ // if (std::stoi((char*)payload) > 0) error handling powerlimit needed?
iv->devControlCmd = 11;
iv->powerLimit = std::stoi((char*)payload);
DPRINTLN(DBG_INFO, F("Power limit for inverter ") + String(iv->id) + F(" set to ") + String(iv->powerLimit) + F("W") );
}
iv->devControlRequest = true;
break;
case 0: // Turn On
iv->devControlCmd = 0;
DPRINTLN(DBG_INFO, F("Turn on inverter ") + String(iv->id) );
iv->devControlRequest = true;
break;
case 1: // Turn Off
iv->devControlCmd = 1;
DPRINTLN(DBG_INFO, F("Turn off inverter ") + String(iv->id) );
iv->devControlRequest = true;
break;
case 2: // Restart
iv->devControlCmd = 2;
DPRINTLN(DBG_INFO, F("Restart inverter ") + String(iv->id) );
iv->devControlRequest = true;
break;
case 12: // Reactive Power Control
// iv->devControlCmd = 12;
// uint16_t reactive_power = std::stoi(strtok(NULL, "/"));
// .../devcontrol/<inverter_id>/<subcmd in dec>/<value in dec>
// ^^^
DPRINTLN(DBG_INFO, F("Reactive Power Control not implemented for inverter ") + String(iv->id) );
break;
case 13: // Set Power Factor
// iv->devControlCmd = 13;
// uint16_t power_factor = std::stoi(strtok(NULL, "/"));
// .../devcontrol/<inverter_id>/<subcmd in dec>/<value in dec>
// ^^^
DPRINTLN(DBG_INFO, F("Set Power Factor not implemented for inverter ") + String(iv->id) );
break;
default:
DPRINTLN(DBG_INFO, "Not implemented");
break;
}
}
}
}
break;
}
token = strtok(NULL, "/");
}
DPRINTLN(DBG_INFO, F("app::cbMqtt finished"));
}
//-----------------------------------------------------------------------------
void app::showStatistics(void) {
@ -661,6 +767,19 @@ void app::showStatistics(void) {
mWeb->send(200, F("text/plain"), content);
}
//-----------------------------------------------------------------------------
void app::devControl(void) { // ToDo
DPRINTLN(DBG_VERBOSE, F("app::devControl"));
if(mWeb->args() > 0) {
//mWeb->arg("ivid").toChar...
// get iv
// set devControl on/off/power limt --> integrate buttons in app::showLiveData
// ...
mWeb->send(200, F("text/html"), F("<!doctype html><html><head><title>Command sent</title><meta http-equiv=\"refresh\" content=\"2; URL=/hoymiles\"></head><body>"
"<p>sent</p></body></html>"));
}
}
//-----------------------------------------------------------------------------
void app::showHoymiles(void) {
@ -700,7 +819,7 @@ void app::showLiveData(void) {
}
modHtml += F("<div class=\"iv\">"
"<div class=\"ch-iv\"><span class=\"head\">") + String(iv->name) + F("</span>");
"<div class=\"ch-iv\"><span class=\"head\">") + String(iv->name) + F(" Limit ") + String(iv->powerLimit) + F(" W</span>");
uint8_t list[] = {FLD_UAC, FLD_IAC, FLD_PAC, FLD_F, FLD_PCT, FLD_T, FLD_YT, FLD_YD, FLD_PDC, FLD_EFF};
for(uint8_t fld = 0; fld < 10; fld++) {
@ -795,6 +914,7 @@ void app::saveValues(bool webSend = true) {
char buf[20] = {0};
uint8_t i = 0;
uint16_t interval;
uint16_t activepowerlimit=-1;
// inverter
serial_u addr;
@ -806,6 +926,10 @@ void app::saveValues(bool webSend = true) {
addr.u64 = Serial2u64(buf);
mEep->write(ADDR_INV_ADDR + (i * 8), addr.u64);
// active power limit
activepowerlimit = mWeb->arg("inv" + String(i) + "ActivePowerLimit").toInt();
mEep->write(ADDR_INV_PWR_LIM + i * 2,activepowerlimit);
// name
mWeb->arg("inv" + String(i) + "Name").toCharArray(buf, 20);
mEep->write(ADDR_INV_NAME + (i * MAX_NAME_LENGTH), buf, MAX_NAME_LENGTH);

2
tools/esp8266/app.h
View File

@ -51,6 +51,7 @@ class app : public Main {
void setup(uint32_t timeout);
void loop(void);
void handleIntr(void);
void cbMqtt(char* topic, byte* payload, unsigned int length);
uint8_t app_loops;
uint8_t getIrqPin(void) {
@ -70,6 +71,7 @@ class app : public Main {
void showHoymiles(void);
void showLiveData(void);
void showJSON(void);
void devControl(void);
void saveValues(bool webSend);

8
tools/esp8266/defines.h
View File

@ -20,8 +20,8 @@
// VERSION
//-------------------------------------
#define VERSION_MAJOR 0
#define VERSION_MINOR 4
#define VERSION_PATCH 26
#define VERSION_MINOR 5
#define VERSION_PATCH 1
//-------------------------------------
@ -53,6 +53,7 @@ typedef struct {
#define INV_CH_CH_NAME_LEN MAX_NUM_INVERTERS * MAX_NAME_LENGTH * 4 // (4 channels)
#define INV_INTERVAL_LEN 2 // uint16_t
#define INV_MAX_RTRY_LEN 1 // uint8_t
#define INV_PWR_LIM_LEN MAX_NUM_INVERTERS * 2 // uint16_t
#define PINOUT_LEN 3 // 3 pins: CS, CE, IRQ
@ -89,8 +90,9 @@ typedef struct {
#define ADDR_INV_CH_NAME ADDR_INV_CH_PWR + INV_CH_CH_PWR_LEN
#define ADDR_INV_INTERVAL ADDR_INV_CH_NAME + INV_CH_CH_NAME_LEN
#define ADDR_INV_MAX_RTRY ADDR_INV_INTERVAL + INV_INTERVAL_LEN
#define ADDR_INV_PWR_LIM ADDR_INV_MAX_RTRY + INV_MAX_RTRY_LEN
#define ADDR_MQTT_ADDR ADDR_INV_MAX_RTRY + INV_MAX_RTRY_LEN
#define ADDR_MQTT_ADDR ADDR_INV_PWR_LIM + INV_PWR_LIM_LEN
#define ADDR_MQTT_USER ADDR_MQTT_ADDR + MQTT_ADDR_LEN
#define ADDR_MQTT_PWD ADDR_MQTT_USER + MQTT_USER_LEN
#define ADDR_MQTT_TOPIC ADDR_MQTT_PWD + MQTT_PWD_LEN

6
tools/esp8266/hmInverter.h
View File

@ -69,6 +69,9 @@ class Inverter {
uint8_t type; // integer which refers to inverter type
byteAssign_t* assign; // type of inverter
uint8_t listLen; // length of assignments
uint16_t powerLimit; // limit power output
uint8_t devControlCmd; // carries the requested cmd
bool devControlRequest; // true if change needed
serial_u serial; // serial number as on barcode
serial_u radioId; // id converted to modbus
uint8_t channels; // number of PV channels (1-4)
@ -79,6 +82,9 @@ class Inverter {
Inverter() {
ts = 0;
powerLimit = -1; // 65535 W Limit -> unlimited
devControlRequest = false;
devControlCmd = 0xff;
}
~Inverter() {

33
tools/esp8266/hmRadio.h
View File

@ -159,6 +159,39 @@ class HmRadio {
return mRfChLst[mTxChIdx];
}
void sendControlPacket(uint64_t invId, uint8_t cmd, uint16_t data) {
DPRINTLN(DBG_VERBOSE, F("hmRadio.h:sendControlPacket"));
// sendCmdPacket(invId, 0x51, 0x80, false); // 0x80 implementation as original DTU code
sendCmdPacket(invId, 0x51, 0x81, false);
int cnt = 0;
mTxBuf[10] = cmd; // cmd --> 0x0b => Type_ActivePowerContr, 0 on, 1 off, 2 restart, 12 reactive power, 13 power factor
mTxBuf[10 + (++cnt)] = 0x00;
if (cmd == 11){
// 4 bytes control data
// Power Limit fix point 10 eg. 30 W --> 0d300 = 0x012c
// -1 = 0xffff --> no limit
if (data == 0xffff){
data &= 0xffff; // ToDo: unlimit value is needed and is inverter specific! --> get it via RF from inverter or via user interface
} else {
data*= 10;
}
mTxBuf[10 + (++cnt)] = (data >> 8) & 0xff; // 0x01
mTxBuf[10 + (++cnt)] = (data ) & 0xff; // 0x2c
// mTxBuf[10 + (++cnt)] = 0x00; // not persistent
mTxBuf[10 + (++cnt)] = 0x01; // persistent
mTxBuf[10 + (++cnt)] = 0x00;
}
// crc control data
uint16_t crc = crc16(&mTxBuf[10], cnt+1);
mTxBuf[10 + (++cnt)] = (crc >> 8) & 0xff;
mTxBuf[10 + (++cnt)] = (crc ) & 0xff;
// crc over all
cnt +=1;
mTxBuf[10 + cnt] = crc8(mTxBuf, 10 + cnt);
sendPacket(invId, mTxBuf, 10 + (++cnt), true);
}
void sendTimePacket(uint64_t invId, uint32_t ts) {
//DPRINTLN(DBG_VERBOSE, F("hmRadio.h:sendTimePacket"));
sendCmdPacket(invId, 0x15, 0x80, false);

5
tools/esp8266/main.cpp
View File

@ -71,6 +71,7 @@ void Main::setup(uint32_t timeout) {
mUpdater->setup(mWeb);
mApActive = startAp;
mStActive = !startAp;
}
@ -121,6 +122,10 @@ void Main::loop(void) {
stats();
}*/
}
if (WiFi.status() != WL_CONNECTED) {
DPRINTLN(DBG_INFO, "[WiFi]: Connection Lost");
mStActive = false;
}
}

1
tools/esp8266/main.h
View File

@ -118,6 +118,7 @@ class Main {
bool mWifiSettingsValid;
bool mSettingsValid;
bool mApActive;
bool mStActive;
ESP8266WebServer *mWeb;
char mVersion[9];
char mDeviceName[DEVNAME_LEN];

20
tools/esp8266/mqtt.h
View File

@ -12,6 +12,8 @@
class mqtt {
public:
PubSubClient *mClient;
mqtt() {
mClient = new PubSubClient(mEspClient);
mAddressSet = false;
@ -40,6 +42,10 @@ class mqtt {
mClient->setBufferSize(MQTT_MAX_PACKET_SIZE);
}
void setCallback(void (*func)(const char* topic, byte* payload, unsigned int length)){
mClient->setCallback(func);
}
void sendMsg(const char *topic, const char *msg) {
//DPRINTLN(DBG_VERBOSE, F("mqtt.h:sendMsg"));
char top[64];
@ -94,8 +100,8 @@ class mqtt {
void loop() {
//DPRINT(F("m"));
//if(!mClient->connected())
// reconnect();
if(!mClient->connected())
reconnect();
mClient->loop();
}
@ -116,13 +122,15 @@ class mqtt {
mClient->connect(mDevName);
}
}
DPRINTLN(DBG_DEBUG, F("MQTT mClient->_state ") + String(mClient->state()) );
DPRINTLN(DBG_DEBUG, F("WIFI mEspClient.status ") + String(mEspClient.status()) );
char topic[MQTT_TOPIC_LEN + 13 ]; // "/devcontrol/#" --> + 6 byte
// ToDo: "/devcontrol/#" is hardcoded
snprintf(topic, MQTT_TOPIC_LEN + 13, "%s/devcontrol/#", mTopic);
DPRINTLN(DBG_INFO, F("subscribe to ") + String(topic));
mClient->subscribe(topic); // subscribe to mTopic + "/devcontrol/#"
}
WiFiClient mEspClient;
PubSubClient *mClient;
bool mAddressSet;
uint16_t mPort;
char mBroker[MQTT_ADDR_LEN];

Write Preview
Loading…
Cancel
Save