diff --git a/HISTORY.md b/HISTORY.md index 4660c41..2ea9980 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -13,4 +13,5 @@ - 2019-12-22 v1.2.4 libinfo can be excluded to save memory, optional use of flash for character definition (newCHR), delay function outsourced (delay.S) - 2019-12-26 v1.2.5 parameter area revised - 2020-01-14 v1.2.6 delay routines as include, more precise timing +- 2020-01-18 v1.2.7 minor source code adjustments / LibreOffice Calc-Sheet to calculate the correction factor diff --git a/include/DelayCalc.ods b/include/DelayCalc.ods new file mode 100644 index 0000000..3e9d821 Binary files /dev/null and b/include/DelayCalc.ods differ diff --git a/include/delay.S b/include/delay.asm similarity index 92% rename from include/delay.S rename to include/delay.asm index 7286160..52731e4 100644 --- a/include/delay.S +++ b/include/delay.asm @@ -20,15 +20,13 @@ .print "v0.1.0 2019-12-21" ; AVR register -;.include "/Users/roland/Projects/inc/m8def.inc" -;.include "/Users/roland/Projects/inc/m328def.inc" -.include "/Users/roland/Projects/inc/tn13def.inc" - - +;.include "../inc/m8def.inc" +;.include "../inc/m328def.inc" +.include "../inc/tn13def.inc" ;calculate counter for delay loop .ifndef __F_CPU ; if not set - .equ __F_CPU, 6000000 ; set to 6MHz systemclock + .equ __F_CPU, 12000000 ; set to 12MHz systemclock .endif .equ Cfactor, 2 ; correction factor diff --git a/hd44780.h b/include/hd44780.h similarity index 96% rename from hd44780.h rename to include/hd44780.h index 35d4040..61e491c 100644 --- a/hd44780.h +++ b/include/hd44780.h @@ -53,8 +53,6 @@ extern "C" { extern void printLCD(const char *text); extern char readLCD(char rs); extern void newCHR(char addr, const char *character); -// extern void mswait(int ms); -// extern void uswait(int us); #ifdef __cplusplus } diff --git a/library.json b/library.json index ca03451..4a8ed9c 100644 --- a/library.json +++ b/library.json @@ -1,6 +1,6 @@ { "name": "LCD-LED-library", - "version": "1.2.6", + "version": "1.2.7", "keywords": "hd44780, ks0066, (max7221), lcd, (led), display", "description": "Display library for HD44780 kompatible displays, supports 4/8 bit and 3 wire serial interface", "platforms": "atmelavr, atmelmegaavr", diff --git a/hd44780.S b/src/hd44780.S similarity index 99% rename from hd44780.S rename to src/hd44780.S index cc89b16..e236ce5 100644 --- a/hd44780.S +++ b/src/hd44780.S @@ -23,8 +23,8 @@ ; you can convert the files from https://github.com/DarkSector/AVR/tree/master/asm/include using atmel2gnu.py .include "../inc/tn13def.inc" -.set __F_CPU, 12000000 -.include "/Users/roland/Projects/lib/disp-lib/include/delay.S" +;.set __F_CPU, 12000000 +#include "delay.asm" ;.include "/Users/roland/Projects/inc/m8def.inc" ;.include "/Users/roland/Projects/inc/m328def.inc"