martin/aqhomecontrol
Public Access
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

avr/lcd: renamed some defs.

Browse Source
This commit is contained in:
Martin Preuss
2023-05-10 21:09:37 +02:00
parent 44bed4dc14
commit f8d9447fde
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
avr/modules/lcd/main.asm
View File

@@ -36,8 +36,10 @@
.equ LCD_PAGE_COUNT = 8
.equ LCD_CMD_MODE = 0x00
.equ LCD_DATA_MODE = 0x40
.equ LCD_MODE_MULTICMD = 0x00
.equ LCD_MODE_SINGLECMD = 0x80
.equ LCD_MODE_DATA = 0x40
.equ LCD_MODE_SINGLEDATA = 0xc0
@@ -143,7 +145,7 @@ LCD_SetCursor:
rcall twiSendByteExpectAck ; (R16, R17, R18, R22)
brcc LCD_SetCursor_error
ldi r16, LCD_CMD_MODE
ldi r16, LCD_MODE_MULTICMD
rcall twiSendByteExpectAck ; (R16, R17, R18, R22)
brcc LCD_SetCursor_error
mov r16, r2
@@ -204,7 +206,7 @@ LCD_Fill_loopY:
ldi r16, (LCD_TWI_ADDRESS*2)
rcall twiSendByteExpectAck ; (R16, R17, R18, R22)
brcc LCD_Fill_error
ldi r16, LCD_DATA_MODE
ldi r16, LCD_MODE_DATA
rcall twiSendByteExpectAck ; (R16, R17, R18, R22)
brcc LCD_Fill_error
@@ -255,7 +257,7 @@ LCD_PrintFromFlash:
ldi r16, (LCD_TWI_ADDRESS*2)
rcall twiSendByteExpectAck ; (R16, R17, R18, R22)
brcc LCD_PrintFromFlash_error
ldi r16, LCD_DATA_MODE
ldi r16, LCD_MODE_DATA
rcall twiSendByteExpectAck ; (R16, R17, R18, R22)
brcc LCD_PrintFromFlash_error
@@ -304,7 +306,7 @@ LCD_PrintChar:
ldi r16, (LCD_TWI_ADDRESS*2)
rcall twiSendByteExpectAck ; (R16, R17, R18, R22)
brcc LCD_PrintChar_error
ldi r16, LCD_DATA_MODE
ldi r16, LCD_MODE_DATA
rcall twiSendByteExpectAck ; (R16, R17, R18, R22)
brcc LCD_PrintChar_error
@@ -343,7 +345,7 @@ LCD_PrintHexByte:
ldi r16, (LCD_TWI_ADDRESS*2)
rcall twiSendByteExpectAck ; (R16, R17, R18, R22)
brcc LCD_PrintHexByte_error
ldi r16, LCD_DATA_MODE
ldi r16, LCD_MODE_DATA
rcall twiSendByteExpectAck ; (R16, R17, R18, R22)
brcc LCD_PrintHexByte_error
mov r16, r20
@@ -385,7 +387,7 @@ LCD_PrintHexWord:
ldi r16, (LCD_TWI_ADDRESS*2)
rcall twiSendByteExpectAck ; (R16, R17, R18, R22)
brcc LCD_PrintHexWord_errorPop
ldi r16, LCD_DATA_MODE
ldi r16, LCD_MODE_DATA
rcall twiSendByteExpectAck ; (R16, R17, R18, R22)
brcc LCD_PrintHexWord_errorPop
pop r19
@@ -645,7 +647,7 @@ lcdUpcase_done:
; TODO: set adressing mode??
lcdInitCommandsBegin: ; 28 bytes
.db LCD_CMD_MODE, 0xa8, ((LCD_PAGE_COUNT*8)-1), 0x8d, 0x14, 0xaf, 0xa1, 0xc8
.db LCD_MODE_MULTICMD, 0xa8, ((LCD_PAGE_COUNT*8)-1), 0x8d, 0x14, 0xaf, 0xa1, 0xc8
lcdInitCommandsEnd:
lcdHelloMsg: .db "AqHOME 2023", 0