Mercurial > public > mk2

changeset 829:69bc5feca5da

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
BUGFIX: "First Diluent" and "SP Mode" used same EEPROM location
author heinrichsweikamp
date Tue, 20 Oct 2015 12:01:18 +0200
parents 4b6d848cb7b8
children e8f5eed0eccf
files code_part1/OSTC_code_asm_part1/changelog.txt code_part1/OSTC_code_asm_part1/definitions.asm code_part1/OSTC_code_asm_part1/menu_ppO2.asm code_part1/OSTC_code_asm_part1/menu_reset.asm
diffstat 4 files changed, 9 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/code_part1/OSTC_code_asm_part1/changelog.txt	Mon Oct 19 10:40:47 2015 +0200
+++ b/code_part1/OSTC_code_asm_part1/changelog.txt	Tue Oct 20 12:01:18 2015 +0200
@@ -1,3 +1,6 @@
+New in 3.11:
+BUGFIX: "First Diluent" and "SP Mode" used same EEPROM location
+
 New in 3.10:
 Stable Release
 
--- a/code_part1/OSTC_code_asm_part1/definitions.asm	Mon Oct 19 10:40:47 2015 +0200
+++ b/code_part1/OSTC_code_asm_part1/definitions.asm	Tue Oct 20 12:01:18 2015 +0200
@@ -22,7 +22,7 @@
 ; ToDo:
 
 #DEFINE	softwareversion_x		d'3'		; Software version  XX.YY
-#DEFINE	softwareversion_y		d'10'		; Software version  XX.YY
+#DEFINE	softwareversion_y		d'11'		; Software version  XX.YY
 
 #DEFINE softwareversion_beta 	0 			; (and 0 for release)
 
--- a/code_part1/OSTC_code_asm_part1/menu_ppO2.asm	Mon Oct 19 10:40:47 2015 +0200
+++ b/code_part1/OSTC_code_asm_part1/menu_ppO2.asm	Tue Oct 20 12:01:18 2015 +0200
@@ -171,7 +171,7 @@
 	movff	WREG,win_top
 	lfsr	FSR2,letter
 
-	movlw	d'116'
+	movlw	d'115'
 	movwf	EEADR
 	call	read_eeprom			; Get current startgas 1-5 # into EEDATA
 	decf	EEDATA,W			; 0-4
@@ -359,7 +359,7 @@
 	OUTPUTTEXT	.88			; First Gas?
 	PUTC	' '
 
-	movlw	d'116'
+	movlw	d'115'
 	movwf	EEADR
 	call	read_eeprom		; Get current startgas 1-5 # into EEDATA
 	decf	EEDATA,W		; 0-4
@@ -566,7 +566,7 @@
 make_first_diluent:
 	movff	decodata+0,EEDATA		; current gas (0-4) into EEDATA
 	incf	EEDATA,F				; current gas (1-5) into EEDATA
-	movlw	d'116'
+	movlw	d'115'
 	movwf	EEADR
 	call	write_eeprom			; store in internal EEPROM
 	movlw	d'1'
@@ -1054,7 +1054,7 @@
 	bra		menu_const_ppO21
 
 get_first_diluent:              ; Read first diluent into lo(O2) and hi(He)
-    read_int_eeprom d'116'      ; Read First Diluent (1-5)
+    read_int_eeprom d'115'      ; Read First Diluent (1-5)
     movf    EEDATA,W            ; WREG: 0-4
     mullw   .4                  ; PRODL: 0-16
     movlw   .93                 ; Base address for O2
--- a/code_part1/OSTC_code_asm_part1/menu_reset.asm	Mon Oct 19 10:40:47 2015 +0200
+++ b/code_part1/OSTC_code_asm_part1/menu_reset.asm	Tue Oct 20 12:01:18 2015 +0200
@@ -521,7 +521,7 @@
     movlw   .1
     movwf   EEDATA
     write_int_eeprom    .33         ; First Gas (1-5)
-    write_int_eeprom    .116        ; First Diluent (1-5)
+    write_int_eeprom    .115        ; First Diluent (1-5)
 	return
 
 ; Write WREG:lo twice, w/o any type clearing, pre-incrementing EEADR