mirror of
https://github.com/arwidcool/Solder-Plate.git
synced 2024-11-28 08:20:52 +01:00
minor fixes
This commit is contained in:
parent
29db45865c
commit
a594c07103
@ -59,10 +59,10 @@ void TFT_Display::drawRealTemp(double *temp, float percentage)
|
|||||||
|
|
||||||
float temperature = static_cast<float>(*temp);
|
float temperature = static_cast<float>(*temp);
|
||||||
|
|
||||||
// Serial.print("Time:");
|
Serial.print("Time:");
|
||||||
// Serial.print(time);
|
Serial.print(percentage);
|
||||||
// Serial.print(" Temp:");
|
Serial.print(" Temp:");
|
||||||
// Serial.println(temperature);
|
Serial.println(temperature);
|
||||||
|
|
||||||
uint16_t eplased = drawTimer.elapsed();
|
uint16_t eplased = drawTimer.elapsed();
|
||||||
|
|
||||||
|
@ -4,11 +4,14 @@
|
|||||||
#include "../common.h"
|
#include "../common.h"
|
||||||
#include "../globals.h"
|
#include "../globals.h"
|
||||||
|
|
||||||
// If you didnt solder the LEDS in order, change the order here just change the pin numbers till it matches your board
|
|
||||||
|
#define GREEN_LED_PIN RIGHT_LED_PIN
|
||||||
|
|
||||||
|
// DO NOT TOUCH
|
||||||
#define LEFT_LED_PIN 20 //Should be RED
|
#define LEFT_LED_PIN 20 //Should be RED
|
||||||
#define MID_LED_PIN 19 //Should be YELLOW
|
#define MID_LED_PIN 19 //Should be YELLOW
|
||||||
#define RIGHT_LED_PIN 18 //Should be GREEN
|
#define RIGHT_LED_PIN 18 //Should be GREEN
|
||||||
#define GREEN_LED_PIN RIGHT_LED_PIN
|
|
||||||
|
|
||||||
|
|
||||||
enum LedDesiredState
|
enum LedDesiredState
|
||||||
|
@ -111,6 +111,7 @@ public:
|
|||||||
endTimes[3] = endTimes[2] + steps[3].duration;
|
endTimes[3] = endTimes[2] + steps[3].duration;
|
||||||
endTimes[4] = endTimes[3] + steps[4].duration;
|
endTimes[4] = endTimes[3] + steps[4].duration;
|
||||||
|
|
||||||
|
|
||||||
startTimes[0] = 0;
|
startTimes[0] = 0;
|
||||||
startTimes[1] = endTimes[0];
|
startTimes[1] = endTimes[0];
|
||||||
startTimes[2] = endTimes[1];
|
startTimes[2] = endTimes[1];
|
||||||
@ -147,7 +148,7 @@ public:
|
|||||||
|
|
||||||
float getPercentage()
|
float getPercentage()
|
||||||
{
|
{
|
||||||
return timer.elapsed() / TOMILLIS(endTimes[4]);
|
return timer.elapsed() / (double)TOMILLIS(endTimes[4]);
|
||||||
}
|
}
|
||||||
|
|
||||||
float getTargetTemp()
|
float getTargetTemp()
|
||||||
|
Loading…
Reference in New Issue
Block a user