Mercurial > public > mk2
changeset 656:5063fb9f07db
2.55beta release
| author | heinrichsweikamp |
|---|---|
| date | Mon, 29 Oct 2012 20:05:59 +0100 |
| parents | 8c01edcf57fc |
| children | 8dd730d3a5d7 |
| files | code_part1/OSTC_code_asm_part1/changelog.txt code_part1/OSTC_code_asm_part1/definitions.asm code_part1/OSTC_code_asm_part1/divemode.asm |
| diffstat | 3 files changed, 48 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/code_part1/OSTC_code_asm_part1/changelog.txt Tue Oct 23 10:03:47 2012 +0200 +++ b/code_part1/OSTC_code_asm_part1/changelog.txt Mon Oct 29 20:05:59 2012 +0100 @@ -1,6 +1,9 @@ +New in 2.56: +BETA Version - Do NOT use for diving! + New in 2.55: BETA Version - Do NOT use for diving! - +NEW: Allow any Diluent to be "First Gas" in CCR mode New in 2.54: BETA Version - Do NOT use for diving!
--- a/code_part1/OSTC_code_asm_part1/definitions.asm Tue Oct 23 10:03:47 2012 +0200 +++ b/code_part1/OSTC_code_asm_part1/definitions.asm Mon Oct 29 20:05:59 2012 +0100 @@ -22,7 +22,7 @@ ; ToDo: #DEFINE softwareversion_x d'2' ; Software version XX.YY -#DEFINE softwareversion_y d'55' ; Software version XX.YY +#DEFINE softwareversion_y d'56' ; Software version XX.YY #DEFINE softwareversion_beta 1 ; (and 0 for release)
--- a/code_part1/OSTC_code_asm_part1/divemode.asm Tue Oct 23 10:03:47 2012 +0200 +++ b/code_part1/OSTC_code_asm_part1/divemode.asm Mon Oct 29 20:05:59 2012 +0100 @@ -1381,48 +1381,86 @@ call write_external_eeprom ; Gases.... + btfsc FLAG_const_ppO2_mode + bra end_dive3 ; Store diluents instead of gases + read_int_eeprom d'6' ; Read byte (stored in EEDATA) movf EEDATA,W call write_external_eeprom read_int_eeprom d'7' ; Read byte (stored in EEDATA) movf EEDATA,W call write_external_eeprom - read_int_eeprom d'10' ; Read byte (stored in EEDATA) movf EEDATA,W call write_external_eeprom read_int_eeprom d'11' ; Read byte (stored in EEDATA) movf EEDATA,W call write_external_eeprom - read_int_eeprom d'14' ; Read byte (stored in EEDATA) movf EEDATA,W call write_external_eeprom read_int_eeprom d'15' ; Read byte (stored in EEDATA) movf EEDATA,W call write_external_eeprom - read_int_eeprom d'18' ; Read byte (stored in EEDATA) movf EEDATA,W call write_external_eeprom read_int_eeprom d'19' ; Read byte (stored in EEDATA) movf EEDATA,W call write_external_eeprom - read_int_eeprom d'22' ; Read byte (stored in EEDATA) movf EEDATA,W call write_external_eeprom read_int_eeprom d'23' ; Read byte (stored in EEDATA) movf EEDATA,W call write_external_eeprom + bra end_dive4 +end_dive3: + read_int_eeprom d'96' ; Read byte (stored in EEDATA) + movf EEDATA,W + call write_external_eeprom + read_int_eeprom d'97' ; Read byte (stored in EEDATA) + movf EEDATA,W + call write_external_eeprom + read_int_eeprom d'98' ; Read byte (stored in EEDATA) + movf EEDATA,W + call write_external_eeprom + read_int_eeprom d'99' ; Read byte (stored in EEDATA) + movf EEDATA,W + call write_external_eeprom + read_int_eeprom d'100' ; Read byte (stored in EEDATA) + movf EEDATA,W + call write_external_eeprom + read_int_eeprom d'101' ; Read byte (stored in EEDATA) + movf EEDATA,W + call write_external_eeprom + read_int_eeprom d'102' ; Read byte (stored in EEDATA) + movf EEDATA,W + call write_external_eeprom + read_int_eeprom d'103' ; Read byte (stored in EEDATA) + movf EEDATA,W + call write_external_eeprom + read_int_eeprom d'104' ; Read byte (stored in EEDATA) + movf EEDATA,W + call write_external_eeprom + read_int_eeprom d'105' ; Read byte (stored in EEDATA) + movf EEDATA,W + call write_external_eeprom + +end_dive4: read_int_eeprom d'24' ; % O2 Gas6 movf EEDATA,W call write_external_eeprom read_int_eeprom d'25' ; % He Gas6 movf EEDATA,W call write_external_eeprom - read_int_eeprom d'33' ; start gas + + movlw .33 ; Start gas + btfsc FLAG_const_ppO2_mode ; In CCR mode? + movlw .106 ; Yes, use start Diluent instead + movwf EEADR + call read_eeprom movf EEDATA,W call write_external_eeprom