#111

eez-open · Nov 6, 2020 · 0e7a59e · 0e7a59e
1 parent 847cc01
commit 0e7a59e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/src/eez/modules/bp3c/comm.cpp b/src/eez/modules/bp3c/comm.cpp
@@ -60,6 +60,7 @@ bool masterSynchro(int slotIndex) {
             uint32_t startIrq = millis();
             while (true) {
                 if (HAL_GPIO_ReadPin(spi::IRQ_GPIO_Port[slotIndex], spi::IRQ_Pin[slotIndex]) == GPIO_PIN_SET) {
+                    slot.firmwareVersionAcquired = true;
                     slot.firmwareMajorVersion = rxBuffer[1];
                     slot.firmwareMinorVersion = rxBuffer[2];
                     slot.idw0 = (rxBuffer[3] << 24) | (rxBuffer[4] << 16) | (rxBuffer[5] << 8) | rxBuffer[6];
@@ -81,6 +82,7 @@ bool masterSynchro(int slotIndex) {
 
         int32_t diff = millis() - start;
         if (diff > CONF_MASTER_SYNC_TIMEOUT_MS) {
+            slot.firmwareVersionAcquired = true;
             slot.firmwareMajorVersion = 0;
             slot.firmwareMinorVersion = 0;
             slot.idw0 = 0;
@@ -94,6 +96,7 @@ bool masterSynchro(int slotIndex) {
 #endif
 
 #if defined(EEZ_PLATFORM_SIMULATOR)
+    slot.firmwareVersionAcquired = true;
     slot.firmwareMajorVersion = 1;
     slot.firmwareMinorVersion = 0;
     slot.idw0 = 0;
@@ -124,6 +127,7 @@ bool masterSynchroV2(int slotIndex) {
                 break;
             }
 
+            slot.firmwareVersionAcquired = true;
             slot.firmwareMajorVersion = rxBuffer[1];
             slot.firmwareMinorVersion = rxBuffer[2];
             slot.idw0 = (rxBuffer[3] << 24) | (rxBuffer[4] << 16) | (rxBuffer[5] << 8) | rxBuffer[6];
@@ -140,6 +144,7 @@ bool masterSynchroV2(int slotIndex) {
         osDelay(1);
     }
 
+    slot.firmwareVersionAcquired = true;
     slot.firmwareMajorVersion = 0;
     slot.firmwareMinorVersion = 0;
     slot.idw0 = 0;
@@ -149,6 +154,7 @@ bool masterSynchroV2(int slotIndex) {
 #endif
 
 #if defined(EEZ_PLATFORM_SIMULATOR)
+    slot.firmwareVersionAcquired = true;
     slot.firmwareMajorVersion = 1;
     slot.firmwareMinorVersion = 0;
     slot.idw0 = 0;

diff --git a/src/eez/modules/dib-dcp405/dib-dcp405.cpp b/src/eez/modules/dib-dcp405/dib-dcp405.cpp
@@ -917,6 +917,8 @@ struct DcpModule : public PsuModule {
         spiCrcCalculationEnable = false;
         numPowerChannels = 1;
         numOtherChannels = 0;		
+
+		firmareBasedModule = false;
     }
 
 	void boot() override {

diff --git a/src/eez/modules/psu/gui/psu.cpp b/src/eez/modules/psu/gui/psu.cpp
@@ -1444,7 +1444,7 @@ Image g_customLogo;
 
 void loadCustomLogo() {
     static const uint32_t CONF_MAX_LOGO_WIDTH = 480;
-    static const uint32_t CONF_MAX_LOGO_HEIGHT = 120;
+    static const uint32_t CONF_MAX_LOGO_HEIGHT = 136;
 
 #ifdef EEZ_PLATFORM_STM32
     static bool loaded;