Updated all binaries to the latest firmware 0.27 . This now allows fo…

…r better BMS testing.
DieBieEngineering · Mar 29, 2019 · 5bc8a41 · 5bc8a41
1 parent f987769
commit 5bc8a41
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 8 deletions.
diff --git a/DieBieMSTool.pro b/DieBieMSTool.pro
@@ -5,7 +5,7 @@
 #-------------------------------------------------
 
 # Version
-DT_VERSION = 0.26
+DT_VERSION = 0.27
 
 DEFINES += DT_VERSION=$$DT_VERSION
 

diff --git a/pages/pagemastergeneral.cpp b/pages/pagemastergeneral.cpp
@@ -54,8 +54,6 @@ void PageMasterGeneral::setDieBieMS(BMSInterface *dieBieMS)
         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");

diff --git a/pages/pagemasterswitch.cpp b/pages/pagemasterswitch.cpp
@@ -45,14 +45,14 @@ void PageMasterSwitch::setDieBieMS(BMSInterface *dieBieMS)
     mDieBieMS = dieBieMS;
 
     if (mDieBieMS) {
-        ui->dischargeTab->addRowSeparator(tr("-"));
+        ui->dischargeTab->addRowSeparator(tr("Low current output switch"));
         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->chargeTab->addRowSeparator(tr("-"));
+        ui->chargeTab->addRowSeparator(tr("General charger switch"));
         ui->chargeTab->addParamRow(mDieBieMS->bmsConfig(), "chargerEnabledThreshold");
         ui->chargeTab->addParamRow(mDieBieMS->bmsConfig(), "timeoutChargerDisconnected");
         ui->chargeTab->addParamRow(mDieBieMS->bmsConfig(), "allowChargingDuringDischarge");

diff --git a/pages/pageslaveswitch.cpp b/pages/pageslaveswitch.cpp
@@ -43,7 +43,7 @@ void PageSlaveSwitch::setDieBieMS(BMSInterface *dieBieMS) {
     mDieBieMS = dieBieMS;
 
     if (mDieBieMS) {
-        ui->switchTab->addRowSeparator(tr("Main output switch"));
+        ui->switchTab->addRowSeparator(tr("High current output switch"));
         ui->switchTab->addParamRow(mDieBieMS->bmsConfig(), "HCUseRelay");
         ui->switchTab->addParamRow(mDieBieMS->bmsConfig(), "togglePowerModeDirectHCDelay");
         ui->switchTab->addParamRow(mDieBieMS->bmsConfig(), "HCUsePrecharge");
@@ -52,5 +52,8 @@ void PageSlaveSwitch::setDieBieMS(BMSInterface *dieBieMS) {
         ui->switchTab->addParamRow(mDieBieMS->bmsConfig(), "timeoutHCRelayOverlap");
         ui->switchTab->addParamRow(mDieBieMS->bmsConfig(), "HCUseLoadDetect");
         ui->switchTab->addParamRow(mDieBieMS->bmsConfig(), "HCLoadDetectThreshold");
+        ui->switchTab->addRowSeparator(tr("DCDC Converter"));
+        ui->switchTab->addParamRow(mDieBieMS->bmsConfig(), "DCDCEnableInverted");
+        ui->switchTab->addParamRow(mDieBieMS->bmsConfig(), "DCDCTargetVoltage");
     }
 }
diff --git a/res/config.xml b/res/config.xml
@@ -1436,7 +1436,7 @@ p, li { white-space: pre-wrap; }
             <enumNames>Normal operation</enumNames>
         </chargeEnableState>
         <DCDCEnableInverted>
-            <longName>Invert DCDC Enable signal</longName>
+            <longName>Invert Enable signal</longName>
             <type>5</type>
             <transmittable>1</transmittable>
             <description>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
@@ -1447,6 +1447,28 @@ p, li { white-space: pre-wrap; }
             <cDefine>CHARGE_ENA_OP_STATE</cDefine>
             <valInt>1</valInt>
         </DCDCEnableInverted>
+        <DCDCTargetVoltage>
+            <longName>Target voltage</longName>
+            <type>1</type>
+            <transmittable>1</transmittable>
+            <description>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'DejaVu Sans'; ; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;The BMS will check whether the DCDC output voltage is within 10% of the voltage specified here, if it is OK it will start controlling the loads on the output of it, like the Relay and FANs.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</description>
+            <cDefine>CHARGE_ENA_OP_STATE</cDefine>
+            <editorDecimalsDouble>0</editorDecimalsDouble>
+            <editorScale>1</editorScale>
+            <editAsPercentage>0</editAsPercentage>
+            <maxDouble>100</maxDouble>
+            <minDouble>0</minDouble>
+            <showDisplay>0</showDisplay>
+            <stepDouble>1</stepDouble>
+            <valDouble>12</valDouble>
+            <vTxDoubleScale>1</vTxDoubleScale>
+            <suffix>V</suffix>
+            <vTx>9</vTx>
+        </DCDCTargetVoltage>
         <pulseToggleButton>
             <longName>Pulse or toggle power button</longName>
             <type>4</type>

diff --git a/res/firmwares/DieBieMS/DieBieMS_default.bin b/res/firmwares/DieBieMS/DieBieMS_default.bin
diff --git a/res/firmwares/EFoilBMSHW1/DieBieMS_default.bin b/res/firmwares/EFoilBMSHW1/DieBieMS_default.bin
diff --git a/res/firmwares/EFoilBMSHW2/DieBieMS_default.bin b/res/firmwares/EFoilBMSHW2/DieBieMS_default.bin
diff --git a/res/info.xml b/res/info.xml
@@ -11,9 +11,10 @@ p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'DejaVu Sans'; ; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu';&quot;&gt;The firmware version(s) that this version of DieBieMS Tool supports.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</description>
             <cDefine></cDefine>
-            <valInt>0</valInt>
+            <valInt>2</valInt>
             <enumNames>0.25</enumNames>
             <enumNames>0.26</enumNames>
+            <enumNames>0.27</enumNames>
         </fw_version>
         <help_can_forward>
             <longName>CAN Forwarding</longName>