Mercurial > public > hwos_code
comparison src/customview.asm @ 530:d36f9fca10ae
2.20beta release
BUGFIX: Minor dive mode layout fixes in CCR Mode
CHANGE: Minor German language fixes
NEW: Warning for Diluent beeing out of safe ppO2 range in CCR modes
NEW: New Customview 9 in OSTC cR or OSTC3 shows mV readings after Sensor calibration
author | heinrichsweikamp |
---|---|
date | Thu, 17 Aug 2017 13:20:03 +0200 |
parents | 00df86a5ac01 |
children | b7eb98dbd800 |
comparison
equal
deleted
inserted
replaced
529:08d7eb26665c | 530:d36f9fca10ae |
---|---|
117 | 117 |
118 global surf_customview_toggle | 118 global surf_customview_toggle |
119 surf_customview_toggle: | 119 surf_customview_toggle: |
120 bcf switch_right | 120 bcf switch_right |
121 incf menupos3,F ; Number of customview to show | 121 incf menupos3,F ; Number of customview to show |
122 movlw d'8' ; Max number of customsviews in surface mode | 122 movlw d'9' ; Max number of customsviews in surface mode |
123 cpfsgt menupos3 ; Max reached? | 123 cpfsgt menupos3 ; Max reached? |
124 bra surf_customview_mask ; No, show | 124 bra surf_customview_mask ; No, show |
125 movlw .1 | 125 movlw .1 |
126 movwf menupos3 ; Reset to one (Always one custom view visible) | 126 movwf menupos3 ; Reset to one (Always one custom view visible) |
127 | 127 |
146 bra surf_customview_init_view6 ; Compass | 146 bra surf_customview_init_view6 ; Compass |
147 dcfsnz WREG,F | 147 dcfsnz WREG,F |
148 bra surf_customview_init_view7 ; Deco settings | 148 bra surf_customview_init_view7 ; Deco settings |
149 dcfsnz WREG,F | 149 dcfsnz WREG,F |
150 bra surf_customview_init_view8 ; Last Dive info | 150 bra surf_customview_init_view8 ; Last Dive info |
151 dcfsnz WREG,F | |
152 bra surf_customview_init_view9 ; Sensor mV readings | |
151 | 153 |
152 call I2C_sleep_accelerometer ; Stop accelerometer | 154 call I2C_sleep_accelerometer ; Stop accelerometer |
153 call I2C_sleep_compass ; Stop compass | 155 call I2C_sleep_compass ; Stop compass |
154 | 156 |
155 movlw .1 | 157 movlw .1 |
199 bra surf_customview_toggle | 201 bra surf_customview_toggle |
200 STRCPY_TEXT_PRINT tFixedSetpoints ; Title of customview | 202 STRCPY_TEXT_PRINT tFixedSetpoints ; Title of customview |
201 call TFT_standard_color | 203 call TFT_standard_color |
202 call TFT_splist_surfmode ; Show Setpoint list | 204 call TFT_splist_surfmode ; Show Setpoint list |
203 bra customview_toggle_exit ; Done. | 205 bra customview_toggle_exit ; Done. |
206 | |
207 surf_customview_init_view9: ; View 9: Sensor mV on the surface | |
208 btfsc FLAG_ccr_mode | |
209 bra surf_customview_init_view9a ; we are in CCR mode | |
210 btfsc FLAG_pscr_mode | |
211 bra surf_customview_init_view9a ; we are in PSCR mode | |
212 bra surf_customview_toggle ; we are not in any rebreather mode, so skip | |
213 surf_customview_init_view9a: | |
214 movff opt_ccr_mode,WREG ; =0: Fixed SP, =1: Sensor, =2: Auto SP | |
215 sublw .1 ; opt_ccr_mode = 1 (Sensor)? | |
216 bnz surf_customview_toggle ; sorry, no sensors, skip again | |
217 STRCPY_TEXT_PRINT tSensorMilliVolt ; Title of customview | |
218 call TFT_standard_color | |
219 extern TFT_sensor_mV | |
220 call TFT_sensor_mV ; write sensor mV readings to screen | |
221 bra customview_toggle_exit ; Done. | |
204 | 222 |
205 surf_customview_init_view4: ; View4: Custom text | 223 surf_customview_init_view4: ; View4: Custom text |
206 call TFT_standard_color | 224 call TFT_standard_color |
207 call TFT_custom_text ; Show the custom text | 225 call TFT_custom_text ; Show the custom text |
208 bra customview_toggle_exit ; Done. | 226 bra customview_toggle_exit ; Done. |
233 call TFT_surface_decosettings ; Show all deco settings | 251 call TFT_surface_decosettings ; Show all deco settings |
234 bra customview_toggle_exit ; Done. | 252 bra customview_toggle_exit ; Done. |
235 | 253 |
236 surf_customview_init_view8: ; View8: Last dive info | 254 surf_customview_init_view8: ; View8: Last dive info |
237 call TFT_surface_lastdive ; Show last dive interval | 255 call TFT_surface_lastdive ; Show last dive interval |
238 | |
239 bra customview_toggle_exit ; Done. | 256 bra customview_toggle_exit ; Done. |
240 | 257 |
241 | 258 |
242 global menuview_toggle | 259 global menuview_toggle |
243 menuview_toggle: ; Show Menu or the simulator tasks | 260 menuview_toggle: ; Show Menu or the simulator tasks |
556 call TFT_pscr_info_mask ; Show ppO2, drop and lung ratio | 573 call TFT_pscr_info_mask ; Show ppO2, drop and lung ratio |
557 call TFT_pscr_info ; Show ppO2, drop and lung ratio | 574 call TFT_pscr_info ; Show ppO2, drop and lung ratio |
558 bra customview_toggle_exit | 575 bra customview_toggle_exit |
559 | 576 |
560 customview_toggle_exit: | 577 customview_toggle_exit: |
578 btfsc divemode ; In Dive Mode? | |
579 call TFT_temp_divemode ; Yes, redraw temperature | |
561 call TFT_standard_color | 580 call TFT_standard_color |
562 bcf toggle_customview ; Clear flag | 581 bcf toggle_customview ; Clear flag |
563 return | 582 return |
564 | 583 |
565 global customview_show_change_depth | 584 global customview_show_change_depth |