Skip to content

Commit

Permalink
v1.2.7
Browse files Browse the repository at this point in the history
  • Loading branch information
rlnd-ldwg committed Jan 18, 2020
1 parent b701dc0 commit 67ba512
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 11 deletions.
1 change: 1 addition & 0 deletions HISTORY.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
</pre>
Binary file added include/DelayCalc.ods
Binary file not shown.
10 changes: 4 additions & 6 deletions include/delay.S → include/delay.asm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions hd44780.h → include/hd44780.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
2 changes: 1 addition & 1 deletion library.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
4 changes: 2 additions & 2 deletions hd44780.S → src/hd44780.S
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 67ba512

Please sign in to comment.