Dev

code/buddy-firmware/impax-buddy-firmware/include/util.h

@@ -7,32 +7,41 @@
 
 // Define LED pins and blink interval
 #define LED_BLINK_DELAY 100
+#define LED_FADE_DELAY 2
 #define LED_BATTERY_LOW 5
 #define LED_ON 2
 #define LED_ON_PIN 2
 #define LED_WIFI_PIN 0
+#define LED_CHARGIN 7
 #define LED_BLINK 1
 #define LED_OFF 0
 #define MOVING_AVERAGE_SIZE 6
-#define VOLTAGE_UPPER_LIMIT 4.19
-#define VOLTAGE_LOWER_LIMIT 3.50
+#define VOLTAGE_UPPER_LIMIT 4.05
+#define VOLTAGE_LOWER_LIMIT 3.4
 
 // Define battery-related constants
 #define BATTERY_READ 33
 const float Vref = 3.3;
+// Define a global variable to store the previous percentage value
+static int prevPercentage = 0;
+#define CHARGIN_STATE 200
+#define BATTERY_LIMIT 10
 
 // Function declarations
-void initLED();            // Initialize LED pins
-void onLedOn();            // Turn on the ON LED
-void offLedOn();           // Turn off the ON LED
-void onLedWifi();          // Turn on the WiFi LED
-void offLedWifi();         // Turn off the WiFi LED
-void blinkLedWifi();       // Blink the WiFi LED
-void blinkLedOn();         // Blink the ON LED
-int getBatteryStatus();    // Get battery status based on voltage
-float getBatteryVoltage(); // Get the voltage of the battery
+void initLED();                           // Initialize LED pins
+void onLedOn();                           // Turn on the ON LED
+void offLedOn();                          // Turn off the ON LED
+void onLedWifi();                         // Turn on the WiFi LED
+void offLedWifi();                        // Turn off the WiFi LED
+void blinkLedWifi();                      // Blink the WiFi LED
+void blinkLedOn();                        // Blink the ON LED
+int getBatteryStatus();                   // Get battery status based on voltage
+float getBatteryVoltage(float *readings); // Get the voltage of the battery
+float getBatteryVoltage();                // Get the voltage of the battery
 void batteryInit();
 void led(int);
+bool batteryIsCharging(float *readings, int size); // Is the battery charging
+void fadeLedOn();
 
 int wakeup_reason();
 

code/buddy-firmware/impax-buddy-firmware/src/define.h

@@ -49,8 +49,6 @@ const int mqtt_port = 1883;
 unsigned long batteryStatusTimer = 0;
 unsigned long measuringTimer = 0;
 
-#define BATTERY_LIMIT 30
-
 String CA_cert =
     "-----BEGIN CERTIFICATE-----\n"
     "MIIDJzCCAg+gAwIBAgIUPKKmid6OdQ5kxFZQxDI0tTTMOwgwDQYJKoZIhvcNAQEL\n"

code/buddy-firmware/impax-buddy-firmware/src/main.cpp

@@ -118,10 +118,11 @@ void process()
         int batteryStatus = getBatteryStatus();
         buddyMQTT.publish(buddyMQTT.topics.BATTERY.c_str(), batteryStatus);
 
-        float vol = getBatteryVoltage();
-        buddyMQTT.publish(buddyMQTT.topics.TEST.c_str(), vol);
-
-        if (batteryStatus < BATTERY_LIMIT)
+        if (batteryStatus == CHARGIN_STATE)
+        {
+            ledStatus = LED_CHARGIN;
+        }
+        else if (batteryStatus < BATTERY_LIMIT)
         {
             ledStatus = LED_BATTERY_LOW;
         }
