# HG changeset patch
# User JeanDo
# Date 1291944926 -3600
# Node ID 3bcccb697bce030c517d7329fd026ff252a1f2ad
# Parent  6655b1c59adcb2990d15b52e2e82bf0638445133
Added HW logo and dimmed cursor in small font.

diff -r 6655b1c59adc -r 3bcccb697bce code_part1/OSTC_code_asm_part1/aa_font28.inc
--- a/code_part1/OSTC_code_asm_part1/aa_font28.inc	Fri Dec 10 02:36:56 2010 +0100
+++ b/code_part1/OSTC_code_asm_part1/aa_font28.inc	Fri Dec 10 02:35:26 2010 +0100
@@ -1,5 +1,5 @@
 ;==========================================================================
-; Font data exported mar. nov. 30 2010 by FontIO.cpp 57 2010-11-24 23:24:47Z gascuel $ 
+; Font data exported ven. déc. 10 2010 by FontIO.cpp 57 2010-11-24 23:24:47Z gascuel $ 
 ;==========================================================================
 aa_font28_height	EQU	.24
 aa_font28_width		EQU	.14
@@ -577,4 +577,37 @@
 			DB 0x41, 0x82, 0x41, 0x60, 0x8F, 0x46, 0x8F, 0x41
 			DB 0x60, 0x42, 0x60, 0x41, 0x8D, 0x41, 0x86, 0x41
 			DB 0xB7
-; TOTAL COMPRESSED SIZE = 3411
+; „ 84
+			DB 0xB9, 0x62, 0x94, 0x62, 0x94, 0x62, 0x8E, 0x6E
+			DB 0x89, 0x6C, 0x8B, 0x6A, 0x8D, 0x68, 0x8F, 0x66
+			DB 0x91, 0x64, 0x93, 0x62, 0x95, 0x60, 0xA3
+; … 85
+			DB 0x94, 0x40, 0x20, 0x00, 0x92, 0x60, 0x20, 0x01
+			DB 0x20, 0x84, 0x40, 0x8B, 0x40, 0x01, 0x20, 0x00
+			DB 0x60, 0x83, 0x60, 0x00, 0x40, 0x88, 0x60, 0x01
+			DB 0x21, 0x00, 0x60, 0x83, 0x60, 0x01, 0x20, 0x86
+			DB 0x60, 0x40, 0x00, 0x40, 0x21, 0x00, 0x20, 0x84
+			DB 0x00, 0x20, 0x60, 0x00, 0x84, 0x60, 0x40, 0x01
+			DB 0x40, 0x22, 0x00, 0x60, 0x83, 0x60, 0x00, 0x61
+			DB 0x00, 0x40, 0x81, 0x60, 0x40, 0x01, 0x20, 0x40
+			DB 0x22, 0x00, 0x40, 0x84, 0x20, 0x00, 0x61, 0x00
+			DB 0x20, 0x60, 0x20, 0x01, 0x20, 0x41, 0x22, 0x00
+			DB 0x20, 0x84, 0x60, 0x00, 0x40, 0x61, 0x40, 0x02
+			DB 0x20, 0x42, 0x23, 0x00, 0x60, 0x84, 0x40, 0x00
+			DB 0x63, 0x45, 0x23, 0x00, 0x20, 0x85, 0x00, 0x20
+			DB 0x64, 0x43, 0x24, 0x00, 0x60, 0x84, 0x60, 0x00
+			DB 0x40, 0x64, 0x42, 0x24, 0x00, 0x20, 0x85, 0x60
+			DB 0x00, 0x66, 0x40, 0x25, 0x00, 0x60, 0x85, 0x20
+			DB 0x00, 0x65, 0x41, 0x26, 0x86
+; † 86
+			DB 0x20, 0x00, 0x64, 0x43, 0x23, 0x00, 0x40, 0x86
+			DB 0x00, 0x40, 0x64, 0x44, 0x22, 0x00, 0x60, 0x86
+			DB 0x00, 0x64, 0x46, 0x21, 0x00, 0x40, 0x86, 0x00
+			DB 0x63, 0x48, 0x21, 0x01, 0x60, 0x84, 0x00, 0x62
+			DB 0x4B, 0x21, 0x00, 0x20, 0x40, 0x82, 0x00, 0x61
+			DB 0x4D, 0x20, 0x01, 0x40, 0x82, 0x00, 0x60, 0x4C
+			DB 0x20, 0x01, 0x40, 0x60, 0x83, 0x00, 0x4A, 0x20
+			DB 0x02, 0x20, 0x60, 0x85, 0x02, 0x25, 0x03, 0x20
+			DB 0x40, 0x60, 0x87, 0x60, 0x40, 0x20, 0x05, 0x20
+			DB 0x41, 0x60, 0xEA
+; TOTAL COMPRESSED SIZE = 3642
diff -r 6655b1c59adc -r 3bcccb697bce code_part1/OSTC_code_asm_part1/aa_font28_idx.inc
--- a/code_part1/OSTC_code_asm_part1/aa_font28_idx.inc	Fri Dec 10 02:36:56 2010 +0100
+++ b/code_part1/OSTC_code_asm_part1/aa_font28_idx.inc	Fri Dec 10 02:35:26 2010 +0100
@@ -1,9 +1,9 @@
 ;==========================================================================
-; Font index exported mar. nov. 30 2010 by FontIO.cpp 57 2010-11-24 23:24:47Z gascuel $ 
+; Font index exported ven. déc. 10 2010 by FontIO.cpp 57 2010-11-24 23:24:47Z gascuel $ 
 ;==========================================================================
-aa_font28_chars		EQU	.99
+aa_font28_chars		EQU	.102
 aa_font28_firstChar	EQU	'!'
