Mercurial > public > mk2
changeset 819:95c08c0cfc29
3.04 beta release
| author | heinrichsweikamp |
|---|---|
| date | Sun, 07 Jun 2015 11:18:28 +0200 |
| parents | 3d9f56e0d18c |
| children | 4fd718965e8f |
| 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, 68 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/code_part1/OSTC_code_asm_part1/changelog.txt Sat Jun 06 19:17:04 2015 +0200 +++ b/code_part1/OSTC_code_asm_part1/changelog.txt Sun Jun 07 11:18:28 2015 +0200 @@ -1,7 +1,8 @@ New in 3.04: -Stable Release +Beta Release BUGFIX: Fix licence in German BUGFIX: Fix minor layout bug in surface mode +NEW: Auto Setpoint switch function (CC Modes) New in 3.03: Stable Release
--- a/code_part1/OSTC_code_asm_part1/definitions.asm Sat Jun 06 19:17:04 2015 +0200 +++ b/code_part1/OSTC_code_asm_part1/definitions.asm Sun Jun 07 11:18:28 2015 +0200 @@ -24,7 +24,7 @@ #DEFINE softwareversion_x d'3' ; Software version XX.YY #DEFINE softwareversion_y d'04' ; Software version XX.YY -#DEFINE softwareversion_beta 0 ; (and 0 for release) +#DEFINE softwareversion_beta 1 ; (and 0 for release) #DEFINE max_custom_number d'73' ; Number of last used custom function
--- a/code_part1/OSTC_code_asm_part1/divemode.asm Sat Jun 06 19:17:04 2015 +0200 +++ b/code_part1/OSTC_code_asm_part1/divemode.asm Sun Jun 07 11:18:28 2015 +0200 @@ -130,7 +130,7 @@ diveloop_loop1c: btfsc show_safety_stop ; Show the safety stop? call DISP_show_safety_stop ; Yes, show/delete if done. - call dive_check_autosp ; Check for Auto-SP + call check_dive_autosp ; Check for Auto-SP call DISP_const_ppO2_value ; display const ppO2 setting in [bar] call calc_deko_divemode ; calculate decompression and display result (any two seconds) btfsc is_bailout ; Are we in Bailout mode? @@ -2032,14 +2032,72 @@ ;============================================================================= ; Check for Auto-SP ; -dive_check_autosp: ; Check for Auto-SP +check_dive_autosp: ; Check for Auto-SP read_int_eeprom .116 tstfsz EEDATA ; =0: Manual - bra dive_check_autosp2 - return -dive_check_autosp2: - ; Check for auto sp - return + bra check_dive_autosp2 + return ; Skip check +check_dive_autosp2: + SAFE_2BYTE_COPY rel_pressure,xA + movlw d'100' + movwf xB+0 + clrf xB+1 + call div16x16 ; compute depth in full m -> result in xC+0 + ; Check SP1 + btfsc sp1_switched ;=1: This setpoint has been autoselected already + bra check_dive_autosp3 ; Skip check + read_int_eeprom .117 ; Get depth in m + tstfsz EEDATA ; =? + bra $+4 ; No, continue + bra check_dive_autosp3 ; Skip check + decf EEDATA,W ; -1 -> WREG + cpfsgt xC+0 ; Compare with depth + bra check_dive_autosp3 ; lower depth, do not switch + ; auto switch to SP1 + read_int_eeprom .36 ; Get Setpoint + movff EEDATA, char_I_const_ppO2 ; Use SetPoint + movff EEDATA, ppO2_setpoint_store ; Store also in this byte... + bsf setpoint_changed + bsf event_occured ; set global event flag + bsf sp1_switched ; Set flag +check_dive_autosp3: + ; Check SP2 + btfsc sp2_switched ;=1: This setpoint has been autoselected already + bra check_dive_autosp4 ; Skip check + read_int_eeprom .118 ; Get depth in m + tstfsz EEDATA ; =? + bra $+4 ; No, continue + bra check_dive_autosp4 ; Skip check + decf EEDATA,W ; -1 -> WREG + cpfsgt xC+0 ; Compare with depth + bra check_dive_autosp4 ; lower depth, do not switch + ; auto switch to SP2 + read_int_eeprom .37 ; Get Setpoint + movff EEDATA, char_I_const_ppO2 ; Use SetPoint + movff EEDATA, ppO2_setpoint_store ; Store also in this byte... + bsf setpoint_changed + bsf event_occured ; set global event flag + bsf sp2_switched ; Set flag +check_dive_autosp4: + ; Check SP3 + btfsc sp3_switched ;=1: This setpoint has been autoselected already + bra check_dive_autosp5 ; Skip check + read_int_eeprom .119 ; Get depth in m + tstfsz EEDATA ; =? + bra $+4 ; No, continue + bra check_dive_autosp5 ; Skip check + decf EEDATA,W ; -1 -> WREG + cpfsgt xC+0 ; Compare with depth + bra check_dive_autosp5 ; lower depth, do not switch + ; auto switch to SP3 + read_int_eeprom .38 ; Get Setpoint + movff EEDATA, char_I_const_ppO2 ; Use SetPoint + movff EEDATA, ppO2_setpoint_store ; Store also in this byte... + bsf setpoint_changed + bsf event_occured ; set global event flag + bsf sp3_switched ; Set flag +check_dive_autosp5: + return ; Done. ;============================================================================= ; Setup everything to enter divemode.