@@ -143,6 +144,8 @@ void process()
 void buddyInit()
 {
     // leds
+    ledStatus = LED_OFF;
+    led(ledStatus);
     ledStatus = LED_BLINK;
     led(ledStatus);
 

code/buddy-firmware/impax-buddy-firmware/src/utils/util.cpp

@@ -33,11 +33,20 @@ int getBatteryStatus()
 {
     float voltage = getBatteryVoltage();
 
-    int percentage = 2808.3808 * pow(voltage, 4) - 43560.9157 * pow(voltage, 3) + 252848.5888 * pow(voltage, 2) - 650767.4615 * voltage + 626532.5703;
     if (voltage > VOLTAGE_UPPER_LIMIT)
-        percentage = 100;
+        return 100;
     else if (voltage <= VOLTAGE_LOWER_LIMIT)
-        percentage = 0;
+        return 0;
+
+    int percentage = 2808.3808 * pow(voltage, 4) - 43560.9157 * pow(voltage, 3) + 252848.5888 * pow(voltage, 2) - 650767.4615 * voltage + 626532.5703;
+
+    // Check if the percentage is increasing
+    bool isIncreasingPercentage = (percentage > prevPercentage);
+    // Update the previous percentage value
+    prevPercentage = percentage;
+
+    if (isIncreasingPercentage)
+        return CHARGIN_STATE;
 
     return percentage;
 }
@@ -51,6 +60,57 @@ void batteryInit()
     }
 }
 
+bool batteryIsCharging(float *readings, int size)
+{
+    for (int i = 1; i < size; i++)
+    {
+        if (readings[i] > readings[i - 1])
+        {
+            return false; // If any element is less than or equal to the previous one, the array is not strictly increasing
+        }
+    }
+    return true; // If all elements are strictly increasing
+}
+
+float getBatteryVoltage(float *readings)
+{
+    static int index = 0;
+    static float sum = 0;
+
+    // Read the raw value
+    int rawValue = analogRead(BATTERY_READ);
+
+    // Convert the raw value to voltage (assuming a voltage divider)
+    float voltage = rawValue * (Vref / 4095.0); // Adjust 3.3 to your actual reference voltage
+
+    // Assuming a voltage divider with equal resistors, adjust the divisor accordingly
+    voltage = voltage * 2.0;
+
+    // Update the sum with the new reading and subtract the oldest reading
+    sum = sum - readings[index] + voltage;
+
+    // Store the new reading in the array
+    readings[index] = voltage;
+
+    // Move to the next index
+    index = (index + 1) % MOVING_AVERAGE_SIZE;
+
+    // Calculate the moving average
+    float movingAverage = sum / MOVING_AVERAGE_SIZE;
+
+    // Serial.print(voltage);
+    // Serial.print(" - ");
+
+    // for (int i = 0; i < MOVING_AVERAGE_SIZE; i++)
+    // {
+    //     Serial.print(readings[i]);
+    //     Serial.print(", ");
+    // }
+    // Serial.println(movingAverage);
+
+    return movingAverage;
+}
+
 float getBatteryVoltage()
 {
     static float readings[MOVING_AVERAGE_SIZE];
@@ -104,6 +164,28 @@ void blinkLedWifi()
     }
 }
 
+void fadeLedOn()
+{
+    static unsigned long lastTime = 0;
+    static int brightness = 0;
+    static int fadeDirection = 1; // 1 for increasing brightness, -1 for decreasing
+
+    if (millis() - lastTime > LED_FADE_DELAY)
+    {
+        lastTime = millis();
+
+        brightness += fadeDirection;
+
+        // Change fade direction when reaching brightness limits
+        if (brightness <= 0 || brightness >= 255)
+        {
+            fadeDirection = -fadeDirection;
+        }
+
+        analogWrite(LED_ON_PIN, brightness);
+    }
+}
+
 void blinkLedOn()
 {
     static unsigned long lastTime = 0;
@@ -139,6 +221,11 @@ void led(int LED_STATE)
         blinkLedOn();
         onLedWifi();
     }
+    else if (LED_STATE == LED_CHARGIN)
+    {
+        fadeLedOn();
+        onLedWifi();
+    }
 }
 
 int wakeup_reason()

