Mercurial > public > mk2

changeset 140:87a53efbb5ba

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
"beta" shown for beta versions noFly and Desat time only shown when > 0
author heinrichsweikamp
date Thu, 06 Jan 2011 18:12:15 +0100
parents e09ecbae060e
children 622da16b768f
files code_part1/OSTC_code_asm_part1/changelog.txt code_part1/OSTC_code_asm_part1/definitions.asm code_part1/OSTC_code_asm_part1/menu_reset.asm code_part1/OSTC_code_asm_part1/pled_outputs.asm code_part1/OSTC_code_asm_part1/text_table.asm
diffstat 5 files changed, 44 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/code_part1/OSTC_code_asm_part1/changelog.txt	Thu Jan 06 09:32:55 2011 +0100
+++ b/code_part1/OSTC_code_asm_part1/changelog.txt	Thu Jan 06 18:12:15 2011 +0100
@@ -1,6 +1,7 @@
 New in 1.76 Beta:
 BETA Version - Do NOT use for diving!
-
+NEW: "beta" is shown for beta versions
+CHANGE: NoFly and Desaturation time only visible when > 0
 
 
 New in 1.75 Beta:
--- a/code_part1/OSTC_code_asm_part1/definitions.asm	Thu Jan 06 09:32:55 2011 +0100
+++ b/code_part1/OSTC_code_asm_part1/definitions.asm	Thu Jan 06 18:12:15 2011 +0100
@@ -25,10 +25,12 @@
 #DEFINE	softwareversion_x		d'1'		; Software version  XX.YY
 #DEFINE	softwareversion_y		d'76'		; Software version  XX.YY
 
+#DEFINE softwareversion_beta 	1 			; (and 0 for release) 
+
 #DEFINE	max_custom_number		d'53'		; Number of last used custom function
 
+
 #DEFINE	logbook_profile_version	0x20		; Do not touch!
-
 #DEFINE	T0CON_debounce	b'00000000'					; Timer0 Switch Debounce
 
 #DEFINE		FT_SMALL		.0
--- a/code_part1/OSTC_code_asm_part1/menu_reset.asm	Thu Jan 06 09:32:55 2011 +0100
+++ b/code_part1/OSTC_code_asm_part1/menu_reset.asm	Thu Jan 06 18:12:15 2011 +0100
@@ -341,8 +341,9 @@
 	write_int_eeprom	d'39'		; Disable Debugbode
 	clrf	EEDATA
 	write_int_eeprom	d'90'		; Disable Brightness offset? (Dim=1, Normal = 0)
-	clrf	EEDATA
-	write_int_eeprom	d'91'		; Reset Date format to MM/DD/YY
+
+	movlw	d'1'
+	write_int_eeprom	d'91'		; Reset Date format to DD.MM.YY
 
 	movlw	d'100'
 	write_int_eeprom	d'26'		; Salinity default: 1.00 kg/l
--- a/code_part1/OSTC_code_asm_part1/pled_outputs.asm	Thu Jan 06 09:32:55 2011 +0100
+++ b/code_part1/OSTC_code_asm_part1/pled_outputs.asm	Thu Jan 06 18:12:15 2011 +0100
@@ -1531,6 +1531,15 @@
 	return
 
 PLED_desaturation_time:	
+	movff		int_O_desaturation_time+0,lo
+	movff		int_O_desaturation_time+1,hi		; Copy
+	tstfsz		lo									; =0?
+	bra			PLED_desaturation_time2				; No!
+	tstfsz		hi									; =0?
+	bra			PLED_desaturation_time2				; No!
+	return											; Do not display Desat
+	
+PLED_desaturation_time2:
 	ostc_debug	'h'
 	WIN_TOP		.150
 	WIN_LEFT	.1
@@ -1557,6 +1566,15 @@
 	return
 
 PLED_nofly_time:	
+	movff		nofly_time+0,lo			
+	movff		nofly_time+1,hi					; Copy
+	tstfsz		lo								; =0?
+	bra			PLED_nofly_time2				; No!
+	tstfsz		hi								; =0?
+	bra			PLED_nofly_time2				; No!
+	return
+
+PLED_nofly_time2:
 	ostc_debug	'g'
 	WIN_TOP		.125
 	WIN_LEFT	.1
