diff --git a/Distancer.cpp b/Distancer.cpp index 54a3043..d71d021 100644 --- a/Distancer.cpp +++ b/Distancer.cpp @@ -1,46 +1,27 @@ -#define F_CPU 1000000 +#include "Hardware.h" +#include "MyLcd.h" #include -#include -#include "LcdShiftReg.h" - -void setupStatusLed() +extern "C" void __cxa_pure_virtual(void) { - DDRB |= (1 << PB0); -} - -void flashStatusLed() -{ - PORTB |= (1 << PB0); - _delay_ms(100); - PORTB &= ~(1 << PB0); + } int main() { - setupStatusLed(); - - LcdShiftReg lcdShiftReg; + MyLcd lcd; + delay_ms(40); + lcd.initDisplay(); + + uint16_t counter = 0; while (true) { - flashStatusLed(); - _delay_ms(400); + lcd.clear(); + lcd.output(counter++); + lcd.output('s'); - lcdShiftReg.set(1); - _delay_ms(100); - lcdShiftReg.set(0); - _delay_ms(400); - - lcdShiftReg.set(1 << 1); - _delay_ms(100); - lcdShiftReg.set(0); - _delay_ms(400); - - lcdShiftReg.set(1 << 7); - _delay_ms(100); - lcdShiftReg.set(0); - _delay_ms(400); + delay_ms(1000); } } diff --git a/Distancer.cppproj b/Distancer.cppproj index dd0acdf..3142382 100644 --- a/Distancer.cppproj +++ b/Distancer.cppproj @@ -55,23 +55,47 @@ False True True - %24(PackRepoDir)\Atmel\ATtiny_DFP\1.2.112\include + + + NDEBUG + + + + + %24(PackRepoDir)\Atmel\ATtiny_DFP\1.2.112\include + + + Optimize for size (-Os) True True True True True - %24(PackRepoDir)\Atmel\ATtiny_DFP\1.2.112\include + + + NDEBUG + + + + + %24(PackRepoDir)\Atmel\ATtiny_DFP\1.2.112\include + + + Optimize for size (-Os) True True True -std=c++11 - libm - %24(PackRepoDir)\Atmel\ATtiny_DFP\1.2.112\include - NDEBUG - Optimize for size (-Os) - NDEBUG - Optimize for size (-Os) + + + libm + + + + + %24(PackRepoDir)\Atmel\ATtiny_DFP\1.2.112\include + + @@ -99,6 +123,7 @@ -std=c++11 libm %24(PackRepoDir)\Atmel\ATtiny_DFP\1.2.112\include + True DEBUG Optimize (-O1) Default (-g2) @@ -110,6 +135,12 @@ + + compile + + + compile + compile @@ -119,12 +150,24 @@ compile + + compile + + + compile + compile compile + + compile + + + compile +