Mercurial > public > mk2
changeset 724:03f8a8eec9ae
correct diluent store address
author | heinrichsweikamp |
---|---|
date | Wed, 29 May 2013 14:41:34 +0200 |
parents | 6fd9a9feca91 |
children | |
files | code_part1/OSTC_code_asm_part1/divemode_menu.asm code_part1/OSTC_code_asm_part1/menu_ppO2.asm code_part1/OSTC_code_asm_part1/menu_reset.asm code_part1/OSTC_code_asm_part1/outputs.asm |
diffstat | 4 files changed, 13 insertions(+), 27 deletions(-) [+] |
line wrap: on
line diff
--- a/code_part1/OSTC_code_asm_part1/divemode_menu.asm Mon May 27 20:23:25 2013 +0200 +++ b/code_part1/OSTC_code_asm_part1/divemode_menu.asm Wed May 29 14:41:34 2013 +0200 @@ -709,14 +709,14 @@ decf active_diluent,W ; 0-4 -> WREG mH mullw .4 movf PRODL,W - addlw d'98' + addlw d'99' movwf EEADR call read_eeprom ; Read He movff EEDATA,char_I_He_ratio ; And copy into hold register decf active_diluent,W ; 0-4 -> WREG mullw .4 movf PRODL,W - addlw d'97' + addlw d'98' movwf EEADR call read_eeprom ; Read O2 movff EEDATA, char_I_O2_ratio ; O2 ratio
--- a/code_part1/OSTC_code_asm_part1/menu_ppO2.asm Mon May 27 20:23:25 2013 +0200 +++ b/code_part1/OSTC_code_asm_part1/menu_ppO2.asm Wed May 29 14:41:34 2013 +0200 @@ -47,20 +47,6 @@ ;Byte116: ;First Diluent (1-5) -; EEPROM BANK0 Byte96-97: -; Diluent 1 (%O2,%He) -; EEPROM BANK0 Byte98-99: -; Diluent 2 (%O2,%He) -; EEPROM BANK0 Byte100-101: -; Diluent 3 (%O2,%He) -; EEPROM BANK0 Byte102-103: -; Diluent 4 (%O2,%He) -; EEPROM BANK0 Byte104-105: -; Diluent 5 (%O2,%He) -; EEPROM BANK0 Byte106: -; First Diluent (1-5) - - menu_const_ppO2: movlw d'1' movwf menupos @@ -121,7 +107,7 @@ clrf divemins+0 ; Here: # of Gas * 4 movlw d'5' movwf waitms_temp ; here: stores row for gas list - movlw d'93' + movlw d'94' movwf wait_temp ; here: stores eeprom address for gas list menu_diluentsetup_list: @@ -161,7 +147,7 @@ movff WREG,win_top lfsr FSR2,letter - movff wait_temp, EEADR ; Gas %He - Set address in internal EEPROM + movff wait_temp, EEADR ; Gas %O2 - Set address in internal EEPROM incf EEADR,F ; Gas %He - Set address in internal EEPROM call read_eeprom ; Read He value from EEPROM movff EEDATA,lo ; Move EEDATA -> lo @@ -283,31 +269,31 @@ diluent_list_edit_gas1: movlw d'0' ; Diluent Number 0-4 movwf decodata+0 - movlw d'91' ; EEPROM address of %O2 + movlw d'92' ; EEPROM address of Dil 1 %O2 default - 4 movwf divemins+0 bra menu_diluentgas diluent_list_edit_gas2: movlw d'1' ; Diluent Number 0-4 movwf decodata+0 - movlw d'95' ; EEPROM address of %O2 + movlw d'96' ; EEPROM address of Dil 2 %O2 default - 4 movwf divemins+0 bra menu_diluentgas diluent_list_edit_gas3: movlw d'2' ; Diluent Number 0-4 movwf decodata+0 - movlw d'99' ; EEPROM address of %O2 + movlw d'100' ; EEPROM address of Dil 3 %O2 default - 4 movwf divemins+0 bra menu_diluentgas diluent_list_edit_gas4: movlw d'3' ; Diluent Number 0-4 movwf decodata+0 - movlw d'103' ; EEPROM address of %O2 + movlw d'104' ; EEPROM address of Dil 4 %O2 default - 4 movwf divemins+0 bra menu_diluentgas diluent_list_edit_gas5: movlw d'4' ; Diluent Number 0-4 movwf decodata+0 - movlw d'107' ; EEPROM address of %O2 + movlw d'108' ; EEPROM address of Dil 5 %O2 default - 4 movwf divemins+0 ; bra menu_diluentgas menu_diluentgas: @@ -674,7 +660,7 @@ call read_eeprom ; High-value movff EEDATA,hi - movf divemins+0,W ; save Default value + movf divemins+0,W ; save current value addlw 0x06 movwf EEADR movff lo,EEDATA @@ -993,7 +979,7 @@ read_int_eeprom d'116' ; Read First Diluent (1-5) movf EEDATA,W ; WREG: 0-4 mullw .4 ; PRODL: 0-16 - movlw .93 ; Base address for O2 + movlw .94 ; Base address for O2 addwf PRODL,W movwf EEADR call read_eeprom ; Read O2
--- a/code_part1/OSTC_code_asm_part1/menu_reset.asm Mon May 27 20:23:25 2013 +0200 +++ b/code_part1/OSTC_code_asm_part1/menu_reset.asm Wed May 29 14:41:34 2013 +0200 @@ -498,7 +498,7 @@ rcall reset_gas ; saves default value for gas #5 rcall reset_gas ; saves current value for gas #6 - movlw d'94' ; address of first diluent-1 + movlw d'95' ; address of first diluent-1 movwf EEADR rcall reset_gas ; saves current value for diluent #1 rcall reset_gas ; saves default value for diluent #1
--- a/code_part1/OSTC_code_asm_part1/outputs.asm Mon May 27 20:23:25 2013 +0200 +++ b/code_part1/OSTC_code_asm_part1/outputs.asm Wed May 29 14:41:34 2013 +0200 @@ -2995,7 +2995,7 @@ WIN_LEFT .100 WIN_FONT FT_SMALL bsf leftbind - movlw d'93' + movlw d'94' movwf wait_temp ; here: stores eeprom address for diluent list (96-2) movlw d'231' movwf waitms_temp ; here: stores row for gas list