Mercurial > public > mk2

changeset 804:7f3f79e53f66

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
BUGFIX: Show manually set O2 (Gas 6) correctly
author heinrichsweikamp
date Wed, 04 Feb 2015 20:18:34 +0100
parents fec91971e4b9
children 6256a891b2a0
files code_part1/OSTC_code_asm_part1/changelog.txt code_part1/OSTC_code_asm_part1/outputs.asm
diffstat 2 files changed, 8 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/code_part1/OSTC_code_asm_part1/changelog.txt	Fri Jan 30 13:39:05 2015 +0100
+++ b/code_part1/OSTC_code_asm_part1/changelog.txt	Wed Feb 04 20:18:34 2015 +0100
@@ -1,6 +1,7 @@
 New in 3.01:
 Stable Release
 BUGFIX: Entry time in logbook when dive was around midnight
+BUGFIX: Show manually set O2 (Gas 6) correctly
 
 
 New in 3.00:
--- a/code_part1/OSTC_code_asm_part1/outputs.asm	Fri Jan 30 13:39:05 2015 +0100
+++ b/code_part1/OSTC_code_asm_part1/outputs.asm	Wed Feb 04 20:18:34 2015 +0100
@@ -2886,11 +2886,18 @@
 	read_int_eeprom	d'24'			; Get Gas6 %O2
 	movff	EEDATA,lo
 	bcf		leftbind
+    movlw   .100
+    cpfseq  lo                      ; 100% O2?
+    bra     DISP_divemode_set_xgas2 ; No
+    STRCAT  "100/0"                 ; Draw 100/0 manually
+    bra     DISP_divemode_set_xgas3
+DISP_divemode_set_xgas2:
 	output_99					; outputs into Postinc2!
     PUTC    '/'
 	read_int_eeprom	d'25'			; Get Gas6 %He
 	movff	EEDATA,lo
 	output_99					; outputs into Postinc2!
+DISP_divemode_set_xgas3:
 	call	word_processor
 	DISPLAYTEXT	.123			; O2 +
 	DISPLAYTEXT	.124			; O2 -