fixed calibration for MIO and wrong thread 6 on calibration start

eez-open · Apr 27, 2021 · 5f0d22b · 5f0d22b
1 parent 2c0e354
commit 5f0d22b
Show file tree

Hide file tree

Showing 17 changed files with 56,898 additions and 56,791 deletions.
diff --git a/modular-psu-firmware.eez-project b/modular-psu-firmware.eez-project
@@ -50939,6 +50939,42 @@
             "size": 19,
             "encoding": 177
           }
+        },
+        {
+          "encoding": 194,
+          "x": 0,
+          "y": 0,
+          "width": 32,
+          "height": 23,
+          "dx": 32,
+          "glyphBitmap": {
+            "width": 32,
+            "height": 23,
+            "pixelArray": "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002188130000000000000000000000000000000000000000000000000000000040a9a42b0000000000000000000000000000000000000000000000000000045eaf8f1900000000000000000000000000000000000000000000000000001488af720800000000000000000000000000000000000000000000000000002ca0ad5300000000000000000000000000000000000000000000000000000046ad9d2800000000000000000000000000000000000000000000000000000876af851000000000000000000000000000000000000000000000000000001b92af6503000000000000000000000000000000000000000000000000000037a6a73b00000000000000000000000000000000000000000000044f86895961af951e00000000000000000020758f76230000000000000000006eab8b86abac740800000000000000000023a69f7c9fa726000000002929293fac60000050ab2f00000000000000000000799d1200109c8829292918afafafafae27000017ab4b00000000000000000000967600000080afafafaf643d3d3d53ac54000044ab33000000000000000000007f980a000a99913d3d3d22000000007aaa7975a88804000000000000000000002daa966c94aa3000000000000000000861979b690b0000000000000000000000003186a28732000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+          },
+          "source": {
+            "filePath": "fonts\\OpenSans-SemiBold.ttf",
+            "size": 19,
+            "encoding": 177
+          }
+        },
+        {
+          "encoding": 195,
+          "x": 0,
+          "y": -2,
+          "width": 32,
+          "height": 23,
+          "dx": 32,
+          "glyphBitmap": {
+            "width": 32,
+            "height": 23,
+            "pixelArray": "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000133a658877000000000000000000000000020e00000000000000011c3f6286a8afafaf9c69000000000000000000000151a6af9c36001336597ca3afafaf9f7c595b9eafa65001000000000000000045af896098afa6afafafa07c593510000023ad97608aaf45000000002929293f918f020010ac9d5b3714000000000000006ca7100002909029292918afafafafa8690000008e8300000000000000000000838e00000069a8afafaf643d3d3d538b980a001cab650000000000000000000066ab1c000a998a3d3d3d220000000035af9b78a6a8170000000000000000000018a8a5789caf34000000000000000000388ea683220000000000000000000000002284a68e3700000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+          },
+          "source": {
+            "filePath": "fonts\\OpenSans-SemiBold.ttf",
+            "size": 19,
+            "encoding": 177
+          }
         }
       ]
     },

diff --git a/src/eez/action_impl.cpp b/src/eez/action_impl.cpp
@@ -410,9 +410,12 @@ void action_ch_settings_copy() {
 
 void action_ch_settings_calibration_toggle_enable() {
     if (g_channel) {
-        g_channel->calibrationEnable(!g_channel->isCalibrationEnabled());
+        channel_dispatcher::calibrationEnable(*g_channel, !g_channel->isCalibrationEnabled());
     } else {
-        bool enable = !g_slots[hmi::g_selectedSlotIndex]->isVoltageCalibrationEnabled(hmi::g_selectedSubchannelIndex);
+        bool enable = !(
+            g_slots[hmi::g_selectedSlotIndex]->isVoltageCalibrationEnabled(hmi::g_selectedSubchannelIndex) || 
+            g_slots[hmi::g_selectedSlotIndex]->isCurrentCalibrationEnabled(hmi::g_selectedSubchannelIndex)
+        );
         g_slots[hmi::g_selectedSlotIndex]->enableVoltageCalibration(hmi::g_selectedSubchannelIndex, enable);
         g_slots[hmi::g_selectedSlotIndex]->enableCurrentCalibration(hmi::g_selectedSubchannelIndex, enable);
     }