mirror of
https://github.com/lumapu/ahoy.git
synced 2025-05-28 00:06:12 +02:00
Merge branch 'development02' into asyncWeb02
This commit is contained in:
commit
ba02b1cc92
7 changed files with 112 additions and 12 deletions
1
tools/esp8266/.gitignore
vendored
1
tools/esp8266/.gitignore
vendored
|
@ -3,3 +3,4 @@
|
|||
.vscode/c_cpp_properties.json
|
||||
.vscode/launch.json
|
||||
.vscode/ipch
|
||||
config_override.h
|
||||
|
|
|
@ -34,9 +34,11 @@ This code can be compiled using Visual Studio Code and **PlatformIO** Addon. The
|
|||
### Optional Configuration before compilation
|
||||
|
||||
- number of supported inverters (set to 3 by default) `config.h`
|
||||
- DTU radio id `hmRadio.h` (default = 1234567801
|
||||
- DTU radio id `config.h` (default = 1234567801)
|
||||
- unformated list in webbrowser `/livedata` `config.h`, `LIVEDATA_VISUALIZED`
|
||||
|
||||
Alternativly, instead of modifying `config.h`, `config_override_example.h` can be copied to `config_override.h` and customized.
|
||||
config_override.h is excluded from version control and stays local.
|
||||
|
||||
## Flash ESP with firmware
|
||||
|
||||
|
@ -87,20 +89,21 @@ The serial console will print the converted values which were read out of the in
|
|||
|
||||
## Todo's [See this post](https://github.com/grindylow/ahoy/issues/142)
|
||||
|
||||
- [ ] Wechsel zu AsyncWebServer und ElegantOTA für Stabilität
|
||||
- [ ] Wechsel zu AsyncWebServer und ElegantOTA für Stabilität
|
||||
- [x] klarer Scheduler / Task manager, der ggf. den Receive Task priorisieren kann
|
||||
- [x] Device Info Kommandos (Firmware Version, etc.) über das Dashboard anzeigen [Device Information ( `0x15` `REQ_ARW_DAT_ALL` ) SubCmd Kommandos #145](https://github.com/grindylow/ahoy/issues/145)
|
||||
- [x] Device Info Kommandos (Firmware Version, etc.) über das Dashboard anzeigen [Device Information ( `0x15` `REQ_ARW_DAT_ALL` ) SubCmd Kommandos #145](https://github.com/grindylow/ahoy/issues/145)
|
||||
- [ ] AlarmData & AlarmUpdate Parsen und auf eigener Seite darstellen
|
||||
|
||||
------------------ SWIM LANE ---------------------------
|
||||
|
||||
- [ ] Device Control Kommandos aus dem Setup ermöglichen (TurnOn, TurnOff, Restart, ActivePower Limit, ReactivePower Limit, SetPowerFactor, etc.)
|
||||
- HM300
|
||||
- [ ] Device Control Kommandos aus dem Setup ermöglichen (TurnOn, TurnOff, Restart, ActivePower Limit, ReactivePower Limit, SetPowerFactor, etc.)
|
||||
- [ ] Settings exportieren / importieren (API/UI)
|
||||
- [ ] Settings in settings.ini speichern (LittleFS statt EEPROM) [Settings in settings.ini speichern (LittleFS statt EEPROM) #164](https://github.com/grindylow/ahoy/issues/164)
|
||||
- [ ] Homepage aufräumen nur ein Status (aktuell drei AJAX Calls /uptime, /time, /cmdstat)
|
||||
- [ ] app.cpp aufräumen und in hmRadio / hmProtokollGen3 auslagern
|
||||
- [ ] MI Wechselrichter unterstützen (miSystem, miInverter, miDefines, miProtokollGen2 etc.)
|
||||
- [ ] nRF24 Interrupt Handling sinnvoll oder warum macht die nRF24 Bibliothek ständig `0x07` Statusabfragen [NRF24 polling trotz aktiviertem IRQ #83](https://github.com/grindylow/ahoy/issues/83)
|
||||
- [ ] Debug Level im Setup änderbar -auch Livedata Visualisierung abschalten ?
|
||||
- [ ] Homepage aufräumen nur ein Status (aktuell drei AJAX Calls /uptime, /time, /cmdstat)
|
||||
- [ ] app.cpp aufräumen und in hmRadio / hmProtokollGen3 auslagern
|
||||
- [ ] MI Wechselrichter unterstützen (miSystem, miInverter, miDefines, miProtokollGen2 etc.)
|
||||
- [ ] nRF24 Interrupt Handling sinnvoll oder warum macht die nRF24 Bibliothek ständig `0x07` Statusabfragen [NRF24 polling trotz aktiviertem IRQ #83](https://github.com/grindylow/ahoy/issues/83)
|
||||
- [ ] Debug Level im Setup änderbar -auch Livedata Visualisierung abschalten ?
|
||||
- [ ] MQTT Discovery (HomeAssistant) im Setup optional machen
|
||||
- [x] MQTT Subscribe nur beim Reconnect [Das subscribe in der Reconnect Procedure sollte doch nur nach einem conect ausgeführt werden und nicht bei jedem Duchlauf #139](https://github.com/grindylow/ahoy/issues/139)
|
||||
- [x] MQTT Subscribe nur beim Reconnect [Das subscribe in der Reconnect Procedure sollte doch nur nach einem conect ausgeführt werden und nicht bei jedem Duchlauf #139](https://github.com/grindylow/ahoy/issues/139)
|
||||
|
|
|
@ -36,6 +36,9 @@
|
|||
#define DEF_RF24_CE_PIN 2
|
||||
#define DEF_RF24_IRQ_PIN 0
|
||||
|
||||
// default radio ID
|
||||
#define DTU_RADIO_ID ((uint64_t)0x1234567801ULL)
|
||||
|
||||
// default NRF24 power, possible values (0 - 3)
|
||||
#define DEF_AMPLIFIERPOWER 2
|
||||
|
||||
|
@ -96,4 +99,8 @@
|
|||
// changes the style of "/setup" page, visualized = nicer
|
||||
#define LIVEDATA_VISUALIZED
|
||||
|
||||
#if __has_include("config_override.h")
|
||||
#include "config_override.h"
|
||||
#endif
|
||||
|
||||
#endif /*__CONFIG_H__*/
|
||||
|
|
30
tools/esp8266/config_override_example.h
Normal file
30
tools/esp8266/config_override_example.h
Normal file
|
@ -0,0 +1,30 @@
|
|||
//-----------------------------------------------------------------------------
|
||||
// 2022 Ahoy, https://www.mikrocontroller.net/topic/525778
|
||||
// Creative Commons - http://creativecommons.org/licenses/by-nc-sa/3.0/de/
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
#ifndef __CONFIG_OVERRIDE_H__
|
||||
#define __CONFIG_OVERRIDE_H__
|
||||
|
||||
// override fallback WiFi info
|
||||
|
||||
// each ovveride must be preceeded with an #undef statement
|
||||
#undef FB_WIFI_SSID
|
||||
#define FB_WIFI_SSID "MY_SSID"
|
||||
|
||||
// each ovveride must be preceeded with an #undef statement
|
||||
#undef FB_WIFI_PWD
|
||||
#define FB_WIFI_PWD "MY_WIFI_KEY"
|
||||
|
||||
// ESP32 default pinout
|
||||
#undef DEF_RF24_CS_PIN
|
||||
#define DEF_RF24_CS_PIN 5
|
||||
#undef DEF_RF24_CE_PIN
|
||||
#define DEF_RF24_CE_PIN 4
|
||||
#undef DEF_RF24_IRQ_PIN
|
||||
#define DEF_RF24_IRQ_PIN 16
|
||||
|
||||
#undef DTU_RADIO_ID
|
||||
#define DTU_RADIO_ID ((uint64_t)0x1234567802ULL)
|
||||
|
||||
#endif /*__CONFIG_OVERRIDE_H__*/
|
|
@ -16,7 +16,6 @@
|
|||
#define DEFAULT_RECV_CHANNEL 3
|
||||
#define SPI_SPEED 1000000
|
||||
|
||||
#define DTU_RADIO_ID ((uint64_t)0x1234567801ULL)
|
||||
#define DUMMY_RADIO_ID ((uint64_t)0xDEADBEEF01ULL)
|
||||
|
||||
#define RF_CHANNELS 5
|
||||
|
|
|
@ -14,9 +14,11 @@ src_dir = .
|
|||
[env]
|
||||
framework = arduino
|
||||
|
||||
build_flags =
|
||||
-include "config.h"
|
||||
; ;;;;; Possible Debug options ;;;;;;
|
||||
; https://docs.platformio.org/en/latest/platforms/espressif8266.html#debug-level
|
||||
;build_flags = -DDEBUG_ESP_PORT=Serial
|
||||
;-DDEBUG_ESP_PORT=Serial
|
||||
;-DDEBUG_ESP_CORE
|
||||
;-DDEBUG_ESP_WIFI
|
||||
;-DDEBUG_ESP_HTTP_CLIENT
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue