misc fixes

Author: tablatronix

httpportal.h

@@ -10,6 +10,8 @@ WiFiManager portal(Logger); // use netlog for logging wm
 // WiFiManager portal;
 
 void begin_httpportal(){
+  // portal.setDebugLevel();
+  // portal.setDebugOutput(true);
 	portal.startWebPortal();
 }
 
@@ -22,7 +24,7 @@ void process_httpportal(){
 }
 
 void init_httpportal(String title = "",bool begin = true){
-  portal.setDebugOutput(true,"[HTTPP] ");
+  portal.setDebugOutput(true,"[HTTPD] ");
   // invert theme, dark
   portal.setDarkMode(true);
   std::vector<const char *> menu = {"wifi","param","info","sep","update","restart","exit"};

mqtt.h

@@ -39,30 +39,37 @@ const char* clientID = "";
 bool mqttconnected = false;
 
 long lastReconnectAttempt = 0;
-uint16_t mqttretry = 5000;
+uint32_t mqttretry = 10000;
+
+// Possible values for client.state()
+// #define MQTT_CONNECTION_TIMEOUT     -4
+// #define MQTT_CONNECTION_LOST        -3
+// #define MQTT_CONNECT_FAILED         -2
+// #define MQTT_DISCONNECTED           -1
+// #define MQTT_CONNECTED               0
+// #define MQTT_CONNECT_BAD_PROTOCOL    1
+// #define MQTT_CONNECT_BAD_CLIENT_ID   2
+// #define MQTT_CONNECT_UNAVAILABLE     3
+// #define MQTT_CONNECT_BAD_CREDENTIALS 4
+// #define MQTT_CONNECT_UNAUTHORIZED    5
 
 void MQTTreconnect() {
-
-  // Loop until we're reconnected
-  // this is blocking
   if (!client.connected()) {
   // while (!client.connected()) {
     if(debug_mqtt) Logger.println("[MQTT] Connecting...");
     // Attempt to connect
     if (client.connect(clientID)) {
+      mqttconnected = true;
       Logger.println("[MQTT] Connected");
       // Once connected, publish an announcement...
       client.publish("TESTOUT", "hello world");
       // ... and resubscribe
       client.subscribe("CMD");
     } else {
-      Logger.print("[ERROR] [MQTT] failed, rc="); // @todo we get here but no actual reconnnect loop, why?
+      Logger.print("[ERROR] [MQTT] failed, rc="); // @todo we get here but no actual reconnnect
       Logger.println(client.state());
-      // Wait 5 seconds before retrying
-      delay(5000);
     }
-    delay(100);
-}
+  }
 }
 
 void MQTTcallback(char* topic, byte* payload, unsigned int length) {
@@ -95,12 +102,7 @@ void mqtt_checkconn(){
     if (now - lastReconnectAttempt > mqttretry) {
       Logger.println("[MQTT] try client re-connect");      
       lastReconnectAttempt = now;
-      // Attempt to reconnect
-      // if (mqttWiFiReconnect()) {
-        lastReconnectAttempt = 0;
-        MQTTreconnect();
-        // client.connect(clientID);
-      // }
+      MQTTreconnect();
     }
   } else {
     // Client connected
@@ -294,13 +296,13 @@ void MQTT_pub(String topic, String sensor, String value){
 // add free heap
 void MQTT_pub_device(){
   if(debug_mqtt) Logger.println("[MQTT] Publish Device");
+  MQTT_pub("device","uptime_s",(String)(millis()/1000));
   MQTT_pub("device","rssi",(String)getRSSIasQuality());
+  MQTT_pub("device","heap",(String)ESP.getFreeHeap());
+  // MQTT_pub("device","hall",(String)hallRead());
   #ifdef ESP32
-  // MQTT_pub("device","hall",(String)hallRead()); // USES PINS 36,39
   MQTT_pub("device","temp",(String)temperatureRead());
-  // MQTT_pub("device","adc_1",(String)analogRead(39));
   #endif
-  MQTT_pub("device","uptime_s",(String)(millis()/1000));  
   MQTT_pub_send("device");
 }
 

neoindicator.h

@@ -131,6 +131,17 @@ void indSetColor(uint8_t r,uint8_t g,uint8_t b){
   indSetColor(ind.Color(r,g,b));
 }
 
+// void setPixelBrightness(uint32_t n, uint32_t a){
+// }
+
+// void indSetBrightness(uint8_t a){
+//   uint32_t c = strip.getPixelColor(0);
+//   // if(DEBUG_neoind)Serial.println("[IND] set ind color brightness:"+(String) ind.Color(r,g,b));    
+//   setPixelColorAlpha(n,c,a);
+//   ind.setPixelBrightness
+// }
+
+
 void setIndColor(uint8_t r,uint8_t g,uint8_t b){
   indSetColor(r,g,b);
 }

neopixel_helper.h

@@ -1,3 +1,7 @@
+/**
+ * All helpers need to be refactored to use neopixel objected passed in
+ * kludge reassign strip to your obj etc and use as a shadow
+ */
 #ifndef NEOPIXEL_HELPER_H
 #define  NEOPIXEL_HELPER_H
 
@@ -159,6 +163,7 @@ uint16_t randomBrightness(uint16_t a,uint8_t range){
 	return b;
 }
 
+// does not allow offsets 0-255
 uint16_t getBrightnessStep(uint8_t step, uint16_t numsteps){
   uint16_t brightness;
 //  brightness = 255 - (step * (255/numsteps)); // linear
@@ -303,6 +308,7 @@ void fadeTo(uint32_t c,uint16_t duration){
   fade(getPixelColor(0),c,duration);
 }
 
+// stepping non blocking fader
 uint32_t getFadeStep(uint32_t startColor, uint32_t endColor, uint16_t steps, uint16_t step){
 	int16_t redDiff   = red(endColor)   - red(startColor);
 	int16_t greenDiff = green(endColor) - green(startColor);
@@ -315,7 +321,8 @@ uint32_t getFadeStep(uint32_t startColor, uint32_t endColor, uint16_t steps, uin
 	blueValue  = (int16_t)blue(startColor)  + (blueDiff  * step / steps);
 	whiteValue = (int16_t)white(startColor) + (whiteDiff * step / steps);
 
-	return color(redValue, greenValue, blueValue,whiteValue);
+	// return color(redValue, greenValue, blueValue,whiteValue);
+  return color(redValue, greenValue, blueValue);
 }
 
 void flasher(uint32_t colorA, uint32_t colorB,int waitA, int waitB){