# HG changeset patch # User heinrichsweikamp # Date 1417008625 -3600 # Node ID 618191753d2b4802d7d9edd368a0307e893097e0 # Parent 93085f5407464a97b99ae9e09800c0b0cde48f62 Preparations for 1.7 diff -r 93085f540746 -r 618191753d2b src/divemode.asm --- a/src/divemode.asm Sun Nov 23 22:33:41 2014 +0100 +++ b/src/divemode.asm Wed Nov 26 14:30:25 2014 +0100 @@ -104,9 +104,6 @@ btfsc toggle_gf ; =1: Toggle GF/aGF rcall divemodemode_togglegf ; Toggle aGF/GF -; btfsc FLAG_ccr_mode ; In CCR mode -; call TFT_active_gas_divemode ; Update Setpoint every second - call compute_ppo2 ; compute mv_sensorX and ppo2_sensorX arrays diveloop_loop3: diff -r 93085f540746 -r 618191753d2b src/ostc3.inc --- a/src/ostc3.inc Sun Nov 23 22:33:41 2014 +0100 +++ b/src/ostc3.inc Wed Nov 26 14:30:25 2014 +0100 @@ -20,10 +20,10 @@ ; Firmware definition #DEFINE softwareversion_x d'1' ; Software version XX.YY -#DEFINE softwareversion_y d'64' ; Software version XX.YY -#DEFINE softwareversion_beta 1 ; (and 0 for release) +#DEFINE softwareversion_y d'70' ; Software version XX.YY +#DEFINE softwareversion_beta 0 ; (and 0 for release) ; Firmware version will appear in "Change Firmware" style -#DEFINE firmware_expire_year .15 +#DEFINE firmware_expire_year .16 #DEFINE firmware_expire_month .1 #DEFINE firmware_expire_day .1 diff -r 93085f540746 -r 618191753d2b src/sleepmode.asm --- a/src/sleepmode.asm Sun Nov 23 22:33:41 2014 +0100 +++ b/src/sleepmode.asm Wed Nov 26 14:30:25 2014 +0100 @@ -165,8 +165,6 @@ onesec_sleep1a: ; At least one button pressed or amb_pressure > wake_up_from_sleep bcf INTCON,INT0IF ; Clear flag bcf INTCON3,INT1IF ; Clear flag - bcf switch_right - bcf switch_left bcf sleepmode ; wake up! SAFE_2BYTE_COPY last_surfpressure_30min, amb_pressure ; copy for compatibility movlw .0 diff -r 93085f540746 -r 618191753d2b src/surfmode.asm --- a/src/surfmode.asm Sun Nov 23 22:33:41 2014 +0100 +++ b/src/surfmode.asm Wed Nov 26 14:30:25 2014 +0100 @@ -117,8 +117,6 @@ WIN_FONT FT_SMALL bcf win_invert ; Reset invert flag -; call TFT_user_image ; Show the user image/text - WIN_COLOR color_lightblue WIN_SMALL menu_pos_column,menu_pos_row STRCPY_TEXT_PRINT tMenu ;"