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

0.8.113 

* code cleanup
* fix ESP32-C3 compile
pull/1626/head
lumapu 9 months ago
parent
d75ba1b566
commit
177420fce2
9 changed files with 39 additions and 26 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      src/CHANGES.md
  2. 2
      src/defines.h
  3. 34
      src/hm/hmInverter.h
  4. 6
      src/hm/hmSystem.h
  5. 2
      src/hm/nrfHal.h
  6. 2
      src/hms/cmtHal.h
  7. 3
      src/plugins/Display/epdHal.h
  8. 10
      src/utils/spiPatcher.h
  9. 2
      src/web/RestApi.h

4
src/CHANGES.md
View File

@ -1,5 +1,9 @@
# Development Changes # Development Changes
## 0.8.113 - 2024-04-25
* code cleanup
* fix ESP32-C3 compile
## 0.8.112 - 2024-04-24 ## 0.8.112 - 2024-04-24
* improved wizard * improved wizard
* converted ePaper and Ethernet to hal-SPI * converted ePaper and Ethernet to hal-SPI

2
src/defines.h
View File

@ -13,7 +13,7 @@
//------------------------------------- //-------------------------------------
#define VERSION_MAJOR 0 #define VERSION_MAJOR 0
#define VERSION_MINOR 8 #define VERSION_MINOR 8
#define VERSION_PATCH 112 #define VERSION_PATCH 113
//------------------------------------- //-------------------------------------
typedef struct { typedef struct {
uint8_t ch; uint8_t ch;

34
src/hm/hmInverter.h
View File

@ -84,7 +84,7 @@ struct record_t {
byteAssign_t* assign = nullptr; // assignment of bytes in payload byteAssign_t* assign = nullptr; // assignment of bytes in payload
uint8_t length = 0; // length of the assignment list uint8_t length = 0; // length of the assignment list
T *record = nullptr; // data pointer T *record = nullptr; // data pointer
uint32_t ts = 0; // timestamp of last received payload uint32_t ts = 0; // Timestamp of last received payload
uint8_t pyldLen = 0; // expected payload length for plausibility check uint8_t pyldLen = 0; // expected payload length for plausibility check
MqttSentStatus mqttSentStatus = MqttSentStatus:: NEW_DATA; // indicates the current MqTT sent status MqttSentStatus mqttSentStatus = MqttSentStatus:: NEW_DATA; // indicates the current MqTT sent status
}; };
@ -146,7 +146,7 @@ class Inverter {
statistics_t radioStatistics; // information about transmitted, failed, ... packets statistics_t radioStatistics; // information about transmitted, failed, ... packets
HeuristicInv heuristics; // heuristic information / logic HeuristicInv heuristics; // heuristic information / logic
uint8_t curCmtFreq = 0; // current used CMT frequency, used to check if freq. was changed during runtime uint8_t curCmtFreq = 0; // current used CMT frequency, used to check if freq. was changed during runtime
uint32_t tsMaxAcPower = 0; // holds the timestamp when the MaxAC power was seen uint32_t tsMaxAcPower = 0; // holds the Timestamp when the MaxAC power was seen
bool commEnabled = true; // 'pause night communication' sets this field to false bool commEnabled = true; // 'pause night communication' sets this field to false
public: public:
@ -189,7 +189,7 @@ class Inverter {
cb(InverterDevInform_Simple, false); // get hardware version cb(InverterDevInform_Simple, false); // get hardware version
} else if((alarmLastId != alarmMesIndex) && (alarmMesIndex != 0)) { } else if((alarmLastId != alarmMesIndex) && (alarmMesIndex != 0)) {
cb(AlarmData, false); // get last alarms cb(AlarmData, false); // get last alarms
} else if((0 == mGridLen) && generalConfig->readGrid) { // read grid profile } else if((0 == mGridLen) && GeneralConfig->readGrid) { // read grid profile
cb(GridOnProFilePara, false); cb(GridOnProFilePara, false);
} else if (mGetLossInterval > AHOY_GET_LOSS_INTERVAL) { // get loss rate } else if (mGetLossInterval > AHOY_GET_LOSS_INTERVAL) { // get loss rate
mGetLossInterval = 1; mGetLossInterval = 1;
@ -213,7 +213,7 @@ class Inverter {
if (getChannelFieldValue(CH0, FLD_PART_NUM, rec) == 0) { if (getChannelFieldValue(CH0, FLD_PART_NUM, rec) == 0) {
cb(0x0f, false); // hard- and firmware version for missing HW part nr, delivered by frame 1 cb(0x0f, false); // hard- and firmware version for missing HW part nr, delivered by frame 1
mIvRxCnt +=2; mIvRxCnt +=2;
} else if((getChannelFieldValue(CH0, FLD_GRID_PROFILE_CODE, rec) == 0) && generalConfig->readGrid) // read grid profile } else if((getChannelFieldValue(CH0, FLD_GRID_PROFILE_CODE, rec) == 0) && GeneralConfig->readGrid) // read grid profile
cb(0x10, false); // legacy GPF command cb(0x10, false); // legacy GPF command
} }
} }
@ -270,16 +270,18 @@ class Inverter {
if(InverterStatus::OFF != status) { if(InverterStatus::OFF != status) {
mDevControlRequest = true; mDevControlRequest = true;
devControlCmd = cmd; devControlCmd = cmd;
//assert(App); assert(App);
//App->triggerTickSend(0); App->triggerTickSend(id);
return true;
} }
return (InverterStatus::OFF != status); return false;
} }
bool setDevCommand(uint8_t cmd) { bool setDevCommand(uint8_t cmd) {
if(InverterStatus::OFF != status) bool retval = (InverterStatus::OFF != status);
if(retval)
devControlCmd = cmd; devControlCmd = cmd;
return (InverterStatus::OFF != status); return retval;
} }
void addValue(uint8_t pos, const uint8_t buf[], record_t<> *rec) { void addValue(uint8_t pos, const uint8_t buf[], record_t<> *rec) {
@ -409,14 +411,14 @@ class Inverter {
if(recordMeas.ts == 0) if(recordMeas.ts == 0)
return false; return false;
if(((*timestamp) - recordMeas.ts) < INVERTER_INACT_THRES_SEC) if(((*Timestamp) - recordMeas.ts) < INVERTER_INACT_THRES_SEC)
avail = true; avail = true;
if(avail) { if(avail) {
if(status < InverterStatus::PRODUCING) if(status < InverterStatus::PRODUCING)
status = InverterStatus::STARTING; status = InverterStatus::STARTING;
} else { } else {
if(((*timestamp) - recordMeas.ts) > INVERTER_OFF_THRES_SEC) { if(((*Timestamp) - recordMeas.ts) > INVERTER_OFF_THRES_SEC) {
if(status != InverterStatus::OFF) { if(status != InverterStatus::OFF) {
status = InverterStatus::OFF; status = InverterStatus::OFF;
actPowerLimit = 0xffff; // power limit will be read once inverter becomes available actPowerLimit = 0xffff; // power limit will be read once inverter becomes available
@ -817,8 +819,8 @@ class Inverter {
} }
public: public:
static uint32_t *timestamp; // system timestamp static uint32_t *Timestamp; // system timestamp
static cfgInst_t *generalConfig; // general inverter configuration from setup static cfgInst_t *GeneralConfig; // general inverter configuration from setup
static IApp *App; static IApp *App;
uint16_t mDtuRxCnt = 0; uint16_t mDtuRxCnt = 0;
@ -837,9 +839,9 @@ class Inverter {
}; };
template <class REC_TYP> template <class REC_TYP>
uint32_t *Inverter<REC_TYP>::timestamp {0}; uint32_t *Inverter<REC_TYP>::Timestamp {0};
template <class REC_TYP> template <class REC_TYP>
cfgInst_t *Inverter<REC_TYP>::generalConfig {0}; cfgInst_t *Inverter<REC_TYP>::GeneralConfig {0};
template <class REC_TYP> template <class REC_TYP>
IApp *Inverter<REC_TYP>::App {nullptr}; IApp *Inverter<REC_TYP>::App {nullptr};
@ -948,7 +950,7 @@ T calcMaxPowerAcCh0(Inverter<> *iv, uint8_t arg0) {
} }
} }
if(acPower > acMaxPower) { if(acPower > acMaxPower) {
iv->tsMaxAcPower = *iv->timestamp; iv->tsMaxAcPower = *iv->Timestamp;
return acPower; return acPower;
} }
} }

6
src/hm/hmSystem.h
View File

@ -16,8 +16,8 @@ class HmSystem {
HmSystem() {} HmSystem() {}
void setup(uint32_t *timestamp, cfgInst_t *config, IApp *app) { void setup(uint32_t *timestamp, cfgInst_t *config, IApp *app) {
INVERTERTYPE::timestamp = timestamp; INVERTERTYPE::Timestamp = timestamp;
INVERTERTYPE::generalConfig = config; INVERTERTYPE::GeneralConfig = config;
INVERTERTYPE::App = app; INVERTERTYPE::App = app;
//mInverter[0].app = app; //mInverter[0].app = app;
} }
@ -26,7 +26,7 @@ class HmSystem {
DPRINTLN(DBG_VERBOSE, F("hmSystem.h:addInverter")); DPRINTLN(DBG_VERBOSE, F("hmSystem.h:addInverter"));
INVERTERTYPE *iv = &mInverter[id]; INVERTERTYPE *iv = &mInverter[id];
iv->id = id; iv->id = id;
iv->config = &mInverter[0].generalConfig->iv[id]; iv->config = &INVERTERTYPE::GeneralConfig->iv[id];
DPRINT(DBG_VERBOSE, "SERIAL: " + String(iv->config->serial.b[5], HEX)); DPRINT(DBG_VERBOSE, "SERIAL: " + String(iv->config->serial.b[5], HEX));
DPRINTLN(DBG_VERBOSE, " " + String(iv->config->serial.b[4], HEX)); DPRINTLN(DBG_VERBOSE, " " + String(iv->config->serial.b[4], HEX));
if((iv->config->serial.b[5] == 0x11) || (iv->config->serial.b[5] == 0x10)) { if((iv->config->serial.b[5] == 0x11) || (iv->config->serial.b[5] == 0x10)) {

2
src/hm/nrfHal.h
View File

@ -42,7 +42,7 @@ class nrfHal: public RF24_hal, public SpiPatcherHandle {
#if defined(CONFIG_IDF_TARGET_ESP32S3) #if defined(CONFIG_IDF_TARGET_ESP32S3)
mHostDevice = SPI2_HOST; mHostDevice = SPI2_HOST;
#else #else
mHostDevice = (14 == sclk) ? SPI2_HOST : SPI3_HOST; mHostDevice = (14 == sclk) ? SPI2_HOST : SPI_HOST_OTHER;
#endif #endif
mSpiPatcher = SpiPatcher::getInstance(mHostDevice); mSpiPatcher = SpiPatcher::getInstance(mHostDevice);

2
src/hms/cmtHal.h
View File

@ -40,7 +40,7 @@ class cmtHal : public SpiPatcherHandle {
#if defined(CONFIG_IDF_TARGET_ESP32S3) #if defined(CONFIG_IDF_TARGET_ESP32S3)
mHostDevice = SPI2_HOST; mHostDevice = SPI2_HOST;
#else #else
mHostDevice = (14 == clk) ? SPI2_HOST : SPI3_HOST; mHostDevice = (14 == clk) ? SPI2_HOST : SPI_HOST_OTHER;
#endif #endif
mSpiPatcher = SpiPatcher::getInstance(mHostDevice); mSpiPatcher = SpiPatcher::getInstance(mHostDevice);

3
src/plugins/Display/epdHal.h
View File

@ -11,6 +11,7 @@
#include <esp_rom_gpio.h> #include <esp_rom_gpio.h>
#include <GxEPD2_BW.h> #include <GxEPD2_BW.h>
#define EPD_DEFAULT_SPI_SPEED 4000000 // 4 MHz #define EPD_DEFAULT_SPI_SPEED 4000000 // 4 MHz
class epdHal: public GxEPD2_HalInterface, public SpiPatcherHandle { class epdHal: public GxEPD2_HalInterface, public SpiPatcherHandle {
@ -41,7 +42,7 @@ class epdHal: public GxEPD2_HalInterface, public SpiPatcherHandle {
#if defined(CONFIG_IDF_TARGET_ESP32S3) #if defined(CONFIG_IDF_TARGET_ESP32S3)
mHostDevice = SPI3_HOST; mHostDevice = SPI3_HOST;
#else #else
mHostDevice = (14 == sclk) ? SPI2_HOST : SPI3_HOST; mHostDevice = (14 == sclk) ? SPI2_HOST : SPI_HOST_OTHER;
#endif #endif
mSpiPatcher = SpiPatcher::getInstance(mHostDevice); mSpiPatcher = SpiPatcher::getInstance(mHostDevice);

10
src/utils/spiPatcher.h
View File

@ -15,6 +15,12 @@
#include <driver/spi_master.h> #include <driver/spi_master.h>
#include <freertos/semphr.h> #include <freertos/semphr.h>
#if (SOC_SPI_PERIPH_NUM > 2)
#define SPI_HOST_OTHER SPI3_HOST
#else
#define SPI_HOST_OTHER SPI2_HOST
#endif
class SpiPatcher { class SpiPatcher {
protected: protected:
explicit SpiPatcher(spi_host_device_t dev) : explicit SpiPatcher(spi_host_device_t dev) :
@ -74,8 +80,10 @@ class SpiPatcher {
assert(mBusState == ESP_OK); assert(mBusState == ESP_OK);
if(SPI2_HOST == host_id) if(SPI2_HOST == host_id)
mHost2Cnt++; mHost2Cnt++;
#if (SOC_SPI_PERIPH_NUM > 2)
if(SPI3_HOST == host_id) if(SPI3_HOST == host_id)
mHost3Cnt++; mHost3Cnt++;
#endif
if((mHost2Cnt > 3) || (mHost3Cnt > 3)) if((mHost2Cnt > 3) || (mHost3Cnt > 3))
DPRINTLN(DBG_ERROR, F("maximum number of SPI devices reached (3)")); DPRINTLN(DBG_ERROR, F("maximum number of SPI devices reached (3)"));
@ -112,7 +120,7 @@ class SpiPatcher {
SemaphoreHandle_t mutex; SemaphoreHandle_t mutex;
StaticSemaphore_t mutex_buffer; StaticSemaphore_t mutex_buffer;
uint8_t mHost2Cnt = 0, mHost3Cnt = 0; uint8_t mHost2Cnt = 0, mHost3Cnt = 0;
spi_host_device_t mDev = SPI3_HOST; spi_host_device_t mDev = SPI2_HOST;
esp_err_t mBusState = ESP_FAIL; esp_err_t mBusState = ESP_FAIL;
spi_bus_config_t mBusConfig; spi_bus_config_t mBusConfig;
}; };

2
src/web/RestApi.h
View File

@ -1014,8 +1014,6 @@ class RestApi {
iv->powerLimit[1] = AbsolutNonPersistent; iv->powerLimit[1] = AbsolutNonPersistent;
accepted = iv->setDevControlRequest(ActivePowerContr); accepted = iv->setDevControlRequest(ActivePowerContr);
if(accepted)
mApp->triggerTickSend(iv->id);
} else if(F("dev") == jsonIn[F("cmd")]) { } else if(F("dev") == jsonIn[F("cmd")]) {
DPRINTLN(DBG_INFO, F("dev cmd")); DPRINTLN(DBG_INFO, F("dev cmd"));
iv->setDevCommand(jsonIn[F("val")].as<int>()); iv->setDevCommand(jsonIn[F("val")].as<int>());

Write Preview
Loading…
Cancel
Save