changeset 525:f9a03808dfe2

moving "bailout" on top of setpoint list
author heinrichsweikamp
date Sat, 10 Dec 2011 16:07:50 +0100
parents 6fa776a44768
children d445f0627e86
files code_part1/OSTC_code_asm_part1/divemode_menu.asm code_part1/OSTC_code_asm_part1/english_text.asm code_part1/OSTC_code_asm_part1/french_text.asm code_part1/OSTC_code_asm_part1/german_text.asm code_part1/OSTC_code_asm_part1/pled_outputs.asm code_part1/OSTC_code_asm_part1/russian_text.asm code_part1/OSTC_code_asm_part1/spanish_text.asm code_part1/OSTC_code_asm_part1/turkish_text.asm
diffstat 8 files changed, 10 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/code_part1/OSTC_code_asm_part1/divemode_menu.asm	Fri Dec 09 20:43:50 2011 +0100
+++ b/code_part1/OSTC_code_asm_part1/divemode_menu.asm	Sat Dec 10 16:07:50 2011 +0100
@@ -209,7 +209,7 @@
 	dcfsnz	WREG,F
 	bra		divemode_menu3_nothing      ; END/EAD in divemode
 	dcfsnz	WREG,F
-	bra		divemode_menu3_nothing      ; Futur TTS...
+	bra		divemode_menu3_nothing      ; Future TTS...
 	dcfsnz	WREG,F
 	bra		toggle_stopwatch            ; Cave bailout prediction.
 
@@ -621,7 +621,7 @@
 	call	PLED_show_ppO2_clear		; Clear ppO2 value
 	
 divemenu_set_gas1:
-	movlw	d'4'				
+	movlw	d'1'				
 	cpfseq	menupos						; At the "Bailout" position?		
 	bra		divemenu_set_gas1b			; No, select SetPoint 1-3
 	bsf		select_bailoutgas			; Set Flag
@@ -629,6 +629,7 @@
 	bra		divemenu_set_gas_2			; Configure the extra gas / Select Bailout
 
 divemenu_set_gas1b:
+	decf	menupos,F					; Adjust 1-3 to 0-2...
 	movlw	d'35'						; offset in memory
 	addwf	menupos,W					; add SP number 0-2
 	movwf	EEADR
--- a/code_part1/OSTC_code_asm_part1/english_text.asm	Fri Dec 09 20:43:50 2011 +0100
+++ b/code_part1/OSTC_code_asm_part1/english_text.asm	Sat Dec 10 16:07:50 2011 +0100
@@ -264,7 +264,7 @@
     TCODE    .10,   .25,     "Divemode! Please help"     ;134 Divemode! Please help
     TCODE    .10,   .50,     "and report the Debug "     ;135 and report the Debug 
     TCODE    .10,   .75,     "Information below!"        ;136 Information below!
-    TCODE    .100,  .75,     "Bailout"                   ;137 Bailout
+    TCODE    .100,  .0,	     "Bailout"                   ;137 Bailout
     TCODE    .85,   .125,    "Apnoe    "                 ;138 Apnoe    
     TCODE    .105,  .120,    "Descent"                   ;139 Descent
     TCODE    .105,  .60,     "Surface"                   ;140 Surface
--- a/code_part1/OSTC_code_asm_part1/french_text.asm	Fri Dec 09 20:43:50 2011 +0100
+++ b/code_part1/OSTC_code_asm_part1/french_text.asm	Sat Dec 10 16:07:50 2011 +0100
@@ -264,7 +264,7 @@
     TCODE    .10,   .25,     "inattendue! Merci de"      ;134 Divemode! Please help
     TCODE    .10,   .50,     "reporter les données"      ;135 and report the Debug 
     TCODE    .10,   .75,     "d'analyse ci-dessous:"     ;136 Information below!
-    TCODE    .100,  .75,     "Bailout"                   ;137 Bailout
+    TCODE    .100,  .0,      "Bailout"                   ;137 Bailout
     TCODE    .85,   .125,    "Apnée    "                 ;138 Apnoe    
     TCODE    .105,  .120,    "Déscente"                  ;139 Descent
     TCODE    .105,  .60,     "Surface"                   ;140 Surface
