mio168 channels calibration

Author: mvladic

CMakeLists.txt

@@ -196,6 +196,7 @@ source_group("eez\\modules\\psu" FILES ${src_eez_modules_psu} ${header_eez_modul
 
 set(src_eez_modules_psu_gui
     src/eez/modules/psu/gui/animations.cpp
+    src/eez/modules/psu/gui/channel_calibration.cpp
     src/eez/modules/psu/gui/data.cpp
     src/eez/modules/psu/gui/edit_mode.cpp
     src/eez/modules/psu/gui/file_manager.cpp
@@ -212,6 +213,7 @@ set(src_eez_modules_psu_gui
 list (APPEND src_files ${src_eez_modules_psu_gui})
 set(header_eez_modules_psu_gui
     src/eez/modules/psu/gui/animations.h
+    src/eez/modules/psu/gui/channel_calibration.h
     src/eez/modules/psu/gui/data.h
     src/eez/modules/psu/gui/edit_mode.h
     src/eez/modules/psu/gui/file_manager.h

modular-psu-firmware.eez-project

@@ -15622,7 +15622,7 @@
               {
                 "type": "DisplayData",
                 "style": {
-                  "inheritFrom": "encoder_cursor_17_enabled"
+                  "inheritFrom": "edit_value_M_centered"
                 },
                 "data": "calibration_point_set_value",
                 "action": "",
@@ -15647,7 +15647,7 @@
               {
                 "type": "DisplayData",
                 "style": {
-                  "inheritFrom": "encoder_cursor_17_enabled"
+                  "inheritFrom": "edit_value_M_centered"
                 },
                 "data": "calibration_point_measured_value",
                 "action": "",

src/eez/action_impl.cpp

@@ -373,10 +373,6 @@ void action_show_ch_settings_info() {
     pushPage(PAGE_ID_CH_SETTINGS_INFO);
 }
 
-void action_show_ch_settings_cal() {
-    pushPage(PAGE_ID_CH_SETTINGS_CALIBRATION);
-}
-
 void action_edit_calibration_password() {
     editCalibrationPassword();
 }
@@ -405,10 +401,6 @@ void action_ch_settings_copy() {
     pushSelectFromEnumPage(channelsEnumDefinition, -1, nullptr, onChannelCopyDestinationSelected, false, false);
 }
 
-void action_ch_settings_calibration_start_calibration() {
-    ChSettingsCalibrationEditPage::start();
-}
-
 void action_ch_settings_calibration_toggle_enable() {
     if (g_channel) {
         g_channel->calibrationEnable(!g_channel->isCalibrationEnabled());
@@ -419,72 +411,6 @@ void action_ch_settings_calibration_toggle_enable() {
     }
 }
 
-void action_ch_settings_calibration_view_points() {
-    ChSettingsCalibrationViewPage::start();
-}
-
-void onSetChannelCalibrationValueType(uint16_t value) {
-    popPage();
-    
-    auto editPage = (ChSettingsCalibrationEditPage *)getPage(PAGE_ID_CH_SETTINGS_CALIBRATION_EDIT);
-    if (editPage) {
-        editPage->setCalibrationValueType((CalibrationValueType)value);
-    } else {
-        auto viewPage = (ChSettingsCalibrationViewPage *)getPage(PAGE_ID_CH_SETTINGS_CALIBRATION_VIEW);
-        if (viewPage) {
-            viewPage->setCalibrationValueType((CalibrationValueType)value);
-        }
-    }
-}
-
-void action_select_channel_calibration_value_type() {
-    if (calibration::hasSupportForCurrentDualRange()) {
-        pushSelectFromEnumPage(ENUM_DEFINITION_CALIBRATION_VALUE_TYPE_DUAL_RANGE, calibration::getCalibrationValueType(), nullptr, onSetChannelCalibrationValueType);
-    } else {
-        pushSelectFromEnumPage(ENUM_DEFINITION_CALIBRATION_VALUE_TYPE, calibration::getCalibrationValueType(), nullptr, onSetChannelCalibrationValueType);
-    }
-}
-
-void action_channel_calibration_point_previous() {
-    auto editPage = (ChSettingsCalibrationEditPage *)getPage(PAGE_ID_CH_SETTINGS_CALIBRATION_EDIT);
-    if (editPage) {
-        editPage->moveToPreviousPoint();
-    } else {
-        auto viewPage = (ChSettingsCalibrationViewPage *)getPage(PAGE_ID_CH_SETTINGS_CALIBRATION_VIEW);
-        viewPage->moveToPreviousPoint();
-    }        
-}
-
-void action_channel_calibration_point_next() {
-    auto editPage = (ChSettingsCalibrationEditPage *)getPage(PAGE_ID_CH_SETTINGS_CALIBRATION_EDIT);
-    if (editPage) {
-        editPage->moveToNextPoint();
-    } else {
-        auto viewPage = (ChSettingsCalibrationViewPage *)getPage(PAGE_ID_CH_SETTINGS_CALIBRATION_VIEW);
-        viewPage->moveToNextPoint();
-    }        
-}
-
-void action_channel_calibration_point_save() {
-    auto page = (ChSettingsCalibrationEditPage *)getPage(PAGE_ID_CH_SETTINGS_CALIBRATION_EDIT);
-    page->savePoint();
-}
-
-void action_channel_calibration_point_delete() {
-    auto page = (ChSettingsCalibrationEditPage *)getPage(PAGE_ID_CH_SETTINGS_CALIBRATION_EDIT);
-    page->deletePoint();
-}
-
-void action_channel_calibration_chart_zoom() {
-    auto editPage = (ChSettingsCalibrationEditPage *)getPage(PAGE_ID_CH_SETTINGS_CALIBRATION_EDIT);
-    if (editPage) {
-        editPage->zoomChart();
-    } else {
-        auto viewPage = (ChSettingsCalibrationViewPage *)getPage(PAGE_ID_CH_SETTINGS_CALIBRATION_VIEW);
-        viewPage->zoomChart();
-    }
-}
-
 void action_ch_settings_prot_clear() {
     ChSettingsProtectionPage::clear();
 }