-aa_font28_lastChar	EQU	'ƒ'
+aa_font28_lastChar	EQU	'†'
 ;
 aa_font28_idx:
 			DW	aa_font28_bits + 0x0000	; ! mark
@@ -105,4 +105,7 @@
 			DW	aa_font28_bits + 0x0CE2	; � 81
 			DW	aa_font28_bits + 0x0D09	; ‚ 82
 			DW	aa_font28_bits + 0x0D22	; ƒ 83
-			DW	aa_font28_bits + 0x0D53	; END OF INDEX
+			DW	aa_font28_bits + 0x0D53	; „ 84
+			DW	aa_font28_bits + 0x0D6A	; … 85
+			DW	aa_font28_bits + 0x0DEF	; † 86
+			DW	aa_font28_bits + 0x0E3A	; END OF INDEX
diff -r 6655b1c59adc -r 3bcccb697bce code_part1/OSTC_code_asm_part1/aa_fonts.asm
--- a/code_part1/OSTC_code_asm_part1/aa_fonts.asm	Fri Dec 10 02:36:56 2010 +0100
+++ b/code_part1/OSTC_code_asm_part1/aa_fonts.asm	Fri Dec 10 02:35:26 2010 +0100
@@ -24,6 +24,7 @@
 			DB	'°', 0x82
 			DB	'¤', 0x83
 			DB	0xB7,0x7F		; Cursor...
+			DB	0xB8,0x84		; Cursor...
 			DB	0				; End of translation table
 			DB	aa_font28_firstChar			; To be substracted
 			DB	aa_font28_chars				; Max value
@@ -69,6 +70,8 @@
 ;
 #include	"aa_font90_idx.inc"
 #include	"aa_font90.inc"
+
+;=============================================================================
 ; Make sure this is coherent...
 	if aa_font90_nbbits != 3
 		error SMALL fount should be encoded with 3bits anti-aliasing...
diff -r 6655b1c59adc -r 3bcccb697bce code_part1/OSTC_code_asm_part1/aa_wordprocessor.asm
--- a/code_part1/OSTC_code_asm_part1/aa_wordprocessor.asm	Fri Dec 10 02:36:56 2010 +0100
+++ b/code_part1/OSTC_code_asm_part1/aa_wordprocessor.asm	Fri Dec 10 02:35:26 2010 +0100
@@ -59,12 +59,6 @@
 			; SMALL font -----------------------------------------------------
 			; Font SMALL character folding...
 aa_char_0:
-;			movlw	0x7E				; Skip chars between ~ and ¡
-;			cpfsgt	PRODL,A				; Compare with char;
-;			bra		aa_char_01
-;			movlw	-.34				; substract 34 (decimal!)
-;			addwf	PRODL,F,A			; put back to PRODL
-;aa_char_01:
 			movlw	LOW aa_font28_block
 			movwf	TBLPTRL,A
 			movlw	HIGH aa_font28_block
@@ -96,6 +90,7 @@
 			movlw	UPPER aa_font28_block
 			movwf	TBLPTRU,A
 
+            ; Proceed to character substitutions
 aa_char_30:
 			tblrd*+						; Read FROM char
 			movf	TABLAT,W			; Get it, and set Z,N
@@ -107,6 +102,7 @@
 			movff	TABLAT, PRODL		; make substitution
 			bra		aa_char_30			; Loop.
 
+            ; Make sure char is in the available range
 aa_char_32:
 			tblrd*+						; Read first char
 			movf	TABLAT,W			; get it.
@@ -117,7 +113,8 @@
 			tblrd*+						; Read default char
 			cpfslt	PRODL				; if char > WREG ?
 			movff	TABLAT,PRODL		; replace PRODL
-aa_char_33:
+
+            ; Decode font height and anti-aliasing mode
 			clrf	aa_flags,BANKED		; Default to no AA
 			tblrd*+						; Read font height + AA flag
 			movf	TABLAT,W			; into WREG
@@ -127,6 +124,7 @@
 			andlw	0x7F				; Keep just font height,
 			movwf	aa_height,BANKED	; then save it (its a register)
 
+            ; Set PROM pointer to the char index
 			movf	PRODL,W				; Read back char
 			mullw	2					; PROD = 2*(char - base), TBLPTR=idx
 			movf	PRODL,W
@@ -134,6 +132,7 @@
 			movf	PRODH,W
 			addwfc	TBLPTRH,F			; and high byte.
 
+            ; Read start and stop pointers
 			tblrd*+						; aa_start = PROM16(*tblptr++)
 			movff	TABLAT,aa_start		; Read low byte
 			tblrd*+
diff -r 6655b1c59adc -r 3bcccb697bce code_part1/OSTC_code_asm_part1/pled_outputs.asm
--- a/code_part1/OSTC_code_asm_part1/pled_outputs.asm	Fri Dec 10 02:36:56 2010 +0100
+++ b/code_part1/OSTC_code_asm_part1/pled_outputs.asm	Fri Dec 10 02:35:26 2010 +0100
@@ -2391,6 +2391,14 @@
 
 
 	lfsr	FSR2,letter
+	movlw   0x85                        ; New aa_font_28 5 grays HW logo.
+	movwf   POSTINC2
+	movlw   0x86
+	movwf   POSTINC2
+	movlw   ' '
+	movwf   POSTINC2
+	movwf   POSTINC2
+	
 	OUTPUTTEXTH		d'262'			; "OSTC "
 	clrf	EEADRH
 	clrf	EEADR				; Get Serial number LOW
@@ -2417,6 +2425,7 @@
 	bsf		leftbind
 	output_99x
 	bcf		leftbind
+	
 	call	word_processor
 	return