added more fonts and corresponding code. disabled test code in ili9341 module.
This commit is contained in:
@@ -175,6 +175,7 @@ irqNotSet:
|
||||
; @routine onSystemStart
|
||||
|
||||
onSystemStart:
|
||||
bigcall test
|
||||
ret
|
||||
; @end
|
||||
|
||||
@@ -226,7 +227,10 @@ onEveryLoop:
|
||||
.include "devices/all/hw_m644p.asm"
|
||||
.include "devices/all/includes.asm"
|
||||
|
||||
.include "common/debug.asm"
|
||||
;.include "common/debug.asm"
|
||||
|
||||
.include "modules/lcd2/font/font3.asm"
|
||||
.include "modules/lcd2/font/font16x26.asm"
|
||||
|
||||
|
||||
|
||||
@@ -238,3 +242,113 @@ onEveryLoop:
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
; @param %0 X
|
||||
; @param %1 Y
|
||||
; @param %2 W
|
||||
; @param %3 H
|
||||
.macro M_FILL_RECT
|
||||
ldi r16, LOW(@0) ; X0
|
||||
mov r4, r16
|
||||
ldi r16, HIGH(@0)
|
||||
mov r5, r16
|
||||
|
||||
ldi r16, LOW(@1) ; Y0
|
||||
mov r6, r16
|
||||
ldi r16, HIGH(@1)
|
||||
mov r7, r16
|
||||
|
||||
ldi r16, LOW(@2) ; W
|
||||
mov r8, r16
|
||||
ldi r16, HIGH(@2)
|
||||
mov r9, r16
|
||||
|
||||
ldi r16, LOW(@3) ; H
|
||||
mov r10, r16
|
||||
ldi r16, HIGH(@3)
|
||||
mov r11, r16
|
||||
|
||||
bigcall ILI9341_FillRect
|
||||
.endmacro
|
||||
|
||||
|
||||
|
||||
|
||||
test:
|
||||
; set foreground (r3:r2)
|
||||
; 0bRRRRRGGGGGGBBBBB
|
||||
ldi r16, 0b11111111
|
||||
mov r3, r16
|
||||
ldi r16, 0b11111111 ; white
|
||||
mov r2, r16
|
||||
M_FILL_RECT 0, 0, 319, 239
|
||||
|
||||
; set foreground (r3:r2)
|
||||
ldi r16, 0b00000000
|
||||
mov r3, r16
|
||||
ldi r16, 0b00011111 ; blue
|
||||
mov r2, r16
|
||||
M_FILL_RECT 0, 0, 319, 32
|
||||
|
||||
; set background (r1:r0)
|
||||
mov r0, r2
|
||||
mov r1, r3
|
||||
|
||||
; set foreground (r3:r2)
|
||||
ldi r16, 0b11111111
|
||||
mov r3, r16
|
||||
ldi r16, 0b11111111 ; white
|
||||
mov r2, r16
|
||||
|
||||
; set Xpos
|
||||
ldi r16, LOW(10)
|
||||
mov r4, r16
|
||||
ldi r16, HIGH(10)
|
||||
mov r5, r16
|
||||
|
||||
; setYpos
|
||||
ldi r16, LOW(3)
|
||||
mov r6, r16
|
||||
ldi r16, HIGH(3)
|
||||
mov r7, r16
|
||||
|
||||
; set font
|
||||
ldi zl, LOW(font3_16x26*2)
|
||||
ldi zh, HIGH(font3_16x26*2)
|
||||
|
||||
; set buffer
|
||||
ldi xl, LOW(glyphBuffer)
|
||||
ldi xh, HIGH(glyphBuffer)
|
||||
|
||||
; write characters
|
||||
ldi r16, 'A'
|
||||
bigcall ili9341_WriteCharacterX1At
|
||||
|
||||
ldi r16, 'Q'
|
||||
bigcall ili9341_WriteCharacterX1At
|
||||
|
||||
ldi r16, 'H'
|
||||
bigcall ili9341_WriteCharacterX1At
|
||||
|
||||
ldi r16, 'O'
|
||||
bigcall ili9341_WriteCharacterX1At
|
||||
|
||||
ldi r16, 'M'
|
||||
bigcall ili9341_WriteCharacterX1At
|
||||
|
||||
ldi r16, 'E'
|
||||
bigcall ili9341_WriteCharacterX1At
|
||||
|
||||
ret
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
.dseg
|
||||
|
||||
glyphBuffer: .byte 1024
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user