Mercurial > public > mk2

changeset 367:584741726190 64kByte Logbook

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
CNS Profile added
author Heinrichsweikamp
date Thu, 09 Jun 2011 19:41:48 +0200
parents ca3d15e6240e
children 61742b3ef842 160b3216b335
files code_part1/OSTC_code_asm_part1/definitions.asm code_part1/OSTC_code_asm_part1/divemode.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/menu_logbook.asm code_part1/OSTC_code_asm_part1/spanish_text.asm
diffstat 7 files changed, 19 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/code_part1/OSTC_code_asm_part1/definitions.asm	Thu Jun 09 19:30:55 2011 +0200
+++ b/code_part1/OSTC_code_asm_part1/definitions.asm	Thu Jun 09 19:41:48 2011 +0200
@@ -270,7 +270,7 @@
 divisor_tank            res 1
 divisor_ppo2            res 1
 divisor_deco_debug      res 1
-divisor_nuy2            res 1
+divisor_cns	            res 1
 
 timeout_counter         res 1   ; Timeout counter variables
 timeout_counter2        res 1
--- a/code_part1/OSTC_code_asm_part1/divemode.asm	Thu Jun 09 19:30:55 2011 +0200
+++ b/code_part1/OSTC_code_asm_part1/divemode.asm	Thu Jun 09 19:41:48 2011 +0200
@@ -627,9 +627,9 @@
 	movlw	d'9'				; Information length	
 	addwf	ProfileFlagByte,F	; add to ProfileFlagByte
 check_extended5:
-	decfsz	divisor_nuy2,W		; Check divisor
+	decfsz	divisor_cns,W		; Check divisor
 	bra		check_extended6		
-	movlw	d'0'				; Information length	
+	movlw	d'1'				; Information length	
 	addwf	ProfileFlagByte,F	; add to ProfileFlagByte
 check_extended6:
 
@@ -718,9 +718,9 @@
 	bra		store_extended5	
 	rcall	store_dive_decodebug
 store_extended5:
-	decfsz	divisor_nuy2,F		; Check divisor
+	decfsz	divisor_cns,F		; Check divisor
 	bra		store_extended6	
-	rcall	store_dive_nuy2
+	rcall	store_dive_cns
 store_extended6:
 
 ; The next block is required to take care of "store never"
@@ -734,8 +734,8 @@
 	clrf	divisor_ppo2			; And clear register again, so it will never reach zero...
 	btfsc	divisor_deco_debug,7	; Test highest Bit (Register must have been zero before the "decfsz" command!)
 	clrf	divisor_deco_debug		; And clear register again, so it will never reach zero...
-	btfsc	divisor_nuy2,7			; Test highest Bit (Register must have been zero before the "decfsz" command!)
-	clrf	divisor_nuy2			; And clear register again, so it will never reach zero...
+	btfsc	divisor_cns,7			; Test highest Bit (Register must have been zero before the "decfsz" command!)
+	clrf	divisor_cns				; And clear register again, so it will never reach zero...
 
 	ostc_debug	'D'		; Sends debug-information to screen if debugmode active
 
@@ -750,9 +750,11 @@
 	bcf		event_occured		; Clear the global event flag
 	return						; Done. (Sample with all informations written to EEPROM)
 	
-store_dive_nuy2:
+store_dive_cns:
+	movff	char_O_CNS_fraction,WREG
+	call	write_external_eeprom		; Store in EEPROM
 	GETCUSTOM8	d'26'
-	movwf	divisor_nuy2			; Reload divisor from CF
+	movwf	divisor_cns			; Reload divisor from CF
 	return
 
 store_dive_decodebug:
@@ -1319,10 +1321,10 @@
 	addwf	temp1,W		; copy to bits 0-3, result in WREG
 	call	write_external_eeprom
 
-	movlw	d'0'		; information size nuy2
+	movlw	d'1'		; information size cns
 	movwf	temp1		; copy to bits 0-3
 	swapf	temp1,F		; swap nibbels 0-3 with 4-7
-	GETCUSTOM8	d'26'	; Divisor nuy2
+	GETCUSTOM8	d'26'	; Divisor cns
 	addwf	temp1,W		; copy to bits 0-3, result in WREG
 	call	write_external_eeprom
 
@@ -1776,7 +1778,7 @@
 	GETCUSTOM8	d'25'
 	movwf	divisor_deco_debug
 	GETCUSTOM8	d'26'
-	movwf	divisor_nuy2
+	movwf	divisor_cns
 
 	btfss	FLAG_apnoe_mode		; In Apnoe mode?
 	bra		divemode1
--- a/code_part1/OSTC_code_asm_part1/english_text.asm	Thu Jun 09 19:30:55 2011 +0200
+++ b/code_part1/OSTC_code_asm_part1/english_text.asm	Thu Jun 09 19:41:48 2011 +0200
@@ -120,7 +120,7 @@
     TCODE    .40,  .35,      "Divisor NotUse1"           ;059 Divisor NotUse1
     TCODE    .40,  .35,      "Divisor ppO2   "           ;060 Divisor ppO2 
     TCODE    .40,  .35,      "Divisor Debug  "           ;061 Divisor Debug  
