comparison src/surfmode.asm @ 230:f6548e8f06f5

Bugfix: Check for divemode before checking for menu
author mh@mh-THINK
date Fri, 20 Feb 2015 00:15:22 +0100
parents 8c11f60193be
children fe9d88fee09f
comparison
equal deleted inserted replaced
229:e1e5876bd777 230:f6548e8f06f5
192 ; One minute tasks for all modes 192 ; One minute tasks for all modes
193 btfsc oneminupdate ; do every minute tasks 193 btfsc oneminupdate ; do every minute tasks
194 call update_surfloop60 ; yes, e.g. update time and date 194 call update_surfloop60 ; yes, e.g. update time and date
195 195
196 ; Mode tasks 196 ; Mode tasks
197 btfsc divemode ; Divemode active?
198 goto diveloop ; Yes, switch into Divemode!
199
197 btfsc menubit ; Menu? 200 btfsc menubit ; Menu?
198 goto do_main_menu ; Menu! 201 goto do_main_menu ; Menu!
199 202
200 btfsc pressure_refresh ; new pressure available? 203 btfsc pressure_refresh ; new pressure available?
201 call TFT_update_surf_press ; display surface pressure 204 call TFT_update_surf_press ; display surface pressure
236 movlw "l" 239 movlw "l"
237 cpfseq RCREG1 240 cpfseq RCREG1
238 bra surfloop_loop4 241 bra surfloop_loop4
239 call TFT_dump_screen ; Dump the screen contents 242 call TFT_dump_screen ; Dump the screen contents
240 surfloop_loop4: 243 surfloop_loop4:
241 btfsc divemode ; Divemode active?
242 goto diveloop ; Yes, switch into Divemode!
243 btfsc sleepmode ; Sleepmode active? 244 btfsc sleepmode ; Sleepmode active?
244 goto sleeploop ; Yes, switch into sleepmode! 245 goto sleeploop ; Yes, switch into sleepmode!
245 246
246 bra surfloop_loop ; loop surfacemode 247 bra surfloop_loop ; loop surfacemode
247 248