handle buttons and leds completely as user tasks

lib/api/GwApi.h

@@ -61,12 +61,6 @@ class GwApi{
         };
         class Status{
             public:
-                typedef enum{
-                    OFF,
-                    PRESSED,
-                    PRESSED_5, //5...10s
-                    PRESSED_10 //>10s...30s
-                } ButtonState;
                 bool wifiApOn=false;
                 bool wifiClientOn=false;
                 bool wifiClientConnected=false;
@@ -89,8 +83,6 @@ class GwApi{
                 bool tcpClientConnected=false;
                 unsigned long n2kRx=0;
                 unsigned long n2kTx=0;
-                ButtonState button=OFF;
-                unsigned long buttonPresses=0;
                 void empty(){
                     wifiApOn=false;
                     wifiClientOn=false;
@@ -114,8 +106,6 @@ class GwApi{
                     tcpClientConnected=false;
                     n2kRx=0;
                     n2kTx=0;
-                    button=OFF;
-                    buttonPresses=0; 
                 }
         }; 
         /**

lib/buttons/GwButtons.h

@@ -1,5 +0,0 @@
-#ifndef _GWBUTTONS_H
-#define _GWBUTTONS_H
-//task function
-void handleButtons(void *param);
-#endif

lib/buttontask/GwButtonTask.cpp

@@ -1,4 +1,5 @@
-#include "GwButtons.h"
+#include "GwButtonTask.h"
+#include "GwIButtonTask.h"
 #include "GwHardware.h"
 #include "GwApi.h"
 #include "GwLedTask.h"
@@ -22,9 +23,12 @@ class FactoryResetRequest: public GwMessage{
             },"reset",1000,NULL,0,NULL);
         };
 };
-void handleButtons(void *param){
+void handleButtons(GwApi *api){
-    GwApi *api=(GwApi*)param;
     GwLog *logger=api->getLogger();
+    IButtonTask state;
+    if (!apiSetIButtonTask(api,state)){
+        LOG_DEBUG(GwLog::ERROR,"unable to set button state");
+    } 
     #ifndef GWBUTTON_PIN
         LOG_DEBUG(GwLog::LOG,"no button pin defined, do not watch");
         vTaskDelete(NULL);
@@ -50,46 +54,51 @@ void handleButtons(void *param){
     unsigned long lastReport=0;
     const unsigned long OFF_TIME=20;
     const unsigned long REPORT_TIME=1000;
-    const unsigned long HARD_REST_TIME=10000;
+    const unsigned long PRESS_5_TIME=5000;
-    GwLedMode ledMode=LED_OFF;
+    const unsigned long PRESS_10_TIME=10000;
+    const unsigned long PRESS_RESET_TIME=12000;
+    LOG_DEBUG(GwLog::LOG,"button task started");
     while(true){
         delay(10);
         int current=digitalRead(GWBUTTON_PIN);
         unsigned long now=millis();
+        IButtonTask::ButtonState lastState=state.state;
         if (current != activeState){
             if (lastPressed != 0 && (lastPressed+OFF_TIME) < now){
                 lastPressed=0; //finally off
                 firstPressed=0;
-                if (ledMode != LED_OFF){
+                state.state=IButtonTask::OFF;
-                    setLedMode(LED_GREEN); //TODO: better "go back"
-                    ledMode=LED_OFF;
-                }
                 LOG_DEBUG(GwLog::LOG,"Button press stopped");
             }
+            if (state.state != lastState){
+                apiSetIButtonTask(api,state);
+            }
             continue;
         }
         lastPressed=now;
         if (firstPressed == 0) {
             firstPressed=now;
             LOG_DEBUG(GwLog::LOG,"Button press started");
+            state.pressCount++;
+            state.state=IButtonTask::PRESSED;
+            apiSetIButtonTask(api,state);
             lastReport=now;
+            continue;
         }
         if (lastReport != 0 && (lastReport + REPORT_TIME) < now ){
             LOG_DEBUG(GwLog::LOG,"Button active for %ld",(now-firstPressed));
             lastReport=now;
         }
-        GwLedMode nextMode=ledMode;
+        if (now > (firstPressed+PRESS_5_TIME)){
-        if (now > (firstPressed+HARD_REST_TIME/2)){
+            state.state=IButtonTask::PRESSED_5;
-            nextMode=LED_BLUE;
         }
-        if (now > (firstPressed+HARD_REST_TIME*0.9)){
+        if (now > (firstPressed+PRESS_10_TIME)){
-            nextMode=LED_RED;
+            state.state=IButtonTask::PRESSED_10;
         }
-        if (ledMode != nextMode){
+        if (lastState != state.state){
-            setLedMode(nextMode);
+            apiSetIButtonTask(api,state);
-            ledMode=nextMode;
         }
-        if (now > (firstPressed+HARD_REST_TIME)){
+        if (now > (firstPressed+PRESS_RESET_TIME)){
             LOG_DEBUG(GwLog::ERROR,"Factory reset by button");
             GwMessage *r=new FactoryResetRequest(api);
             api->getQueue()->sendAndForget(r);

lib/buttontask/GwButtonTask.h

@@ -0,0 +1,7 @@
+#ifndef _GWBUTTONTASK_H
+#define _GWBUTTONTASK_H
+#include "GwApi.h"
+//task function
+void handleButtons(GwApi *param);
+DECLARE_USERTASK(handleButtons);
+#endif

lib/buttontask/GwIButtonTask.h

@@ -0,0 +1,19 @@
+#ifndef _GWIBUTTONTASK_H
+#define _GWIBUTTONTASK_H
+#include "GwApi.h"
+class IButtonTask : public GwApi::TaskInterfaces::Base
+{
+public:
+    typedef enum
+    {
+        OFF,
+        PRESSED,
+        PRESSED_5, // 5...10s
+        PRESSED_10 //>10s
+    } ButtonState;
+    ButtonState state=OFF;
+    long pressCount=0;
+};
+DECLARE_TASKIF(handleButtons,IButtonTask);
+
+#endif

lib/ledtask/GwLedTask.cpp

@@ -2,12 +2,14 @@
 #include "GwHardware.h"
 #include "GwApi.h"
 #include "FastLED.h"
-
+#include "GwIButtonTask.h"
-static GwLedMode mode=LED_OFF;
+typedef enum {
-void setLedMode(GwLedMode newMode){
+    LED_OFF,
-    //we consider the mode to an atomic item...
+    LED_GREEN,
-    mode=newMode;
+    LED_BLUE,
-}
+    LED_RED,
+    LED_WHITE
+} GwLedMode;
 
 static CRGB::HTMLColorCode colorFromMode(GwLedMode cmode){
     switch(cmode){
@@ -38,15 +40,38 @@ void handleLeds(GwApi *api){
     FastLED.addLeds<GWLED_TYPE,GWLED_PIN>(leds,1);
     #endif
     uint8_t brightness=api->getConfig()->getInt(GwConfigDefinitions::ledBrightness,128);
-    GwLedMode currentMode=mode;
+    GwLedMode currentMode=LED_GREEN;
     leds[0]=colorFromMode(currentMode);
     FastLED.setBrightness(brightness);
     FastLED.show();
     LOG_DEBUG(GwLog::LOG,"led task started with mode %d",(int)currentMode);
-    while(true){
+    int apiResult=0;
+    while (true)
+    {
         delay(50);
-        GwLedMode newMode=mode;
+        GwLedMode newMode = currentMode;
-        if (newMode != currentMode){
+        IButtonTask buttonState = apiGetIButtonTask(api, apiResult);
+        if (apiResult >= 0)
+        {
+            switch (buttonState.state)
+            {
+            case IButtonTask::PRESSED_5:
+                newMode = LED_BLUE;
+                break;
+            case IButtonTask::PRESSED_10:
+                newMode = LED_RED;
+                break;
+            default:
+                newMode = LED_GREEN;
+                break;
+            }
+        }
+        else
+        {
+            newMode = LED_WHITE;
+        }
+        if (newMode != currentMode)
+        {
             leds[0] = colorFromMode(newMode);
             FastLED.show();
             currentMode = newMode;

lib/ledtask/GwLedTask.h

@@ -3,13 +3,6 @@
 #include "GwApi.h"
 //task function
 void handleLeds(GwApi *param);
-typedef enum {
+
-    LED_OFF,
-    LED_GREEN,
-    LED_BLUE,
-    LED_RED,
-    LED_WHITE
-} GwLedMode;
-void setLedMode(GwLedMode mode);
 DECLARE_USERTASK(handleLeds);
 #endif

src/main.cpp

@@ -53,8 +53,6 @@ const unsigned long HEAP_REPORT_TIME=2000; //set to 0 to disable heap reporting
 #include "GwSerial.h"
 #include "GwWebServer.h"
 #include "NMEA0183DataToN2K.h"
-#include "GwButtons.h"
-#include "GwLedTask.h"
 #include "GwCounter.h"
 #include "GwXDRMappings.h"
 #include "GwSynchronized.h"
@@ -852,8 +850,6 @@ void setup() {
   NMEA2000.Open();
   logger.logDebug(GwLog::LOG,"starting addon tasks");
   logger.flush();
-  setLedMode(LED_GREEN);
-  userCodeHandler.startAddonTask(F("handleButtons"),handleButtons,100);
   {
     GWSYNCHRONIZED(&mainLock);
     userCodeHandler.startUserTasks(MIN_USER_TASK);