# HG changeset patch
# User heinrichsweikamp
# Date 1302676546 -7200
# Node ID 9657a7bcc7e14a74e2bd5027b584f1bb49d1db23
# Parent  5c17b2b4b9dd24e69c17e713f172b161368fe288
inactive gases with change depth>0 ignored

diff -r 5c17b2b4b9dd -r 9657a7bcc7e1 code_part1/OSTC_code_asm_part1/menu_gassetup.asm
--- a/code_part1/OSTC_code_asm_part1/menu_gassetup.asm	Wed Apr 13 00:05:19 2011 +0200
+++ b/code_part1/OSTC_code_asm_part1/menu_gassetup.asm	Wed Apr 13 08:35:46 2011 +0200
@@ -1127,34 +1127,36 @@
 	movlw	d'99'
 	movwf	logbook_temp4		; Last Gas change depth
 
+	movff	letter+.25, logbook_temp5	; Activity flags
+
 ; Done. Copy Gas #logbook_temp3 into EEPROM Place Gas 5
 	rcall	gassetup_sort_sort	; Sort!
 	movlw	d'5'					; Gas 5
-	movwf	logbook_temp5
+	movwf	logbook_temp2
 	rcall	gassetup_sort_store
 
 ; Done. Copy Gas #logbook_temp3 into EEPROM Place Gas 4
 	rcall	gassetup_sort_sort	; Sort!
 	movlw	d'4'					; Gas 4
-	movwf	logbook_temp5
+	movwf	logbook_temp2
 	rcall	gassetup_sort_store
 
 ; Done. Copy Gas #logbook_temp3 into EEPROM Place Gas 3
 	rcall	gassetup_sort_sort	; Sort!
 	movlw	d'3'					; Gas 3
-	movwf	logbook_temp5
+	movwf	logbook_temp2
 	rcall	gassetup_sort_store
 
 ; Done. Copy Gas #logbook_temp3 into EEPROM Place Gas 2
 	rcall	gassetup_sort_sort	; Sort!
 	movlw	d'2'					; Gas 2
-	movwf	logbook_temp5
+	movwf	logbook_temp2
 	rcall	gassetup_sort_store
 
 ; Done. Copy Gas #logbook_temp3 into EEPROM Place Gas 1
 	rcall	gassetup_sort_sort	; Sort!
 	movlw	d'1'					; Gas 1
-	movwf	logbook_temp5
+	movwf	logbook_temp2
 	bra     gassetup_sort_store
 
 ;-----------------------------------------------------------------------------
@@ -1162,7 +1164,7 @@
 	clrf	logbook_temp2               ; Tested gas (0-4)
 	clrf	logbook_temp1               ; Found change depth in m
 	clrf	logbook_temp3               ; Found gas (0-4)
-	movff	letter+.25, logbook_temp5	; Activity flags
+;	movff	letter+.25, logbook_temp5	; Activity flags
 
 	lfsr	FSR2,letter+.20             ; Change depths Gas1
 gassetup_sort_gaslist2:
@@ -1176,6 +1178,7 @@
     ; Is gas active?
     ; Should not select inactive gas, because we might have several
     ; gas with the same depth, some active, some not...
+
 	rrcf	logbook_temp5,F				; Shift into Carry bit
 	btfss	STATUS,C                    ; Was Gas active?
 	bra		gassetup_sort_gaslist3      ; No: Skip.
@@ -1193,9 +1196,6 @@
 	movff	logbook_temp1,logbook_temp4 ; copy new depth (Store for next run)
 
 ; Debugger
-;call	enable_rs232	
-;	movff	logbook_temp1,TXREG
-;	call	rs232_wait_tx				; wait for UART
 ;	movff	logbook_temp2,TXREG
 ;	call	rs232_wait_tx				; wait for UART
 ;	movff	logbook_temp3,TXREG
@@ -1233,7 +1233,7 @@
 ;movff	logbook_temp1,TXREG
 ;call	rs232_wait_tx				    ; wait for UART
 
-	movf	logbook_temp5,W             ; Destination slot : 1-5
+	movf	logbook_temp2,W             ; Destination slot : 1-5
 	mullw	d'4'
 	movff	PRODL,EEADR                 ; Point to EEPROM of Gas #logbook_temp5
 	movlw	d'90'                       ; +90 Offset to new... 
@@ -1251,7 +1251,7 @@
 	movff	POSTINC2,EEDATA			; He Current
 	call	write_eeprom			; store in internal EEPROM
 
-	movf	logbook_temp5,W			; Destination slot : 1-5
+	movf	logbook_temp2,W			; Destination slot : 1-5
     addlw   d'117'
     movwf   EEADR
 	movff	logbook_temp1,EEDATA    ; Change depth -> EEDATA