Mercurial > public > mk2

changeset 249:544cc5d47755

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
small clean
author heinrichsweikamp
date Tue, 29 Mar 2011 22:59:58 +0200
parents 571626276aaa
children 4ef3bcbc7091
files code_part1/OSTC_code_asm_part1/changelog.txt code_part1/OSTC_code_asm_part1/menu_logbook.asm code_part1/OSTC_code_asm_part1/pled_outputs.asm
diffstat 3 files changed, 9 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/code_part1/OSTC_code_asm_part1/changelog.txt	Tue Mar 29 21:29:48 2011 +0200
+++ b/code_part1/OSTC_code_asm_part1/changelog.txt	Tue Mar 29 22:59:58 2011 +0200
@@ -4,6 +4,7 @@
 NEW: High altitude (Plane/Fly) mode added
 NEW: Gaslist, Salinity, Gradient Factors and Average depth displayed in Logbook
 NEW: Internal logbook shows Gas changes
+NEW: Release in French, Spain, English and German (Use correct HEX file!)
 
 New in 1.83 beta:
 BETA Version - Do NOT use for diving!
--- a/code_part1/OSTC_code_asm_part1/menu_logbook.asm	Tue Mar 29 21:29:48 2011 +0200
+++ b/code_part1/OSTC_code_asm_part1/menu_logbook.asm	Tue Mar 29 22:59:58 2011 +0200
@@ -466,9 +466,6 @@
 	movff		eeprom_address+0,average_depth_hold+0
 	movff		eeprom_address+1,average_depth_hold+1			; Pointer to Gaslist (For Page 2)
 
-;	incf_eeprom_address	d'18'				; Skip 18Bytes in EEPROM (faster)
-;	;18bytes gases, battery, firmware number
-
 	incf_eeprom_address	d'12'				; Skip 12 Bytes in EEPROM (faster) (Gaslist)
 	call		I2CREAD2					; Read start gas (1-5)
 	movff		SSPBUF,active_gas			; Store
--- a/code_part1/OSTC_code_asm_part1/pled_outputs.asm	Tue Mar 29 21:29:48 2011 +0200
+++ b/code_part1/OSTC_code_asm_part1/pled_outputs.asm	Tue Mar 29 22:59:58 2011 +0200
@@ -1711,14 +1711,11 @@
 	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!
+ 	movf    nofly_time+0,W              ; Is nofly null ?
+    iorwf   nofly_time+1,W
+    bnz     PLED_nofly_time2            ; No...
 	return
-
+ 
 PLED_nofly_time2:
 	ostc_debug	'g'
 	WIN_TOP		.125
@@ -1732,7 +1729,7 @@
 	PUTC    ' '
 	movff		nofly_time+0,lo			; divide by 60...
 	movff		nofly_time+1,hi
-	call		convert_time				; converts hi:lo in minutes to hours (hi) and minutes (lo)
+	call		convert_time			; converts hi:lo in minutes to hours (hi) and minutes (lo)
 	bsf			leftbind
 	movf		lo,W
 	movff		hi,lo
@@ -1740,9 +1737,9 @@
 	output_8								; Hours
 	PUTC        ':'
 	movff		hi,lo					; Minutes
-	decf		lo,F
-	btfsc		lo,7					; keep Nofly time
-	clrf		lo
+;	decf		lo,F
+;	btfsc		lo,7					; keep Nofly time
+;	clrf		lo
 	output_99x
 	bcf		leftbind
 	call	word_processor