From 3e19d9fe861440d260b67fff96e52ed165b00a95 Mon Sep 17 00:00:00 2001 From: clali Date: Fri, 5 Feb 2016 01:52:26 +0100 Subject: [PATCH 1/5] supports splash screen at start up --- changelog.txt | 5 +++++ todo.txt | 5 +++++ 2 files changed, 10 insertions(+) create mode 100644 changelog.txt create mode 100644 todo.txt diff --git a/changelog.txt b/changelog.txt new file mode 100644 index 0000000..1fd9699 --- /dev/null +++ b/changelog.txt @@ -0,0 +1,5 @@ + +Claas, 2016-02-06: +- At startup a splash screen will be displayed. You may personalize it for your own purposes. + + diff --git a/todo.txt b/todo.txt new file mode 100644 index 0000000..a011cfc --- /dev/null +++ b/todo.txt @@ -0,0 +1,5 @@ + +Claas, 2016-ß2-06: +- standy temp should never be higher than the lowest stored temperatur -> t_stby = min (150,temp1,temp2,temp3) + + From fba365137f577a2d4bfd6165d3d510228edba6b7 Mon Sep 17 00:00:00 2001 From: clali Date: Fri, 5 Feb 2016 02:21:40 +0100 Subject: [PATCH 2/5] supports splash screen at start up --- Maiskolben.ino | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/Maiskolben.ino b/Maiskolben.ino index 5858f07..3df5bd7 100644 --- a/Maiskolben.ino +++ b/Maiskolben.ino @@ -7,6 +7,14 @@ #define VERSION 100 #define EEPROM_CHECK 42 +// splash screen +#define SPLASH_SHOW 1 +#define SPLASH_TIME 2000 +#define SPLASH_LINE1 'Property of' +#define SPLASH_LINE1 ' Name' +#define SPLASH_LINE1 ' Street' +#define SPLASH_LINE1 ' City' + #define STBY_TEMP 150 //SOFTWARE CAN'T MEASURE MORE THAN 422, IF SET TO >= 422 IT'S LIKELY TO KILL YOUR TIP! //If read 1024 on Analog in, the tip is turned off. @@ -73,6 +81,9 @@ void setup() { TCCR2B = TCCR2B & 0xFF; display.begin(); + if (SPLASH_SHOW != 0) + sayHello(); + display.clearDisplay(); if (EEPROM.read(0) != EEPROM_CHECK) { EEPROM.update(0, EEPROM_CHECK); @@ -96,6 +107,19 @@ void setup() { Timer1.attachInterrupt(timer_isr); } +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() { EEPROM.update(1, stby); for (uint8_t i = 0; i < 3; i++) { From 813d3b244df9d87ffaf8039eca61de3af0055e7f Mon Sep 17 00:00:00 2001 From: clali Date: Fri, 5 Feb 2016 04:10:17 +0100 Subject: [PATCH 3/5] date correction --- todo.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/todo.txt b/todo.txt index a011cfc..dc12511 100644 --- a/todo.txt +++ b/todo.txt @@ -1,5 +1,5 @@ -Claas, 2016-ß2-06: +Claas, 2016-02-06: - standy temp should never be higher than the lowest stored temperatur -> t_stby = min (150,temp1,temp2,temp3) From 22e35520137c2e31fb6a82604f28287d6c5da522 Mon Sep 17 00:00:00 2001 From: clali Date: Fri, 5 Feb 2016 04:30:23 +0100 Subject: [PATCH 4/5] spelling mistake --- todo.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/todo.txt b/todo.txt index dc12511..d4d3868 100644 --- a/todo.txt +++ b/todo.txt @@ -1,5 +1,5 @@ Claas, 2016-02-06: -- standy temp should never be higher than the lowest stored temperatur -> t_stby = min (150,temp1,temp2,temp3) +- standby temp should never be higher than the lowest stored temperatur -> t_stby = min (150,temp1,temp2,temp3) From 34a7df342f20e9de0844ac18962ebe83e8b9fe07 Mon Sep 17 00:00:00 2001 From: clali Date: Sun, 7 Feb 2016 00:26:10 +0100 Subject: [PATCH 5/5] corrected line numbering --- Maiskolben.ino | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Maiskolben.ino b/Maiskolben.ino index 3df5bd7..0104314 100644 --- a/Maiskolben.ino +++ b/Maiskolben.ino @@ -11,9 +11,9 @@ #define SPLASH_SHOW 1 #define SPLASH_TIME 2000 #define SPLASH_LINE1 'Property of' -#define SPLASH_LINE1 ' Name' -#define SPLASH_LINE1 ' Street' -#define SPLASH_LINE1 ' City' +#define SPLASH_LINE2 ' Name' +#define SPLASH_LINE3 ' Street' +#define SPLASH_LINE4 ' City' #define STBY_TEMP 150 //SOFTWARE CAN'T MEASURE MORE THAN 422, IF SET TO >= 422 IT'S LIKELY TO KILL YOUR TIP!