# HG changeset patch # User heinrichsweikamp # Date 1431780506 -7200 # Node ID df8cd5ffd9930b1d90cf2162f010bd48f0aaeaa4 # Parent 2a0e5d884fc3933986622f289994ecd2d2e2ad79 BUGFIX: Load first diluent if <> 1 correctly Auto-SP change work... diff -r 2a0e5d884fc3 -r df8cd5ffd993 code_part1/OSTC_code_asm_part1/definitions.asm --- a/code_part1/OSTC_code_asm_part1/definitions.asm Tue May 12 11:30:35 2015 +0200 +++ b/code_part1/OSTC_code_asm_part1/definitions.asm Sat May 16 14:48:26 2015 +0200 @@ -24,14 +24,14 @@ #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 ; International extension. Selecting messages source: -;#DEFINE ENGLISH ; Use english_text.asm +#DEFINE ENGLISH ; Use english_text.asm ;#DEFINE FRENCH ; Use french_text.asm -#DEFINE GERMAN ; Use german_text.asm +;#DEFINE GERMAN ; Use german_text.asm ;#DEFINE SPANISH ; Use spanish_text.asm ;#DEFINE RUSSIAN ; Use russian_text.asm ;#DEFINE ITALIAN ; Use italian_text.asm diff -r 2a0e5d884fc3 -r df8cd5ffd993 code_part1/OSTC_code_asm_part1/divemode.asm --- a/code_part1/OSTC_code_asm_part1/divemode.asm Tue May 12 11:30:35 2015 +0200 +++ b/code_part1/OSTC_code_asm_part1/divemode.asm Sat May 16 14:48:26 2015 +0200 @@ -1503,7 +1503,7 @@ movlw .33 ; Start gas btfsc FLAG_const_ppO2_mode ; In CCR mode? - movlw .116 ; Yes, use start Diluent instead + movlw .115 ; Yes, use start Diluent instead movwf EEADR call read_eeprom movf EEDATA,W @@ -2188,6 +2188,6 @@ bsf STATUS,C ; Borrow bit subfwb lo,W ; minus O2 movff WREG, char_I_N2_ratio ; = N2! - read_int_eeprom d'116' ; Read First Diluent (1-5) + read_int_eeprom d'115' ; Read First Diluent (1-5) movff EEDATA,active_diluent return \ No newline at end of file diff -r 2a0e5d884fc3 -r df8cd5ffd993 code_part1/OSTC_code_asm_part1/english_text.asm --- a/code_part1/OSTC_code_asm_part1/english_text.asm Tue May 12 11:30:35 2015 +0200 +++ b/code_part1/OSTC_code_asm_part1/english_text.asm Sat May 16 14:48:26 2015 +0200 @@ -369,7 +369,7 @@ TCODE .5, .2, "Dil. Setup - Gaslist" ;231 Dil. Setup - Gaslist TCODE .100, .100, "Diluent" ;232 Diluent TCODE .93, .170, " Ceiling" ;233 Ceiling (9Chars, right alligned) - TCODE .0, .0, "" ;234 unused + TCODE .20, .95, "SP Mode: " ;234 SP Mode: (10 chars) TCODE .10, .2, "Decomode changed!" ;235 Decomode changed! TCODE .85, .125, "L16-GF CC" ;236 L16-GF CC diff -r 2a0e5d884fc3 -r df8cd5ffd993 code_part1/OSTC_code_asm_part1/french_text.asm --- a/code_part1/OSTC_code_asm_part1/french_text.asm Tue May 12 11:30:35 2015 +0200 +++ b/code_part1/OSTC_code_asm_part1/french_text.asm Sat May 16 14:48:26 2015 +0200 @@ -371,7 +371,7 @@ TCODE .5, .2, "Liste des Diluants" ;231 Dil. Setup - Gaslist TCODE .100, .100, "Diluant" ;232 Diluent TCODE .93, .170, " Ceiling" ;233 Ceiling (9Chars, right alligned) - TCODE .0, .0, "" ;234 unused + TCODE .20, .95, "SP Mode: " ;234 SP Mode: (10 chars) TCODE .10, .2, "Mode de Déco changé!" ;235 Decomode changed! TCODE .85, .125, "L16-GF CC" ;236 L16-GF CC diff -r 2a0e5d884fc3 -r df8cd5ffd993 code_part1/OSTC_code_asm_part1/german_text.asm --- a/code_part1/OSTC_code_asm_part1/german_text.asm Tue May 12 11:30:35 2015 +0200 +++ b/code_part1/OSTC_code_asm_part1/german_text.asm Sat May 16 14:48:26 2015 +0200 @@ -370,7 +370,7 @@ TCODE .5, .2, "Dil. Setup - Gasliste" ;231 Dil. Setup - Gaslist TCODE .100, .100, "Diluent" ;232 Diluent TCODE .93, .170, " Ceiling" ;233 Ceiling (9Chars, right alligned) - TCODE .0, .0, "" ;234 unused + TCODE .20, .95, "SP Mode: " ;234 SP Mode: (10 chars) TCODE .10, .2, "Dekomodell verändert!" ;235 Decomode changed! TCODE .85, .125, "L16-GF CC" ;236 L16-GF CC diff -r 2a0e5d884fc3 -r df8cd5ffd993 code_part1/OSTC_code_asm_part1/italian_text.asm --- a/code_part1/OSTC_code_asm_part1/italian_text.asm Tue May 12 11:30:35 2015 +0200 +++ b/code_part1/OSTC_code_asm_part1/italian_text.asm Sat May 16 14:48:26 2015 +0200 @@ -369,7 +369,7 @@ TCODE .5, .2, "Dil. Setup - Gaslist" ;231 Dil. Setup - Gaslist TCODE .100, .100, "Diluent" ;232 Diluent TCODE .93, .170, " Ceiling" ;233 Ceiling (9Chars, right alligned) - TCODE .0, .0, "" ;234 unused + TCODE .20, .95, "SP Mode: " ;234 SP Mode: (10 chars) TCODE .10, .2, "Deco Cambiato!" ;235 Decomode changed! TCODE .85, .125, "L16-GF CC" ;236 L16-GF CC diff -r 2a0e5d884fc3 -r df8cd5ffd993 code_part1/OSTC_code_asm_part1/menu_ppO2.asm --- a/code_part1/OSTC_code_asm_part1/menu_ppO2.asm Tue May 12 11:30:35 2015 +0200 +++ b/code_part1/OSTC_code_asm_part1/menu_ppO2.asm Sat May 16 14:48:26 2015 +0200 @@ -66,19 +66,22 @@ movwf menupos menu_const_ppO2_return: call DISP_ClearScreen +menu_const_ppO2_return2: call DISP_ccr_setup_menu_mask call refresh_cursor call menu_pre_loop_common + call show_sp_mode menu_const_ppO2_preloop: call check_switches_menu - movlw d'3' + movlw d'4' cpfseq menupos bra menu_const_ppO2_preloop2 ; Returns movlw d'6' movwf menupos call DISP_menu_cursor + menu_const_ppO2_preloop2: btfsc menubit2 bra do_ccr_pre_menu ; call submenu @@ -97,7 +100,7 @@ dcfsnz menupos,F goto menu_const_ppO2_setpoints dcfsnz menupos,F - goto exit_menu_const_ppO2 ; exit... + goto menu_const_ppO2_toggle_mode dcfsnz menupos,F goto exit_menu_const_ppO2 ; exit... dcfsnz menupos,F @@ -107,6 +110,28 @@ movwf menupos goto more_menu2 +menu_const_ppO2_toggle_mode: + read_int_eeprom .116 ; SP Mode + movlw .1 ; Preload 1 + tstfsz EEDATA ; =0? + movlw .0 ; No. + movwf EEDATA ; Set new value + write_int_eeprom .116 ; write back result + movlw d'3' + movwf menupos + goto menu_const_ppO2_return2 ; Done. + +show_sp_mode: + read_int_eeprom .116 ; SP Mode + tstfsz EEDATA ; =0? + bra show_sp_mode2 ; No + DISPLAYTEXTH .312 ; =0: Manual + return +show_sp_mode2: + DISPLAYTEXTH .313 ; =1: Auto + return + + menu_diluentsetup: movlw d'1' movwf menupos @@ -933,10 +958,10 @@ movff EEDATA,lo incf lo,F ; increase depth - movlw d'251' + movlw d'201' cpfseq lo bra change_ppo2_plus2 - movlw d'250' + movlw d'200' movwf lo change_ppo2_plus2: movff lo,EEDATA ; write result @@ -953,10 +978,10 @@ movff EEDATA,lo decf lo,F ; decrease depth - movlw d'255' + movlw d'29' cpfseq lo bra change_ppo2_minus2 - movlw d'0' + movlw d'30' movwf lo change_ppo2_minus2: diff -r 2a0e5d884fc3 -r df8cd5ffd993 code_part1/OSTC_code_asm_part1/outputs.asm --- a/code_part1/OSTC_code_asm_part1/outputs.asm Tue May 12 11:30:35 2015 +0200 +++ b/code_part1/OSTC_code_asm_part1/outputs.asm Sat May 16 14:48:26 2015 +0200 @@ -1271,6 +1271,7 @@ call DISP_standard_color DISPLAYTEXT .229 ; Diluent Setup DISPLAYTEXT .230 ; Setpoint Setup + DISPLAYTEXT .234 ; SP Mode: DISPLAYTEXT .11 ; Exit return diff -r 2a0e5d884fc3 -r df8cd5ffd993 code_part1/OSTC_code_asm_part1/spanish_text.asm --- a/code_part1/OSTC_code_asm_part1/spanish_text.asm Tue May 12 11:30:35 2015 +0200 +++ b/code_part1/OSTC_code_asm_part1/spanish_text.asm Sat May 16 14:48:26 2015 +0200 @@ -368,7 +368,7 @@ TCODE .5, .2, "Config Dil. - Listagas" ;231 Dil. Setup - Gaslist TCODE .100, .100, "Diluyente" ;232 Diluent TCODE .93, .170, " Ceiling" ;233 Ceiling (9Chars, right alligned) - TCODE .0, .0, "" ;234 unused + TCODE .20, .95, "SP Mode: " ;234 SP Mode: (10 chars) TCODE .10, .2, "ˇModoDeco cambiado!" ;235 Decomode changed! TCODE .85, .125, "L16-GF CC" ;236 L16-GF CC diff -r 2a0e5d884fc3 -r df8cd5ffd993 docu/ostc_interface_description.odt Binary file docu/ostc_interface_description.odt has changed