Mercurial > public > hwos_code

comparison src/menu_tree.asm @ 345:3f2d0c0bc101

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
re-arrange settings menu
author heinrichsweikamp
date Mon, 20 Jul 2015 19:07:28 +0200
parents 508d7fb98b34
children 093b32bf6db2
comparison
equal deleted inserted replaced
344:1e342e433839 345:3f2d0c0bc101
332 call menu_processor_pop ; Drop exit entry 332 call menu_processor_pop ; Drop exit entry
333 call menu_processor_pop ; Pop return line. 333 call menu_processor_pop ; Pop return line.
334 334
335 extern compass_calibration_loop 335 extern compass_calibration_loop
336 do_settings_menu: 336 do_settings_menu:
337 MENU_BEGIN tSystSets, .7 337 btfsc ble_available ; ble available
338 bra do_settings_menu_ble ; Yes.
339 MENU_BEGIN tSystSets, .6
338 MENU_CALL tInfoMenu, do_info_menu 340 MENU_CALL tInfoMenu, do_info_menu
339 MENU_CALL tSetTimeDate, do_date_time_menu 341 MENU_CALL tSetTimeDate, do_date_time_menu
340 MENU_CALL tDispSets, do_dispsets_menu 342 MENU_CALL tDispSets, do_dispsets_menu
341 MENU_OPTION tLanguage, oLanguage, 0 343 MENU_OPTION tLanguage, oLanguage, 0
342 MENU_CALL tResetMenu, do_reset_menu
343 MENU_CALL tMore, do_settings_menu_more 344 MENU_CALL tMore, do_settings_menu_more
344 MENU_CALL tExit, do_continue_main_menu 345 MENU_CALL tExit, do_continue_main_menu
345 MENU_END 346 MENU_END
346 347
348 do_settings_menu_ble:
349 MENU_BEGIN tSystSets, .7
350 MENU_CALL tInfoMenu, do_info_menu
351 MENU_CALL tBleTitle, comm_mode0
352 MENU_CALL tSetTimeDate, do_date_time_menu
353 MENU_CALL tDispSets, do_dispsets_menu
354 MENU_OPTION tLanguage, oLanguage, 0
355 MENU_CALL tMore, do_settings_menu_more
356 MENU_CALL tExit, do_continue_main_menu
357 MENU_END
347 358
348 do_return_settings_more: 359 do_return_settings_more:
349 call menu_processor_pop ; Drop exit entry 360 call menu_processor_pop ; Drop exit entry
350 call menu_processor_pop ; Pop return line. 361 call menu_processor_pop ; Pop return line.
351 362
352 do_settings_menu_more: 363 do_settings_menu_more:
353 btfsc rechargeable ; piezo buttons available 364 btfsc rechargeable ; piezo buttons available
354 bra do_settings_menu_more_piezo 365 bra do_settings_menu_more_piezo
355 btfsc ble_available ; ble available 366 btfsc ble_available ; ble available
356 bra do_settings_menu_more_ostc3p 367 bra do_settings_menu_more_ostc3p
357 MENU_BEGIN tSystSets, .6 368 MENU_BEGIN tSystSets, .7
358 MENU_CALL tCompassMenu, do_compass_menu 369 MENU_CALL tCompassMenu, do_compass_menu
359 MENU_CALL tLogOffset, do_log_offset_menu 370 MENU_CALL tLogOffset, do_log_offset_menu
360 MENU_OPTION tUnits, oUnits, 0 371 MENU_OPTION tUnits, oUnits, 0
361 MENU_OPTION tSamplingrate,oSamplingRate,0 372 MENU_OPTION tSamplingrate,oSamplingRate,0
362 MENU_OPTION tDvSalinity,oDiveSalinity, 0 373 MENU_OPTION tDvSalinity,oDiveSalinity, 0
374 MENU_CALL tResetMenu, do_reset_menu
363 MENU_CALL tExit, do_return_settings 375 MENU_CALL tExit, do_return_settings
364 MENU_END 376 MENU_END
365 377
366 do_settings_menu_more_piezo: 378 do_settings_menu_more_piezo:
367 MENU_BEGIN tSystSets, .7 379 MENU_BEGIN tSystSets, .7
368 MENU_CALL tCompassMenu, do_compass_menu 380 MENU_CALL tCompassMenu, do_compass_menu
369 MENU_CALL tLogOffset, do_log_offset_menu 381 MENU_CALL tLogOffset, do_log_offset_menu
370 MENU_OPTION tUnits, oUnits, 0 382 MENU_OPTION tUnits, oUnits, 0
371 MENU_OPTION tSamplingrate,oSamplingRate,0 383 MENU_OPTION tSamplingrate,oSamplingRate,0
372 MENU_OPTION tDvSalinity,oDiveSalinity, 0 384 MENU_OPTION tDvSalinity,oDiveSalinity, 0
373 MENU_CALL tMore, do_settings_cr_menu 385 MENU_CALL tMore, do_settings_piezo_menu
374 MENU_CALL tExit, do_return_settings 386 MENU_CALL tExit, do_return_settings
375 MENU_END 387 MENU_END
376 388
377 extern comm_mode0 389 extern comm_mode0
378 390
379 do_settings_cr_menu: 391 do_settings_piezo_menu:
380 btfsc ble_available ; ble available 392 ; Menu with features only available in piezo button hardware
381 bra do_settings_menu_more_ostc2
382 ; Menu with features only available in cR hardware
383 MENU_BEGIN tSystSets, .4 393 MENU_BEGIN tSystSets, .4
384 MENU_CALL tUsbTitle, comm_mode0 394 MENU_CALL tResetMenu, do_reset_menu
385 MENU_OPTION tButtonleft,ocR_button_left ,0 ; left button sensitivity 395 MENU_OPTION tButtonleft,ocR_button_left ,0 ; left button sensitivity
386 MENU_OPTION tButtonright,ocR_button_right,0 ; right button sensitivity 396 MENU_OPTION tButtonright,ocR_button_right,0 ; right button sensitivity
387 MENU_CALL tExit, do_settings_menu_more_piezo 397 MENU_CALL tExit, do_settings_menu_more_piezo
388 MENU_END 398 MENU_END
389
390 do_settings_menu_more_ostc2:
391 ; Menu OSTC2
392 MENU_BEGIN tSystSets, .4
393 MENU_CALL tBleTitle, comm_mode0
394 MENU_OPTION tButtonleft,ocR_button_left ,0 ; left button sensitivity
395 MENU_OPTION tButtonright,ocR_button_right,0 ; right button sensitivity
396 MENU_CALL tExit, do_settings_menu_more_piezo
397 MENU_END
398
399 399
400 do_settings_menu_more_ostc3p: ; Menu with BLE feature 400 do_settings_menu_more_ostc3p: ; Menu with BLE feature
401 MENU_BEGIN tSystSets, .7 401 MENU_BEGIN tSystSets, .7
402 MENU_CALL tCompassMenu, do_compass_menu 402 MENU_CALL tCompassMenu, do_compass_menu
403 MENU_CALL tLogOffset, do_log_offset_menu 403 MENU_CALL tLogOffset, do_log_offset_menu
404 MENU_OPTION tUnits, oUnits, 0 404 MENU_OPTION tUnits, oUnits, 0
405 MENU_OPTION tSamplingrate,oSamplingRate,0 405 MENU_OPTION tSamplingrate,oSamplingRate,0
406 MENU_OPTION tDvSalinity,oDiveSalinity, 0 406 MENU_OPTION tDvSalinity,oDiveSalinity, 0
407 MENU_CALL tBleTitle, comm_mode0 407 MENU_CALL tResetMenu, do_reset_menu
408 MENU_CALL tExit, do_return_settings 408 MENU_CALL tExit, do_return_settings
409 MENU_END 409 MENU_END
410 410
411 do_compass_menu: 411 do_compass_menu:
412 MENU_BEGIN tSystSets, .2 412 MENU_BEGIN tSystSets, .2