Move led flashing code from lcdLib to lcdOutput
Refactor led flashing code from lcdLib.c and lcdLib.h to lcdOutput.c. Signed-off-by: Collin J. Doering <collin.doering@rekahsoft.ca>
This commit is contained in:
parent
1ba8dd6b86
commit
4f9462e983
16
lcdLib.c
16
lcdLib.c
|
@ -35,18 +35,6 @@ const uint8_t lineBeginnings[LCD_NUMBER_OF_LINES] = { LCD_LINE_BEGINNINGS };
|
||||||
//------------------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------------------
|
||||||
// Function definitions
|
// Function definitions
|
||||||
|
|
||||||
void flashLED(uint8_t times) {
|
|
||||||
while (times > 0) {
|
|
||||||
STATUS_LED_PORT |= 1 << STATUS_LED; // turn on status LED
|
|
||||||
_delay_ms(100);
|
|
||||||
STATUS_LED_PORT &= ~(1 << STATUS_LED); // turn status LED off
|
|
||||||
_delay_ms(100);
|
|
||||||
times--;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
//------------------------------------
|
|
||||||
|
|
||||||
void clkLCD(void) {
|
void clkLCD(void) {
|
||||||
LCD_ENABLE_PORT |= (1 << LCD_ENABLE);
|
LCD_ENABLE_PORT |= (1 << LCD_ENABLE);
|
||||||
_delay_us(LCD_ENABLE_HIGH_DELAY);
|
_delay_us(LCD_ENABLE_HIGH_DELAY);
|
||||||
|
@ -63,7 +51,6 @@ void loop_until_LCD_BF_clear(void) {
|
||||||
// Set LCD_BF as input
|
// Set LCD_BF as input
|
||||||
LCD_DBUS7_DDR &= ~(1 << LCD_BF);
|
LCD_DBUS7_DDR &= ~(1 << LCD_BF);
|
||||||
|
|
||||||
STATUS_LED_PORT |= 1 << STATUS_LED; // DEBUG
|
|
||||||
do {
|
do {
|
||||||
bf = 0;
|
bf = 0;
|
||||||
LCD_ENABLE_PORT |= (1 << LCD_ENABLE);
|
LCD_ENABLE_PORT |= (1 << LCD_ENABLE);
|
||||||
|
@ -81,7 +68,6 @@ void loop_until_LCD_BF_clear(void) {
|
||||||
_delay_us(1); // 'address hold time', 'data hold time' and 'enable cycle width'
|
_delay_us(1); // 'address hold time', 'data hold time' and 'enable cycle width'
|
||||||
#endif
|
#endif
|
||||||
} while (bf);
|
} while (bf);
|
||||||
STATUS_LED_PORT &= ~(1 << STATUS_LED); // DEBUG
|
|
||||||
|
|
||||||
#if defined (FOUR_BIT_MODE) || defined (EIGHT_BIT_ARBITRARY_PIN_MODE)
|
#if defined (FOUR_BIT_MODE) || defined (EIGHT_BIT_ARBITRARY_PIN_MODE)
|
||||||
LCD_DBUS7_DDR |= (1 << LCD_DBUS7);
|
LCD_DBUS7_DDR |= (1 << LCD_DBUS7);
|
||||||
|
@ -406,8 +392,6 @@ void initLCD (void) {
|
||||||
|
|
||||||
// Display on, cursor on, blink off
|
// Display on, cursor on, blink off
|
||||||
writeLCDInstr(INSTR_DISPLAY | (1 << INSTR_DISPLAY_D) | (1 << INSTR_DISPLAY_C));
|
writeLCDInstr(INSTR_DISPLAY | (1 << INSTR_DISPLAY_D) | (1 << INSTR_DISPLAY_C));
|
||||||
|
|
||||||
flashLED(5); // DEBUG
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
8
lcdLib.h
8
lcdLib.h
|
@ -67,15 +67,7 @@
|
||||||
|
|
||||||
|
|
||||||
//------------------------------------
|
//------------------------------------
|
||||||
|
|
||||||
#define STATUS_LED_PORT PORTC
|
|
||||||
#define STATUS_LED_DDR DDRC
|
|
||||||
#define STATUS_LED PC5
|
|
||||||
|
|
||||||
// Function definitions
|
// Function definitions
|
||||||
void flashLED(uint8_t times);
|
|
||||||
|
|
||||||
//------------------------------------
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
Bring LCD_ENABLE line high, wait for LCD_ENABLE_HIGH_DELAY; then bring LCD_ENABLE line low
|
Bring LCD_ENABLE line high, wait for LCD_ENABLE_HIGH_DELAY; then bring LCD_ENABLE line low
|
||||||
|
|
15
lcdOutput.c
15
lcdOutput.c
|
@ -34,6 +34,20 @@
|
||||||
#include "ansi_escapes.h"
|
#include "ansi_escapes.h"
|
||||||
#include "USART.h"
|
#include "USART.h"
|
||||||
|
|
||||||
|
#define STATUS_LED_PORT PORTC
|
||||||
|
#define STATUS_LED_DDR DDRC
|
||||||
|
#define STATUS_LED PC5
|
||||||
|
|
||||||
|
void flashLED(uint8_t times) {
|
||||||
|
while (times > 0) {
|
||||||
|
STATUS_LED_PORT |= 1 << STATUS_LED; // turn on status LED
|
||||||
|
_delay_ms(100);
|
||||||
|
STATUS_LED_PORT &= ~(1 << STATUS_LED); // turn status LED off
|
||||||
|
_delay_ms(100);
|
||||||
|
times--;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
int main(void) {
|
int main(void) {
|
||||||
clock_prescale_set(clock_div_1);
|
clock_prescale_set(clock_div_1);
|
||||||
|
|
||||||
|
@ -44,6 +58,7 @@ int main(void) {
|
||||||
|
|
||||||
initLCD();
|
initLCD();
|
||||||
//initLCDByInternalReset();
|
//initLCDByInternalReset();
|
||||||
|
flashLED(5); // DEBUG
|
||||||
|
|
||||||
while (1) {
|
while (1) {
|
||||||
serialChar = receiveByte();
|
serialChar = receiveByte();
|
||||||
|
|
Loading…
Reference in New Issue