MakesHacksHip/Maiskolben
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/master'

Browse source 
# Conflicts:
#	Maiskolben_LCD/Maiskolben_LCD.ino
This commit is contained in:
Luca Zimmermann 2016-05-30 16:11:27 +02:00
commit 9524589856
1 changed files with 27 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
Maiskolben_LCD/Maiskolben_LCD.ino
View file

@ -9,6 +9,14 @@
#define EEPROM_CHECK 42 #define EEPROM_CHECK 42
//#define HAS_BATTERY //#define HAS_BATTERY
// splash screen
#define SPLASH_SHOW 1
#define SPLASH_TIME 2000
#define SPLASH_LINE1 'Property of'
#define SPLASH_LINE2 ' Name'
#define SPLASH_LINE3 ' Street'
#define SPLASH_LINE4 ' City'
#define STBY_TEMP 150 #define STBY_TEMP 150
//SOFTWARE CAN'T MEASURE MORE THAN 422 DUE TO RESISTOR CONFIGURATION, IF SET TO >= 422 IT'S LIKELY TO KILL YOUR TIP! //SOFTWARE CAN'T MEASURE MORE THAN 422 DUE TO RESISTOR CONFIGURATION, IF SET TO >= 422 IT'S LIKELY TO KILL YOUR TIP!
//If read 1024 on Analog in, the tip is turned off //If read 1024 on Analog in, the tip is turned off
@ -84,7 +92,13 @@ void setup() {
TCCR2B = TCCR2B & 0b11111000 | 7; TCCR2B = TCCR2B & 0b11111000 | 7;
delay(500); delay(500);
display.begin(); display.begin();
<<<<<<< HEAD:Maiskolben_LCD/Maiskolben_LCD.ino
delay(500); delay(500);
=======
if (SPLASH_SHOW != 0)
sayHello();
>>>>>>> origin/master:Maiskolben.ino
display.clearDisplay(); display.clearDisplay();
if (EEPROM.read(0) != EEPROM_CHECK) { if (EEPROM.read(0) != EEPROM_CHECK) {
EEPROM.update(0, EEPROM_CHECK); EEPROM.update(0, EEPROM_CHECK);
@ -109,6 +123,19 @@ void setup() {
sendNext = millis(); sendNext = millis();
} }
void sayHello() {
display.clearDisplay();
display.setTextSize(1);
display.setCursor(0,10);
display.print(SPLASH_LINE1);
display.setCursor(0,20);
display.print(SPLASH_LINE2);
display.setCursor(0,30);
display.print(SPLASH_LINE3);
display.setCursor(0,40);
display.print(SPLASH_LINE4);
}
void updateEEPROM() { void updateEEPROM() {
EEPROM.update(1, stby); EEPROM.update(1, stby);
for (uint8_t i = 0; i < 3; i++) { for (uint8_t i = 0; i < 3; i++) {