[mm] Remove TaskScheduler library and update readme with library requ…

…irements
CapnBry · Feb 19, 2021 · 10141af · 10141af
1 parent 0999d50
commit 10141af
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 25 deletions.
diff --git a/arduino/MeterMonitor/MeterMonitor.ino b/arduino/MeterMonitor/MeterMonitor.ino
@@ -1,6 +1,5 @@
 #include <HeaterMeterClient.h>
 #include <TM1637Display.h>
-#include <TaskScheduler.h>
 #include "segment_chars.h"
 
 #define WIFI_SSID       "network"
@@ -21,19 +20,6 @@ static float g_LastTemps[TEMP_COUNT];
 static uint8_t g_HmTempsChanged;
 static err_t g_LastClientError;
 
-static Scheduler ts;
-static void taskcbEspStats(void);
-Task taskEspStats(30 * 1000, TASK_FOREVER, &taskcbEspStats);
-
-static void taskcbEspStats(void)
-{
-  Serial.print(F("STATS: Uptime="));
-  Serial.print(millis(), DEC);
-  Serial.print(F(" MemFree="));
-  Serial.print(ESP.getFreeHeap(), DEC);
-  Serial.println();
-}
-
 static void displayTemps(void)
 {
   --g_HmTempsChanged;
@@ -151,13 +137,6 @@ static void setupLeds(void)
   ledsShowNoWifi();
 }
 
-static void setupScheduler(void)
-{
-  ts.init();
-  ts.addTask(taskEspStats);
-  taskEspStats.enableDelayed();
-}
-
 void setup()
 {
   if (WiFi.status() != WL_CONNECTED)
@@ -178,7 +157,6 @@ void setup()
   hm.onError = &proxy_onError;
 
   setupLeds();
-  setupScheduler();
 }
 
 void loop()
@@ -187,6 +165,5 @@ void loop()
   // Updating each LED takes ~22ms with 100uS delay
   if (g_HmTempsChanged > 0)
     displayTemps();
-  ts.execute();
   delay(100);
 }
