Increased firmware version number requirement to 0.24 and added a lon…

…g list of configurable options.
DieBieEngineering · Dec 31, 2018 · 580ff5d · 580ff5d
1 parent c898dc8
commit 580ff5d
Show file tree

Hide file tree

Showing 11 changed files with 461 additions and 290 deletions.
diff --git a/mainwindow.ui b/mainwindow.ui
@@ -336,7 +336,7 @@
      <normaloff>:/res/icons/Horizontal Settings Mixer-96.png</normaloff>:/res/icons/Horizontal Settings Mixer-96.png</iconset>
    </property>
    <property name="text">
-    <string>Parameter Editor BMScconf</string>
+    <string>Parameter Editor Config</string>
    </property>
   </action>
   <action name="actionSaveBMSConfigurationHeader">

diff --git a/pages/pagemastercell.cpp b/pages/pagemastercell.cpp
@@ -45,9 +45,12 @@ void PageMasterCell::setDieBieMS(BMSInterface *dieBieMS)
     mDieBieMS = dieBieMS;
 
     if (mDieBieMS) {
-        ui->specificationsTab->addParamRow(mDieBieMS->bmsConfig(), "cellTechnology");
-        ui->specificationsTab->addParamRow(mDieBieMS->bmsConfig(), "noOfCells");
+        ui->specificationsTab->addRowSeparator(tr("Pack configuration"));
+        ui->specificationsTab->addParamRow(mDieBieMS->bmsConfig(), "noOfCellsSeries");
+        ui->specificationsTab->addParamRow(mDieBieMS->bmsConfig(), "noOfCellsParallel");
         ui->specificationsTab->addParamRow(mDieBieMS->bmsConfig(), "batteryCapacity");
+        ui->specificationsTab->addRowSeparator(tr("Cell specifications"));
+        ui->specificationsTab->addParamRow(mDieBieMS->bmsConfig(), "cellTechnology");
         ui->specificationsTab->addParamRow(mDieBieMS->bmsConfig(), "cellHardUnderVoltage");
         ui->specificationsTab->addParamRow(mDieBieMS->bmsConfig(), "cellHardOverVoltage");
         ui->specificationsTab->addParamRow(mDieBieMS->bmsConfig(), "cellLCSoftUnderVoltage");
@@ -57,6 +60,7 @@ void PageMasterCell::setDieBieMS(BMSInterface *dieBieMS)
         ui->specificationsTab->addParamRow(mDieBieMS->bmsConfig(), "hysteresisDischarge");
         ui->specificationsTab->addParamRow(mDieBieMS->bmsConfig(), "hysteresisCharge");
 
+        ui->balancingTab->addRowSeparator(tr("Balancing configuration"));
         ui->balancingTab->addParamRow(mDieBieMS->bmsConfig(), "cellBalanceStart");
         ui->balancingTab->addParamRow(mDieBieMS->bmsConfig(), "cellBalanceDifferenceThreshold");
         ui->balancingTab->addParamRow(mDieBieMS->bmsConfig(), "cellBalanceUpdateInterval");
@@ -71,11 +75,12 @@ void PageMasterCell::setDieBieMS(BMSInterface *dieBieMS)
         ui->throttlingTab->addParamRow(mDieBieMS->bmsConfig(), "cellThrottleUpperMargin");
         ui->throttlingTab->addParamRow(mDieBieMS->bmsConfig(), "throttleChargeIncreaseRate");
 
-        ui->socTab->addParamRow(mDieBieMS->bmsConfig(), "soCMethod");
+        ui->socTab->addRowSeparator(tr("SoC general"));
+        ui->socTab->addParamRow(mDieBieMS->bmsConfig(), "stateOfChargeMethod");
+        ui->socTab->addParamRow(mDieBieMS->bmsConfig(), "stateOfChargeStoreInterval");
         ui->socTab->addParamRow(mDieBieMS->bmsConfig(), "timeoutChargeCompleted");
         ui->socTab->addParamRow(mDieBieMS->bmsConfig(), "timeoutChargingCompletedMinimalMismatch");
         ui->socTab->addParamRow(mDieBieMS->bmsConfig(), "maxMismatchThreshold");
-        ui->socTab->addParamRow(mDieBieMS->bmsConfig(), "stateOfChargeStoreInterval");
     }
 }
 

