mirror/maiskolben
1
0
Fork 0
mirror of https://github.com/ArduinoHannover/Maiskolben.git synced 2025-09-02 17:42:40 +02:00
Code Issues Releases Wiki Activity

Version 2.1

Browse Source 
GUI not working with 2.1
This commit is contained in:
Luca Zimmermann
2016-06-23 21:30:54 +02:00
parent 8102f3b6c0
commit c054b65d58
2 changed files with 74 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
Maiskolben_TFT/Maiskolben_TFT.ino
View File

@@ -21,6 +21,7 @@ float v_c1, v_c2, v_c3;
uint8_t array_index, array_count; uint8_t array_index, array_count;
uint32_t sendNext; uint32_t sendNext;
uint32_t last_temperature_drop; uint32_t last_temperature_drop;
uint32_t last_on_state;
boolean wasOff = true; boolean wasOff = true;
Adafruit_ST7735 tft = Adafruit_ST7735(TFT_CS, TFT_DC, 0); Adafruit_ST7735 tft = Adafruit_ST7735(TFT_CS, TFT_DC, 0);
@@ -221,6 +222,7 @@ void setStandby(boolean state) {
stby = state; stby = state;
last_measured = cur_t; last_measured = cur_t;
last_temperature_drop = millis(); last_temperature_drop = millis();
last_on_state = millis()/1000;
EEPROM.update(1, stby); EEPROM.update(1, stby);
} }
@@ -232,6 +234,7 @@ void setOff(boolean state) {
state = true; //don't switch on, if powered via USB state = true; //don't switch on, if powered via USB
setError(USB_ONLY); setError(USB_ONLY);
} }
last_on_state = millis()/1000;
off = state; off = state;
wasOff = true; wasOff = true;
last_measured = cur_t; last_measured = cur_t;
@@ -299,17 +302,23 @@ void display() {
tft.fillTriangle(149, 50, 159, 50, 154, 38, (set_t < MAX_TEMP) ? ST7735_WHITE : ST7735_GRAY); tft.fillTriangle(149, 50, 159, 50, 154, 38, (set_t < MAX_TEMP) ? ST7735_WHITE : ST7735_GRAY);
tft.fillTriangle(149, 77, 159, 77, 154, 90, (set_t > MIN_TEMP) ? ST7735_WHITE : ST7735_GRAY); tft.fillTriangle(149, 77, 159, 77, 154, 90, (set_t > MIN_TEMP) ? ST7735_WHITE : ST7735_GRAY);
} }
if (!off && !stby) { if (!off) {
uint16_t tout = min(max(0,(last_temperature_drop + STANDBY_TIMEOUT - (millis()+500)/1000)), STANDBY_TIMEOUT); uint16_t tout;
tft.setTextColor(ST7735_YELLOW, ST7735_BLACK); if (stby) {
tout = min(max(0,(last_on_state + OFF_TIMEOUT - (millis()+999)/1000)), OFF_TIMEOUT);
} else {
tout = min(max(0,(last_temperature_drop + STANDBY_TIMEOUT - (millis()+999)/1000)), STANDBY_TIMEOUT);
}
tft.setTextColor(stby?ST7735_RED:ST7735_YELLOW, ST7735_BLACK);
tft.setTextSize(2); tft.setTextSize(2);
tft.setCursor(58,78); tft.setCursor(46,78);
if (tout < 600) tft.write('0');
tft.print(tout/60); tft.print(tout/60);
tft.write(':'); tft.write(':');
if (tout%60 < 10) tft.write('0'); if (tout%60 < 10) tft.write('0');
tft.print(tout%60); tft.print(tout%60);
} else if (temperature != 999) { } else if (temperature != 999) {
tft.fillRect(54, 78, 60, 20, ST7735_BLACK); tft.fillRect(46, 78, 60, 20, ST7735_BLACK);
} }
} }
if (cur_t_old != temperature) { if (cur_t_old != temperature) {
@@ -399,6 +408,9 @@ void display() {
if (!off && !stby && millis()/1000 > (last_temperature_drop + STANDBY_TIMEOUT)) { if (!off && !stby && millis()/1000 > (last_temperature_drop + STANDBY_TIMEOUT)) {
setStandby(true); setStandby(true);
} }
if (!off && stby && millis()/1000 > (last_on_state + OFF_TIMEOUT)) {
setOff(true);
}
blink = !blink; blink = !blink;
} }
@@ -481,7 +493,9 @@ void loop() {
Serial.print(";"); Serial.print(";");
Serial.print(stored[2]); Serial.print(stored[2]);
Serial.print(";"); Serial.print(";");
Serial.print(off?1:0); Serial.print(off?0:1);
Serial.print(";");
Serial.print(error);
Serial.print(";"); Serial.print(";");
Serial.print(stby?1:0); Serial.print(stby?1:0);
Serial.print(";"); Serial.print(";");
@@ -501,5 +515,58 @@ void loop() {
Serial.flush(); Serial.flush();
display(); display();
} }
if (Serial.available()) {
uint16_t t = 0;
switch (Serial.read()) {
//Set new Temperature (eg. S350 to set to 350C)
case 'T':
if (Serial.available() >= 3) {
t = serialReadTemp();
Serial.println(t);
if (t <= MAX_TEMP && t >= MIN_TEMP) {
set_t = t;
updateEEPROM();
}
}
break;
//Store new Preset (eg. P1200 to store 200C to Preset 1, NOT 0 indexed)
case 'P':
if (Serial.available() >= 4) {
uint8_t slot = Serial.read()-'1';
if (slot < 3) {
t = serialReadTemp();
if (t <= MAX_TEMP && t >= MIN_TEMP) {
stored[slot] = t;
updateEEPROM();
}
}
}
break;
//Clear errors
case 'C':
error = NO_ERROR;
break;
//Set standby
case 'S':
setStandby(Serial.read() == '1');
break;
//Set on/off
case 'O':
setOff(Serial.read() == '0');
break;
}
}
delay(DELAY_MAIN_LOOP); delay(DELAY_MAIN_LOOP);
} }
uint16_t serialReadTemp() {
uint16_t t;
uint8_t n;
n = Serial.read()-'0';
t = min(9, max(0, n))*100;
n = Serial.read()-'0';
t += min(9, max(0, n))*10;
n = Serial.read()-'0';
t += min(9, max(0, n))*1;
return t;
}

3
Maiskolben_TFT/definitions.h
View File

@@ -1,6 +1,5 @@
#define VERSION 103 #define VERSION "2.1"
#define EEPROM_CHECK 42 #define EEPROM_CHECK 42
//#define HAS_BATTERY
#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!