Mercurial > public > mk2

changeset 577:e3ffc6d62a63

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
minor clean
author heinrichsweikamp
date Sun, 22 Apr 2012 21:32:04 +0200
parents ab2686087bce
children fbd5e2b75a63
files code_part1/OSTC_code_asm_part1/MAIN.ASM code_part1/OSTC_code_asm_part1/definitions.asm code_part1/OSTC_code_asm_part1/divemode.asm code_part1/OSTC_code_asm_part1/math.asm code_part1/OSTC_code_asm_part1/menu_logbook.asm code_part1/OSTC_code_asm_part1/oled_samsung.asm
diffstat 6 files changed, 11 insertions(+), 36 deletions(-) [+]
line wrap: on
line diff
--- a/code_part1/OSTC_code_asm_part1/MAIN.ASM	Sun Apr 22 14:38:10 2012 +0200
+++ b/code_part1/OSTC_code_asm_part1/MAIN.ASM	Sun Apr 22 21:32:04 2012 +0200
@@ -78,7 +78,7 @@
 #include	math.asm			; mathematical functions
 #include 	wait.asm			; waitroutines
 #include	oled_samsung.asm	; Attached in 80-System 8-Bit Mode
-#include	aa_wordprocessor.asm ; New antialiased word processor and fonts
+#include	aa_wordprocessor.asm; New antialiased word processor and fonts
 #include    color_processor.asm ; Color image drawing.
 #include    dump_screen.asm     ; Copy screen contains to serial interface
 #include	valconv.asm			; outputs to POSTINC2
--- a/code_part1/OSTC_code_asm_part1/definitions.asm	Sun Apr 22 14:38:10 2012 +0200
+++ b/code_part1/OSTC_code_asm_part1/definitions.asm	Sun Apr 22 21:32:04 2012 +0200
@@ -85,12 +85,12 @@
 #DEFINE color_orange        b'11111000'     ; (7,6,0)
 #DEFINE color_pink          b'11111010'     ; (7,6,2)
 
-#DEFINE	warn_depth		d'1'
-#DEFINE	warn_cns		d'2'
-#DEFINE	warn_gf			d'3'
-#DEFINE	warn_ppo2		d'4'
-#DEFINE warn_velocity	d'5'
-#DEFINE warn_ceiling	d'6'
+#DEFINE	warn_depth			d'1'
+#DEFINE	warn_cns			d'2'
+#DEFINE	warn_gf				d'3'
+#DEFINE	warn_ppo2			d'4'
+#DEFINE warn_velocity		d'5'
+#DEFINE warn_ceiling		d'6'
 #DEFINE	warn_gas_in_gaslist	d'7'
 
 ;Configuration bits
@@ -157,9 +157,6 @@
 ;
 bank1 udata 0x100               ;Bank 1
 
-;wreg_temp       res 1           ;variables used for context saving during ISR 
-;status_temp     res 1
-;bsr_temp        res 1
 prod_temp       res 2           ;Trashed by isr_mult16x16, for sensor compensations
 
 secs            res 1           ;realtime clock
@@ -276,7 +273,6 @@
 temperature_avg res 2           ; Temperature summing buffer.
 temperature     res 2           ; Final temperature. SIGNED.
 last_temperature res 2          ; Last displayed temperature (used to detect changes).
-Dx              res 2
 
 last_surfpressure       res 2   ; Divemode
 last_surfpressure_15min res 2
@@ -315,8 +311,6 @@
 eeprom_address          res 2   ; external EEPROM
 eeprom_header_address   res 2
 
-divenumber              res 1   ; Logbook
-
 batt_voltage            res 2   ; Battery voltage in mV
 
 i2c_temp                res 1   ; I²C timeout counter
@@ -335,7 +329,7 @@
 
 active_gas              res 1   ; Holds number of active gas
 
-last_diluent            res 1   ; backup of diluent percentage in const ppO2 mode
+;last_diluent            res 1   ; backup of diluent percentage in const ppO2 mode
 ;last_ppO2_value         res 1   ; last calculated ppO2 value
 
 debug_char              res 6    ; For debugmode
--- a/code_part1/OSTC_code_asm_part1/divemode.asm	Sun Apr 22 14:38:10 2012 +0200
+++ b/code_part1/OSTC_code_asm_part1/divemode.asm	Sun Apr 22 21:32:04 2012 +0200
@@ -1743,7 +1743,7 @@
 	clrf	average_depth_hold_total+2
 	clrf	average_depth_hold_total+3	; Clear Non-Resettable Average
 	bcf		depth_greater_100m			; clear flag
-	setf	last_diluent				; to be displayed after first calculation (range: 0 to 100 [%])
+;	setf	last_diluent				; to be displayed after first calculation (range: 0 to 100 [%])
 	bcf		dekostop_active	
 	bcf		is_bailout					;=1: CC mode, but bailout active!		
 	bcf		better_gas_available        ;=1: A better gas is available and a gas change is advised in divemode
--- a/code_part1/OSTC_code_asm_part1/math.asm	Sun Apr 22 14:38:10 2012 +0200
+++ b/code_part1/OSTC_code_asm_part1/math.asm	Sun Apr 22 21:32:04 2012 +0200
@@ -44,26 +44,6 @@
 	bra		div16
 	return
 
-sub32:  ;xC:4=xC:4-sub_c:4 (Warning: sub_c+3 trashes sub_a+0!)
-	movf    sub_c+0, W
-	subwf   xC+0, F
-
-	movf    sub_c+1, W
-	BTFSS    STATUS, C
-	incfsz sub_c+1, W
-	subwf xC+1, F
-
-	movf    sub_c+2, W
-	BTFSS    STATUS, C
-	incfsz sub_c+2, W
-	subwf xC+2, F
-
-	movf    sub_c+3, W
-	BTFSS    STATUS, C
-	incfsz sub_c+3, W
-	subwf xC+3, F
-	return
-
 sub16:	;  sub_c = sub_a - sub_b (with signed values)
 	bcf		neg_flag
 	movf   	sub_b+0, W             	; Get Value to be subtracted
--- a/code_part1/OSTC_code_asm_part1/menu_logbook.asm	Sun Apr 22 14:38:10 2012 +0200
+++ b/code_part1/OSTC_code_asm_part1/menu_logbook.asm	Sun Apr 22 21:32:04 2012 +0200
@@ -37,6 +37,7 @@
         logbook_min_tp:2        ; Min temperature, for drawing profile.
         logbook_max_tp:2        ; Maximum temperature, for drawing profile.
         logbook_ceiling         ; Current ceiling, for drawing profile.
+		divenumber              ; Dive number
     ENDC
 
 ;=============================================================================
--- a/code_part1/OSTC_code_asm_part1/oled_samsung.asm	Sun Apr 22 14:38:10 2012 +0200
+++ b/code_part1/OSTC_code_asm_part1/oled_samsung.asm	Sun Apr 22 21:32:04 2012 +0200
@@ -852,7 +852,7 @@
 	
 	return
 
-PLED_set_color:;Converts 8Bit RGB b'RRRGGGBB' into 16Bit RGB b'RRRRRGGGGGGBBBBB'
+PLED_set_color:;Converts 8Bit RGB b'RRRGGGBB' into 16Bit RGB b'RRRRRGGG GGGBBBBB'
 	movwf	oled1_temp				; Get 8Bit RGB b'RRRGGGBB'
 	movff	oled1_temp,	oled2_temp	; Copy