diff --git a/pages/pagemastergeneral.cpp b/pages/pagemastergeneral.cpp
@@ -45,35 +45,54 @@ void PageMasterGeneral::setDieBieMS(BMSInterface *dieBieMS)
     mDieBieMS = dieBieMS;
 
     if (mDieBieMS) {
+        ui->powerStateTab->addRowSeparator(tr("Onstate"));
         ui->powerStateTab->addParamRow(mDieBieMS->bmsConfig(), "pulseToggleButton");
         ui->powerStateTab->addParamRow(mDieBieMS->bmsConfig(), "notUsedCurrentThreshold");
         ui->powerStateTab->addParamRow(mDieBieMS->bmsConfig(), "notUsedTimeout");
         ui->powerStateTab->addParamRow(mDieBieMS->bmsConfig(), "powerDownDelay");
-        ui->powerStateTab->addParamRow(mDieBieMS->bmsConfig(), "extEnableState");
         ui->powerStateTab->addParamRow(mDieBieMS->bmsConfig(), "allowForceOn");
+        ui->powerStateTab->addRowSeparator(tr("Jump to"));
+        ui->powerStateTab->addParamRow(mDieBieMS->bmsConfig(), "extEnableState");
+        ui->powerStateTab->addParamRow(mDieBieMS->bmsConfig(), "chargeEnableState");
+        ui->powerStateTab->addRowSeparator(tr("DCDC Converter"));
+        ui->powerStateTab->addParamRow(mDieBieMS->bmsConfig(), "DCDCEnableInverted");
+
+        ui->masterLimitsTab->addRowSeparator(tr("Current"));
+        ui->masterLimitsTab->addParamRow(mDieBieMS->bmsConfig(), "maxAllowedCurrent");
+        ui->masterLimitsTab->addRowSeparator(tr("Temperature"));
+        ui->masterLimitsTab->addParamRow(mDieBieMS->bmsConfig(), "allowedTempBattDischargingMax");
+        ui->masterLimitsTab->addParamRow(mDieBieMS->bmsConfig(), "allowedTempBattDischargingMin");
+        ui->masterLimitsTab->addParamRow(mDieBieMS->bmsConfig(), "allowedTempBattChargingMax");
+        ui->masterLimitsTab->addParamRow(mDieBieMS->bmsConfig(), "allowedTempBattChargingMin");
+        ui->masterLimitsTab->addParamRow(mDieBieMS->bmsConfig(), "allowedTempBMSMax");
+        ui->masterLimitsTab->addParamRow(mDieBieMS->bmsConfig(), "allowedTempBMSMin");
 
+        ui->canTab->addRowSeparator(tr("CAN Configuration"));
         ui->canTab->addParamRow(mDieBieMS->bmsConfig(), "CANID");
         ui->canTab->addParamRow(mDieBieMS->bmsConfig(), "CANBaudRate");
         ui->canTab->addParamRow(mDieBieMS->bmsConfig(), "CANIDStyle");
+        ui->canTab->addRowSeparator(tr("CAN Messaging"));
         ui->canTab->addParamRow(mDieBieMS->bmsConfig(), "emitStatusOverCAN");
         ui->canTab->addParamRow(mDieBieMS->bmsConfig(), "useCANSafetyInput");
         ui->canTab->addParamRow(mDieBieMS->bmsConfig(), "useCANDelayedPowerDown");
 
-        ui->masterSensorsTab->addRowSeparator(tr("Monitor IC"));
+        ui->masterSensorsTab->addRowSeparator(tr("Celvoltage monitor"));
         ui->masterSensorsTab->addParamRow(mDieBieMS->bmsConfig(), "cellMonitorICType");
         ui->masterSensorsTab->addParamRow(mDieBieMS->bmsConfig(), "cellMonitorICCount");
         ui->masterSensorsTab->addRowSeparator(tr("Shunt"));
         ui->masterSensorsTab->addParamRow(mDieBieMS->bmsConfig(), "shuntLCFactor");
         ui->masterSensorsTab->addParamRow(mDieBieMS->bmsConfig(), "shuntLCOffset");
-        ui->masterSensorsTab->addRowSeparator(tr("NTC enable mask"));
-        ui->masterSensorsTab->addParamRow(mDieBieMS->bmsConfig(), "tempEnableMaskBMS");
-        ui->masterSensorsTab->addParamRow(mDieBieMS->bmsConfig(), "tempEnableMaskBattery");
         ui->masterSensorsTab->addRowSeparator(tr("NTC specifications"));
         ui->masterSensorsTab->addParamRow(mDieBieMS->bmsConfig(), "NTCPCBTopResistor");
         ui->masterSensorsTab->addParamRow(mDieBieMS->bmsConfig(), "NTCPCB25Deg");
         ui->masterSensorsTab->addParamRow(mDieBieMS->bmsConfig(), "NTCPCBBeta");
         ui->masterSensorsTab->addParamRow(mDieBieMS->bmsConfig(), "NTCLTCTopResistor");
         ui->masterSensorsTab->addParamRow(mDieBieMS->bmsConfig(), "NTCLTC25Deg");
         ui->masterSensorsTab->addParamRow(mDieBieMS->bmsConfig(), "NTCLTCBeta");
+        ui->masterSensorsTab->addRowSeparator(tr("NTC enable mask"));
+        ui->masterSensorsTab->addParamRow(mDieBieMS->bmsConfig(), "tempEnableMaskBMS");
+        ui->masterSensorsTab->addParamRow(mDieBieMS->bmsConfig(), "tempEnableMaskBattery");
+        ui->masterSensorsTab->addRowSeparator(tr("Water detect enable mask"));
+        ui->masterSensorsTab->addParamRow(mDieBieMS->bmsConfig(), "waterSensorEnableMask");
     }
 }