diff --git a/arduino/MeterMonitor/MeterMonitor.vcxproj b/arduino/MeterMonitor/MeterMonitor.vcxproj
@@ -93,7 +93,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\MeterMonitor;$(ProjectDir)..\..\..\..\Arduino\libraries\HeaterMeterClient\src;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp8266\hardware\esp8266\2.7.4\libraries\ESP8266WiFi\src;$(ProjectDir)..\..\..\..\Arduino\libraries\ESPAsyncTCP\src;$(ProjectDir)..\..\..\..\Arduino\libraries\ArduinoJson\src;$(ProjectDir)..\..\..\..\Arduino\libraries\TM1637;$(ProjectDir)..\..\..\..\Arduino\libraries\TaskScheduler\src;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp8266\hardware\esp8266\2.7.4\libraries\ESP8266HTTPClient\src;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp8266\hardware\esp8266\2.7.4\cores\esp8266;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp8266\hardware\esp8266\2.7.4\cores\esp8266\avr;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp8266\hardware\esp8266\2.7.4\cores\esp8266\libb64;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp8266\hardware\esp8266\2.7.4\cores\esp8266\spiffs;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp8266\hardware\esp8266\2.7.4\cores\esp8266\umm_malloc;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp8266\hardware\esp8266\2.7.4\variants\d1_mini;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp8266\hardware\esp8266\2.7.4\tools\sdk\include;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp8266\hardware\esp8266\2.7.4\tools\sdk\lwip2\include;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp8266\hardware\esp8266\2.7.4\tools\sdk\libc\xtensa-lx106-elf\include;$(ProjectDir)..\..\..\..\..\DOCUME~1\GITHUB~1\HEATER~1\arduino\METERM~1;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp8266\tools\xtensa-lx106-elf-gcc\2.5.0-4-b40a506\xtensa-lx106-elf\include\c++\4.8.2;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp8266\tools\xtensa-lx106-elf-gcc\2.5.0-4-b40a506\xtensa-lx106-elf\include\c++\4.8.2\xtensa-lx106-elf;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp8266\tools\xtensa-lx106-elf-gcc\2.5.0-4-b40a506\xtensa-lx106-elf\include;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp8266\tools\xtensa-lx106-elf-gcc\2.5.0-4-b40a506\lib\gcc\xtensa-lx106-elf\4.8.2\include;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp8266\hardware\esp8266\2.7.4\tools\sdk\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\MeterMonitor;$(ProjectDir)..\..\..\..\Arduino\libraries\HeaterMeterClient\src;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp8266\hardware\esp8266\2.7.4\libraries\ESP8266WiFi\src;$(ProjectDir)..\..\..\..\Arduino\libraries\ESPAsyncTCP\src;$(ProjectDir)..\..\..\..\Arduino\libraries\ArduinoJson\src;$(ProjectDir)..\..\..\..\Arduino\libraries\TM1637;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp8266\hardware\esp8266\2.7.4\libraries\ESP8266HTTPClient\src;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp8266\hardware\esp8266\2.7.4\cores\esp8266;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp8266\hardware\esp8266\2.7.4\cores\esp8266\avr;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp8266\hardware\esp8266\2.7.4\cores\esp8266\libb64;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp8266\hardware\esp8266\2.7.4\cores\esp8266\spiffs;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp8266\hardware\esp8266\2.7.4\cores\esp8266\umm_malloc;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp8266\hardware\esp8266\2.7.4\variants\d1_mini;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp8266\hardware\esp8266\2.7.4\tools\sdk\include;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp8266\hardware\esp8266\2.7.4\tools\sdk\lwip2\include;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp8266\hardware\esp8266\2.7.4\tools\sdk\libc\xtensa-lx106-elf\include;$(ProjectDir)..\..\..\..\..\DOCUME~1\GITHUB~1\HEATER~1\arduino\METERM~1;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp8266\tools\xtensa-lx106-elf-gcc\2.5.0-4-b40a506\xtensa-lx106-elf\include\c++\4.8.2;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp8266\tools\xtensa-lx106-elf-gcc\2.5.0-4-b40a506\xtensa-lx106-elf\include\c++\4.8.2\xtensa-lx106-elf;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp8266\tools\xtensa-lx106-elf-gcc\2.5.0-4-b40a506\xtensa-lx106-elf\include;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp8266\tools\xtensa-lx106-elf-gcc\2.5.0-4-b40a506\lib\gcc\xtensa-lx106-elf\4.8.2\include;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp8266\hardware\esp8266\2.7.4\tools\sdk\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ForcedIncludeFiles>$(ProjectDir)__vm\.MeterMonitor.vsarduino.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
       <PreprocessorDefinitions>__ESP8266_esp8266__;__ESP8266_ESP8266__;__ets__;ICACHE_FLASH;NEW_OOM_ABORT;BEARSSL_SSL_BASIC;NONOSDK22x_190703=1;F_CPU=80000000L;LWIP_OPEN_SRC;TCP_MSS=536;LWIP_FEATURES=1;LWIP_IPV6=0;ARDUINO=108012;ARDUINO_ESP8266_WEMOS_D1MINI;ARDUINO_ARCH_ESP8266;FLASHMODE_DIO;ESP8266;__cplusplus=201103L;_VMICRO_INTELLISENSE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>

diff --git a/arduino/libraries/HeaterMeterClient/README.txt b/arduino/libraries/HeaterMeterClient/README.txt
@@ -1 +1,5 @@
-A simple server-sent events client for streaming HeaterMeter state using server-sent events and an ESP8266
+A simple server-sent events client for streaming HeaterMeter state using server-sent events and an ESP8266
+
+Requires Arduino Libraries (available from the Arduino 'Manage Libraries' dialog):
+ESPAsyncTCP - https://github.com/me-no-dev/ESPAsyncTCP
+ArduinoJson - https://github.com/bblanchon/ArduinoJson