Merge remote-tracking branch 'origin/ac_main' into mdev

This commit is contained in:
Ewoud
2023-01-02 21:05:03 +01:00
37 changed files with 4740 additions and 4253 deletions

View File

@@ -11,8 +11,8 @@
*/
//#include "../usermods/EXAMPLE_v2/usermod_v2_example.h"
#ifdef USERMOD_BATTERY_STATUS_BASIC
#include "../usermods/battery_status_basic/usermod_v2_battery_status_basic.h"
#ifdef USERMOD_BATTERY
#include "../usermods/battery/usermod_v2_battery.h"
#endif
#ifdef USERMOD_DALLASTEMPERATURE
@@ -208,8 +208,8 @@ void registerUsermods()
* \/ \/ \/
*/
//usermods.add(new MyExampleUsermod());
#ifdef USERMOD_BATTERY_STATUS_BASIC
usermods.add(new UsermodBatteryBasic());
#ifdef USERMOD_BATTERY
usermods.add(new UsermodBattery());
#endif
#ifdef USERMOD_DALLASTEMPERATURE