-    TCODE    .40,  .35,      "Divisor NotUse2"           ;062 Divisor NotUse2
+    TCODE    .40,  .35,      "Divisor CNS    "           ;062 Divisor CNS
     TCODE    .40,  .35,      "CNSshow dive[%]"           ;063 CNSshow dive[%]
     TCODE    .40,  .35,      "Logbook offset "           ;064 Logbook offset 
     TCODE    .40,  .35,      "Last Deco at[m]"           ;065 Last Deco at[m]
--- a/code_part1/OSTC_code_asm_part1/french_text.asm	Thu Jun 09 19:30:55 2011 +0200
+++ b/code_part1/OSTC_code_asm_part1/french_text.asm	Thu Jun 09 19:41:48 2011 +0200
@@ -121,7 +121,7 @@
     TCODE    .40,  .35,      "Diviseur NotUse"           ;059 Divisor NotUse1
     TCODE    .40,  .35,      "Diviseur ppO2  "           ;060 Divisor ppO2 
     TCODE    .40,  .35,      "Diviseur Debug "           ;061 Divisor Debug  
-    TCODE    .40,  .35,      "Diviseur NotUse"           ;062 Divisor NotUse2
+    TCODE    .40,  .35,      "Diviseur CNS   "           ;062 Divisor CNS
     TCODE    .40,  .35,      "Aff.CNSPlong[%]"           ;063 CNSshow dive[%]
     TCODE    .40,  .35,      "Décalage Carnet"           ;064 Logbook offset 
     TCODE    .40,  .35,      "Dern. Palier[m]"           ;065 Last Deco at[m]
--- a/code_part1/OSTC_code_asm_part1/german_text.asm	Thu Jun 09 19:30:55 2011 +0200
+++ b/code_part1/OSTC_code_asm_part1/german_text.asm	Thu Jun 09 19:41:48 2011 +0200
@@ -121,7 +121,7 @@
     TCODE    .40,  .35,      "Divisor frei1  "           ;059 Divisor NotUse1
     TCODE    .40,  .35,      "Divisor ppO2   "           ;060 Divisor ppO2 
     TCODE    .40,  .35,      "Divisor Debug  "           ;061 Divisor Debug  
-    TCODE    .40,  .35,      "Divisor frei2  "           ;062 Divisor NotUse2
+    TCODE    .40,  .35,      "Divisor CNS    "           ;062 Divisor CNS
     TCODE    .40,  .35,      "CNS-Anz. TG [%]"           ;063 CNSshow dive[%]
     TCODE    .40,  .35,      "Logbuch Versatz"           ;064 Logbook offset 
     TCODE    .40,  .35,      "Letzte Deko [m]"           ;065 Last Deco at[m]
--- a/code_part1/OSTC_code_asm_part1/menu_logbook.asm	Thu Jun 09 19:30:55 2011 +0200
+++ b/code_part1/OSTC_code_asm_part1/menu_logbook.asm	Thu Jun 09 19:41:48 2011 +0200
@@ -551,7 +551,7 @@
 	call		I2CREAD2					; Read divisor
 	movff		SSPBUF,divisor_deco_debug	; Store divisor
 	call		I2CREAD2					; Read divisor
-	movff		SSPBUF,divisor_nuy2			; Store divisor
+	movff		SSPBUF,divisor_cns			; Store divisor
 	incf_eeprom_address	d'2'				; Skip 2Bytes in EEPROM (faster)
 	; 2 bytes salinity, GF
 	btfss	logbook_format_0x21				; 10byte extra?
--- a/code_part1/OSTC_code_asm_part1/spanish_text.asm	Thu Jun 09 19:30:55 2011 +0200
+++ b/code_part1/OSTC_code_asm_part1/spanish_text.asm	Thu Jun 09 19:41:48 2011 +0200
@@ -120,7 +120,7 @@
     TCODE    .40,  .35,      "Divisor SinUso1"           ;059 Divisor NotUse1
     TCODE    .40,  .35,      "Divisor ppO2   "           ;060 Divisor ppO2 
     TCODE    .40,  .35,      "Divisor Depurac"           ;061 Divisor Debug  
-    TCODE    .40,  .35,      "Divisor SinUso2"           ;062 Divisor NotUse2
+    TCODE    .40,  .35,      "Divisor CNS    "           ;062 Divisor CNS
     TCODE    .40,  .35,      "Mues.CNSbuc.[%]"           ;063 CNSshow dive[%]
     TCODE    .40,  .35,      "Despl. diario  "           ;064 Logbook offset 
     TCODE    .40,  .35,      "Ult. Deco a [m]"           ;065 Last Deco at[m]