# HG changeset patch # User heinrichsweikamp # Date 1447074257 -3600 # Node ID e8f5eed0eccfbcd2589669cdeb3b6da01768c75b # Parent 69bc5feca5da9f5afcbfad9e8587bbaccbd42574 BUGFIX: Minor layout fix (Battery warning in divemode) diff -r 69bc5feca5da -r e8f5eed0eccf code_part1/OSTC_code_asm_part1/changelog.txt --- a/code_part1/OSTC_code_asm_part1/changelog.txt Tue Oct 20 12:01:18 2015 +0200 +++ b/code_part1/OSTC_code_asm_part1/changelog.txt Mon Nov 09 14:04:17 2015 +0100 @@ -1,3 +1,7 @@ +New in 3.12: +BUGFIX: Minor layout fix (Battery warning in divemode) + + New in 3.11: BUGFIX: "First Diluent" and "SP Mode" used same EEPROM location diff -r 69bc5feca5da -r e8f5eed0eccf code_part1/OSTC_code_asm_part1/definitions.asm --- a/code_part1/OSTC_code_asm_part1/definitions.asm Tue Oct 20 12:01:18 2015 +0200 +++ b/code_part1/OSTC_code_asm_part1/definitions.asm Mon Nov 09 14:04:17 2015 +0100 @@ -22,7 +22,7 @@ ; ToDo: #DEFINE softwareversion_x d'3' ; Software version XX.YY -#DEFINE softwareversion_y d'11' ; Software version XX.YY +#DEFINE softwareversion_y d'12' ; Software version XX.YY #DEFINE softwareversion_beta 0 ; (and 0 for release) diff -r 69bc5feca5da -r e8f5eed0eccf code_part1/OSTC_code_asm_part1/english_text.asm --- a/code_part1/OSTC_code_asm_part1/english_text.asm Tue Oct 20 12:01:18 2015 +0200 +++ b/code_part1/OSTC_code_asm_part1/english_text.asm Mon Nov 09 14:04:17 2015 +0100 @@ -383,7 +383,7 @@ TCODE .132, .0, "beta" ;243 beta TCODE .100, .100, "unuse" ;244 unuse TCODE .20, .65, "Reset CF,Gas & Deco" ;245 Reset CF,Gas & Deco - TCODE .50, .145, "LowBatt!" ;246 LowBatt! + TCODE .58, .145, "Batt!" ;246 Batt! TCODE .20, .125, "Simulator" ;247 Simulator TCODE .30, .2, "OSTC Simulator" ;248 OSTC Simulator TCODE .20, .65, "Start Dive" ;249 Start Dive diff -r 69bc5feca5da -r e8f5eed0eccf code_part1/OSTC_code_asm_part1/french_text.asm --- a/code_part1/OSTC_code_asm_part1/french_text.asm Tue Oct 20 12:01:18 2015 +0200 +++ b/code_part1/OSTC_code_asm_part1/french_text.asm Mon Nov 09 14:04:17 2015 +0100 @@ -385,7 +385,7 @@ TCODE .132, .0, "bйta" ;243 beta TCODE .100, .100, "unuse" ;244 unuse TCODE .20, .65, "RaZ CF,Gaz & Dйco" ;245 Reset CF,Gas & Deco - TCODE .50, .145, "BattFaible!" ;246 LowBatt! + TCODE .58, .145, "Batt!" ;246 Batt! TCODE .20, .125, "Simulateur" ;247 Simulator TCODE .27, .2, "Simulateur OSTC" ;248 OSTC Simulator TCODE .20, .65, "Dйbut Simulation..." ;249 Start Dive diff -r 69bc5feca5da -r e8f5eed0eccf code_part1/OSTC_code_asm_part1/german_text.asm --- a/code_part1/OSTC_code_asm_part1/german_text.asm Tue Oct 20 12:01:18 2015 +0200 +++ b/code_part1/OSTC_code_asm_part1/german_text.asm Mon Nov 09 14:04:17 2015 +0100 @@ -384,7 +384,7 @@ TCODE .132, .0, "beta" ;243 beta TCODE .100, .100, "frei" ;244 unuse TCODE .20, .65, "CF,Gas&Deko zurьcks." ;245 Reset CF,Gas & Deco - TCODE .50, .145, "Battery schwach!" ;246 LowBatt! + TCODE .58, .145, "Batt!" ;246 Batt! TCODE .20, .125, "Simulator" ;247 Simulator TCODE .30, .2, "OSTC Simulator" ;248 OSTC Simulator TCODE .20, .65, "TG beginnen" ;249 Start Dive diff -r 69bc5feca5da -r e8f5eed0eccf code_part1/OSTC_code_asm_part1/italian_text.asm --- a/code_part1/OSTC_code_asm_part1/italian_text.asm Tue Oct 20 12:01:18 2015 +0200 +++ b/code_part1/OSTC_code_asm_part1/italian_text.asm Mon Nov 09 14:04:17 2015 +0100 @@ -383,7 +383,7 @@ TCODE .132, .0, "beta" ;243 beta TCODE .100, .100, "unuse" ;244 unuse TCODE .20, .65, "Resetta CF,Gas & Deco" ;245 Reset CF,Gas & Deco - TCODE .50, .145, "Batt bassa!" ;246 LowBatt! + TCODE .58, .145, "Batt!" ;246 Batt! TCODE .20, .125, "Simulatore" ;247 Simulator TCODE .27, .2, "Simulatore OSTC" ;248 OSTC Simulator TCODE .20, .65, "Inizio Immersione" ;249 Start Dive diff -r 69bc5feca5da -r e8f5eed0eccf code_part1/OSTC_code_asm_part1/russian_text.asm --- a/code_part1/OSTC_code_asm_part1/russian_text.asm Tue Oct 20 12:01:18 2015 +0200 +++ b/code_part1/OSTC_code_asm_part1/russian_text.asm Mon Nov 09 14:04:17 2015 +0100 @@ -386,7 +386,7 @@ TCODE .132, .0, "beta" ;243 beta TCODE .100, .100, "unuse" ;244 unuse TCODE .20, .65, "Сброс ДП,газ и деко" ;245 Reset CF,Gas & Deco - TCODE .50, .145, "Батарея!" ;246 LowBatt! + TCODE .58, .145, "Батарея!" ;246 LowBatt! TCODE .20, .125, "Планировщик" ;247 Simulator TCODE .30, .2, "OSTC Планировщик" ;248 OSTC Simulator TCODE .20, .65, "Начать имитацию" ;249 Start Dive diff -r 69bc5feca5da -r e8f5eed0eccf code_part1/OSTC_code_asm_part1/spanish_text.asm --- a/code_part1/OSTC_code_asm_part1/spanish_text.asm Tue Oct 20 12:01:18 2015 +0200 +++ b/code_part1/OSTC_code_asm_part1/spanish_text.asm Mon Nov 09 14:04:17 2015 +0100 @@ -382,7 +382,7 @@ TCODE .132, .0, "beta" ;243 beta TCODE .100, .100, "nouso" ;244 unuse TCODE .20, .65, "Rein. CF,Gas y Deco" ;245 Reset CF,Gas & Deco - TCODE .50, .145, "BatBaja!" ;246 LowBatt! + TCODE .58, .145, "Batt!" ;246 Batt! TCODE .20, .125, "Simulador" ;247 Simulator TCODE .30, .2, "Simulador OSTC" ;248 OSTC Simulator TCODE .20, .65, "Inicio Buc." ;249 Start Dive