Mercurial > public > mk2

changeset 255:1efd59d689f8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
small change in the set time menu, default setpoints set to 0.8, 1.0 and 1.2Bar
author heinrichsweikamp
date Sun, 10 Apr 2011 09:17:20 +0200
parents 8f20e8948b97
children d8dfbc7041b0
files code_part1/OSTC_code_asm_part1/adc_rtc.asm code_part1/OSTC_code_asm_part1/changelog.txt 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/menu_reset.asm code_part1/OSTC_code_asm_part1/menu_settime.asm code_part1/OSTC_code_asm_part1/pled_outputs.asm code_part1/OSTC_code_asm_part1/spanish_text.asm code_part1/OSTC_code_asm_part1/start.asm
diffstat 10 files changed, 25 insertions(+), 23 deletions(-) [+]
line wrap: on
line diff
--- a/code_part1/OSTC_code_asm_part1/adc_rtc.asm	Fri Apr 08 11:58:55 2011 +0200
+++ b/code_part1/OSTC_code_asm_part1/adc_rtc.asm	Sun Apr 10 09:17:20 2011 +0200
@@ -232,9 +232,9 @@
 	movwf	mins
 	movlw	.12
 	movwf	hours
-	movlw	.1
+	movlw	.10
 	movwf	day
-	movlw	.1
+	movlw	.4
 	movwf	month
 	movlw	.11
 	movwf	year
--- a/code_part1/OSTC_code_asm_part1/changelog.txt	Fri Apr 08 11:58:55 2011 +0200
+++ b/code_part1/OSTC_code_asm_part1/changelog.txt	Sun Apr 10 09:17:20 2011 +0200
@@ -5,6 +5,7 @@
 NEW: Gaslist, Salinity, CNS and Average depth displayed in Logbook
 NEW: Internal logbook shows Gas changes
 NEW: Release in French, Spain, English and German (Use correct HEX file!)
+CHANGE: Set Time menu
 
 New in 1.83 beta:
 BETA Version - Do NOT use for diving!
--- a/code_part1/OSTC_code_asm_part1/english_text.asm	Fri Apr 08 11:58:55 2011 +0200
+++ b/code_part1/OSTC_code_asm_part1/english_text.asm	Sun Apr 10 09:17:20 2011 +0200
@@ -80,7 +80,7 @@
     TCODE    .20,  .35,      "Cancel Reset"              ;021 Cancel Reset
     TCODE    .32,  .65,      "Time:"                     ;022 Time:
     TCODE    .32,  .95,      "Date:"                     ;023 Date:
-    TCODE    .32,  .155,     "Set Hours"                 ;024 Set Hours
+    TCODE    .0,   .215,     "Set Hours"                 ;024 Set Hours
     TCODE    .6,   .0,       "Reset..."                  ;025 Reset...
     TCODE    .55,  .2,       "Logbook"                   ;026 Logbook
     TCODE    .14,  .2,       "Custom Functions I"        ;027 Custom Functions I
--- a/code_part1/OSTC_code_asm_part1/french_text.asm	Fri Apr 08 11:58:55 2011 +0200
+++ b/code_part1/OSTC_code_asm_part1/french_text.asm	Sun Apr 10 09:17:20 2011 +0200
@@ -81,7 +81,7 @@
     TCODE    .20,  .35,      "Annuler RaZ"               ;021 Cancel Reset
     TCODE    .32,  .65,      "Heure:"                    ;022 Time:
     TCODE    .32,  .95,      "Date :"                    ;023 Date:
-    TCODE    .32,  .155,     "Réglage Heures"            ;024 Set Hours     (see also 090..094)
+    TCODE    .0,   .215,     "Réglage Heures"            ;024 Set Hours     (see also 090..094)
     TCODE    .6,   .0,       "Initialisation..."         ;025 Reset...
     TCODE    .17,  .2,       "Carnet de plongées"        ;026 Logbook
     TCODE    .14,  .2,       "Config Fonctions I"        ;027 Custom Functions I
--- a/code_part1/OSTC_code_asm_part1/german_text.asm	Fri Apr 08 11:58:55 2011 +0200
+++ b/code_part1/OSTC_code_asm_part1/german_text.asm	Sun Apr 10 09:17:20 2011 +0200
@@ -81,7 +81,7 @@
     TCODE    .20,  .35,      "Zurücksetzen abbr."        ;021 Cancel Reset
     TCODE    .32,  .65,      "Uhrzeit:"                  ;022 Time:
     TCODE    .32,  .95,      "Datum:"                    ;023 Date:
-    TCODE    .32,  .155,     "Einst.Stunden"             ;024 Set Hours
+    TCODE    .0,   .215,     "Einst.Stunden"             ;024 Set Hours
     TCODE    .6,   .0,       "Zurücksetzen..."           ;025 Reset...
     TCODE    .55,  .2,       "Logbuch"                   ;026 Logbook
     TCODE    .14,  .2,       "Custom Funktionen I"       ;027 Custom Functions I
--- a/code_part1/OSTC_code_asm_part1/menu_reset.asm	Fri Apr 08 11:58:55 2011 +0200
+++ b/code_part1/OSTC_code_asm_part1/menu_reset.asm	Sun Apr 10 09:17:20 2011 +0200
@@ -364,11 +364,15 @@
 	clrf	EEDATA
 	write_int_eeprom	d'32'		; reset change depth gas #5
 
+	movlw	d'80'
+	movwf	EEDATA
+	write_int_eeprom	d'36'		; reset mix1 to ppO2=0.80Bar
 	movlw	d'100'
 	movwf	EEDATA
-	write_int_eeprom	d'36'		; reset mix1 to ppO2=1.00Bar
 	write_int_eeprom	d'37'		; reset mix2 to ppO2=1.00Bar
