# HG changeset patch
# User heinrichsweikamp
# Date 1611057443 -3600
# Node ID 2750099bf5bbf8c45aed59165474adbf26910577
# Parent  23ed973d4fb91fdbb89d964b065b608d96996b70
3.15 release

diff -r 23ed973d4fb9 -r 2750099bf5bb code_part1/OSTC_code_asm_part1/aa_wordprocessor.asm
--- a/code_part1/OSTC_code_asm_part1/aa_wordprocessor.asm	Fri Jan 01 19:57:21 2021 +0100
+++ b/code_part1/OSTC_code_asm_part1/aa_wordprocessor.asm	Tue Jan 19 12:57:23 2021 +0100
@@ -467,13 +467,23 @@
 ; Setup pointers for a char:
 ; Inputs : letter : string to print (SHOULD BE NULL TERMINATED)
 ; Output : DISPLAY commands on port D + clocks.
-; 
+		
         global  aa_wordprocessor        ; Callable from C-code.
 aa_wordprocessor:
+		movlw	.20
+		cpfseq	win_leftx2
+		bra	aa_wordprocessor_no_menu
+	    
+		clrf    WREG
+		movff   WREG,letter+.18
+
+aa_wordprocessor_no_menu:		
 		; Make sure context is well known
 		movlb	HIGH win_top            ; Switch to bank 0...
 
 		rcall	aa_string_width		    ; Set win_height, compute win_width
+		
+		movlb	HIGH win_top            ; Switch to bank 0...
 		call	DISP_box_write		    ; Use that for the box.
 
 		; Restart the loop for each char to print
diff -r 23ed973d4fb9 -r 2750099bf5bb code_part1/OSTC_code_asm_part1/adc_rtc.asm
--- a/code_part1/OSTC_code_asm_part1/adc_rtc.asm	Fri Jan 01 19:57:21 2021 +0100
+++ b/code_part1/OSTC_code_asm_part1/adc_rtc.asm	Tue Jan 19 12:57:23 2021 +0100
@@ -236,11 +236,11 @@
 	movwf	mins
 	movlw	.12
 	movwf	hours
-	movlw	.1
+	movlw	.19
 	movwf	day
-	movlw	.5
+	movlw	.1
 	movwf	month
-	movlw	.13
+	movlw	.21
 	movwf	year
 	bsf		PIE1, TMR1IE		; Enable clock int
 	return
diff -r 23ed973d4fb9 -r 2750099bf5bb code_part1/OSTC_code_asm_part1/definitions.asm
--- a/code_part1/OSTC_code_asm_part1/definitions.asm	Fri Jan 01 19:57:21 2021 +0100
+++ b/code_part1/OSTC_code_asm_part1/definitions.asm	Tue Jan 19 12:57:23 2021 +0100
@@ -179,6 +179,7 @@
                                 ; never use wait_temp in interrupt routines (isr) and never call any wait routine in interrupts
 
 textnumber      res 1           ; for textdisplay
+letter_counter	res 1		; for aa_wordprocessor      
 textaddress     res 2				
 
 average_depth_hold  res 4       ; Holds Sum of depths (Resettable)
diff -r 23ed973d4fb9 -r 2750099bf5bb code_part1/OSTC_code_asm_part1/displaytext.asm
--- a/code_part1/OSTC_code_asm_part1/displaytext.asm	Fri Jan 01 19:57:21 2021 +0100
+++ b/code_part1/OSTC_code_asm_part1/displaytext.asm	Tue Jan 19 12:57:23 2021 +0100
@@ -77,6 +77,7 @@
     movlw   UPPER(text_pointer-4)
     movwf   TBLPTRU
 
+    clrf    letter_counter		; reset the letter counter
     movlw   4                           ; textnumber * 4 --> PROD
     mulwf   textnumber
 
@@ -118,6 +119,7 @@
 	movf    TABLAT,W
 	bz      display_text_exit           ; Text finished?
 	movwf   POSTINC2
+	incf	letter_counter,F	    ; ++1
 	bra     displaytext3
 
 display_text_exit:
diff -r 23ed973d4fb9 -r 2750099bf5bb code_part1/OSTC_code_asm_part1/menu_gassetup.asm
--- a/code_part1/OSTC_code_asm_part1/menu_gassetup.asm	Fri Jan 01 19:57:21 2021 +0100
+++ b/code_part1/OSTC_code_asm_part1/menu_gassetup.asm	Tue Jan 19 12:57:23 2021 +0100
@@ -908,7 +908,7 @@
 	incf	lo,F				
 	bsf		leftbind
 	output_99
-	STRCAT_PRINT ": "
+	STRCAT_PRINT ":"
 	
 	WIN_TOP		.2
 	WIN_LEFT	.50
@@ -992,7 +992,12 @@
 	call	read_eeprom			; Low-value
 	movff	EEDATA,lo
 	output_8
-    STRCAT_PRINT  TXT_METER2
+    STRCAT  TXT_METER2
+    
+    clrf    WREG
+    movff   WREG,letter+.22
+    call    word_processor
+
     call	DISP_standard_color
 	return
 
diff -r 23ed973d4fb9 -r 2750099bf5bb code_part1/OSTC_code_asm_part1/start.asm
--- a/code_part1/OSTC_code_asm_part1/start.asm	Fri Jan 01 19:57:21 2021 +0100
+++ b/code_part1/OSTC_code_asm_part1/start.asm	Tue Jan 19 12:57:23 2021 +0100
@@ -129,7 +129,7 @@
 	clrf	EEADRH					; Reset EEADRH
 	
 	movlw	softwareversion_x
-	cpfseq	temp1					; compare version x
+;	cpfseq	temp1					; compare version x
 	bra		check_firmware_new		; is not equal -> reset CF and store new version in EEPROM
 
 	movlw	softwareversion_y
@@ -169,7 +169,7 @@
     write_int_eeprom	d'119'
     ; SP Mode (Manual)
     write_int_eeprom	d'116'
-;    call    reset_all_cf_bank2      ; Reset CF64-93 with this update....
+    call    reset_all_cf_bank2      ; Reset CF64-93 with this update....
 
 restart:
     ; check for time/date vault