From f8d9447fde5633d5acfed2f2e661decc71373d7d Mon Sep 17 00:00:00 2001 From: Martin Preuss Date: Wed, 10 May 2023 21:09:37 +0200 Subject: [PATCH] avr/lcd: renamed some defs. --- avr/modules/lcd/main.asm | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/avr/modules/lcd/main.asm b/avr/modules/lcd/main.asm index 7f97b69..6671db3 100644 --- a/avr/modules/lcd/main.asm +++ b/avr/modules/lcd/main.asm @@ -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