Mercurial > public > mk2
diff code_part1/OSTC_code_asm_part1/divemode_menu.asm @ 71:6beb680a6130
1.72beta - color-coded gaslist, small fix with stopwatch
| author | heinrichsweikamp |
|---|---|
| date | Wed, 10 Nov 2010 14:59:09 +0100 |
| parents | d0b677e1e9a5 |
| children | 2227459e8ef2 |
line wrap: on
line diff
--- a/code_part1/OSTC_code_asm_part1/divemode_menu.asm Wed Oct 20 19:43:11 2010 +0200 +++ b/code_part1/OSTC_code_asm_part1/divemode_menu.asm Wed Nov 10 14:59:09 2010 +0100 @@ -86,13 +86,16 @@ btfsc standalone_simulator ; Standalone Simualtor active? bra divemode_menu_simulator ; Yes, Show simulator menu! - bsf LED_red ; LEDr on + bsf LED_red ; LEDr on movlw d'6' ; Type of Alarm (Manual Marker) movwf AlarmType ; Copy to Alarm Register bsf event_occured ; Set Event Flag - btfss stopwatch_active ; =1: Reset Average registers + btfss stopwatch_active ; =1: Reset Average registers return + btfsc lock_stopwatch_reset ; Reset locked? + return ; Yes, do not reset (now)... + ; Maker Set, also reset average Depth.... clrf average_depth_hold+0 clrf average_depth_hold+1 @@ -744,6 +747,7 @@ bcf display_set_simulator bcf switch_left ; and debounce switches bcf switch_right + bsf lock_stopwatch_reset ; Lock the stopwatch reset for at least one second (Cleared in "calc_average_depth:") return timeout_divemenu3: