# HG changeset patch # User heinrichsweikamp # Date 1369299574 -7200 # Node ID 91ae251d379f5558c5621def5a13e1dd6ff40332 # Parent d333c846284412719b3da209795f057f010da864 "ostc3-style" menu titles diff -r d333c8462844 -r 91ae251d379f code_part1/OSTC_code_asm_part1/altimeter.asm --- a/code_part1/OSTC_code_asm_part1/altimeter.asm Wed May 22 14:46:00 2013 +0200 +++ b/code_part1/OSTC_code_asm_part1/altimeter.asm Thu May 23 10:59:34 2013 +0200 @@ -110,7 +110,6 @@ WIN_TOP .35 ; Custom view drawing zone... WIN_LEFT .90 - WIN_INVERT .0 WIN_FONT .0 call DISP_standard_color @@ -230,16 +229,14 @@ altimeter_menu_1: call DISP_ClearScreen ; Menu header. + call DISP_divemask_color + DISPLAYTEXTH .288 ; Title bar call DISP_standard_color - call DISP_topline_box - WIN_INVERT .1 ; Init new Wordprocessor - DISPLAYTEXTH .288 ; Title bar movlw 2 ; Start menu on line 2. movwf menupos altimeter_menu_2: - WIN_INVERT 0 WIN_FONT 0 WIN_LEFT .20 ; First line: WIN_TOP .35 diff -r d333c8462844 -r 91ae251d379f code_part1/OSTC_code_asm_part1/interface.asm --- a/code_part1/OSTC_code_asm_part1/interface.asm Wed May 22 14:46:00 2013 +0200 +++ b/code_part1/OSTC_code_asm_part1/interface.asm Thu May 23 10:59:34 2013 +0200 @@ -117,11 +117,9 @@ bcf PIE1,RCIE ; No Interrupt for UART bsf LED_blue call DISP_ClearScreen - call DISP_topline_box - WIN_INVERT .1 ; Init new Wordprocessor + call DISP_divemask_color DISPLAYTEXT .15 ; "Interface" - WIN_INVERT .0 ; Init new Wordprocessor - + call DISP_standard_color movlw d'5' movwf uart1_temp menu_interface1: diff -r d333c8462844 -r 91ae251d379f code_part1/OSTC_code_asm_part1/menu.asm --- a/code_part1/OSTC_code_asm_part1/menu.asm Wed May 22 14:46:00 2013 +0200 +++ b/code_part1/OSTC_code_asm_part1/menu.asm Thu May 23 10:59:34 2013 +0200 @@ -256,12 +256,9 @@ goto restart ; No, restart to surfacemode call DISP_ClearScreen - -deco_info_screen1: - call DISP_topline_box - WIN_INVERT .1 ; Init new Wordprocessor - DISPLAYTEXT .235 ;Decomode changed! - WIN_INVERT .0 ; Init new Wordprocessor + call DISP_divemask_color + DISPLAYTEXT .235 ;Decomode changed! + call DISP_standard_color read_int_eeprom d'34' ; Read deco data diff -r d333c8462844 -r 91ae251d379f code_part1/OSTC_code_asm_part1/menu_battery.asm --- a/code_part1/OSTC_code_asm_part1/menu_battery.asm Wed May 22 14:46:00 2013 +0200 +++ b/code_part1/OSTC_code_asm_part1/menu_battery.asm Thu May 23 10:59:34 2013 +0200 @@ -25,11 +25,9 @@ menu_battery_state: call DISP_ClearScreen - call DISP_topline_box - WIN_INVERT .1 ; Init new Wordprocessor + call DISP_divemask_color DISPLAYTEXT .114 ; Battery Information - WIN_INVERT .0 ; Init new Wordprocessor - + call DISP_standard_color WIN_TOP .35 WIN_LEFT .0 WIN_FONT FT_SMALL diff -r d333c8462844 -r 91ae251d379f code_part1/OSTC_code_asm_part1/menu_custom.asm --- a/code_part1/OSTC_code_asm_part1/menu_custom.asm Wed May 22 14:46:00 2013 +0200 +++ b/code_part1/OSTC_code_asm_part1/menu_custom.asm Thu May 23 10:59:34 2013 +0200 @@ -211,11 +211,9 @@ movlw 1 ; Stepsize: 1, 10, or 100. movwf cf_step - call DISP_topline_box - WIN_INVERT .1 ; Init new Wordprocessor + call DISP_divemask_color movff cf_title_text,WREG ; Title text in low bank call displaytext_1_low - WIN_INVERT .0 ; Init new Wordprocessor menu_custom_functions1: call DISP_standard_color ; Trash EEADRH... diff -r d333c8462844 -r 91ae251d379f code_part1/OSTC_code_asm_part1/menu_gassetup.asm --- a/code_part1/OSTC_code_asm_part1/menu_gassetup.asm Wed May 22 14:46:00 2013 +0200 +++ b/code_part1/OSTC_code_asm_part1/menu_gassetup.asm Thu May 23 10:59:34 2013 +0200 @@ -31,10 +31,9 @@ call DISP_ClearScreen call gassetup_sort_gaslist ; Sorts Gaslist according to change depth call menu_pre_loop_common ; Clear some menu flags, timeout and switches - call DISP_topline_box - WIN_INVERT .1 ; Init new Wordprocessor + call DISP_divemask_color DISPLAYTEXT .106 ; Gas List - WIN_INVERT .0 ; Init new Wordprocessor + call DISP_standard_color clrf decodata+0 ; Here: # of gas 0-4 clrf divemins+0 ; Here: # of Gas * 4 movlw d'5' @@ -897,8 +896,8 @@ ; Changed v1.44se gassetup_title_bar2: - call DISP_topline_box - WIN_INVERT .1 ; Init new Wordprocessor +; call DISP_topline_box + call DISP_divemask_color WIN_TOP .2 WIN_LEFT .0 lfsr FSR2,letter @@ -992,8 +991,7 @@ movff EEDATA,lo output_8 STRCAT_PRINT TXT_METER2 - - WIN_INVERT .0 ; Init new Wordprocessor + call DISP_standard_color return gassetup_show_ppO2: diff -r d333c8462844 -r 91ae251d379f code_part1/OSTC_code_asm_part1/menu_logbook.asm --- a/code_part1/OSTC_code_asm_part1/menu_logbook.asm Wed May 22 14:46:00 2013 +0200 +++ b/code_part1/OSTC_code_asm_part1/menu_logbook.asm Thu May 23 10:59:34 2013 +0200 @@ -59,9 +59,9 @@ menu_logbook1a: - WIN_INVERT .1 + call DISP_divemask_color DISPLAYTEXT .12 ;" Wait.." - WIN_INVERT .0 + call DISP_standard_color call I2CReset ; Reset I2C Bus call get_free_EEPROM_location ; search from "here" backwards through the external memory @@ -82,9 +82,9 @@ ; recopy data to search from here menu_logbook1b: - WIN_INVERT .1 + call DISP_divemask_color DISPLAYTEXT .12 ;" Wait.." - WIN_INVERT .0 + call DISP_standard_color ;---- fast loop: check every other byte ---------------------------------- menu_logbook2: @@ -200,11 +200,10 @@ btfss logbook_page_not_empty ; Was there one dive at all? bra menu_logbook ; Yes, so reload the first page - call DISP_topline_box ; Draw box - WIN_INVERT .1 + call DISP_topline_box_clear ; Clears Bar at the top + call DISP_divemask_color DISPLAYTEXT .26 ; "Logbook" - WIN_INVERT .0 - + call DISP_standard_color DISPLAYTEXT .11 ; Displays "Exit" in the last row on the current page call menu_pre_loop_common ; Clear some menu flags, timeout and switches @@ -1372,10 +1371,10 @@ btfsc logbook_header_drawn ; "Logbook already displayed? bra display_listdive1a - call DISP_topline_box ; Draw box - WIN_INVERT .1 + call DISP_topline_box_clear ; Clears Bar at the top + call DISP_divemask_color DISPLAYTEXT .26 ; "Logbook" - WIN_INVERT .0 + call DISP_standard_color bsf logbook_header_drawn display_listdive1a: diff -r d333c8462844 -r 91ae251d379f code_part1/OSTC_code_asm_part1/menu_ppO2.asm --- a/code_part1/OSTC_code_asm_part1/menu_ppO2.asm Wed May 22 14:46:00 2013 +0200 +++ b/code_part1/OSTC_code_asm_part1/menu_ppO2.asm Thu May 23 10:59:34 2013 +0200 @@ -114,10 +114,9 @@ menu_diluentsetup_prelist: call DISP_ClearScreen call menu_pre_loop_common ; Clear some menu flags, timeout and switches - call DISP_topline_box - WIN_INVERT .1 ; Init new Wordprocessor + call DISP_divemask_color DISPLAYTEXT .231 ; Dil. Setup - Gaslist - WIN_INVERT .0 ; Init new Wordprocessor + call DISP_standard_color clrf decodata+0 ; Here: # of gas 0-4 clrf divemins+0 ; Here: # of Gas * 4 movlw d'5' @@ -692,8 +691,8 @@ diluent_title_bar2: - call DISP_topline_box - WIN_INVERT .1 ; Init new Wordprocessor +; call DISP_topline_box + call DISP_divemask_color WIN_TOP .2 WIN_LEFT .30 lfsr FSR2,letter @@ -780,7 +779,7 @@ diluent_title_bar7: STRCAT_PRINT "" - WIN_INVERT .0 ; Init new Wordprocessor + call DISP_standard_color return @@ -803,12 +802,10 @@ menu_const_ppO20: call DISP_ClearScreen - call DISP_topline_box - - WIN_INVERT .1 ; Init new Wordprocessor + call DISP_divemask_color DISPLAYTEXT .111 ; Constant ppO2 Setup - WIN_INVERT .0 ; Init new Wordprocessor - + call DISP_standard_color + menu_const_ppO21: WIN_LEFT .20 diff -r d333c8462844 -r 91ae251d379f code_part1/OSTC_code_asm_part1/menu_settime.asm --- a/code_part1/OSTC_code_asm_part1/menu_settime.asm Wed May 22 14:46:00 2013 +0200 +++ b/code_part1/OSTC_code_asm_part1/menu_settime.asm Thu May 23 10:59:34 2013 +0200 @@ -35,10 +35,9 @@ bcf set_month clrf menupos2 - call DISP_topline_box - WIN_INVERT .1 ; Init new Wordprocessor + call DISP_divemask_color DISPLAYTEXT .29 ; Set Time - WIN_INVERT .0 ; Init new Wordprocessor + call DISP_standard_color DISPLAYTEXT .22 ; Time: DISPLAYTEXT .23 ; Date: diff -r d333c8462844 -r 91ae251d379f code_part1/OSTC_code_asm_part1/outputs.asm --- a/code_part1/OSTC_code_asm_part1/outputs.asm Wed May 22 14:46:00 2013 +0200 +++ b/code_part1/OSTC_code_asm_part1/outputs.asm Thu May 23 10:59:34 2013 +0200 @@ -1062,10 +1062,9 @@ return DISP_menu_mask: - call DISP_topline_box - WIN_INVERT .1 ; Init new Wordprocessor + call DISP_divemask_color DISPLAYTEXT .5 ; Menu: - WIN_INVERT .0 ; Init new Wordprocessor + call DISP_standard_color DISPLAYTEXT .6 ; Logbook DISPLAYTEXT .7 ; Gas Setup DISPLAYTEXT .9 ; Reset all @@ -1094,10 +1093,9 @@ return DISP_setup_menu_mask: - call DISP_topline_box - WIN_INVERT .1 ; Init new Wordprocessor + call DISP_divemask_color DISPLAYTEXT .98 ; Setup Menu: - WIN_INVERT .0 ; Init new Wordprocessor + call DISP_standard_color DISPLAYTEXT .99 ; Custom FunctionsI DISPLAYTEXT .153 ; Custom FunctionsII DISPLAYTEXTH .295 ; Custom FunctionsIII @@ -1107,10 +1105,9 @@ return DISP_ccr_setup_menu_mask: - call DISP_topline_box - WIN_INVERT .1 ; Init new Wordprocessor + call DISP_divemask_color DISPLAYTEXT .111 ; CCR Setup Menu - WIN_INVERT .0 ; Init new Wordprocessor + call DISP_standard_color DISPLAYTEXT .229 ; Diluent Setup DISPLAYTEXT .230 ; Setpoint Setup DISPLAYTEXT .11 ; Exit @@ -1118,10 +1115,9 @@ DISP_more_setup_menu_mask: - call DISP_topline_box - WIN_INVERT .1 ; Init new Wordprocessor + call DISP_divemask_color DISPLAYTEXTH .258 ; Setup Menu 2: - WIN_INVERT .0 ; Init new Wordprocessor + call DISP_standard_color DISPLAYTEXTH .257 ; Date format: DISPLAYTEXT .129 ; Debug: DISPLAYTEXT .187 ; Show License @@ -1131,10 +1127,9 @@ return DISP_more_menu_mask: - call DISP_topline_box - WIN_INVERT .1 ; Init new Wordprocessor + call DISP_divemask_color DISPLAYTEXT .144 ; Menu 2: - WIN_INVERT .0 ; Init new Wordprocessor + call DISP_standard_color DISPLAYTEXT .8 ; Set Time DISPLAYTEXT .110 ; Const. ppO2 Setup DISPLAYTEXT .113 ; Battery Info @@ -1144,10 +1139,9 @@ return DISP_reset_menu_mask: - call DISP_topline_box - WIN_INVERT .1 ; Init new Wordprocessor + call DISP_divemask_color DISPLAYTEXT .28 ; Reset Menu - WIN_INVERT .0 ; Init new Wordprocessor + call DISP_standard_color DISPLAYTEXT .21 ; Cancel Reset DISPLAYTEXT .245 ; Reset CF,Gases & Deco DISPLAYTEXTH .284 ; Reset Logbook @@ -1157,10 +1151,9 @@ return DISP_simulator_mask: - call DISP_topline_box - WIN_INVERT .1 ; Init new Wordprocessor + call DISP_divemask_color DISPLAYTEXT .248 ; OSTC Simulator - WIN_INVERT .0 ; Init new Wordprocessor + call DISP_standard_color DISPLAYTEXTH .307 ; Interval: DISPLAYTEXT .249 ; Start Dive DISPLAYTEXTH .277 ; Bottom Time: @@ -1695,7 +1688,9 @@ WIN_BOX_BLACK .68, .146, .34, .101 ;top, bottom, left, right WIN_FRAME_STD .70, .144, .35, .100 + call DISP_divemask_color DISPLAYTEXT .143 ; Confirm: + call DISP_standard_color DISPLAYTEXT .145 ; Cancel DISPLAYTEXT .146 ; OK! @@ -3366,10 +3361,9 @@ ;============================================================================= DISP_startupscreen1: - call DISP_topline_box - WIN_INVERT .1 ; Init new Wordprocessor + call DISP_divemask_color DISPLAYTEXT d'3' ; "HeinrichsWeikamp" - WIN_INVERT .0 ; Init new Wordprocessor + call DISP_standard_color DISPLAYTEXT .68 ; Licence 1/2 DISPLAYTEXT .69 DISPLAYTEXT .70 @@ -3380,10 +3374,9 @@ return DISP_startupscreen2: - call DISP_topline_box - WIN_INVERT .1 ; Init new Wordprocessor + call DISP_divemask_color DISPLAYTEXT d'3' ; "HeinrichsWeikamp" - WIN_INVERT .0 ; Init new Wordprocessor + call DISP_standard_color DISPLAYTEXT .75 ; Licence 2/2 DISPLAYTEXT .76 DISPLAYTEXT .77 @@ -3394,10 +3387,9 @@ return DISP_new_cf_warning: - call DISP_topline_box - WIN_INVERT .1 ; Init new Wordprocessor + call DISP_divemask_color DISPLAYTEXTH .271 ; New CF added! - WIN_INVERT .0 ; Init new Wordprocessor + call DISP_standard_color DISPLAYTEXTH .272 ; New CustomFunctions DISPLAYTEXTH .273 ; were added! Check DISPLAYTEXTH .274 ; CF I and CF II Menu diff -r d333c8462844 -r 91ae251d379f code_part1/OSTC_code_asm_part1/simulator.asm --- a/code_part1/OSTC_code_asm_part1/simulator.asm Wed May 22 14:46:00 2013 +0200 +++ b/code_part1/OSTC_code_asm_part1/simulator.asm Thu May 23 10:59:34 2013 +0200 @@ -222,10 +222,9 @@ STRCPY_PRINT TXT_CNSGR10 simulator_decoplan_cns_2: - call DISP_standard_color ; Back to normal. - WIN_INVERT .1 ; Init new Wordprocessor + call DISP_divemask_color DISPLAYTEXT .188 ; Sim. Results: - WIN_INVERT .0 ; Init new Wordprocessor + call DISP_standard_color simulator_show_decoplan1: call wait_switches ; Waits until switches are released, resets flag if button stays pressed! @@ -376,10 +375,9 @@ movff xC+0,sim_pressure+0 movff xC+1,sim_pressure+1 - call DISP_topline_box - WIN_INVERT .1 + call DISP_divemask_color DISPLAYTEXT .12 ; "Wait..." - WIN_INVERT .0 + call DISP_standard_color ; This override is done in ISR too, but do it right now also: movff sim_pressure+0,amb_pressure+0 diff -r d333c8462844 -r 91ae251d379f code_part1/OSTC_code_asm_part1/surfmode.asm --- a/code_part1/OSTC_code_asm_part1/surfmode.asm Wed May 22 14:46:00 2013 +0200 +++ b/code_part1/OSTC_code_asm_part1/surfmode.asm Thu May 23 10:59:34 2013 +0200 @@ -482,10 +482,10 @@ test_switches_surfmode3: bcf switch_right - call DISP_topline_box ; Write a filled bar at the top - WIN_INVERT .1 ; Init new Wordprocessor + call DISP_topline_box_clear + call DISP_divemask_color DISPLAYTEXT .4 ;Menu? - WIN_INVERT .0 ; Init new Wordprocessor + call DISP_standard_color bsf premenu clrf timeout_counter2 return