code/hub-firmware/led-battery/led..txt

@@ -0,0 +1,11 @@
+sudo systemctl daemon-reload
+
+sudo systemctl enable led
+sudo systemctl start led
+
+sudo systemctl status led
+
+sudo systemctl restart hubService
+
+sudo nano /etc/systemd/system/hubService.service
+

code/hub-firmware/mqtt-broker-config/ca_authentication.txt

@@ -30,4 +30,28 @@ keyfile /etc/mosquitto/certs/server.key
 certfile /etc/mosquitto/certs/server.crt
 tls_version tlsv1.2
 
+-----BEGIN CERTIFICATE-----
+MIIECTCCAvGgAwIBAgIUGEzPoz/1G3v0vKcmPSoTCv0YGC4wDQYJKoZIhvcNAQEL
+BQAwgZMxCzAJBgNVBAYTAkxLMRMwEQYDVQQIDApTaHJvcHNoaXJlMRMwEQYDVQQH
+DApJcm9uYnJpZGdlMREwDwYDVQQKDAhDQW1hc3RlcjENMAsGA1UECwwEVEVTVDEU
+MBIGA1UEAwwLcmFzcGJlcnJ5cGkxIjAgBgkqhkiG9w0BCQEWE3N0ZXZlQHRlc3Rl
+bWFpbC5jb20wHhcNMjQwMTIyMjIwNDMxWhcNMjkwMTIxMjIwNDMxWjCBkzELMAkG
+A1UEBhMCTEsxEzARBgNVBAgMClNocm9wc2hpcmUxEzARBgNVBAcMCklyb25icmlk
+Z2UxETAPBgNVBAoMCENBbWFzdGVyMQ0wCwYDVQQLDARURVNUMRQwEgYDVQQDDAty
+YXNwYmVycnlwaTEiMCAGCSqGSIb3DQEJARYTc3RldmVAdGVzdGVtYWlsLmNvbTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMMxRH2QvAvSk86xdbN+lIiE
+VFzxSoudqZjIEXOGCoRlxXyWMG8T3CIp0vQScSSBoIJvCYppz1JhfnIUM3rFdnI1
+NVjVZULqzQ3PxWrevbPtGOYp8AINGOa40Pv6LChV0HkRJOSpGvZvGgw0Fw65xuUM
+I7tlWctnL3v8aouuIcCNKpNCBqwmEAChDNOOxzepydL3PhnU1cXIdRcKWd7/wDP9
+m9q2PNfZXJXg+J5LInJ4ZITva7jKMrdbTwYDz/4XUWdK9YfSiV+iIO4IBKFUVPk7
+AzMAn6O0Y+ccViWmSzub56VPXrkdy8GuOjquDEW2HZHeopIAyK/8Yrk5ckMN8VkC
+AwEAAaNTMFEwHQYDVR0OBBYEFE7sOLSLZ+3+eli63fFq/G7Un7BPMB8GA1UdIwQY
+MBaAFE7sOLSLZ+3+eli63fFq/G7Un7BPMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZI
+hvcNAQELBQADggEBAD/E3X1OyPOqrrosu1MTbz4eUtMNyq3VUuxtJ4QBNlRdIo+e
+yW1+ncTWBUWa3Iqy5++0qhneOe83GZe1twZm7GLV/Zm3TC8vsXrIaESQpSlXVyBA
+W21km+MY4IFQZMvOmcWBRi6ZQ7J4sIF0sFk8zlChcUE7AGlSW71OsKRbmgyekuAi
+yYyfayanB9Fy50tYQ2Jo8a07VdBn4kMARsJ/0F4WU30qjllSg/jXNtR0Idt4n6Qn
+EKHPYrWypCDOgDSz4Pmi6STbJltQbFRIWtUjQiJsItBOlfanKdwgnbUfwRJR3/Yj
+hnrgltMV/x5Xa1zhrZ6mXBm3jDSVaFf8yiMp+8o=
+-----END CERTIFICATE-----