@@ -1717,7 +1735,7 @@
 	bsf		leftbind
 	output_99x
 	bcf		leftbind
-	PUTC    '/'
+	PUTC    '.'
 	movff	convert_value_temp+1,lo			;day
 	bra 	PLED_convert_date1_common		;year
 
@@ -1731,14 +1749,14 @@
 	bsf		leftbind
 	output_99x
 	bcf		leftbind
-	PUTC    '/'
+	PUTC    '.'
 	movff	convert_value_temp+0,lo			;month
 
 PLED_convert_date1_common:
 	bsf		leftbind
 	output_99x
 	bcf		leftbind
-	PUTC    '/'
+	PUTC    '.'
 	movff	convert_value_temp+2,lo			;year
 	bsf		leftbind
 	output_99x
@@ -1750,12 +1768,12 @@
 	bsf		leftbind
 	output_99x
 	bcf		leftbind
-    PUTC    '/'
+    PUTC    '.'
 	movff	convert_value_temp+0,lo			;month
 	bsf		leftbind
 	output_99x
 	bcf		leftbind
-    PUTC    '/'
+    PUTC    '.'
 	movff	convert_value_temp+1,lo			;day
 	bsf		leftbind
 	output_99x
@@ -1772,7 +1790,7 @@
 	bsf		leftbind
 	output_99x
 	bcf		leftbind
-    PUTC    '/'
+    PUTC    '.'
 	movff	convert_value_temp+1,lo			;day
 	bsf		leftbind
 	output_99x
@@ -1789,7 +1807,7 @@
 	bsf		leftbind
 	output_99x
 	bcf		leftbind
-    PUTC    '/'
+    PUTC    '.'
 	movff	convert_value_temp+0,lo			;month
 	bsf		leftbind
 	output_99x
@@ -2085,8 +2103,15 @@
 	bsf		leftbind
 	output_99x
 	bcf		leftbind
-	
 	call	word_processor
+
+	movlw	softwareversion_beta			; =1: Beta, =0: Release
+	decfsz	WREG,F
+	return									; Release version -> Return
+
+	call	PLED_warnings_color
+	DISPLAYTEXT		d'243'			; beta
+	call	PLED_standard_color
 	return
 
 PLED_divemode_menu_mask_first:			; Write Divemode menu1 mask
--- a/code_part1/OSTC_code_asm_part1/text_table.asm	Thu Jan 06 09:32:55 2011 +0100
+++ b/code_part1/OSTC_code_asm_part1/text_table.asm	Thu Jan 06 18:12:15 2011 +0100
@@ -82,7 +82,7 @@
 	DB	.20,.20,.20,.20,.20,.20 ;t222......t227
 	DB	.20,.20,.20,.20,.20,.20 ;t228......t233
 	DB	.20,.20,.10,.10,.10,.8	;t234;t235;t236;t237;t238;t239
-	DB	.10,.8,.8,.14,.6,.20	;t240;t241;t242;t243;t244;t245
+	DB	.10,.8,.8,.6,.6,.20		;t240;t241;t242;t243;t244;t245
 	DB	.16,.10,.16,.12,.6,.6	;t246;t247;t248;t249;t250;t251
 	DB	.6,.6,.6,.6				;t252;t253;t254;t255
 
@@ -356,7 +356,7 @@
 	DB	.90,.50				;240	(Surface) Interval:
 	DB	.100,.75			;241	Display (Divemode Menu)
 	DB	.100,.0				;242	No Deco (GF)
-	DB	.2,.12				;243
+	DB	.120,.0				;243	beta
 	DB	.100,.100			;244	Exit
 	DB	.20,.65				;245
 	DB	.2,.30				;246
@@ -668,7 +668,7 @@
 	DA	"Interval:}"			;240		l=10
 	DA	"Display}"				;241		l=8
 	DA	"No deco}"				;242		l=8
-	DA	"Search module}"		;243		l=14
+	DA	"beta}}"				;243		l=6
 	DA	"unuse}"				;244		l=6
 	DA	"Reset CF,Gas & Deco}"	;245		l=20
 	DA	"Disable module}}"		;246		l=16