Mercurial > public > mk2

changeset 824:6cb5518e74d2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
NEW: Quit Simulator automatically when starting a real dive
author heinrichsweikamp
date Wed, 29 Jul 2015 19:22:50 +0200
parents 1a64088b49d3
children 588867b0d5c2
files code_part1/OSTC_code_asm_part1/changelog.txt code_part1/OSTC_code_asm_part1/definitions.asm code_part1/OSTC_code_asm_part1/ms5535.asm
diffstat 3 files changed, 15 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/code_part1/OSTC_code_asm_part1/changelog.txt	Mon Jun 22 09:58:33 2015 +0200
+++ b/code_part1/OSTC_code_asm_part1/changelog.txt	Wed Jul 29 19:22:50 2015 +0200
@@ -1,3 +1,7 @@
+New in 3.05:
+Beta Release
+NEW: Quit Simulator automatically when starting a real dive
+
 New in 3.04:
 Beta Release
 BUGFIX: Fix licence in German
--- a/code_part1/OSTC_code_asm_part1/definitions.asm	Mon Jun 22 09:58:33 2015 +0200
+++ b/code_part1/OSTC_code_asm_part1/definitions.asm	Wed Jul 29 19:22:50 2015 +0200
@@ -22,7 +22,7 @@
 ; ToDo:
 
 #DEFINE	softwareversion_x		d'3'		; Software version  XX.YY
-#DEFINE	softwareversion_y		d'04'		; Software version  XX.YY
+#DEFINE	softwareversion_y		d'05'		; Software version  XX.YY
 
 #DEFINE softwareversion_beta 	1 			; (and 0 for release)
 
--- a/code_part1/OSTC_code_asm_part1/ms5535.asm	Mon Jun 22 09:58:33 2015 +0200
+++ b/code_part1/OSTC_code_asm_part1/ms5535.asm	Wed Jul 29 19:22:50 2015 +0200
@@ -146,6 +146,16 @@
 	btfss	simulatormode_active		; are we in simulator mode?
 	bra		calc_compensation_2			; no
 
+    movlw   .5
+    cpfsgt  isr_xC+2                    ; >1280mbar ?
+    bra     pressure_extra_common2      ; No
+    ; Yes, reset sim_pressure:2 to 1000mbar (End of sim)
+    movlw   LOW     .1000
+    movwf   sim_pressure+0
+    movlw   HIGH    .1000
+    movwf   sim_pressure+1
+
+pressure_extra_common2:
 	movff	sim_pressure+0,isr_xC+1	    ; override readings with simulator values
 	movff	sim_pressure+1,isr_xC+2