comparison src/menu_tree.asm @ 562:8b7ea27ea1fa

seperate desat and sat multipliers for GF and Non-GF modes. Set to 100/100 as default in GF mode
author heinrichsweikamp
date Sat, 03 Feb 2018 15:17:01 +0100
parents b7eb98dbd800
children b455b31ce022
comparison
equal deleted inserted replaced
561:9c54849b8d3b 562:8b7ea27ea1fa
318 MENU_CALL tExit, do_return_divemode_menu 318 MENU_CALL tExit, do_return_divemode_menu
319 MENU_END 319 MENU_END
320 320
321 do_return_decoparameters_menu: 321 do_return_decoparameters_menu:
322 rcall menu_tree_double_pop ; drop exit line and back to last line 322 rcall menu_tree_double_pop ; drop exit line and back to last line
323 do_decoparameters_menu: 323 do_decoparameters_menu:
324 movff char_I_deco_model,lo ; 0 = ZH-L16, 1 = ZH-L16-GF
325 tstfsz lo
326 bra do_decoparameters_menugf ; <> 0 -> GF menu!
327 ; NON-GF menu
328 MENU_BEGIN tDecoparameters, .4
329 MENU_OPTION tSaturationMult,osatmult, 0
330 MENU_OPTION tDesaturationMult,odesatmult,0
331 MENU_OPTION tLastDecostop,oLastDeco, 0
332 MENU_CALL tExit, do_return_divemode_menu
333 MENU_END
334
335 do_decoparameters_menugf:
336 ; GF menu
324 MENU_BEGIN tDecoparameters, .7 337 MENU_BEGIN tDecoparameters, .7
325 MENU_OPTION tGF_low, oGF_low, 0 338 MENU_OPTION tGF_low, oGF_low, 0
326 MENU_OPTION tGF_high, oGF_high, 0 339 MENU_OPTION tGF_high, oGF_high, 0
327 MENU_CALL taGFMenu, do_aGF_menu 340 MENU_CALL taGFMenu, do_aGF_menu
328 MENU_OPTION tSaturationMult,osatmult, 0 341 MENU_OPTION tSaturationMult,osatmultgf, 0
329 MENU_OPTION tDesaturationMult,odesatmult,0 342 MENU_OPTION tDesaturationMult,odesatmultgf,0
330 MENU_OPTION tLastDecostop,oLastDeco, 0 343 MENU_OPTION tLastDecostop,oLastDeco, 0
331 MENU_CALL tExit, do_return_divemode_menu 344 MENU_CALL tExit, do_return_divemode_menu
332 MENU_END 345 MENU_END
333 346
347
348
334 349
335 do_return_2nd_deco_plan_menu: 350 do_return_2nd_deco_plan_menu:
336 rcall menu_tree_double_pop ; drop exit line and back to last line 351 rcall menu_tree_double_pop ; drop exit line and back to last line
337 352
338 353
394 bra do_settings_menu_ble ; Yes. 409 bra do_settings_menu_ble ; Yes.
395 MENU_BEGIN tSystSets, .6 410 MENU_BEGIN tSystSets, .6
396 MENU_CALL tInfoMenu, do_info_menu 411 MENU_CALL tInfoMenu, do_info_menu
397 MENU_CALL tSetTimeDate, do_date_time_menu 412 MENU_CALL tSetTimeDate, do_date_time_menu
398 MENU_CALL tDispSets, do_dispsets_menu 413 MENU_CALL tDispSets, do_dispsets_menu
399 MENU_OPTION tAltMode, oAltMode, 0 414 MENU_OPTION tLanguage, oLanguage, 0
400 MENU_CALL tMore, do_settings_menu_more 415 MENU_CALL tMore, do_settings_menu_more
401 MENU_CALL tExit, do_continue_main_menu 416 MENU_CALL tExit, do_continue_main_menu
402 MENU_END 417 MENU_END
403 418
404 do_settings_menu_ble: 419 do_settings_menu_ble:
405 MENU_BEGIN tSystSets, .7 420 MENU_BEGIN tSystSets, .7
406 MENU_CALL tInfoMenu, do_info_menu 421 MENU_CALL tInfoMenu, do_info_menu
407 MENU_CALL tBleTitle, comm_mode0 422 MENU_CALL tBleTitle, comm_mode0
408 MENU_CALL tSetTimeDate, do_date_time_menu 423 MENU_CALL tSetTimeDate, do_date_time_menu
409 MENU_CALL tDispSets, do_dispsets_menu 424 MENU_CALL tDispSets, do_dispsets_menu
410 MENU_OPTION tAltMode, oAltMode, 0 425 MENU_OPTION tLanguage, oLanguage, 0
411 MENU_CALL tMore, do_settings_menu_more 426 MENU_CALL tMore, do_settings_menu_more
412 MENU_CALL tExit, do_continue_main_menu 427 MENU_CALL tExit, do_continue_main_menu
413 MENU_END 428 MENU_END
414 429
415 do_return_settings_more: 430 do_return_settings_more:
422 bra do_settings_menu_more_ostc3p 437 bra do_settings_menu_more_ostc3p
423 MENU_BEGIN tSystSets, .7 438 MENU_BEGIN tSystSets, .7
424 MENU_CALL tCompassMenu, do_compass_menu 439 MENU_CALL tCompassMenu, do_compass_menu
425 MENU_CALL tLogOffset, do_log_offset_menu 440 MENU_CALL tLogOffset, do_log_offset_menu
426 MENU_OPTION tUnits, oUnits, 0 441 MENU_OPTION tUnits, oUnits, 0
427 MENU_OPTION tLanguage, oLanguage, 0 442 MENU_OPTION tAltMode, oAltMode, 0
428 MENU_OPTION tDvSalinity, oDiveSalinity, 0 443 MENU_OPTION tDvSalinity, oDiveSalinity, 0
429 MENU_CALL tResetMenu, do_reset_menu 444 MENU_CALL tResetMenu, do_reset_menu
430 MENU_CALL tExit, do_return_settings 445 MENU_CALL tExit, do_return_settings
431 MENU_END 446 MENU_END
432 447
438 do_settings_menu_more_piezo: 453 do_settings_menu_more_piezo:
439 MENU_BEGIN tSystSets, .7 454 MENU_BEGIN tSystSets, .7
440 MENU_CALL tCompassMenu, do_compass_menu 455 MENU_CALL tCompassMenu, do_compass_menu
441 MENU_CALL tLogOffset, do_log_offset_menu 456 MENU_CALL tLogOffset, do_log_offset_menu
442 MENU_OPTION tUnits, oUnits, 0 457 MENU_OPTION tUnits, oUnits, 0
443 MENU_OPTION tLanguage, oLanguage, 0 458 MENU_OPTION tAltMode, oAltMode, 0
444 MENU_OPTION tDvSalinity, oDiveSalinity, 0 459 MENU_OPTION tDvSalinity, oDiveSalinity, 0
445 MENU_CALL tMore, do_settings_piezo_menu 460 MENU_CALL tMore, do_settings_piezo_menu
446 MENU_CALL tExit, do_return_settings 461 MENU_CALL tExit, do_return_settings
447 MENU_END 462 MENU_END
448 463
460 do_settings_menu_more_ostc3p: ; Menu with BLE feature 475 do_settings_menu_more_ostc3p: ; Menu with BLE feature
461 MENU_BEGIN tSystSets, .7 476 MENU_BEGIN tSystSets, .7
462 MENU_CALL tCompassMenu, do_compass_menu 477 MENU_CALL tCompassMenu, do_compass_menu
463 MENU_CALL tLogOffset, do_log_offset_menu 478 MENU_CALL tLogOffset, do_log_offset_menu
464 MENU_OPTION tUnits, oUnits, 0 479 MENU_OPTION tUnits, oUnits, 0
465 MENU_OPTION tLanguage, oLanguage, 0 480 MENU_OPTION tAltMode, oAltMode, 0
466 MENU_OPTION tDvSalinity, oDiveSalinity, 0 481 MENU_OPTION tDvSalinity, oDiveSalinity, 0
467 MENU_CALL tResetMenu, do_reset_menu 482 MENU_CALL tResetMenu, do_reset_menu
468 MENU_CALL tExit, do_return_settings 483 MENU_CALL tExit, do_return_settings
469 MENU_END 484 MENU_END
470 485
697 do_dispsets_menu_3stack: 712 do_dispsets_menu_3stack:
698 bcf in_color_menu 713 bcf in_color_menu
699 call menu_tree_double_pop ; drop exit line and back to last line 714 call menu_tree_double_pop ; drop exit line and back to last line
700 715
701 do_dispsets_menu: 716 do_dispsets_menu:
702 MENU_BEGIN tDispSets, .6 717 MENU_BEGIN tDispSets, .5
703 MENU_OPTION tBright, oBrightness, 0 718 MENU_OPTION tBright, oBrightness, 0
704 MENU_CALL tColorScheme, do_color_scheme 719 MENU_CALL tColorScheme, do_color_scheme
705 MENU_OPTION tLanguage, oLanguage, 0
706 MENU_OPTION tFlip, oFlipScreen, 0 720 MENU_OPTION tFlip, oFlipScreen, 0
707 MENU_CALL tMore, do_dispsets_menu_more 721 MENU_CALL tMore, do_dispsets_menu_more
708 MENU_CALL tExit, do_return_settings 722 MENU_CALL tExit, do_return_settings
709 MENU_END 723 MENU_END
710 724