3pp-mirror/ahoy
1
0
Fork 0
mirror of https://github.com/lumapu/ahoy.git synced 2025-05-24 14:26:11 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix changes from merge

Browse source
This commit is contained in:
lumapu 2022-12-12 21:05:36 +01:00
parent f0014e8c70
commit dc9eda5ee3
3 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/CHANGES.md
View file

@ -6,3 +6,4 @@
* generate `bin.gz` only for 1M device ESP8285 * generate `bin.gz` only for 1M device ESP8285
* fix calcSunrise was not called every day * fix calcSunrise was not called every day
* incresed number of allowed characters for MQTT user, broker and password * incresed number of allowed characters for MQTT user, broker and password
* added NRF24 info to Systeminfo, thanks @DanielR92

6
src/app.cpp
View file

@ -62,14 +62,14 @@ void app::setup() {
DPRINTLN(DBG_WARN, F("WARNING! your NRF24 module can't be reached, check the wiring")); DPRINTLN(DBG_WARN, F("WARNING! your NRF24 module can't be reached, check the wiring"));
// when WiFi is in client mode, then enable mqtt broker // when WiFi is in client mode, then enable mqtt broker
if ((mConfig->mqtt.broker[0] > 0) && (WiFi.getMode() == WIFI_STA)) { #if !defined(AP_ONLY)
mMqtt.setup(&mConfig->mqtt, mConfig->sys.deviceName, mVersion, mSys, &mTimestamp, &mSunrise, &mSunset); if (mConfig->mqtt.broker[0] > 0) {
mPayload.addListener(std::bind(&PubMqttType::payloadEventListener, &mMqtt, std::placeholders::_1)); mPayload.addListener(std::bind(&PubMqttType::payloadEventListener, &mMqtt, std::placeholders::_1));
everySec(std::bind(&PubMqttType::tickerSecond, &mMqtt)); everySec(std::bind(&PubMqttType::tickerSecond, &mMqtt));
everyMin(std::bind(&PubMqttType::tickerMinute, &mMqtt)); everyMin(std::bind(&PubMqttType::tickerMinute, &mMqtt));
mMqtt.setSubscriptionCb(std::bind(&app::mqttSubRxCb, this, std::placeholders::_1)); mMqtt.setSubscriptionCb(std::bind(&app::mqttSubRxCb, this, std::placeholders::_1));
} }
#endif
setupLed(); setupLed();
mWeb = new web(this, mConfig, &mStat, mVersion); mWeb = new web(this, mConfig, &mStat, mVersion);

2
src/hm/hmRadio.h
View file

@ -296,7 +296,7 @@ class HmRadio {
return mNrf24.isChipConnected(); return mNrf24.isChipConnected();
} }
rf24_datarate_e getDataRate(void) { uint8_t getDataRate(void) {
return mNrf24.getDataRate(); return mNrf24.getDataRate();
} }