Mercurial > public > hwos_code
diff src/surfmode.inc @ 582:b455b31ce022
work on 2.97 stable
| author | heinrichsweikamp |
|---|---|
| date | Mon, 26 Feb 2018 16:40:28 +0100 |
| parents | b7eb98dbd800 |
| children | c40025d8e750 |
line wrap: on
line diff
--- a/src/surfmode.inc Sun Feb 25 18:25:38 2018 +0100 +++ b/src/surfmode.inc Mon Feb 26 16:40:28 2018 +0100 @@ -1,6 +1,6 @@ ;============================================================================= ; -; File surfmode.inc REFACTORED VERSION V2.92 +; File surfmode.inc REFACTORED VERSION V2.97 ; ; ; Copyright (c) 2011, JD Gascuel, HeinrichsWeikamp, all right reserved. @@ -8,109 +8,107 @@ ; HISTORY ; 2011-08-07 : [mH] moving from OSTC code - extern surfloop -; extern calc_deko_surfmode DELETED - not used any more ## no fly - extern timeout_surfmode - extern timeout_testmode + extern surfloop + extern timeout_surfmode + extern timeout_testmode ; Surfacemode/Homescreen layout: ; row=0...239 ; column=0...159 (x2) -#DEFINE surf_clock_row .0 -#DEFINE surf_clock_column .5 -#DEFINE surf_date_row .25 -#DEFINE surf_date_column .1 +#DEFINE surf_clock_row .0 +#DEFINE surf_clock_column .5 +#DEFINE surf_date_row .25 +#DEFINE surf_date_column .1 -#DEFINE batt_voltage_row .8 -#DEFINE batt_voltage_column .45 -#DEFINE batt_percent_row .26 -#DEFINE batt_percent_column .60 +#DEFINE batt_voltage_row .8 +#DEFINE batt_voltage_column .45 +#DEFINE batt_percent_row .26 +#DEFINE batt_percent_column .60 -#DEFINE surf_desat_row .103 -#DEFINE surf_desat_column .65 -#DEFINE surf_nofly_row .128 -#DEFINE surf_nofly_column .65 +#DEFINE surf_desat_row .103 +#DEFINE surf_desat_column .65 +#DEFINE surf_nofly_row .128 +#DEFINE surf_nofly_column .65 -#DEFINE surf_warning1_column .40 -#DEFINE surf_warning1_row .191 -#DEFINE surf_warning2_column surf_warning1_column -#DEFINE surf_warning2_row surf_warning1_row+.24 -#DEFINE surf_warning_length .11 ; total string length +#DEFINE surf_warning1_column .40 +#DEFINE surf_warning1_row .191 +#DEFINE surf_warning2_column surf_warning1_column +#DEFINE surf_warning2_row surf_warning1_row+.24 +#DEFINE surf_warning_length .11 ; total string length -#DEFINE surf_temp_row .185 -#DEFINE surf_temp_column .120 ; CHANGED - clear overlapp with warning text area ## temp -#DEFINE surf_press_row .160 -#DEFINE surf_press_column .98 +#DEFINE surf_temp_row .185 +#DEFINE surf_temp_column .120 +#DEFINE surf_press_row .160 +#DEFINE surf_press_column .98 -#DEFINE surf_gaslist_row .66 -#DEFINE surf_gaslist_column .2 -#DEFINE surf_gaslist_spacing .24 +#DEFINE surf_gaslist_row .66 +#DEFINE surf_gaslist_column .2 +#DEFINE surf_gaslist_spacing .24 -#DEFINE surf_customview_title_row .52 -#DEFINE surf_customview_title_column .15 +#DEFINE surf_customview_title_row .52 +#DEFINE surf_customview_title_column .15 -#DEFINE surf_customtext_row1 .66 -#DEFINE surf_customtext_row2 surf_customtext_row1+.24 -#DEFINE surf_customtext_row3 surf_customtext_row2+.24 -#DEFINE surf_customtext_row4 surf_customtext_row3+.24 -#DEFINE surf_customtext_row5 surf_customtext_row4+.24 -#DEFINE surf_customtext_column .5 +#DEFINE surf_customtext_row1 .66 +#DEFINE surf_customtext_row2 surf_customtext_row1+.24 +#DEFINE surf_customtext_row3 surf_customtext_row2+.24 +#DEFINE surf_customtext_row4 surf_customtext_row3+.24 +#DEFINE surf_customtext_row5 surf_customtext_row4+.24 +#DEFINE surf_customtext_column .5 -#DEFINE surf_compass_mask_row surf_customtext_row2 -#DEFINE surf_compass_mask_column .10 -#DEFINE surf_compass_head_row surf_customtext_row4-.8 -#DEFINE surf_compass_head_column .10 +#DEFINE surf_compass_mask_row surf_customtext_row2 +#DEFINE surf_compass_mask_column .10 +#DEFINE surf_compass_head_row surf_customtext_row4-.8 +#DEFINE surf_compass_head_column .10 -#DEFINE surf_compass_bear_column .15 -#DEFINE surf_compass_bear_row surf_customtext_row5 +#DEFINE surf_compass_bear_column .15 +#DEFINE surf_compass_bear_row surf_customtext_row5 -#DEFINE surf_hud_sensor1_column .112 -#DEFINE surf_hud_sensor1_row .87 -#DEFINE surf_hud_sensor2_column surf_hud_sensor1_column -#DEFINE surf_hud_sensor2_row .111 -#DEFINE surf_hud_sensor3_column surf_hud_sensor1_column -#DEFINE surf_hud_sensor3_row .135 +#DEFINE surf_hud_sensor1_column .112 +#DEFINE surf_hud_sensor1_row .87 +#DEFINE surf_hud_sensor2_column surf_hud_sensor1_column +#DEFINE surf_hud_sensor2_row .111 +#DEFINE surf_hud_sensor3_column surf_hud_sensor1_column +#DEFINE surf_hud_sensor3_row .135 -#DEFINE surf_menu_sensor1_column .80 -#DEFINE surf_menu_sensor1_row .60 -#DEFINE surf_menu_sensor2_column surf_menu_sensor1_column -#DEFINE surf_menu_sensor2_row surf_menu_sensor1_row+.27*.1 -#DEFINE surf_menu_sensor3_column surf_menu_sensor1_column -#DEFINE surf_menu_sensor3_row surf_menu_sensor1_row+.27*.2 -#DEFINE surf_menu_sensor4_column surf_menu_sensor1_column -#DEFINE surf_menu_sensor4_row surf_menu_sensor1_row-.27*.1 -#DEFINE surf_menu2_sensor1_row .47 -#DEFINE surf_menu2_sensor2_row surf_menu2_sensor1_row+.27*.1 -#DEFINE surf_menu2_sensor3_row surf_menu2_sensor1_row+.27*.2 -#DEFINE surf_menu2_ambient_row surf_menu2_sensor1_row+.27*.4 -#DEFINE surf_menu2_ambient_column .95 - +#DEFINE surf_menu_sensor1_column .80 +#DEFINE surf_menu_sensor1_row .60 +#DEFINE surf_menu_sensor2_column surf_menu_sensor1_column +#DEFINE surf_menu_sensor2_row surf_menu_sensor1_row+.27*.1 +#DEFINE surf_menu_sensor3_column surf_menu_sensor1_column +#DEFINE surf_menu_sensor3_row surf_menu_sensor1_row+.27*.2 +#DEFINE surf_menu_sensor4_column surf_menu_sensor1_column +#DEFINE surf_menu_sensor4_row surf_menu_sensor1_row-.27*.1 +#DEFINE surf_menu2_sensor1_row .47 +#DEFINE surf_menu2_sensor2_row surf_menu2_sensor1_row+.27*.1 +#DEFINE surf_menu2_sensor3_row surf_menu2_sensor1_row+.27*.2 +#DEFINE surf_menu2_ambient_row surf_menu2_sensor1_row+.27*.4 +#DEFINE surf_menu2_ambient_column .95 + #DEFINE surf_mV_sensor_status_column .145 -#DEFINE surf_tissue_diagram_top .66 -#DEFINE surf_tissue_diagram_bottom surf_tissue_diagram_top+.117 ; 183 -#DEFINE surf_tissue_diagram_left .5 -#DEFINE surf_tissue_diagram_right surf_decotype_column-.5 -#DEFINE surf_tissue_N2_row surf_tissue_diagram_top+.1 -#DEFINE surf_tissue_N2_column surf_tissue_diagram_left+.5 -#DEFINE surf_tissue_He_row surf_tissue_diagram_top+.56 -#DEFINE surf_tissue_He_column surf_tissue_N2_column +#DEFINE surf_tissue_diagram_top .66 +#DEFINE surf_tissue_diagram_bottom surf_tissue_diagram_top+.117 ; 183 +#DEFINE surf_tissue_diagram_left .5 +#DEFINE surf_tissue_diagram_right surf_decotype_column-.5 +#DEFINE surf_tissue_N2_row surf_tissue_diagram_top+.1 +#DEFINE surf_tissue_N2_column surf_tissue_diagram_left+.5 +#DEFINE surf_tissue_He_row surf_tissue_diagram_top+.56 +#DEFINE surf_tissue_He_column surf_tissue_N2_column -#DEFINE surf_decotype_row .60 -#DEFINE surf_decotype_column .100 +#DEFINE surf_decotype_row .60 +#DEFINE surf_decotype_column .100 ; OSTC2-style start gas and boxes -#DEFINE surf_decotype_boxes_top surf_decotype_row+.30+.25-.1 -#DEFINE surf_decotype_boxes_bottom surf_decotype_boxes_top+.22 -#DEFINE surf_decotype_boxes_left1 surf_decotype_column+.5 -#DEFINE surf_decotype_boxes_left2 surf_decotype_boxes_left1+.9 -#DEFINE surf_decotype_boxes_left3 surf_decotype_boxes_left1+.18 -#DEFINE surf_decotype_boxes_left4 surf_decotype_boxes_left1+.27 -#DEFINE surf_decotype_boxes_left5 surf_decotype_boxes_left1+.36 - - #DEFINE surf_mV_sensor_column .5 - #DEFINE surf_mV_sensor1_row .90 - #DEFINE surf_mV_sensor2_row surf_mV_sensor1_row+.24 - #DEFINE surf_mV_sensor3_row surf_mV_sensor2_row+.24 +#DEFINE surf_decotype_boxes_top surf_decotype_row+.30+.25-.1 +#DEFINE surf_decotype_boxes_bottom surf_decotype_boxes_top+.22 +#DEFINE surf_decotype_boxes_left1 surf_decotype_column+.5 +#DEFINE surf_decotype_boxes_left2 surf_decotype_boxes_left1+.9 +#DEFINE surf_decotype_boxes_left3 surf_decotype_boxes_left1+.18 +#DEFINE surf_decotype_boxes_left4 surf_decotype_boxes_left1+.27 +#DEFINE surf_decotype_boxes_left5 surf_decotype_boxes_left1+.36 +#DEFINE surf_mV_sensor_column .5 +#DEFINE surf_mV_sensor1_row .90 +#DEFINE surf_mV_sensor2_row surf_mV_sensor1_row+.24 +#DEFINE surf_mV_sensor3_row surf_mV_sensor2_row+.24