Wersja finalna
This commit is contained in:
@@ -1,17 +1,11 @@
|
|||||||
#include <TFT_eSPI.h>
|
#include <TFT_eSPI.h>
|
||||||
#include <SPI.h>
|
#include <SPI.h>
|
||||||
|
|
||||||
|
|
||||||
// Wymaga konfiguracjie:
|
// Wymaga konfiguracjie:
|
||||||
// C:\Users\siiee\Documents\Arduino\libraries\TFT_eSPI
|
// C:\Users\siiee\Documents\Arduino\libraries\TFT_eSPI
|
||||||
|
|
||||||
TFT_eSPI tft = TFT_eSPI(); // domyślna konfiguracja z User_Setup.h
|
TFT_eSPI tft = TFT_eSPI(); // domyślna konfiguracja z User_Setup.h
|
||||||
|
|
||||||
//2DO:
|
#define Version "0.1.1"
|
||||||
// obsługa przycisków zmieniających menu i LED
|
|
||||||
//160x128
|
|
||||||
|
|
||||||
#define Version "0.1.0"
|
|
||||||
#include <SPI.h>
|
#include <SPI.h>
|
||||||
#include <Wire.h>
|
#include <Wire.h>
|
||||||
#include <Adafruit_GFX.h>
|
#include <Adafruit_GFX.h>
|
||||||
@@ -38,10 +32,6 @@ TFT_eSPI tft = TFT_eSPI(); // domyślna konfiguracja z User_Setup.h
|
|||||||
#define MAGENTA 0xF81F
|
#define MAGENTA 0xF81F
|
||||||
#define PINK 0xF8FF
|
#define PINK 0xF8FF
|
||||||
#define SPACE_4_TEXT 20
|
#define SPACE_4_TEXT 20
|
||||||
//#define ST7735 NEW 0xD500FF
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
AS726X sensor;
|
AS726X sensor;
|
||||||
|
|
||||||
@@ -64,11 +54,11 @@ int HeightGreen = 0;
|
|||||||
int HeightBlue = 0;
|
int HeightBlue = 0;
|
||||||
int HeightViolet = 0;
|
int HeightViolet = 0;
|
||||||
|
|
||||||
byte gain = 3; // values: 0,1,2,3
|
byte gain = 3; // values: 0,1,2,3
|
||||||
byte old_gain = 3; // values: 0,1,2,3
|
byte old_gain = 3; // values: 0,1,2,3
|
||||||
float gainValue = 64;
|
float gainValue = 64;
|
||||||
int menu_number = 0; // values:0 menu 1,2,3
|
int menu_number = 0; // values:0 menu 1,2,3
|
||||||
int old_menu_number = 0; // values:0 menu 1,2,3
|
int old_menu_number = 0; // values:0 menu 1,2,3
|
||||||
int LedPower = 0;
|
int LedPower = 0;
|
||||||
int GraphHeight = 128;
|
int GraphHeight = 128;
|
||||||
int GrapWidth = 25;
|
int GrapWidth = 25;
|
||||||
@@ -82,13 +72,10 @@ float test_vle = 1.0;
|
|||||||
char FloatInChar[20];
|
char FloatInChar[20];
|
||||||
char ChValue[20];
|
char ChValue[20];
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
void setup() {
|
void setup() {
|
||||||
tft.init();
|
tft.init();
|
||||||
tft.setRotation(1);
|
tft.setRotation(1);
|
||||||
tft.fillScreen(TFT_BLACK);
|
tft.fillScreen(TFT_BLACK);
|
||||||
|
|
||||||
tft.setTextColor(TFT_YELLOW, TFT_BLACK);
|
tft.setTextColor(TFT_YELLOW, TFT_BLACK);
|
||||||
tft.setTextSize(2);
|
tft.setTextSize(2);
|
||||||
tft.drawString("Version:"+ String(Version), 0, 0);
|
tft.drawString("Version:"+ String(Version), 0, 0);
|
||||||
@@ -98,9 +85,7 @@ void setup() {
|
|||||||
pinMode(Btn1, INPUT);
|
pinMode(Btn1, INPUT);
|
||||||
pinMode(Btn2, INPUT);
|
pinMode(Btn2, INPUT);
|
||||||
pinMode(Btn3, INPUT);
|
pinMode(Btn3, INPUT);
|
||||||
|
|
||||||
tft.fillRect(0, 0, 240, 240, TFT_BLACK);
|
tft.fillRect(0, 0, 240, 240, TFT_BLACK);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -142,23 +127,37 @@ void loop() {
|
|||||||
tft.drawString("1:Calc.Values",0, 48);
|
tft.drawString("1:Calc.Values",0, 48);
|
||||||
tft.drawString("2:Raw",0, 64);
|
tft.drawString("2:Raw",0, 64);
|
||||||
tft.drawString("3:Rel. Graph",0, 80);
|
tft.drawString("3:Rel. Graph",0, 80);
|
||||||
tft.drawString("4:Calc. Graph",0, 96);
|
// tft.drawString("4:Calc. Graph",0, 96);
|
||||||
}
|
}
|
||||||
// show calculated values
|
// show calculated values
|
||||||
if (menu_number == 1 ) {//show calculated values
|
if (menu_number == 1 ) {//show calculated values
|
||||||
tft.drawString("1.Calc Values",0,0);
|
tft.drawString("1.Calc Values",0,0);
|
||||||
tft.drawString("Gain: " + String(gainValue) + " LED: ", 0,10);
|
tft.drawString("Gain: " + String(gainValue) + " LED: ", 0,9);
|
||||||
if (LedPower == 1){
|
if (LedPower == 1){
|
||||||
tft.drawString("ON ",100, 10);
|
tft.drawString("ON ",100, 10);
|
||||||
} else {
|
} else {
|
||||||
tft.drawString("OFF",100, 10);
|
tft.drawString("OFF",100, 10);
|
||||||
}
|
}
|
||||||
tft.drawString("R:" + String(CalcRed),0, 20);
|
|
||||||
tft.drawString("O:" + String(CalcOrange),0, 39);
|
tft.fillRect(0, 20, 160,18, TFT_RED);
|
||||||
tft.drawString("Y:" + String(CalcYellow),0, 58);
|
tft.fillRect(0, 38, 160,18, TFT_ORANGE);
|
||||||
tft.drawString("G:" + String(CalcGreen),0, 77);
|
tft.fillRect(0, 56, 160,18, TFT_YELLOW);
|
||||||
tft.drawString("B:" + String(CalcBlue),0, 96);
|
tft.fillRect(0, 74, 160,18, TFT_GREEN);
|
||||||
tft.drawString("V:" + String(CalcViolet),0, 115);
|
tft.fillRect(0, 92, 160,18, TFT_BLUE);
|
||||||
|
tft.fillRect(0, 110, 160,20, TFT_MAGENTA);
|
||||||
|
tft.setTextSize(2);
|
||||||
|
tft.setTextColor(TFT_BLACK, TFT_RED);
|
||||||
|
tft.drawString("R:" + String(CalcRed),2, 22);
|
||||||
|
tft.setTextColor(TFT_BLACK, TFT_ORANGE);
|
||||||
|
tft.drawString("O:" + String(CalcOrange),2, 40);
|
||||||
|
tft.setTextColor(TFT_BLACK, TFT_YELLOW);
|
||||||
|
tft.drawString("Y:" + String(CalcYellow),2, 58);
|
||||||
|
tft.setTextColor(TFT_BLACK, TFT_GREEN);
|
||||||
|
tft.drawString("G:" + String(CalcGreen),2, 76);
|
||||||
|
tft.setTextColor(TFT_BLACK, TFT_BLUE);
|
||||||
|
tft.drawString("B:" + String(CalcBlue),2, 94);
|
||||||
|
tft.setTextColor(TFT_BLACK, TFT_MAGENTA);
|
||||||
|
tft.drawString("V:" + String(CalcViolet),2, 112);
|
||||||
}
|
}
|
||||||
// //show raw values
|
// //show raw values
|
||||||
if (menu_number == 2 || menu_number == 6) {
|
if (menu_number == 2 || menu_number == 6) {
|
||||||
@@ -169,13 +168,26 @@ void loop() {
|
|||||||
} else {
|
} else {
|
||||||
tft.drawString("OFF",100, 10);
|
tft.drawString("OFF",100, 10);
|
||||||
}
|
}
|
||||||
tft.drawString("R:" + String(RawRed),0, 20);
|
|
||||||
tft.drawString("O:" + String(RawOrange),0, 39);
|
|
||||||
tft.drawString("Y:" + String(RawYellow),0, 58);
|
|
||||||
tft.drawString("G:" + String(RawGreen),0, 77);
|
|
||||||
tft.drawString("B:" + String(RawBlue),0, 96);
|
|
||||||
tft.drawString("V:" + String(RawViolet),0, 115);
|
|
||||||
|
|
||||||
|
tft.fillRect(0, 20, 160,18, TFT_RED);
|
||||||
|
tft.fillRect(0, 38, 160,18, TFT_ORANGE);
|
||||||
|
tft.fillRect(0, 56, 160,18, TFT_YELLOW);
|
||||||
|
tft.fillRect(0, 74, 160,18, TFT_GREEN);
|
||||||
|
tft.fillRect(0, 92, 160,18, TFT_BLUE);
|
||||||
|
tft.fillRect(0, 110, 160,20, TFT_MAGENTA);
|
||||||
|
tft.setTextSize(2);
|
||||||
|
tft.setTextColor(TFT_BLACK, TFT_RED);
|
||||||
|
tft.drawString("R:" + String(RawRed),2, 22);
|
||||||
|
tft.setTextColor(TFT_BLACK, TFT_ORANGE);
|
||||||
|
tft.drawString("O:" + String(RawOrange),2, 40);
|
||||||
|
tft.setTextColor(TFT_BLACK, TFT_YELLOW);
|
||||||
|
tft.drawString("Y:" + String(RawYellow),2, 58);
|
||||||
|
tft.setTextColor(TFT_BLACK, TFT_GREEN);
|
||||||
|
tft.drawString("G:" + String(RawGreen),2, 76);
|
||||||
|
tft.setTextColor(TFT_BLACK, TFT_BLUE);
|
||||||
|
tft.drawString("B:" + String(RawBlue),2, 94);
|
||||||
|
tft.setTextColor(TFT_BLACK, TFT_MAGENTA);
|
||||||
|
tft.drawString("V:" + String(RawViolet),2, 112);
|
||||||
}
|
}
|
||||||
//show relative calculated values graph
|
//show relative calculated values graph
|
||||||
if (menu_number == 3){
|
if (menu_number == 3){
|
||||||
@@ -242,55 +254,55 @@ void loop() {
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
// //show relative raw data graph
|
// // //show relative raw data graph
|
||||||
if (menu_number == 4){
|
// if (menu_number == 4){
|
||||||
tft.setTextColor(TFT_WHITE, TFT_BLACK);
|
// tft.setTextColor(TFT_WHITE, TFT_BLACK);
|
||||||
maxValue = 0.0;
|
// maxValue = 0.0;
|
||||||
minValue = 0.0;
|
// minValue = 0.0;
|
||||||
for (int i = 0; i < 5; i++) {
|
// for (int i = 0; i < 5; i++) {
|
||||||
maxValue = max(maxValue, ReadRawValues[i]);
|
// maxValue = max(maxValue, ReadRawValues[i]);
|
||||||
}
|
// }
|
||||||
for (int i = 0; i < 5; i++) {
|
// for (int i = 0; i < 5; i++) {
|
||||||
minValue = min(minValue, ReadRawValues[i]);
|
// minValue = min(minValue, ReadRawValues[i]);
|
||||||
}
|
// }
|
||||||
|
|
||||||
// HeightRed = int(((RawRed + abs(minValue)) / (maxValue + abs(minValue))) * GraphHeight);
|
// // HeightRed = int(((RawRed + abs(minValue)) / (maxValue + abs(minValue))) * GraphHeight);
|
||||||
// HeightOrange = int(((RawOrange + abs(minValue)) / (maxValue + abs(minValue))) * GraphHeight);
|
// // HeightOrange = int(((RawOrange + abs(minValue)) / (maxValue + abs(minValue))) * GraphHeight);
|
||||||
// HeightYellow = int(((RawYellow + abs(minValue)) / (maxValue + abs(minValue))) * GraphHeight);
|
// // HeightYellow = int(((RawYellow + abs(minValue)) / (maxValue + abs(minValue))) * GraphHeight);
|
||||||
// HeightGreen = int(((RawGreen + abs(minValue)) / (maxValue + abs(minValue))) * GraphHeight);
|
// // HeightGreen = int(((RawGreen + abs(minValue)) / (maxValue + abs(minValue))) * GraphHeight);
|
||||||
// HeightBlue = int(((RawBlue + abs(minValue)) / (maxValue + abs(minValue))) * GraphHeight);
|
// // HeightBlue = int(((RawBlue + abs(minValue)) / (maxValue + abs(minValue))) * GraphHeight);
|
||||||
// HeightViolet = int(((RawViolet + abs(minValue)) / (maxValue + abs(minValue))) * GraphHeight);
|
// // HeightViolet = int(((RawViolet + abs(minValue)) / (maxValue + abs(minValue))) * GraphHeight);
|
||||||
tft.fillRect(minValue, 0, 240, maxValue-minValue, TFT_BLACK);
|
// tft.fillRect(minValue, 0, 240, maxValue-minValue, TFT_BLACK);
|
||||||
tft.setTextColor(TFT_WHITE, TFT_BLACK);
|
// tft.setTextColor(TFT_WHITE, TFT_BLACK);
|
||||||
tft.drawString("4.Relvative Raw Values",0,0);
|
// tft.drawString("4.Relvative Raw Values",0,0);
|
||||||
tft.drawString("Gain: " + String(gainValue) + " LED: ", 0,10);
|
// tft.drawString("Gain: " + String(gainValue) + " LED: ", 0,10);
|
||||||
if (LedPower == 1){
|
// if (LedPower == 1){
|
||||||
tft.drawString("ON ",100, 10);
|
// tft.drawString("ON ",100, 10);
|
||||||
} else {
|
// } else {
|
||||||
tft.drawString("OFF",100, 10);
|
// tft.drawString("OFF",100, 10);
|
||||||
}
|
// }
|
||||||
|
|
||||||
tft.fillRect(0 * GrapWidth, GraphHeight - HeightRed, GrapWidth, HeightRed + SPACE_4_TEXT, TFT_RED);
|
// tft.fillRect(0 * GrapWidth, GraphHeight - HeightRed, GrapWidth, HeightRed + SPACE_4_TEXT, TFT_RED);
|
||||||
tft.fillRect(1 * GrapWidth + 1, GraphHeight - HeightOrange, GrapWidth, HeightOrange + SPACE_4_TEXT, TFT_ORANGE);
|
// tft.fillRect(1 * GrapWidth + 1, GraphHeight - HeightOrange, GrapWidth, HeightOrange + SPACE_4_TEXT, TFT_ORANGE);
|
||||||
tft.fillRect(2 * GrapWidth + 2, GraphHeight - HeightYellow, GrapWidth, HeightYellow + SPACE_4_TEXT, TFT_YELLOW);
|
// tft.fillRect(2 * GrapWidth + 2, GraphHeight - HeightYellow, GrapWidth, HeightYellow + SPACE_4_TEXT, TFT_YELLOW);
|
||||||
tft.fillRect(3 * GrapWidth + 3, GraphHeight - HeightGreen, GrapWidth, HeightGreen + SPACE_4_TEXT, TFT_GREEN);
|
// tft.fillRect(3 * GrapWidth + 3, GraphHeight - HeightGreen, GrapWidth, HeightGreen + SPACE_4_TEXT, TFT_GREEN);
|
||||||
tft.fillRect(4 * GrapWidth + 4, GraphHeight - HeightBlue, GrapWidth, HeightBlue + SPACE_4_TEXT, TFT_BLUE);
|
// tft.fillRect(4 * GrapWidth + 4, GraphHeight - HeightBlue, GrapWidth, HeightBlue + SPACE_4_TEXT, TFT_BLUE);
|
||||||
tft.fillRect(5 * GrapWidth + 5, GraphHeight - HeightViolet, GrapWidth, HeightViolet + SPACE_4_TEXT, TFT_MAGENTA);
|
// tft.fillRect(5 * GrapWidth + 5, GraphHeight - HeightViolet, GrapWidth, HeightViolet + SPACE_4_TEXT, TFT_MAGENTA);
|
||||||
tft.setTextColor(TFT_BLACK, TFT_RED);
|
// tft.setTextColor(TFT_BLACK, TFT_RED);
|
||||||
tft.drawString(" R:",1 * GrapWidth -20, 120);
|
// tft.drawString(" R:",1 * GrapWidth -20, 120);
|
||||||
tft.setTextColor(TFT_BLACK, TFT_ORANGE);
|
// tft.setTextColor(TFT_BLACK, TFT_ORANGE);
|
||||||
tft.drawString(" O:",2 * GrapWidth -19, 120);
|
// tft.drawString(" O:",2 * GrapWidth -19, 120);
|
||||||
tft.setTextColor(TFT_BLACK, TFT_YELLOW);
|
// tft.setTextColor(TFT_BLACK, TFT_YELLOW);
|
||||||
tft.drawString(" Y:",3 * GrapWidth -18, 120);
|
// tft.drawString(" Y:",3 * GrapWidth -18, 120);
|
||||||
tft.setTextColor(TFT_BLACK, TFT_GREEN);
|
// tft.setTextColor(TFT_BLACK, TFT_GREEN);
|
||||||
tft.drawString(" G:",4 * GrapWidth -17, 120);
|
// tft.drawString(" G:",4 * GrapWidth -17, 120);
|
||||||
tft.setTextColor(TFT_BLACK, TFT_BLUE);
|
// tft.setTextColor(TFT_BLACK, TFT_BLUE);
|
||||||
tft.drawString(" B:",5 * GrapWidth -16, 120);
|
// tft.drawString(" B:",5 * GrapWidth -16, 120);
|
||||||
tft.setTextColor(TFT_BLACK, TFT_MAGENTA);
|
// tft.setTextColor(TFT_BLACK, TFT_MAGENTA);
|
||||||
tft.drawString(" V:",6 * GrapWidth -15, 120);
|
// tft.drawString(" V:",6 * GrapWidth -15, 120);
|
||||||
maxValue = 0.0;
|
// maxValue = 0.0;
|
||||||
minValue = 0.0;
|
// minValue = 0.0;
|
||||||
}
|
// }
|
||||||
|
|
||||||
|
|
||||||
if (gain == 0 ) {
|
if (gain == 0 ) {
|
||||||
@@ -354,7 +366,7 @@ void setLed() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
void setMenu() {
|
void setMenu() {
|
||||||
if (menu_number < 4) {
|
if (menu_number < 3) {
|
||||||
menu_number = menu_number + 1;
|
menu_number = menu_number + 1;
|
||||||
} else {
|
} else {
|
||||||
menu_number = 0;
|
menu_number = 0;
|
||||||
|
|||||||
Reference in New Issue
Block a user