diff --git a/pages/pagemastergeneral.ui b/pages/pagemastergeneral.ui
@@ -32,6 +32,16 @@
        </item>
       </layout>
      </widget>
+     <widget class="QWidget" name="Limits">
+      <attribute name="title">
+       <string>Limits</string>
+      </attribute>
+      <layout class="QVBoxLayout" name="verticalLayout_5">
+       <item>
+        <widget class="ParamTable" name="masterLimitsTab"/>
+       </item>
+      </layout>
+     </widget>
      <widget class="QWidget" name="CAN">
       <attribute name="title">
        <string>CAN</string>

diff --git a/pages/pagemastersignals.cpp b/pages/pagemastersignals.cpp
@@ -45,6 +45,7 @@ void PageMasterSignals::setDieBieMS(BMSInterface *dieBieMS)
     mDieBieMS = dieBieMS;
 
     if (mDieBieMS) {
-
+        ui->signalsTab->addRowSeparator(tr("Current sensing"));
+        ui->signalsTab->addParamRow(mDieBieMS->bmsConfig(), "packCurrentDataSource");
     }
 }
diff --git a/pages/pagemasterswitch.cpp b/pages/pagemasterswitch.cpp
@@ -45,13 +45,14 @@ void PageMasterSwitch::setDieBieMS(BMSInterface *dieBieMS)
     mDieBieMS = dieBieMS;
 
     if (mDieBieMS) {
+        ui->dischargeTab->addRowSeparator(tr("-"));
         ui->dischargeTab->addParamRow(mDieBieMS->bmsConfig(), "LCUseDischarge");
         ui->dischargeTab->addParamRow(mDieBieMS->bmsConfig(), "LCUsePrecharge");
         ui->dischargeTab->addParamRow(mDieBieMS->bmsConfig(), "minimalPrechargePercentage");
         ui->dischargeTab->addParamRow(mDieBieMS->bmsConfig(), "timeoutLCPreCharge");
         ui->dischargeTab->addParamRow(mDieBieMS->bmsConfig(), "timeoutDischargeRetry");        
-        ui->dischargeTab->addParamRow(mDieBieMS->bmsConfig(), "maxAllowedCurrent");
 
+        ui->chargeTab->addRowSeparator(tr("-"));
         ui->chargeTab->addParamRow(mDieBieMS->bmsConfig(), "chargerEnabledThreshold");
         ui->chargeTab->addParamRow(mDieBieMS->bmsConfig(), "timeoutChargerDisconnected");
         ui->chargeTab->addParamRow(mDieBieMS->bmsConfig(), "allowChargingDuringDischarge");

diff --git a/pages/pageslavegeneral.cpp b/pages/pageslavegeneral.cpp
@@ -46,12 +46,16 @@ void PageSlaveGeneral::setDieBieMS(BMSInterface *dieBieMS) {
         ui->slaveSensorsTab->addRowSeparator(tr("Shunt"));
         ui->slaveSensorsTab->addParamRow(mDieBieMS->bmsConfig(), "shuntHCFactor");
         ui->slaveSensorsTab->addParamRow(mDieBieMS->bmsConfig(), "shuntHCOffset");
-        ui->slaveSensorsTab->addRowSeparator(tr("NTC specifications"));
+        ui->slaveSensorsTab->addRowSeparator(tr("NTC's local"));
         ui->slaveSensorsTab->addParamRow(mDieBieMS->bmsConfig(), "NTCHiAmpPCBTopResistor");
         ui->slaveSensorsTab->addParamRow(mDieBieMS->bmsConfig(), "NTCHiAmpPCB25Deg");
         ui->slaveSensorsTab->addParamRow(mDieBieMS->bmsConfig(), "NTCHiAmpPCBBeta");
         ui->slaveSensorsTab->addParamRow(mDieBieMS->bmsConfig(), "NTCHiAmpExtTopResistor");
         ui->slaveSensorsTab->addParamRow(mDieBieMS->bmsConfig(), "NTCHiAmpExt25Deg");
         ui->slaveSensorsTab->addParamRow(mDieBieMS->bmsConfig(), "NTCHiAmpExtBeta");
+        ui->slaveSensorsTab->addRowSeparator(tr("NTC Aux"));
+        ui->slaveSensorsTab->addParamRow(mDieBieMS->bmsConfig(), "NTCHiAmpAUXTopResistor");
+        ui->slaveSensorsTab->addParamRow(mDieBieMS->bmsConfig(), "NTCHiAmpAUX25Deg");
+        ui->slaveSensorsTab->addParamRow(mDieBieMS->bmsConfig(), "NTCHiAmpAUXBeta");
     }
 }
