Mercurial > public > mk2

changeset 664:9c13bf8a3033

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Ignore decoplanner in gauge and apnoe mode
author heinrichsweikamp
date Wed, 14 Nov 2012 12:02:14 +0100
parents 64194a3c8d5b
children 259e4c1bf3c2
files code_part1/OSTC_code_asm_part1/oled_samsung.asm code_part1/OSTC_code_asm_part1/simulator.asm
diffstat 2 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/code_part1/OSTC_code_asm_part1/oled_samsung.asm	Mon Nov 12 20:53:58 2012 +0100
+++ b/code_part1/OSTC_code_asm_part1/oled_samsung.asm	Wed Nov 14 12:02:14 2012 +0100
@@ -227,7 +227,7 @@
 ; Trash  : NONE
 ;
 AA_DATA_WRITE_PROD	macro
-;       rcall   PLED_DataWrite_PROD	; slow but saves a lot of bytes in flash
+;      rcall   PLED_DataWrite_PROD	; slow but saves a lot of bytes in flash
 	; /* Fast writing
 		bsf		oled_rs				    ; Data mode
 		movff	PRODH,PORTD			    ; NOTE: OLED is BIGENDIAN!
--- a/code_part1/OSTC_code_asm_part1/simulator.asm	Mon Nov 12 20:53:58 2012 +0100
+++ b/code_part1/OSTC_code_asm_part1/simulator.asm	Wed Nov 14 12:02:14 2012 +0100
@@ -334,6 +334,11 @@
 ; OSTC Simulator: compute a new runtime
 ;
 simulator_calc_deco:
+    btfsc	gauge_mode                  ; In Gauge mode?
+    bra     menu_simulator              ; Yes, igonore decoplaner
+	btfsc   FLAG_apnoe_mode             ; In Apnoe mode?
+    bra     menu_simulator              ; Yes, igonore decoplaner
+
 	call	simulator_save_tissue_data  ; Stores 32 floats "pre_tissue" into bank3
 
     movff   char_I_dive_interval,WREG   ; Any interval ?