Mercurial > public > ostc4
changeset 1039:f8e2895c91e5 GasConsumption
Reorder the 'SYS' menus so that they follow 'features / hardware / display' which should be less confusing for users.
Also fix a bug with a non-implemented menu entry in the 'SYS1' menu on OSTC 4 (mikeller)
| author | heinrichsweikamp |
|---|---|
| date | Mon, 13 Oct 2025 15:44:12 +0200 |
| parents | 677d293c669f |
| children | 74be24428049 |
| files | Discovery/Inc/tStructure.h Discovery/Src/tMenu.c Discovery/Src/tMenuHardware.c |
| diffstat | 3 files changed, 115 insertions(+), 117 deletions(-) [+] |
line wrap: on
line diff
--- a/Discovery/Inc/tStructure.h Tue Sep 16 20:13:43 2025 +0200 +++ b/Discovery/Inc/tStructure.h Mon Oct 13 15:44:12 2025 +0200 @@ -301,149 +301,147 @@ //#define StMHARD6_UpdateCPU2_Now _MB(2,7,6,3,0) /* PAGE 8 */ -#define StMSYS _MB(2,8,0,0,0) +#define StMOption _MB(2,8,0,0,0) +#define StMOption_Compass _MB(2,8,1,0,0) +#define StMOption_Compass_SetCourse _MB(2,8,1,1,0) +#define StMOption_Compass_ResetCourse _MB(2,8,1,2,0) +#define StMOption_Compass_Calibrate _MB(2,8,1,3,0) +#define StMOption_Compass_Inertia _MB(2,8,1,4,0) +#define StMOption_Compass_Declination _MB(2,8,1,5,0) + +#define StMOption_Timer _MB(2,8,2,0,0) +#define StMOption_Timer_Value _MB(2,8,2,1,0) + +#define StMOption_Heartbeat _MB(2,8,3,0,0) -/* PAGE 8 EDIT FIELD CONTENT */ -#define StMSYS1_DateTime _MB(2,8,1,0,0) -#define StMSYS1_Date _MB(2,8,1,1,0) -#define StMSYS1_Time _MB(2,8,1,2,0) -#define StMSYS1_FORMAT _MB(2,8,1,3,0) -#define StMSYS1_DDMMYY _MB(2,8,1,3,1) -#define StMSYS1_MMDDYY _MB(2,8,1,3,2) -#define StMSYS1_YYMMDD _MB(2,8,1,3,3) -#define StMSYS1_12HR _MB(2,8,1,4,0) -#define StMSYS1_GNSSDT _MB(2,8,1,5,0) -#define StMSYS1_ZONE _MB(2,8,1,6,0) +/* PAGE 9 */ +#define StMSYS _MB(2,9,0,0,0) + +/* PAGE 9 EDIT FIELD CONTENT */ +#define StMSYS1_DateTime _MB(2,9,1,0,0) +#define StMSYS1_Date _MB(2,9,1,1,0) +#define StMSYS1_Time _MB(2,9,1,2,0) +#define StMSYS1_FORMAT _MB(2,9,1,3,0) +#define StMSYS1_DDMMYY _MB(2,9,1,3,1) +#define StMSYS1_MMDDYY _MB(2,9,1,3,2) +#define StMSYS1_YYMMDD _MB(2,9,1,3,3) +#define StMSYS1_12HR _MB(2,9,1,4,0) +#define StMSYS1_GNSSDT _MB(2,9,1,5,0) +#define StMSYS1_ZONE _MB(2,9,1,6,0) #ifdef ENABLE_SETTING_PROFILES -#define StMSYS_Profile _MB(2,8,2,0,0) -#define StMSYS_ProfileA _MB(2,8,2,1,0) -#define StMSYS_ProfileB _MB(2,8,2,2,0) -#define StMSYS_ProfileC _MB(2,8,2,3,0) -#define StMSYS_ProfileD _MB(2,8,2,4,0) +#define StMSYS_Profile _MB(2,9,2,0,0) +#define StMSYS_ProfileA _MB(2,9,2,1,0) +#define StMSYS_ProfileB _MB(2,9,2,2,0) +#define StMSYS_ProfileC _MB(2,9,2,3,0) +#define StMSYS_ProfileD _MB(2,9,2,4,0) -#define StMSYS2_English _MB(2,8,3,1,0) -#define StMSYS2_German _MB(2,8,3,2,0) -#define StMSYS2_French _MB(2,8,3,3,0) -#define StMSYS2_Italian _MB(2,8,3,4,0) -#define StMSYS2_Espanol _MB(2,8,3,5,0) +#define StMSYS2_English _MB(2,9,3,1,0) +#define StMSYS2_German _MB(2,9,3,2,0) +#define StMSYS2_French _MB(2,9,3,3,0) +#define StMSYS2_Italian _MB(2,9,3,4,0) +#define StMSYS2_Espanol _MB(2,9,3,5,0) -#define StMSYS3_Units _MB(2,8,4,1,0) -#define StMSYS3_Colors _MB(2,8,4,2,0) +#define StMSYS3_Units _MB(2,9,4,1,0) +#define StMSYS3_Colors _MB(2,9,4,2,0) #ifdef HAVE_DEBUG_VIEW -#define StMSYS3_Debug _MB(2,8,4,3,0) +#define StMSYS3_Debug _MB(2,9,4,3,0) #endif -#define StMSYS4_Info _MB(2,8,5,1,0) +#define StMSYS4_Info _MB(2,9,5,1,0) -#define StMSYS5_Exit _MB(2,8,6,1,0) -#define StMSYS5_LogbookOffset _MB(2,8,6,7,0) -#define StMSYS5_ResetAll _MB(2,8,6,2,0) -#define StMSYS5_ResetDeco _MB(2,8,6,3,0) -#define StMSYS5_Reboot _MB(2,8,6,4,0) -#define StMSYS5_Maintenance _MB(2,8,6,5,0) -#define StMSYS5_ResetLogbook _MB(2,8,6,6,0) -#define StMSYS5_SetBattCharge _MB(2,8,6,7,0) -#define StMSYS5_RebootRTE _MB(2,8,6,8,0) -#define StMSYS5_RebootMainCPU _MB(2,8,6,9,0) -#define StMSYS5_ScreenTest _MB(2,8,6,10,0) -#define StMSYS5_SetFactoryBC _MB(2,8,6,11,0) -#define StMSYS5_ResetBluetooth _MB(2,8,6,12,0) -#define StMSYS5_SetSampleIndx _MB(2,8,6,13,0) -#define StMSYS5_AdjustSurfPres _MB(2,8,6,14,0) -#define StMSYS5_FlashBoot _MB(2,8,6,15,0) +#define StMSYS5_Exit _MB(2,9,6,1,0) +#define StMSYS5_LogbookOffset _MB(2,9,6,7,0) +#define StMSYS5_ResetAll _MB(2,9,6,2,0) +#define StMSYS5_ResetDeco _MB(2,9,6,3,0) +#define StMSYS5_Reboot _MB(2,9,6,4,0) +#define StMSYS5_Maintenance _MB(2,9,6,5,0) +#define StMSYS5_ResetLogbook _MB(2,9,6,6,0) +#define StMSYS5_SetBattCharge _MB(2,9,6,7,0) +#define StMSYS5_RebootRTE _MB(2,9,6,8,0) +#define StMSYS5_RebootMainCPU _MB(2,9,6,9,0) +#define StMSYS5_ScreenTest _MB(2,9,6,10,0) +#define StMSYS5_SetFactoryBC _MB(2,9,6,11,0) +#define StMSYS5_ResetBluetooth _MB(2,9,6,12,0) +#define StMSYS5_SetSampleIndx _MB(2,9,6,13,0) +#define StMSYS5_AdjustSurfPres _MB(2,9,6,14,0) +#define StMSYS5_FlashBoot _MB(2,9,6,15,0) #else -#define StMSYS2_English _MB(2,8,2,1,0) -#define StMSYS2_German _MB(2,8,2,2,0) -#define StMSYS2_French _MB(2,8,2,3,0) -#define StMSYS2_Italian _MB(2,8,2,4,0) -#define StMSYS2_Espanol _MB(2,8,2,5,0) +#define StMSYS2_English _MB(2,9,2,1,0) +#define StMSYS2_German _MB(2,9,2,2,0) +#define StMSYS2_French _MB(2,9,2,3,0) +#define StMSYS2_Italian _MB(2,9,2,4,0) +#define StMSYS2_Espanol _MB(2,9,2,5,0) -#define StMSYS3_Units _MB(2,8,3,1,0) -#define StMSYS3_Colors _MB(2,8,3,2,0) +#define StMSYS3_Units _MB(2,9,3,1,0) +#define StMSYS3_Colors _MB(2,9,3,2,0) #ifdef HAVE_DEBUG_VIEW -#define StMSYS3_Debug _MB(2,8,3,3,0) +#define StMSYS3_Debug _MB(2,9,3,3,0) #endif -#define StMSYS4_Info _MB(2,8,4,1,0) +#define StMSYS4_Info _MB(2,9,4,1,0) -#define StMSYS5_Exit _MB(2,8,5,1,0) -#define StMSYS5_LogbookOffset _MB(2,8,5,7,0) -#define StMSYS5_ResetAll _MB(2,8,5,2,0) -#define StMSYS5_ResetDeco _MB(2,8,5,3,0) -#define StMSYS5_Reboot _MB(2,8,5,4,0) -#define StMSYS5_Maintenance _MB(2,8,5,5,0) -#define StMSYS5_ResetLogbook _MB(2,8,5,6,0) -#define StMSYS5_SetBattCharge _MB(2,8,5,7,0) -#define StMSYS5_RebootRTE _MB(2,8,5,8,0) -#define StMSYS5_RebootMainCPU _MB(2,8,5,9,0) -#define StMSYS5_ScreenTest _MB(2,8,5,10,0) -#define StMSYS5_SetFactoryBC _MB(2,8,5,11,0) -#define StMSYS5_ResetBluetooth _MB(2,8,5,12,0) -#define StMSYS5_SetSampleIndx _MB(2,8,5,13,0) -#define StMSYS5_AdjustSurfPres _MB(2,8,5,14,0) -#define StMSYS5_FlashBoot _MB(2,8,5,15,0) +#define StMSYS5_Exit _MB(2,9,5,1,0) +#define StMSYS5_LogbookOffset _MB(2,9,5,7,0) +#define StMSYS5_ResetAll _MB(2,9,5,2,0) +#define StMSYS5_ResetDeco _MB(2,9,5,3,0) +#define StMSYS5_Reboot _MB(2,9,5,4,0) +#define StMSYS5_Maintenance _MB(2,9,5,5,0) +#define StMSYS5_ResetLogbook _MB(2,9,5,6,0) +#define StMSYS5_SetBattCharge _MB(2,9,5,7,0) +#define StMSYS5_RebootRTE _MB(2,9,5,8,0) +#define StMSYS5_RebootMainCPU _MB(2,9,5,9,0) +#define StMSYS5_ScreenTest _MB(2,9,5,10,0) +#define StMSYS5_SetFactoryBC _MB(2,9,5,11,0) +#define StMSYS5_ResetBluetooth _MB(2,9,5,12,0) +#define StMSYS5_SetSampleIndx _MB(2,9,5,13,0) +#define StMSYS5_AdjustSurfPres _MB(2,9,5,14,0) +#define StMSYS5_FlashBoot _MB(2,9,5,15,0) #endif +/* Temporary line markers for dive mode custom view configuration */ +/* These use line numbers 21-26 which don't conflict with actual menu items */ +#define StMSYS_Custom0 _MB(2,9,21,0,0) +#define StMSYS_Custom1 _MB(2,9,22,0,0) +#define StMSYS_Custom2 _MB(2,9,23,0,0) +#define StMSYS_Custom3 _MB(2,9,24,0,0) +#define StMSYS_Custom4 _MB(2,9,25,0,0) +#define StMSYS_Custom5 _MB(2,9,26,0,0) -#define StMSYS_Custom0 _MB(2,8,1,0,0) -#define StMSYS_Custom1 _MB(2,8,2,0,0) -#define StMSYS_Custom2 _MB(2,8,3,0,0) -#define StMSYS_Custom3 _MB(2,8,4,0,0) -#define StMSYS_Custom4 _MB(2,8,5,0,0) -#define StMSYS_Custom5 _MB(2,8,6,0,0) +/* PAGE 10 */ +#define StMCustom _MB(2,10,0,0,0) - /* PAGE 9 */ - - # define StMCustom _MB(2,9,0,0,0) - - /* PAGE 9 EDIT FIELD CONTENT */ + /* PAGE 10 EDIT FIELD CONTENT */ // -#define StMCustom1_CViewTimeout _MB(2,9,1,1,0) -#define StMCustom1_CViewStandard _MB(2,9,1,2,0) -#define StMCustom1_CViewStandardBF _MB(2,9,1,3,0) -#define StMCustom1_CViewAutoFocusBF _MB(2,9,1,4,0) -#define StMCustom1_CornerTimeout _MB(2,9,1,5,0) -#define StMCustom1_CornerStandard _MB(2,9,1,6,0) +#define StMCustom1_CViewTimeout _MB(2,10,1,1,0) +#define StMCustom1_CViewStandard _MB(2,10,1,2,0) +#define StMCustom1_CViewStandardBF _MB(2,10,1,3,0) +#define StMCustom1_CViewAutoFocusBF _MB(2,10,1,4,0) +#define StMCustom1_CornerTimeout _MB(2,10,1,5,0) +#define StMCustom1_CornerStandard _MB(2,10,1,6,0) -#define StMCustom2_BFSelection _MB(2,9,2,1,0) +#define StMCustom2_BFSelection _MB(2,10,2,1,0) -#define StMCustom3_CViewSelection1 _MB(2,9,3,1,0) -#define StMCustom3_CViewSelection2 _MB(2,9,3,2,0) -#define StMCustom3_CViewSelection3 _MB(2,9,3,3,0) -#define StMCustom3_CViewSelection4 _MB(2,9,3,4,0) -#define StMCustom3_CViewSelection5 _MB(2,9,3,5,0) -#define StMCustom3_CViewSelection6 _MB(2,9,3,6,0) +#define StMCustom3_CViewSelection1 _MB(2,10,3,1,0) +#define StMCustom3_CViewSelection2 _MB(2,10,3,2,0) +#define StMCustom3_CViewSelection3 _MB(2,10,3,3,0) +#define StMCustom3_CViewSelection4 _MB(2,10,3,4,0) +#define StMCustom3_CViewSelection5 _MB(2,10,3,5,0) +#define StMCustom3_CViewSelection6 _MB(2,10,3,6,0) -#define StMCustom4_CViewSelection1 _MB(2,9,4,1,0) +#define StMCustom4_CViewSelection1 _MB(2,10,4,1,0) #ifdef ENABLE_MOTION_CONTROL -#define StMCustom5_CViewPortCalib _MB(2,9,5,1,0) -#define StMCustom5_CViewPortSpotSize _MB(2,9,5,2,0) -#define StMCustom5_CViewPortLayout _MB(2,9,5,3,0) -#define StMCustom5_CViewPortAmbient _MB(2,9,5,4,0) -#define StMCustom5_CViewPortControl _MB(2,9,5,5,0) +#define StMCustom5_CViewPortCalib _MB(2,10,5,1,0) +#define StMCustom5_CViewPortSpotSize _MB(2,10,5,2,0) +#define StMCustom5_CViewPortLayout _MB(2,10,5,3,0) +#define StMCustom5_CViewPortAmbient _MB(2,10,5,4,0) +#define StMCustom5_CViewPortControl _MB(2,10,5,5,0) #endif - - -/* Page 10 */ -#define StMOption _MB(2,10,0,0,0) -#define StMOption_Compass _MB(2,10,1,0,0) -#define StMOption_Compass_SetCourse _MB(2,10,1,1,0) -#define StMOption_Compass_ResetCourse _MB(2,10,1,2,0) -#define StMOption_Compass_Calibrate _MB(2,10,1,3,0) -#define StMOption_Compass_Inertia _MB(2,10,1,4,0) -#define StMOption_Compass_Declination _MB(2,10,1,5,0) - -#define StMOption_Timer _MB(2,10,2,0,0) -#define StMOption_Timer_Value _MB(2,10,2,1,0) - -#define StMOption_Heartbeat _MB(2,10,3,0,0) - /* PAGE 11 */ #define StMPLAN _MB(2,11,0,0,0)
--- a/Discovery/Src/tMenu.c Tue Sep 16 20:13:43 2025 +0200 +++ b/Discovery/Src/tMenu.c Mon Oct 13 15:44:12 2025 +0200 @@ -578,17 +578,17 @@ */ - tM_add(StMSYS); //now in both modes if(actual_menu_content == MENU_SURFACE) { tM_add(StMDECO); tM_add(StMHARD); + tM_add(StMOption); + tM_add(StMSYS); tM_add(StMCustom); - tM_add(StMOption); -// tM_add(StMSYS); now in both modes } else { + tM_add(StMSYS); //now in both modes (dive mode) tM_add(StMXTRA); } if(actual_menu_content == MENU_SURFACE)
--- a/Discovery/Src/tMenuHardware.c Tue Sep 16 20:13:43 2025 +0200 +++ b/Discovery/Src/tMenuHardware.c Mon Oct 13 15:44:12 2025 +0200 @@ -152,8 +152,8 @@ text[textPointer++] = '\005'; else text[textPointer++] = '\006'; + nextline(text,&textPointer); } - nextline(text,&textPointer); return StMHARD; }