# HG changeset patch # User heinrichsweikamp # Date 1588835579 -7200 # Node ID 9a64914a8fcacef0206dbbf9a06ee444a382a424 # Parent 4050675965ea80618552db9c2fea99b966de7b7b 3.10 re-release addressing some minor issues and language fixes diff -r 4050675965ea -r 9a64914a8fca src/configuration.inc --- a/src/configuration.inc Tue Apr 28 17:34:31 2020 +0200 +++ b/src/configuration.inc Thu May 07 09:12:59 2020 +0200 @@ -43,8 +43,8 @@ #endif #define firmware_creation_year 0x14 -#define firmware_creation_month 0x04 -#define firmware_creation_day 0x1C +#define firmware_creation_month 0x05 +#define firmware_creation_day 0x07 #define firmware_expire_year 0x15 #define firmware_expire_month 0x02 diff -r 4050675965ea -r 9a64914a8fca src/divemode.asm --- a/src/divemode.asm Tue Apr 28 17:34:31 2020 +0200 +++ b/src/divemode.asm Thu May 07 09:12:59 2020 +0200 @@ -3147,7 +3147,7 @@ bsf alt_layout_active ; YES - start with alternative layout ; configure tissue graphics - TSTOSS opt_tissue_graphics ; shall show: 0= pres+sat, 1= N2+He + TSTOSC opt_tissue_graphics ; shall show: 0= pres+sat, 1= N2+He bsf tissue_graphic_layout ; YES - show press+sat TSTOSC char_I_model ; GF factors enabled? bsf tissue_graphic_gf ; YES - show GF lines diff -r 4050675965ea -r 9a64914a8fca src/menu_tree.asm --- a/src/menu_tree.asm Tue Apr 28 17:34:31 2020 +0200 +++ b/src/menu_tree.asm Thu May 07 09:12:59 2020 +0200 @@ -2064,7 +2064,12 @@ ; 0x02: ambient sensor ---> OSTC Sport (USB model) YES NO 1.5V 3.6V disposable 3.6V rechargeable ; 0x52: BLE and ambient sensor and low volt core ---> OSTC Sport (BLE model) YES NO 1.5V 3.6V disposable 3.6V rechargeable - movlw 0x11 ; OSTC 2 (old model) + movlw 0x11 ; OSTC 2 (2015 model) + cpfseq HW_descriptor + bra $+4 + bra use_18650_battery + + movlw 0x91 ; OSTC 2 (2015 model) with block write cpfseq HW_descriptor bra $+4 bra use_18650_battery @@ -2074,15 +2079,20 @@ bra $+4 bra use_18650_battery - movlw 0x33 ; OSTC 2 TR + movlw 0x85 ; OSTC 2 cR with block write + cpfseq HW_descriptor + bra $+4 + bra use_18650_battery + + movlw 0xB3 ; OSTC 2 TR cpfseq HW_descriptor bra $+4 bra do_use_16650_battery -; movlw 0xXX ; OSTC 2 (new model) TODO: define signature -; cpfseq HW_descriptor -; bra $+4 -; bra do_use_16650_battery + movlw 0x93 ; OSTC 2 (2017 model) + cpfseq HW_descriptor + bra $+4 + bra do_use_16650_battery movlw 0x13 ; OSTC Plus TODO: and OSTC 2 new model as of now cpfseq HW_descriptor diff -r 4050675965ea -r 9a64914a8fca src/p2_deco.c --- a/src/p2_deco.c Tue Apr 28 17:34:31 2020 +0200 +++ b/src/p2_deco.c Thu May 07 09:12:59 2020 +0200 @@ -3293,7 +3293,7 @@ // - if a valid alternative plan TTS exists, and // - if it is not a bailout plan if( (deco_status & CALC_ALT ) ) - if( (int_O_TTS_alt & INT_FLAG_INVALID) ) + if( !(int_O_TTS_alt & INT_FLAG_INVALID) ) if( !(deco_status & BAILOUT_MODE ) ) { if( int_O_TTS_alt < int_O_TTS_norm ) deco_info |= DECO_ZONE; diff -r 4050675965ea -r 9a64914a8fca src/simulator.asm --- a/src/simulator.asm Tue Apr 28 17:34:31 2020 +0200 +++ b/src/simulator.asm Thu May 07 09:12:59 2020 +0200 @@ -758,8 +758,9 @@ bcf decoplan_overflow ; no overflow in gas needs by default - btfsc decoplan_pressures_shown ; results in bar? - bra deco_results_gas_volumes_1 ; YES + btfss decoplan_pressures_shown ; results in bar? + bra deco_results_gas_volumes_2 ; NO - liter + ;bra deco_results_gas_volumes_1 ; YES - bar ; output of gas needs in bar deco_results_gas_volumes_1: diff -r 4050675965ea -r 9a64914a8fca src/text_french.inc --- a/src/text_french.inc Tue Apr 28 17:34:31 2020 +0200 +++ b/src/text_french.inc Thu May 07 09:12:59 2020 +0200 @@ -297,7 +297,7 @@ TCODE tVSIgraph, "Graph.Vitesse: " ; Speed Graph TCODE tVSItext2, "Vites.Variabl: " ; adaptive Speed TCODE tShowppO2, "Afficher PpO2: " ; always show ppO2 - TCODE tDepthWarning, "Prof. Flash : " ; Depth blinking + TCODE tDepthWarning, "Signal Prof. : " ; Depth blinking TCODE t2ndDepth, "Choix Prof:" ; 2nd Depth Display Content (11 chars max) TCODE tTissueGraphics, "Graphique :" ; Tissue Graphics TCODE tIBCDwarning, "Alerte CDI: " ; IBCD Warning @@ -500,7 +500,7 @@ ; Divemode menu - TCODE tDiveAckn, "Conf?" ; Acknf? (max. 5 chars) (Acknowledge) + TCODE tDiveAckn, "OkVu?" ; Acknf? (max. 5 chars) (Acknowledge) TCODE tDivePreMenu, "Menu?" ; Menu? (max. 5 chars) TCODE tDiveLayout, "Affich" ; Layout (max. 6 chars) IFDEF _compass diff -r 4050675965ea -r 9a64914a8fca src/text_multilang.asm --- a/src/text_multilang.asm Tue Apr 28 17:34:31 2020 +0200 +++ b/src/text_multilang.asm Thu May 07 09:12:59 2020 +0200 @@ -21,11 +21,11 @@ ; fast hack **ONLY** for **CHANGING** languages ( en / de / fr / it ) -#undefine _language_1 -#define _language_1 fr -; -#undefine _language_2 -#define _language_2 it +;#undefine _language_1 +;#define _language_1 fr +;; +;#undefine _language_2 +;#define _language_2 it ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff -r 4050675965ea -r 9a64914a8fca src/tft_outputs.asm --- a/src/tft_outputs.asm Tue Apr 28 17:34:31 2020 +0200 +++ b/src/tft_outputs.asm Thu May 07 09:12:59 2020 +0200 @@ -2949,8 +2949,9 @@ movff int_O_TST_alt+1,WREG ; get high byte of the alternative total stops time btfsc WREG,int_is_zero ; total stops time = zero ? bra TFT_display_ftts_9 ; YES - show "NDL" - btfsc WREG,deco_zone ; NO - fTTS <= TTS ? - FONT_COLOR_ADVICE ; YES - set to advice color (green) + movff char_O_deco_info,WREG ; NO - get deco info vector + btfsc WREG,deco_zone ; - fTTS <= TTS ? + FONT_COLOR_ADVICE ; YES - set to advice color (green) TFT_display_ftts_7: bsf leftbind ; print left-aligned output_999 ; print ascent time (0-999) @@ -4715,6 +4716,7 @@ addwf win_leftx2,F ; add to base position movlw color_yellow ; color for GF high line BOX_COLOR ; draw line + bra TFT_dive_tissues_4 ; continue with number of leading tissue IFDEF _helium TFT_dive_tissues_3: