Mercurial > public > ostc4
comparison Discovery/Inc/tStructure.h @ 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 | 2af07aa38531 |
| children |
comparison
equal
deleted
inserted
replaced
| 1038:677d293c669f | 1039:f8e2895c91e5 |
|---|---|
| 299 //#define StMHARD6_UpdateCPU2_No _MB(2,7,6,1,0) | 299 //#define StMHARD6_UpdateCPU2_No _MB(2,7,6,1,0) |
| 300 //#define StMHARD6_UpdateCPU2_Yes _MB(2,7,6,2,0) | 300 //#define StMHARD6_UpdateCPU2_Yes _MB(2,7,6,2,0) |
| 301 //#define StMHARD6_UpdateCPU2_Now _MB(2,7,6,3,0) | 301 //#define StMHARD6_UpdateCPU2_Now _MB(2,7,6,3,0) |
| 302 | 302 |
| 303 /* PAGE 8 */ | 303 /* PAGE 8 */ |
| 304 #define StMSYS _MB(2,8,0,0,0) | 304 #define StMOption _MB(2,8,0,0,0) |
| 305 | 305 #define StMOption_Compass _MB(2,8,1,0,0) |
| 306 /* PAGE 8 EDIT FIELD CONTENT */ | 306 #define StMOption_Compass_SetCourse _MB(2,8,1,1,0) |
| 307 #define StMSYS1_DateTime _MB(2,8,1,0,0) | 307 #define StMOption_Compass_ResetCourse _MB(2,8,1,2,0) |
| 308 #define StMSYS1_Date _MB(2,8,1,1,0) | 308 #define StMOption_Compass_Calibrate _MB(2,8,1,3,0) |
| 309 #define StMSYS1_Time _MB(2,8,1,2,0) | 309 #define StMOption_Compass_Inertia _MB(2,8,1,4,0) |
| 310 #define StMSYS1_FORMAT _MB(2,8,1,3,0) | 310 #define StMOption_Compass_Declination _MB(2,8,1,5,0) |
| 311 #define StMSYS1_DDMMYY _MB(2,8,1,3,1) | 311 |
| 312 #define StMSYS1_MMDDYY _MB(2,8,1,3,2) | 312 #define StMOption_Timer _MB(2,8,2,0,0) |
| 313 #define StMSYS1_YYMMDD _MB(2,8,1,3,3) | 313 #define StMOption_Timer_Value _MB(2,8,2,1,0) |
| 314 #define StMSYS1_12HR _MB(2,8,1,4,0) | 314 |
| 315 #define StMSYS1_GNSSDT _MB(2,8,1,5,0) | 315 #define StMOption_Heartbeat _MB(2,8,3,0,0) |
| 316 #define StMSYS1_ZONE _MB(2,8,1,6,0) | 316 |
| 317 /* PAGE 9 */ | |
| 318 #define StMSYS _MB(2,9,0,0,0) | |
| 319 | |
| 320 /* PAGE 9 EDIT FIELD CONTENT */ | |
| 321 #define StMSYS1_DateTime _MB(2,9,1,0,0) | |
| 322 #define StMSYS1_Date _MB(2,9,1,1,0) | |
| 323 #define StMSYS1_Time _MB(2,9,1,2,0) | |
| 324 #define StMSYS1_FORMAT _MB(2,9,1,3,0) | |
| 325 #define StMSYS1_DDMMYY _MB(2,9,1,3,1) | |
| 326 #define StMSYS1_MMDDYY _MB(2,9,1,3,2) | |
| 327 #define StMSYS1_YYMMDD _MB(2,9,1,3,3) | |
| 328 #define StMSYS1_12HR _MB(2,9,1,4,0) | |
| 329 #define StMSYS1_GNSSDT _MB(2,9,1,5,0) | |
| 330 #define StMSYS1_ZONE _MB(2,9,1,6,0) | |
| 317 | 331 |
| 318 #ifdef ENABLE_SETTING_PROFILES | 332 #ifdef ENABLE_SETTING_PROFILES |
| 319 #define StMSYS_Profile _MB(2,8,2,0,0) | 333 #define StMSYS_Profile _MB(2,9,2,0,0) |
| 320 #define StMSYS_ProfileA _MB(2,8,2,1,0) | 334 #define StMSYS_ProfileA _MB(2,9,2,1,0) |
| 321 #define StMSYS_ProfileB _MB(2,8,2,2,0) | 335 #define StMSYS_ProfileB _MB(2,9,2,2,0) |
| 322 #define StMSYS_ProfileC _MB(2,8,2,3,0) | 336 #define StMSYS_ProfileC _MB(2,9,2,3,0) |
| 323 #define StMSYS_ProfileD _MB(2,8,2,4,0) | 337 #define StMSYS_ProfileD _MB(2,9,2,4,0) |
| 324 | 338 |
| 325 #define StMSYS2_English _MB(2,8,3,1,0) | 339 #define StMSYS2_English _MB(2,9,3,1,0) |
| 326 #define StMSYS2_German _MB(2,8,3,2,0) | 340 #define StMSYS2_German _MB(2,9,3,2,0) |
| 327 #define StMSYS2_French _MB(2,8,3,3,0) | 341 #define StMSYS2_French _MB(2,9,3,3,0) |
| 328 #define StMSYS2_Italian _MB(2,8,3,4,0) | 342 #define StMSYS2_Italian _MB(2,9,3,4,0) |
| 329 #define StMSYS2_Espanol _MB(2,8,3,5,0) | 343 #define StMSYS2_Espanol _MB(2,9,3,5,0) |
| 330 | 344 |
| 331 #define StMSYS3_Units _MB(2,8,4,1,0) | 345 #define StMSYS3_Units _MB(2,9,4,1,0) |
| 332 #define StMSYS3_Colors _MB(2,8,4,2,0) | 346 #define StMSYS3_Colors _MB(2,9,4,2,0) |
| 333 #ifdef HAVE_DEBUG_VIEW | 347 #ifdef HAVE_DEBUG_VIEW |
| 334 #define StMSYS3_Debug _MB(2,8,4,3,0) | 348 #define StMSYS3_Debug _MB(2,9,4,3,0) |
| 335 #endif | 349 #endif |
| 336 | 350 |
| 337 #define StMSYS4_Info _MB(2,8,5,1,0) | 351 #define StMSYS4_Info _MB(2,9,5,1,0) |
| 338 | 352 |
| 339 #define StMSYS5_Exit _MB(2,8,6,1,0) | 353 #define StMSYS5_Exit _MB(2,9,6,1,0) |
| 340 #define StMSYS5_LogbookOffset _MB(2,8,6,7,0) | 354 #define StMSYS5_LogbookOffset _MB(2,9,6,7,0) |
| 341 #define StMSYS5_ResetAll _MB(2,8,6,2,0) | 355 #define StMSYS5_ResetAll _MB(2,9,6,2,0) |
| 342 #define StMSYS5_ResetDeco _MB(2,8,6,3,0) | 356 #define StMSYS5_ResetDeco _MB(2,9,6,3,0) |
| 343 #define StMSYS5_Reboot _MB(2,8,6,4,0) | 357 #define StMSYS5_Reboot _MB(2,9,6,4,0) |
| 344 #define StMSYS5_Maintenance _MB(2,8,6,5,0) | 358 #define StMSYS5_Maintenance _MB(2,9,6,5,0) |
| 345 #define StMSYS5_ResetLogbook _MB(2,8,6,6,0) | 359 #define StMSYS5_ResetLogbook _MB(2,9,6,6,0) |
| 346 #define StMSYS5_SetBattCharge _MB(2,8,6,7,0) | 360 #define StMSYS5_SetBattCharge _MB(2,9,6,7,0) |
| 347 #define StMSYS5_RebootRTE _MB(2,8,6,8,0) | 361 #define StMSYS5_RebootRTE _MB(2,9,6,8,0) |
| 348 #define StMSYS5_RebootMainCPU _MB(2,8,6,9,0) | 362 #define StMSYS5_RebootMainCPU _MB(2,9,6,9,0) |
| 349 #define StMSYS5_ScreenTest _MB(2,8,6,10,0) | 363 #define StMSYS5_ScreenTest _MB(2,9,6,10,0) |
| 350 #define StMSYS5_SetFactoryBC _MB(2,8,6,11,0) | 364 #define StMSYS5_SetFactoryBC _MB(2,9,6,11,0) |
| 351 #define StMSYS5_ResetBluetooth _MB(2,8,6,12,0) | 365 #define StMSYS5_ResetBluetooth _MB(2,9,6,12,0) |
| 352 #define StMSYS5_SetSampleIndx _MB(2,8,6,13,0) | 366 #define StMSYS5_SetSampleIndx _MB(2,9,6,13,0) |
| 353 #define StMSYS5_AdjustSurfPres _MB(2,8,6,14,0) | 367 #define StMSYS5_AdjustSurfPres _MB(2,9,6,14,0) |
| 354 #define StMSYS5_FlashBoot _MB(2,8,6,15,0) | 368 #define StMSYS5_FlashBoot _MB(2,9,6,15,0) |
| 355 | 369 |
| 356 #else | 370 #else |
| 357 | 371 |
| 358 #define StMSYS2_English _MB(2,8,2,1,0) | 372 #define StMSYS2_English _MB(2,9,2,1,0) |
| 359 #define StMSYS2_German _MB(2,8,2,2,0) | 373 #define StMSYS2_German _MB(2,9,2,2,0) |
| 360 #define StMSYS2_French _MB(2,8,2,3,0) | 374 #define StMSYS2_French _MB(2,9,2,3,0) |
| 361 #define StMSYS2_Italian _MB(2,8,2,4,0) | 375 #define StMSYS2_Italian _MB(2,9,2,4,0) |
| 362 #define StMSYS2_Espanol _MB(2,8,2,5,0) | 376 #define StMSYS2_Espanol _MB(2,9,2,5,0) |
| 363 | 377 |
| 364 #define StMSYS3_Units _MB(2,8,3,1,0) | 378 #define StMSYS3_Units _MB(2,9,3,1,0) |
| 365 #define StMSYS3_Colors _MB(2,8,3,2,0) | 379 #define StMSYS3_Colors _MB(2,9,3,2,0) |
| 366 #ifdef HAVE_DEBUG_VIEW | 380 #ifdef HAVE_DEBUG_VIEW |
| 367 #define StMSYS3_Debug _MB(2,8,3,3,0) | 381 #define StMSYS3_Debug _MB(2,9,3,3,0) |
| 368 #endif | 382 #endif |
| 369 | 383 |
| 370 #define StMSYS4_Info _MB(2,8,4,1,0) | 384 #define StMSYS4_Info _MB(2,9,4,1,0) |
| 371 | 385 |
| 372 #define StMSYS5_Exit _MB(2,8,5,1,0) | 386 #define StMSYS5_Exit _MB(2,9,5,1,0) |
| 373 #define StMSYS5_LogbookOffset _MB(2,8,5,7,0) | 387 #define StMSYS5_LogbookOffset _MB(2,9,5,7,0) |
| 374 #define StMSYS5_ResetAll _MB(2,8,5,2,0) | 388 #define StMSYS5_ResetAll _MB(2,9,5,2,0) |
| 375 #define StMSYS5_ResetDeco _MB(2,8,5,3,0) | 389 #define StMSYS5_ResetDeco _MB(2,9,5,3,0) |
| 376 #define StMSYS5_Reboot _MB(2,8,5,4,0) | 390 #define StMSYS5_Reboot _MB(2,9,5,4,0) |
| 377 #define StMSYS5_Maintenance _MB(2,8,5,5,0) | 391 #define StMSYS5_Maintenance _MB(2,9,5,5,0) |
| 378 #define StMSYS5_ResetLogbook _MB(2,8,5,6,0) | 392 #define StMSYS5_ResetLogbook _MB(2,9,5,6,0) |
| 379 #define StMSYS5_SetBattCharge _MB(2,8,5,7,0) | 393 #define StMSYS5_SetBattCharge _MB(2,9,5,7,0) |
| 380 #define StMSYS5_RebootRTE _MB(2,8,5,8,0) | 394 #define StMSYS5_RebootRTE _MB(2,9,5,8,0) |
| 381 #define StMSYS5_RebootMainCPU _MB(2,8,5,9,0) | 395 #define StMSYS5_RebootMainCPU _MB(2,9,5,9,0) |
| 382 #define StMSYS5_ScreenTest _MB(2,8,5,10,0) | 396 #define StMSYS5_ScreenTest _MB(2,9,5,10,0) |
| 383 #define StMSYS5_SetFactoryBC _MB(2,8,5,11,0) | 397 #define StMSYS5_SetFactoryBC _MB(2,9,5,11,0) |
| 384 #define StMSYS5_ResetBluetooth _MB(2,8,5,12,0) | 398 #define StMSYS5_ResetBluetooth _MB(2,9,5,12,0) |
| 385 #define StMSYS5_SetSampleIndx _MB(2,8,5,13,0) | 399 #define StMSYS5_SetSampleIndx _MB(2,9,5,13,0) |
| 386 #define StMSYS5_AdjustSurfPres _MB(2,8,5,14,0) | 400 #define StMSYS5_AdjustSurfPres _MB(2,9,5,14,0) |
| 387 #define StMSYS5_FlashBoot _MB(2,8,5,15,0) | 401 #define StMSYS5_FlashBoot _MB(2,9,5,15,0) |
| 388 #endif | 402 #endif |
| 389 | 403 |
| 390 | 404 /* Temporary line markers for dive mode custom view configuration */ |
| 391 #define StMSYS_Custom0 _MB(2,8,1,0,0) | 405 /* These use line numbers 21-26 which don't conflict with actual menu items */ |
| 392 #define StMSYS_Custom1 _MB(2,8,2,0,0) | 406 #define StMSYS_Custom0 _MB(2,9,21,0,0) |
| 393 #define StMSYS_Custom2 _MB(2,8,3,0,0) | 407 #define StMSYS_Custom1 _MB(2,9,22,0,0) |
| 394 #define StMSYS_Custom3 _MB(2,8,4,0,0) | 408 #define StMSYS_Custom2 _MB(2,9,23,0,0) |
| 395 #define StMSYS_Custom4 _MB(2,8,5,0,0) | 409 #define StMSYS_Custom3 _MB(2,9,24,0,0) |
| 396 #define StMSYS_Custom5 _MB(2,8,6,0,0) | 410 #define StMSYS_Custom4 _MB(2,9,25,0,0) |
| 397 | 411 #define StMSYS_Custom5 _MB(2,9,26,0,0) |
| 398 /* PAGE 9 */ | 412 |
| 399 | 413 /* PAGE 10 */ |
| 400 # define StMCustom _MB(2,9,0,0,0) | 414 #define StMCustom _MB(2,10,0,0,0) |
| 401 | 415 |
| 402 /* PAGE 9 EDIT FIELD CONTENT */ | 416 /* PAGE 10 EDIT FIELD CONTENT */ |
| 403 // | 417 // |
| 404 | 418 |
| 405 #define StMCustom1_CViewTimeout _MB(2,9,1,1,0) | 419 #define StMCustom1_CViewTimeout _MB(2,10,1,1,0) |
| 406 #define StMCustom1_CViewStandard _MB(2,9,1,2,0) | 420 #define StMCustom1_CViewStandard _MB(2,10,1,2,0) |
| 407 #define StMCustom1_CViewStandardBF _MB(2,9,1,3,0) | 421 #define StMCustom1_CViewStandardBF _MB(2,10,1,3,0) |
| 408 #define StMCustom1_CViewAutoFocusBF _MB(2,9,1,4,0) | 422 #define StMCustom1_CViewAutoFocusBF _MB(2,10,1,4,0) |
| 409 #define StMCustom1_CornerTimeout _MB(2,9,1,5,0) | 423 #define StMCustom1_CornerTimeout _MB(2,10,1,5,0) |
| 410 #define StMCustom1_CornerStandard _MB(2,9,1,6,0) | 424 #define StMCustom1_CornerStandard _MB(2,10,1,6,0) |
| 411 | 425 |
| 412 #define StMCustom2_BFSelection _MB(2,9,2,1,0) | 426 #define StMCustom2_BFSelection _MB(2,10,2,1,0) |
| 413 | 427 |
| 414 #define StMCustom3_CViewSelection1 _MB(2,9,3,1,0) | 428 #define StMCustom3_CViewSelection1 _MB(2,10,3,1,0) |
| 415 #define StMCustom3_CViewSelection2 _MB(2,9,3,2,0) | 429 #define StMCustom3_CViewSelection2 _MB(2,10,3,2,0) |
| 416 #define StMCustom3_CViewSelection3 _MB(2,9,3,3,0) | 430 #define StMCustom3_CViewSelection3 _MB(2,10,3,3,0) |
| 417 #define StMCustom3_CViewSelection4 _MB(2,9,3,4,0) | 431 #define StMCustom3_CViewSelection4 _MB(2,10,3,4,0) |
| 418 #define StMCustom3_CViewSelection5 _MB(2,9,3,5,0) | 432 #define StMCustom3_CViewSelection5 _MB(2,10,3,5,0) |
| 419 #define StMCustom3_CViewSelection6 _MB(2,9,3,6,0) | 433 #define StMCustom3_CViewSelection6 _MB(2,10,3,6,0) |
| 420 | 434 |
| 421 #define StMCustom4_CViewSelection1 _MB(2,9,4,1,0) | 435 #define StMCustom4_CViewSelection1 _MB(2,10,4,1,0) |
| 422 | 436 |
| 423 #ifdef ENABLE_MOTION_CONTROL | 437 #ifdef ENABLE_MOTION_CONTROL |
| 424 #define StMCustom5_CViewPortCalib _MB(2,9,5,1,0) | 438 #define StMCustom5_CViewPortCalib _MB(2,10,5,1,0) |
| 425 #define StMCustom5_CViewPortSpotSize _MB(2,9,5,2,0) | 439 #define StMCustom5_CViewPortSpotSize _MB(2,10,5,2,0) |
| 426 #define StMCustom5_CViewPortLayout _MB(2,9,5,3,0) | 440 #define StMCustom5_CViewPortLayout _MB(2,10,5,3,0) |
| 427 #define StMCustom5_CViewPortAmbient _MB(2,9,5,4,0) | 441 #define StMCustom5_CViewPortAmbient _MB(2,10,5,4,0) |
| 428 #define StMCustom5_CViewPortControl _MB(2,9,5,5,0) | 442 #define StMCustom5_CViewPortControl _MB(2,10,5,5,0) |
| 429 #endif | 443 #endif |
| 430 | |
| 431 | |
| 432 | |
| 433 /* Page 10 */ | |
| 434 #define StMOption _MB(2,10,0,0,0) | |
| 435 #define StMOption_Compass _MB(2,10,1,0,0) | |
| 436 #define StMOption_Compass_SetCourse _MB(2,10,1,1,0) | |
| 437 #define StMOption_Compass_ResetCourse _MB(2,10,1,2,0) | |
| 438 #define StMOption_Compass_Calibrate _MB(2,10,1,3,0) | |
| 439 #define StMOption_Compass_Inertia _MB(2,10,1,4,0) | |
| 440 #define StMOption_Compass_Declination _MB(2,10,1,5,0) | |
| 441 | |
| 442 #define StMOption_Timer _MB(2,10,2,0,0) | |
| 443 #define StMOption_Timer_Value _MB(2,10,2,1,0) | |
| 444 | |
| 445 #define StMOption_Heartbeat _MB(2,10,3,0,0) | |
| 446 | 444 |
| 447 /* PAGE 11 */ | 445 /* PAGE 11 */ |
| 448 #define StMPLAN _MB(2,11,0,0,0) | 446 #define StMPLAN _MB(2,11,0,0,0) |
| 449 | 447 |
| 450 /* PAGE 11 EDIT FIELD CONTENT */ | 448 /* PAGE 11 EDIT FIELD CONTENT */ |