Mercurial > public > mk2
changeset 640:50ba6255f53e
ccr menu
| author | heinrichsweikamp |
|---|---|
| date | Thu, 20 Sep 2012 14:29:58 +0200 |
| parents | 2ab9e9a8a189 |
| children | 9dc52559956e |
| files | code_part1/OSTC_code_asm_part1/changelog.txt code_part1/OSTC_code_asm_part1/english_text.asm code_part1/OSTC_code_asm_part1/menu_ppO2.asm |
| diffstat | 3 files changed, 11 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- a/code_part1/OSTC_code_asm_part1/changelog.txt Thu Sep 20 10:06:19 2012 +0200 +++ b/code_part1/OSTC_code_asm_part1/changelog.txt Thu Sep 20 14:29:58 2012 +0200 @@ -1,6 +1,6 @@ New in 2.52: BETA Version - Do NOT use for diving! -TODO: Text 61,229,110,111,230 update +TODO: Text 61,229,110,111,230, TXT_DIL_C update NEW: Divisor Decoplan (CF25) stores entire decoplan in logbook NEW: CF29 stored in divelog header (Byte 52)
--- a/code_part1/OSTC_code_asm_part1/english_text.asm Thu Sep 20 10:06:19 2012 +0200 +++ b/code_part1/OSTC_code_asm_part1/english_text.asm Thu Sep 20 14:29:58 2012 +0200 @@ -115,6 +115,7 @@ #DEFINE TXT_TX2 "x" ; "x" #DEFINE TXT_NX1 "N" ; "N" #DEFINE TXT_NX2 "x" ; "x" +#DEFINE TXT_DIL_C "D" ; "D" #ENDIF ;=============================================================================
--- a/code_part1/OSTC_code_asm_part1/menu_ppO2.asm Thu Sep 20 10:06:19 2012 +0200 +++ b/code_part1/OSTC_code_asm_part1/menu_ppO2.asm Thu Sep 20 14:29:58 2012 +0200 @@ -111,7 +111,7 @@ movf waitms_temp,W ; Load row into WREG movff WREG,win_top lfsr FSR2,letter - PUTC TXT_GAS_C + PUTC TXT_DIL_C movff decodata+0,lo incf lo,F bsf leftbind @@ -194,6 +194,7 @@ DISPLAYTEXT .11 ; Exit call wait_switches ; Waits until switches are released, resets flag if button stays pressed! call PLED_menu_cursor + clrf EEADRH menu_diluentsetup_loop: call check_switches_logbook @@ -292,31 +293,20 @@ OUTPUTTEXT d'192' ; Dil. PUTC ' ' - read_int_eeprom d'33' ; Read byte (stored in EEDATA) - movff EEDATA,active_gas ; Read start gas (1-5) - - decf active_gas,W ; Gas 0-4 - mullw d'4' - movf PRODL,W - addlw d'6' ; = address for O2 ratio + movlw .1 + movwf EEADRH + addlw d'96' ; = address for O2 ratio movwf EEADR call read_eeprom ; Read O2 ratio - movff EEDATA, lo ; O2 ratio - - + movff EEDATA, lo ; O2 ratio bsf leftbind output_99 - PUTC '/' - - decf active_gas,W ; Gas 0-4 - mullw d'4' - movf PRODL,W - addlw d'7' ; = address for He ratio + addlw d'97' ; = address for He ratio movwf EEADR call read_eeprom ; Read He ratio - movff EEDATA,lo ; And copy into hold register - + movff EEDATA,lo ; And copy into hold register + clrf EEADRH bsf leftbind output_99 STRCAT_PRINT ")"