-	write_int_eeprom	d'38'		; reset mix3 to ppO2=1.00Bar
+	movlw	d'120'
+	movwf	EEDATA
+	write_int_eeprom	d'38'		; reset mix3 to ppO2=1.20Bar
 
 	clrf	nofly_time+0			; Clear nofly time
 	clrf	nofly_time+1			; Clear nofly time
--- a/code_part1/OSTC_code_asm_part1/menu_settime.asm	Fri Apr 08 11:58:55 2011 +0200
+++ b/code_part1/OSTC_code_asm_part1/menu_settime.asm	Sun Apr 10 09:17:20 2011 +0200
@@ -50,14 +50,14 @@
 
 	DISPLAYTEXT	.24			; Set Hours
 	
+	bcf		switch_right
 	bcf		switch_left
-	bcf		switch_right
 
 settime_loop:
-	btfsc	switch_left
+	btfsc	switch_right
 	call	add_hours_or_minutes_or_date
 
-	btfsc	switch_right
+	btfsc	switch_left
 	call	set_time_next_or_exit
 
 	btfsc	menubit4
@@ -137,9 +137,9 @@
 	movwf	day
 
 set_time_done2:
-	WIN_LEFT	.32
-	WIN_TOP		.155
-	movlw	(.160-.32)/7                ; full line length, for various translations.
+	WIN_LEFT	.0
+	WIN_TOP		.215
+	movlw	(.160-.0)/7                ; full line length, for various translations.
 	movwf	temp1
 	call	PLED_display_clear_common_y1
 	
@@ -193,8 +193,8 @@
 	dcfsnz	menupos3,F
 	bsf		set_year
 	
-	WIN_LEFT	.32
-	WIN_TOP		.155
+	WIN_LEFT	.0
+	WIN_TOP		.215
     call    PLED_standard_color    
 	lfsr	FSR2,letter
 	OUTPUTTEXT	.94			    ; Set
@@ -223,7 +223,7 @@
 	return
 	
 add_hours_or_minutes_or_date:
-	bcf		switch_right
+	bcf		switch_left
 	clrf	secs
 
 	btfsc	set_year
--- a/code_part1/OSTC_code_asm_part1/pled_outputs.asm	Fri Apr 08 11:58:55 2011 +0200
+++ b/code_part1/OSTC_code_asm_part1/pled_outputs.asm	Sun Apr 10 09:17:20 2011 +0200
@@ -292,8 +292,6 @@
 
     movlb   1                       ; For C-code calls
 	call	PLED_boot				; PLED boot
-	call	PLED_ClearScreen		; clean up OLED
-
 	call	PLED_standard_color
 	WIN_INVERT	.0					; Init new Wordprocessor
 
@@ -1697,8 +1695,8 @@
 	PUTC    ' '
 ;	movff		int_O_desaturation_time+0,lo			; divide by 60...
 ;	movff		int_O_desaturation_time+1,hi
-movff		desaturation_time_buffer+0,lo			; divide by 60...
-movff		desaturation_time_buffer+1,hi
+	movff		desaturation_time_buffer+0,lo			; divide by 60...
+	movff		desaturation_time_buffer+1,hi
 
 	call		convert_time				; converts hi:lo in minutes to hours (hi) and minutes (lo)
 	bsf			leftbind
@@ -1764,7 +1762,6 @@
 	btfsc	high_altitude_mode		; In high altitude mode?
 	call	PLED_warnings_color		; Yes, display ambient pressure in red
 
-
 	lfsr	FSR2,letter
 	movff	amb_pressure+0,lo
 	movff	amb_pressure+1,hi
--- a/code_part1/OSTC_code_asm_part1/spanish_text.asm	Fri Apr 08 11:58:55 2011 +0200
+++ b/code_part1/OSTC_code_asm_part1/spanish_text.asm	Sun Apr 10 09:17:20 2011 +0200
@@ -80,7 +80,7 @@
     TCODE    .20,  .35,      "Cancelar Reinicio"         ;021 Cancel Reset
     TCODE    .32,  .65,      "Hora :"                    ;022 Time:
     TCODE    .32,  .95,      "Fecha:"                    ;023 Date:
-    TCODE    .32,  .155,     "Fijar Horas"               ;024 Set Hours
+    TCODE    .0,   .215,     "Fijar Horas"               ;024 Set Hours
     TCODE    .6,   .0,       "Reinicio..."               ;025 Reset...
     TCODE    .55,  .2,       "Diario"                    ;026 Logbook
     TCODE    .14,  .2,       "Func. Personaliz. I"       ;027 Custom Functions I
--- a/code_part1/OSTC_code_asm_part1/start.asm	Fri Apr 08 11:58:55 2011 +0200
+++ b/code_part1/OSTC_code_asm_part1/start.asm	Sun Apr 10 09:17:20 2011 +0200
@@ -185,7 +185,6 @@
 	bsf		nsm						; NO-SLEEP-MODE : for hardware debugging
 
 	call	gassetup_sort_gaslist       ; Sorts Gaslist according to change depth
-	call	PLED_boot                   ; PLED boot (Incl. Clear Screen!)
 	WIN_TOP		.0
 	WIN_LEFT	.0
 	WIN_FONT 	FT_SMALL
@@ -206,6 +205,7 @@
 	bra		restart_1				; No new CF, continue with boot
 restart_01:
 ; Save new number of current CF count
+	call	PLED_boot                   ; PLED boot (Incl. Clear Screen!)
 	rcall	display_new_cf_installed; Show warning
 	movlw	max_custom_number		; Defined in definitions.asm
 	movwf	EEDATA