diff --git a/pages/pageslaveswitch.cpp b/pages/pageslaveswitch.cpp
@@ -43,9 +43,12 @@ void PageSlaveSwitch::setDieBieMS(BMSInterface *dieBieMS) {
     mDieBieMS = dieBieMS;
 
     if (mDieBieMS) {
+        ui->switchTab->addRowSeparator(tr("Main output switch"));
         ui->switchTab->addParamRow(mDieBieMS->bmsConfig(), "HCUseRelay");
         ui->switchTab->addParamRow(mDieBieMS->bmsConfig(), "HCUsePrecharge");
+        ui->switchTab->addParamRow(mDieBieMS->bmsConfig(), "HCUseLoadDetect");
         ui->switchTab->addParamRow(mDieBieMS->bmsConfig(), "togglePowerModeDirectHCDelay");
+        ui->switchTab->addParamRow(mDieBieMS->bmsConfig(), "HCLoadDetectThreshold");
         ui->switchTab->addParamRow(mDieBieMS->bmsConfig(), "timeoutHCPreCharge");
         ui->switchTab->addParamRow(mDieBieMS->bmsConfig(), "timeoutHCPreChargeRetryInterval");
         ui->switchTab->addParamRow(mDieBieMS->bmsConfig(), "timeoutHCRelayOverlap");