--- a/code_part1/OSTC_code_asm_part1/german_text.asm	Fri Dec 09 20:43:50 2011 +0100
+++ b/code_part1/OSTC_code_asm_part1/german_text.asm	Sat Dec 10 16:07:50 2011 +0100
@@ -264,7 +264,7 @@
     TCODE    .10,   .25,     "TG-Modus! Bitte melden"    ;134 Divemode! Please help
     TCODE    .10,   .50,     "Sie die u.a. Debug "       ;135 and report the Debug 
     TCODE    .10,   .75,     "Informationen!"            ;136 Information below!
-    TCODE    .100,  .75,     "Bailout"                   ;137 Bailout
+    TCODE    .100,  .0,      "Bailout"                   ;137 Bailout
     TCODE    .85,   .125,    "Apnoe    "                 ;138 Apnoe    
     TCODE    .105,  .120,    "Abstieg"                   ;139 Descent
     TCODE    .105,  .60,     "Oberfl."                   ;140 Surface
--- a/code_part1/OSTC_code_asm_part1/pled_outputs.asm	Fri Dec 09 20:43:50 2011 +0100
+++ b/code_part1/OSTC_code_asm_part1/pled_outputs.asm	Sat Dec 10 16:07:50 2011 +0100
@@ -2917,7 +2917,7 @@
 	; list three SP in Gaslist
 	movlw	d'35'				; 36 = current SP position in EEPROM
 	movwf	wait_temp			; here: stores eeprom address for gas list
-	movlw	d'231'
+	movlw	d'0'
 	movwf	waitms_temp			; here: stores row for gas list
 	clrf 	decoplan_index	    ; here: SP counter
 
--- a/code_part1/OSTC_code_asm_part1/russian_text.asm	Fri Dec 09 20:43:50 2011 +0100
+++ b/code_part1/OSTC_code_asm_part1/russian_text.asm	Sat Dec 10 16:07:50 2011 +0100
@@ -267,7 +267,7 @@
     TCODE    .10,   .25,     "ðåæèìà ïîãðóæåíèÿ!   "     ;134 Divemode! Please help
     TCODE    .10,   .50,     "Ñîîáùèòå îá îøèáêå,  "     ;135 and report the Debug
     TCODE    .10,   .75,     "îòïðàâüòå îò÷åò íèæå!"     ;136 Information below!
-    TCODE    .100,  .75,     "Íà çàïàñ"                  ;137 Bailout
+    TCODE    .100,  .0,      "Íà çàïàñ"                  ;137 Bailout
     TCODE    .85,   .125,    "Àïíîý     "                ;138 Apnoe
     TCODE    .112,  .120,    "Â âîäå"                    ;139 Descent
     TCODE    .105,  .60,     "Íàâåðõó"                   ;140 Surface
--- a/code_part1/OSTC_code_asm_part1/spanish_text.asm	Fri Dec 09 20:43:50 2011 +0100
+++ b/code_part1/OSTC_code_asm_part1/spanish_text.asm	Sat Dec 10 16:07:50 2011 +0100
@@ -263,7 +263,7 @@
     TCODE    .0,    .25,     "del Modo Buceo. Ayudar"    ;134 Divemode! Please help
     TCODE    .0,    .50,     "reportando Información"    ;135 and report the Debug 
     TCODE    .0,    .75,     "de Depuración debajo!"     ;136 Information below!
-    TCODE    .100,  .75,     "Bailout"                   ;137 Bailout
+    TCODE    .100,  .0,      "Bailout"                   ;137 Bailout
     TCODE    .85,   .125,    "Apnea    "                 ;138 Apnoe    
     TCODE    .105,  .120,    "Descen."                   ;139 Descent
     TCODE    .105,  .60,     "Superf."                   ;140 Surface
--- a/code_part1/OSTC_code_asm_part1/turkish_text.asm	Fri Dec 09 20:43:50 2011 +0100
+++ b/code_part1/OSTC_code_asm_part1/turkish_text.asm	Sat Dec 10 16:07:50 2011 +0100
@@ -265,7 +265,7 @@
     TCODE    .10,   .25,     "Dalis Modu! Lütfen asa"    ;134 Divemode! Please help
     TCODE    .10,   .50,     "gidaki hata kodunu ra"     ;135 and report the Debug
     TCODE    .10,   .75,     "porlayin.     "            ;136 Information below!
-    TCODE    .100,  .75,     "Bailout"                   ;137 Bailout
+    TCODE    .100,  .0,      "Bailout"                   ;137 Bailout
     TCODE    .85,   .125,    "Apnea    "                 ;138 Apnoe
     TCODE    .105,  .120,    "Yüksel "                   ;139 Descent
     TCODE    .105,  .60,     "Yüzey  "                   ;140 Surface