fix build

.gitignore

@@ -1,5 +1,4 @@
-.pioenvs
+.pio
-.piolibdeps
 .vscode/.browse.c_cpp.db*
 .vscode/c_cpp_properties.json
 .vscode/launch.json

.vscode/extensions.json

@@ -1,7 +1,7 @@
-{
+{
-	// See http://go.microsoft.com/fwlink/?LinkId=827846
+	// See http://go.microsoft.com/fwlink/?LinkId=827846
-	// for the documentation about the extensions.json format
+	// for the documentation about the extensions.json format
-	"recommendations": [
+	"recommendations": [
-		"platformio.platformio-ide"
+		"platformio.platformio-ide"
-	]
+	]
 }

data/mqttConfig.json

@@ -1,6 +1,6 @@
 {
     "mqttClientName" : "bb1",
-    "mqttBrokerHost" : "192.168.1.2",
+    "mqttBrokerHost" : "192.168.1.134",
     "mqttBrokerPort" : 1883,
     "mqttRootTopic" : "wirelos/bb1"
 }

platformio.ini

@@ -8,7 +8,7 @@ lib_deps =
     Hash
     TaskScheduler
     SPIFFS
-    ArduinoJson
+    ArduinoJson@5.13.4
     Ai Esp32 Rotary Encoder
     ESP8266_SSD1306
     ESPmDNS
@@ -20,11 +20,11 @@ lib_deps =
     PubSubClient
     Update
     https://gitlab.com/wirelos/sprocket-lib.git#develop
-    https://gitlab.com/wirelos/sprocket-network-wifi.git
+    https://gitlab.com/wirelos/sprocket-network-wifi.git#next
     https://gitlab.com/wirelos/sprocket-plugin-gpio.git
     https://gitlab.com/wirelos/sprocket-plugin-display.git
-    https://gitlab.com/wirelos/sprocket-plugin-web.git
+    https://gitlab.com/wirelos/sprocket-plugin-web.git#next
-    https://gitlab.com/wirelos/sprocket-plugin-mqtt.git
+    https://gitlab.com/wirelos/sprocket-plugin-mqtt.git#next
 
 [env:default]
 platform = ${common.platform}

src/RotaryPlugin.cpp

@@ -0,0 +1,38 @@
+#include "RotaryPlugin.h"
+
+RotaryPlugin::RotaryPlugin(RotaryConfig cfg)
+{
+    config = cfg;
+    rotaryEncoder = new AiEsp32RotaryEncoder(config.pinA, config.pinB, config.pinButton, config.pinVcc);
+    rotaryEncoder->begin();
+    rotaryEncoder->setBoundaries(config.lowerBound, config.upperBound, config.circulateValues);
+}
+void RotaryPlugin::activate(Scheduler *userScheduler)
+{
+    
+    // add update task
+    inputTask.set(TASK_MILLISECOND * config.updateInterval, TASK_FOREVER, std::bind(&RotaryPlugin::checkInput, this));
+    userScheduler->addTask(inputTask);
+    inputTask.enable();
+
+    // add dummy subscription
+    subscribe(config.topic, [](String msg){});
+    subscribe(String(config.topic) + "/btn", [](String msg){});
+
+    PRINT_MSG(Serial, "PLUGIN", "RotaryPlugin activated");
+}
+
+void RotaryPlugin::checkInput()
+{
+    rotaryEncoder->enable();
+    if (rotaryEncoder->encoderChanged())
+    {
+        int encReading = rotaryEncoder->readEncoder();
+        publish(config.topic, String(encReading));
+    }
+    ButtonState newBtnState = rotaryEncoder->currentButtonState();
+    if(newBtnState != btnState){
+        btnState = newBtnState;
+        publish(String(config.topic) + String("/btn"), String(btnState));
+    }
+}

src/RotaryPlugin.h

@@ -0,0 +1,45 @@
+#ifndef __ROTARY_PLUGIN_H__
+#define __ROTARY_PLUGIN_H__
+
+#define _TASK_SLEEP_ON_IDLE_RUN
+#define _TASK_STD_FUNCTION 
+
+#include <functional>
+#include <vector>
+#include <FS.h>
+#include <TaskSchedulerDeclarations.h>
+#include <Plugin.h>
+#include <utils/print.h>
+#include <utils/misc.h>
+#include "AiEsp32RotaryEncoder.h"
+
+using namespace std;
+using namespace std::placeholders;
+
+struct RotaryConfig
+{
+    int pinA;
+    int pinB;
+    int pinButton;
+    int pinVcc;
+    int updateInterval;
+    int lowerBound;
+    int upperBound;
+    bool circulateValues;
+    const char* topic;
+    //const char* topicButton;
+};
+
+class RotaryPlugin : public Plugin {
+    public:
+        Task inputTask;
+        int currentVal = 0;
+        ButtonState btnState = BUT_RELEASED;
+        AiEsp32RotaryEncoder* rotaryEncoder;
+        RotaryConfig config;
+        RotaryPlugin(RotaryConfig cfg);
+        void activate(Scheduler* userScheduler);
+        void checkInput();
+};
+
+#endif

src/main.cpp

@@ -7,9 +7,9 @@
 #include <WebConfigPlugin.h>
 #include <WebApiPlugin.h>
 #include <MqttPlugin.h>
-#include "inputs/rotary/RotaryPlugin.h"
 #include "inputs/analog/AnalogInputPlugin.h"
 #include "inputs/digital/DigitalInputPlugin.h"
+#include "RotaryPlugin.h"
 
 WiFiNet *network;
 Sprocket *sprocket;