161 - Finished Displaying Regen as a Percentage of Total Capacity

NERODevelopment/content/EfficiencyScreen.qml

@@ -10,6 +10,7 @@ Item {
     anchors.fill: parent
     property int torqueLimit: efficiencyController.currentMaxTorque
     property int numRegen: efficiencyController.currentRegenStrength
+    property double numRegenPercentage: efficiencyController.currentRegenPercentage
     property int hvSOC: efficiencyController.stateOfCharge
     property int lvSOC: efficiencyController.lowVoltageStateOfCharge
     property int motorTemp: efficiencyController.motorTemp
@@ -84,14 +85,15 @@ Item {
             ThermometerValueComponent {
                 id: regen
                 regen: true
-                thermometerValue: efficiency.numRegen
+                showPercentage: true
+                thermometerValue: showPercentage ? efficiency.numRegenPercentage : efficiency.numRegen
                 title: "REGEN"
                 Layout.fillWidth: true
                 Layout.fillHeight: true
                 radius: efficiency.borderRadii
                 valueFontSize: efficiency.valueFontSize
                 labelFontSize: efficiency.labelFontSize
-                unitFontSize: efficiency.labelFontSize / 2
+                unitFontSize: efficiency.valueFontSize / 1.5
             }
         }
 

NERODevelopment/content/SpeedMode.qml

@@ -19,6 +19,7 @@ Item {
     property int maxDraw: speedController.maxCurrent
     property int dcl: speedController.currentDischarge
     property double regen: speedController.regen
+    property double regenPercentage: speedController.regenPercentage
 
     property int xMargin: width / 20
     property int yMargin: height / 20
@@ -89,8 +90,9 @@ Item {
             spacing: parent.height / 20
 
             ThermometerValueComponent {
-                thermometerValue: speedMode.regen
-                title: "Regen"
+                showPercentage: true
+                thermometerValue: showPercentage ? speedMode.regenPercentage : speedMode.regen
+                title: "REGEN"
                 Layout.fillHeight: true
                 Layout.fillWidth: true
                 Layout.preferredHeight: 1

NERODevelopment/content/ThermometerValueComponent.qml

@@ -14,6 +14,7 @@ Item {
     property int valueFontSize
     property int labelFontSize
     property int unitFontSize: valueFontSize
+    property bool showPercentage: false
 
     LabeledComponent {
         anchors.fill: parent
@@ -28,11 +29,11 @@ Item {
         labelVerticalSpacing: thermometerComponent.labelVerticalSpacing
         labelColor: thermometerComponent.labelColor
         horizontalPadding: thermometerComponent.horizontalPadding
-        valueUnit: regen ? "A" : "°"
+        valueUnit: regen ? (showPercentage ? "%" : "A") : "°"
         radius: thermometerComponent.radius
         valueFontSize: thermometerComponent.valueFontSize
         labelFontSize: thermometerComponent.labelFontSize
         unitFontSize: thermometerComponent.unitFontSize
-        unitAnchorBottom: regen ? true : false
+        unitAnchorBottom: false
     }
 }

NERODevelopment/src/controllers/efficiencycontroller.cpp

@@ -2,12 +2,13 @@
 
 EfficiencyController::EfficiencyController(Model *model, QObject *parent)
     : ButtonController{model, 4, parent}, m_updateTimer(new QTimer(this)),
-      m_timerRunning(false) {
-  connect(m_model, &Model::onCurrentDataChange, this,
-          &EfficiencyController::currentDataDidChange);
-  connect(m_updateTimer, &QTimer::timeout, this,
-          &EfficiencyController::updateCurrentTime);
-  m_updateTimer->setInterval(1);
+    m_timerRunning(false) {
+    connect(m_model, &Model::onCurrentDataChange, this,
+            &EfficiencyController::currentDataDidChange);
+    connect(m_updateTimer, &QTimer::timeout, this,
+            &EfficiencyController::updateCurrentTime);
+    m_updateTimer->setInterval(1);
+    currentDataDidChange();
 }
 
 int EfficiencyController::currentMaxTorque() const {
@@ -23,10 +24,30 @@ void EfficiencyController::setCurrentMaxTorque(int torque) {
 int EfficiencyController::currentRegenStrength() const {
   return m_currentRegenStrength;
 }
+
+float EfficiencyController::currentRegenPercentage() const {
+    if (m_maxRegenCapacity > 0) {
+        return (m_currentRegenStrength / m_maxRegenCapacity) * 100.0f;
+    }
+    return 0.0f;
+}
+
+float EfficiencyController::maxRegenCapacity() const {
+    return m_maxRegenCapacity;
+}
+
+void EfficiencyController::setMaxRegenCapacity(float capacity) {
+    if (capacity != m_maxRegenCapacity) {
+        m_maxRegenCapacity = capacity;
+        emit maxRegenCapacityChanged(capacity);
+        emit currentRegenPercentageChanged(currentRegenPercentage());
+    }
+}
 void EfficiencyController::setCurrentRegenStrength(int strength) {
   if (strength != m_currentRegenStrength) {
     m_currentRegenStrength = strength;
     emit currentRegenStrengthChanged(strength);
+    emit currentRegenPercentageChanged(currentRegenPercentage());
   }
 }
 
@@ -73,35 +94,39 @@ void EfficiencyController::setSpeed(int speed) {
 }
 
 void EfficiencyController::currentDataDidChange() {
-  std::optional<float> torque = m_model->getTorquePower();
-  std::optional<float> regen = m_model->getRegenPower();
-  std::optional<float> soc = m_model->getStateOfCharge();
-  std::optional<float> motorTemp = m_model->getMotorTemp();
-  std::optional<float> packTemp = m_model->getPackTemp();
-  std::optional<float> lowVoltageSoc = m_model->getLowVoltageStateOfCharge();
-  std::optional<float> speed = m_model->getMph();
-
-  if (torque) {
-    setCurrentMaxTorque(*torque);
-  }
-  if (regen) {
-    setCurrentRegenStrength(*regen);
-  }
-  if (soc) {
-    setStateOfCharge(*soc);
-  }
-  if (motorTemp) {
-    setMotorTemp(*motorTemp);
-  }
-  if (packTemp) {
-    setPackTemp(*packTemp);
-  }
-  if (lowVoltageSoc) {
-    setLowVoltageStateOfCharge(*lowVoltageSoc);
-  }
-  if (speed) {
-    setSpeed(*speed);
-  }
+    std::optional<float> torque = m_model->getTorquePower();
+    std::optional<float> regen = m_model->getRegenPower();
+    std::optional<float> soc = m_model->getStateOfCharge();
+    std::optional<float> motorTemp = m_model->getMotorTemp();
+    std::optional<float> packTemp = m_model->getPackTemp();
+    std::optional<float> lowVoltageSoc = m_model->getLowVoltageStateOfCharge();
+    std::optional<float> speed = m_model->getMph();
+    std::optional<float> maxRegenCapacity = m_model->getMaxRegenCapacity();
+
+    if (torque) {
+        setCurrentMaxTorque(*torque);
+    }
+    if (regen) {
+        setCurrentRegenStrength(*regen);
+    }
+    if (soc) {
+        setStateOfCharge(*soc);
+    }
+    if (motorTemp) {
+        setMotorTemp(*motorTemp);
+    }
+    if (packTemp) {
+        setPackTemp(*packTemp);
+    }
+    if (lowVoltageSoc) {
+        setLowVoltageStateOfCharge(*lowVoltageSoc);
+    }
+    if (speed) {
+        setSpeed(*speed);
+    }
+    if (maxRegenCapacity) {
+        setMaxRegenCapacity(*maxRegenCapacity);
+    }
 }
 
 int EfficiencyController::currentTime() const { return m_currentTime; }

NERODevelopment/src/controllers/efficiencycontroller.h

@@ -33,6 +33,8 @@ class EfficiencyController : public ButtonController {
                  fastestTimeChanged)
   Q_PROPERTY(
       int lastTime READ lastTime WRITE setLastTime NOTIFY lastTimeChanged)
+  Q_PROPERTY(float currentRegenPercentage READ currentRegenPercentage NOTIFY currentRegenPercentageChanged)
+  Q_PROPERTY(float maxRegenCapacity READ maxRegenCapacity WRITE setMaxRegenCapacity NOTIFY maxRegenCapacityChanged)
 
 public:
   explicit EfficiencyController(Model *model, QObject *parent = nullptr);
@@ -46,6 +48,8 @@ class EfficiencyController : public ButtonController {
   int currentTime() const;
   int fastestTime() const;
   int lastTime() const;
+  float currentRegenPercentage() const;
+  float maxRegenCapacity() const;
 
 signals:
   void currentMaxTorqueChanged(int);
@@ -58,6 +62,8 @@ class EfficiencyController : public ButtonController {
   void currentTimeChanged(int);
   void fastestTimeChanged(int);
   void lastTimeChanged(int);
+  void currentRegenPercentageChanged(float);
+  void maxRegenCapacityChanged(float);
 
 public slots:
   void setCurrentMaxTorque(int);
@@ -71,13 +77,15 @@ public slots:
   void setCurrentTime(int);
   void setFastestTime(int);
   void setLastTime(int);
+  void setMaxRegenCapacity(float);
 
   void enterButtonPressed() override;
   void updateCurrentTime();
 
-private:
+  private:
   int m_currentMaxTorque = 0;        // torque percentage [0,100]
   int m_currentRegenStrength = 0;    // regen strength [1,3]
+  float m_maxRegenCapacity = 10.0f;      // Changed from 10.0f to 0 - will be set from model
   int m_stateOfCharge = 0;           // charge percentage [0,100]
   int m_motorTemp = 0;               // Celsius
   int m_packTemp = 0;                // Celsius

NERODevelopment/src/controllers/speedcontroller.cpp

@@ -4,10 +4,11 @@
 
 SpeedController::SpeedController(Model *model, QObject *parent)
     : ButtonController{model, 3, parent}, m_updateTimer(new QTimer(this)) {
-  connect(m_model, &Model::onCurrentDataChange, this, &SpeedController::update);
-  connect(m_updateTimer, &QTimer::timeout, this,
-          &SpeedController::updateCurrentTime);
-  m_updateTimer->setInterval(1);
+    connect(m_model, &Model::onCurrentDataChange, this, &SpeedController::update);
+    connect(m_updateTimer, &QTimer::timeout, this,
+            &SpeedController::updateCurrentTime);
+    m_updateTimer->setInterval(1);
+    update();
 }
 
 bool SpeedController::tractionControl() const { return m_tractionControl; }
@@ -23,9 +24,30 @@ void SpeedController::setRegen(float regen) {
   if (regen != m_regen) {
     m_regen = regen;
     emit regenChanged(regen);
+    emit regenPercentageChanged(regenPercentage());
   }
 }
 
+float SpeedController::regenPercentage() const {
+    if (m_maxRegenCapacity > 0) {
+        float result = (m_regen / m_maxRegenCapacity) * 100.0f;
+        return result;
+    }
+    return 0.0f;
+}
+
+float SpeedController::maxRegenCapacity() const {
+    return m_maxRegenCapacity;
+}
+
+void SpeedController::setMaxRegenCapacity(float capacity) {
+    if (capacity != m_maxRegenCapacity) {
+        m_maxRegenCapacity = capacity;
+        emit maxRegenCapacityChanged(capacity);
+        emit regenPercentageChanged(regenPercentage());
+    }
+}
+
 float SpeedController::packTemp() const { return m_packTemp; }
 void SpeedController::setPackTemp(float packTemp) {
   if (packTemp != m_packTemp) {
@@ -144,14 +166,15 @@ void SpeedController::updateCurrentTime() {
 }
 
 void SpeedController::update() {
-  setTractionControl(*m_model->getTractionControl());
-  setPackTemp(*m_model->getPackTemp());
-  setMotorTemp(*m_model->getMotorTemp());
-  setChargeState(*m_model->getStateOfCharge());
-  setCurrentSpeed(*m_model->getMph());
-  setMaxSpeed(m_model->getMaxSpeed());
-  setCurrent(*m_model->getCurrent());
-  setMaxCurrent(m_model->getMaxDraw());
-  setCurrentDischarge(*m_model->getDcl());
-  setRegen(*m_model->getRegenPower());
+    setTractionControl(*m_model->getTractionControl());
+    setPackTemp(*m_model->getPackTemp());
+    setMotorTemp(*m_model->getMotorTemp());
+    setChargeState(*m_model->getStateOfCharge());
+    setCurrentSpeed(*m_model->getMph());
+    setMaxSpeed(m_model->getMaxSpeed());
+    setCurrent(*m_model->getCurrent());
+    setMaxCurrent(m_model->getMaxDraw());
+    setCurrentDischarge(*m_model->getDcl());
+    setRegen(*m_model->getRegenPower());
+    setMaxRegenCapacity(*m_model->getMaxRegenCapacity());
 }

NERODevelopment/src/controllers/speedcontroller.h

@@ -35,6 +35,8 @@ class SpeedController : public ButtonController {
                  setCurrentDischarge NOTIFY currentDischargeChanged)
   Q_PROPERTY(float maxCurrentDischarge READ maxCurrentDischarge WRITE
                  setMaxCurrentDischarge NOTIFY maxCurrentDischargeChanged)
+  Q_PROPERTY(float regenPercentage READ regenPercentage NOTIFY regenPercentageChanged)
+  Q_PROPERTY(float maxRegenCapacity READ maxRegenCapacity WRITE setMaxRegenCapacity NOTIFY maxRegenCapacityChanged)
 
 public:
   explicit SpeedController(Model *model, QObject *parent = nullptr);
@@ -53,6 +55,8 @@ class SpeedController : public ButtonController {
   float currentDischarge() const;
   float maxCurrentDischarge() const;
   float regen() const;
+  float regenPercentage() const;
+  float maxRegenCapacity() const;
 
 signals:
   void tractionControlChanged(bool);
@@ -69,6 +73,8 @@ class SpeedController : public ButtonController {
   void currentDischargeChanged(float);
   void maxCurrentDischargeChanged(float);
   void regenChanged(float);
+  void regenPercentageChanged(float);
+  void maxRegenCapacityChanged(float);
 
 public slots:
   void setTractionControl(bool);
@@ -85,6 +91,7 @@ public slots:
   void setCurrentDischarge(float);
   void setMaxCurrentDischarge(float);
   void setRegen(float);
+  void setMaxRegenCapacity(float);
 
   void enterButtonPressed() override;
   void updateCurrentTime();
@@ -106,7 +113,7 @@ public slots:
   float m_currentDischarge = 0;
   float m_maxCurrentDischarge = 0;
   float m_regen = 0;
-
+  float m_maxRegenCapacity = 10.0f;
   bool m_timerRunning = false;
   QElapsedTimer m_timer;
   QTimer *m_updateTimer;

NERODevelopment/src/main.cpp

@@ -32,15 +32,15 @@ int main(int argc, char *argv[]) {
 
   if (osName == "raspberrypi-sta") {
 
-  model = new RaspberryModel();
-  model->connectToMQTT();
+      model = new RaspberryModel();
+      model->connectToMQTT();
 
   } else {
-    model = new MockModel;
-    QThread *dataThread = new QThread;
+      model = new MockModel;
+      QThread *dataThread = new QThread;
 
-    model->moveToThread(dataThread);
-    dataThread->start();
+      model->moveToThread(dataThread);
+      dataThread->start();
   }
 
   HomeController homeController(model);