From d342cd165b7d5afb1e54006b3394196f2dba38ec Mon Sep 17 00:00:00 2001 From: sieja Date: Sat, 16 Nov 2024 12:51:50 +0100 Subject: [PATCH 1/2] Menu, przyciski - poczatek Version: 1.0.0 --- .../SpectralSensor/SpectralSensor.ino | 213 ++++++++++++++---- 1 file changed, 165 insertions(+), 48 deletions(-) diff --git a/LeonardoProMicro/SpectralSensor/SpectralSensor.ino b/LeonardoProMicro/SpectralSensor/SpectralSensor.ino index e537e05..8cfdb67 100644 --- a/LeonardoProMicro/SpectralSensor/SpectralSensor.ino +++ b/LeonardoProMicro/SpectralSensor/SpectralSensor.ino @@ -15,21 +15,24 @@ void setIntegrationTime(byte integrationValue); void enableInterrupt(); void disableInterrupt(); - */ //2DO: // obsługa przycisków zmieniających menu i LED // obsługa przycisków zmieniających gain //obsługa włączania/wyłączania LED +#define Version "1.0.0" #include #include #include #include #include "AS726X.h" +#define Btn1 8 //on board: 8 menu +#define Btn2 9 //on board: 9 gain AS726X sensor; Adafruit_SSD1306 display(4); + int RawRed = 0; int RawOrange = 0; int RawYellow = 0; @@ -50,22 +53,39 @@ Adafruit_SSD1306 display(4); int HeightViolet = 0; byte gain = 3; // values: 0,1,2,3 - int menu_number = 3; // values: 1,2,3 bez led, 4,5,6 z LED + int menu_number = 0; // values:0 menu 1,2,3 bez led, 4,5,6 z LED int LedPower = 0; int GraphHeight = 32; -// int GrapStart = ; int GrapWidth = 20; float ReadValues[6] = {0, 0, 0, 0, 0, 0}; float maxValue = 0.0; - + int j = 0; void setup() { +//DIPLAY settings +// if (!display.begin(SSD1306_SWITCHCAPVCC, SCREEN_ADDRESS)) { +// Serial.println(F("SSD1306 allocation failed")); +// for (;;); // Don't proceed, loop forever +// } +// display.begin(SSD1306_SWITCHCAPVCC, SCREEN_ADDRESS); + display.clearDisplay(); + display.setTextColor(WHITE); + display.setRotation(0); + display.setTextSize(3); + display.setCursor(0, 0); + display.println("Version:"); + display.setCursor(0, 25); + display.println(Version); + display.display(); + delay(500); Wire.begin(); Serial.begin(115200); display.begin(SSD1306_SWITCHCAPVCC, 0x3C); display.clearDisplay(); sensor.begin(); -} + pinMode(Btn1, INPUT_PULLUP); + pinMode(Btn2, INPUT_PULLUP); + } void loop() { display.clearDisplay(); @@ -75,6 +95,9 @@ void loop() { sensor.setGain(gain); if (menu_number > 3 ){ LedPower = 1; + } else { + LedPower = 0; + } if (LedPower == 1) { @@ -106,61 +129,111 @@ void loop() { ReadValues[4] = CalcBlue; ReadValues[5] = CalcViolet; - +//testowa linia +//void drawLine(64, 32, 1, 32, uint16_t color); + +//linia 2 pix per 1 gin suma: 12 pix +//linia 3 linia 5pix dla led+kropka kolo niej 6 pix + + if (menu_number == 0 ) {//pokaż menu konfiguracyjne + display.setRotation(1); + display.setCursor(0, 0); + display.println("GAIN:"); + display.setCursor(0, 10); + display.println(gain); + + display.setCursor(30, 0); + display.println("LED:"); + display.setCursor(30,10); + display.println(LedPower); + + display.setCursor(40, 0); + display.println("BTN1:"); + display.setCursor(40, 10); + display.println(digitalRead(Btn1)); + + display.setCursor(50, 0); + display.println("BTN2:"); + display.setCursor(50, 10); + display.println(digitalRead(Btn2)); + +//display.fillCircle(75, 10, 10, SSD1306_WHITE); + + display.setCursor(0,20); + display.println("menu, calculated, raw, relative graph, calc graph"); + + } if (menu_number == 1 || menu_number == 4 ) {//pokaż wartości przeliczone - display.setCursor(0, 0); - display.println("R:"); - display.setCursor(10, 0); - display.println(CalcRed, 1); - display.setCursor(0, 10); - display.println("G:"); - display.setCursor(10, 10); - display.println(CalcGreen, 1); - display.setCursor(0, 20); - display.println("B:"); - display.setCursor(10, 20); - display.println(CalcBlue, 1); - display.setCursor(60, 0); - display.println("O:"); - display.setCursor(70, 0); - display.println(CalcOrange, 1); - display.setCursor(60, 10); - display.println("Y:"); - display.setCursor(70, 10); - display.println(CalcYellow, 1); - display.setCursor(60, 20); - display.println("V:"); - display.setCursor(70, 20); - display.println(CalcViolet, 1); + display.setRotation(2); + display.setCursor(GrapWidth, 0); + display.println("R:"); + display.setCursor(GrapWidth, 10); + display.println(CalcRed, 1); + + display.setCursor(GrapWidth * 2, 0); + display.println("O:"); + display.setCursor(GrapWidth * 2, 10); + display.println(CalcOrange, 1); + + display.setCursor(GrapWidth * 3,0); + display.println("Y:"); + display.setCursor(GrapWidth * 3, 10); + display.println(CalcYellow, 1); + + display.setCursor(GrapWidth * 4, 0); + display.println("G:"); + display.setCursor(GrapWidth * 4, 10); + display.println(CalcGreen, 1); + + display.setCursor(GrapWidth * 5, 0); + display.println("B:"); + display.setCursor(GrapWidth * 5, 20); + display.println(CalcBlue, 1); + + display.setCursor(GrapWidth * 6, 0); + display.println("V:"); + display.setCursor(GrapWidth * 6, 10); + display.println(CalcViolet, 1); } + display.setRotation(1); + if (menu_number == 2 || menu_number == 5) { //pokaż wartości bezpośrednie - display.setCursor(0, 0); + display.setRotation(2); + + display.setCursor(GrapWidth, 0); display.println("rR:"); - display.setCursor(10, 0); + display.setCursor(GrapWidth, 10); display.println(RawRed, 1); - display.setCursor(0, 10); - display.println("rG:"); - display.setCursor(10, 10); - display.println(RawGreen, 1); - display.setCursor(0, 20); - display.println("rB:"); - display.setCursor(10, 20); - display.println(RawBlue, 1); - display.setCursor(60, 0); + + display.setCursor(GrapWidth * 2, 0); display.println("rO:"); - display.setCursor(70, 0); + display.setCursor(GrapWidth * 2, 10); display.println(RawOrange, 1); - display.setCursor(60, 10); + + display.setCursor(GrapWidth * 3, 0); display.println("rY:"); - display.setCursor(70, 10); + display.setCursor(GrapWidth * 3, 10); display.println(RawYellow, 1); - display.setCursor(60, 20); + display.setCursor(0, 20); + + display.setCursor(GrapWidth * 4, 0); + display.println("rG:"); + display.setCursor(GrapWidth * 4, 10); + display.println(RawGreen, 1); + + display.setCursor(GrapWidth * 5, 0); + display.println("rB:"); + display.setCursor(GrapWidth * 5, 10); + display.println(RawBlue, 1); + + display.setCursor(GrapWidth * 6, 0); display.println("rV:"); - display.setCursor(70, 20); - display.println(RawViolet, 1); + display.setCursor(GrapWidth * 6, 10); + display.println(RawYellow, 1); } + display.setRotation(1); if (menu_number == 3 || menu_number == 6 ){ //pokaż grafy @@ -233,5 +306,49 @@ void loop() { } display.display(); - delay(750); + delay(1000); + +// j = j+1; +// +// switch (j) { +// case 1: +// menu_number = 0; +// break; +// case 2: +// menu_number = 0; +// break; +// case 3: +// menu_number = 0; +// break; +// case 4: +// menu_number = 1; +// break; +// case 5: +// menu_number = 1; +// break; +// case 6: +// menu_number = 1; +// break; +// case 7: +// menu_number = 2; +// break; +// case 8: +// menu_number = 2; +// break; +// case 9: +// menu_number = 2; +// break; +// case 10: +// menu_number = 3; +// break; +// case 11: +// menu_number = 3; +// break; +// case 12: +// menu_number = 3; +// break; +// case 13: +// j = 0; +// break; +// } } From 1b88288da48daeac5aef33cdc88865a26c9b1537 Mon Sep 17 00:00:00 2001 From: Kamil Siejka Date: Sun, 24 Nov 2024 14:28:20 +0100 Subject: [PATCH 2/2] menu cd --- .../SpectralSensor/SpectralSensor.ino | 69 ++++--------------- 1 file changed, 13 insertions(+), 56 deletions(-) diff --git a/LeonardoProMicro/SpectralSensor/SpectralSensor.ino b/LeonardoProMicro/SpectralSensor/SpectralSensor.ino index 8cfdb67..317fbb7 100644 --- a/LeonardoProMicro/SpectralSensor/SpectralSensor.ino +++ b/LeonardoProMicro/SpectralSensor/SpectralSensor.ino @@ -53,13 +53,13 @@ Adafruit_SSD1306 display(4); int HeightViolet = 0; byte gain = 3; // values: 0,1,2,3 - int menu_number = 0; // values:0 menu 1,2,3 bez led, 4,5,6 z LED + int menu_number = 3; // values:0 menu 1,2,3 bez led, 4,5,6 z LED + int LedPower = 0; int GraphHeight = 32; int GrapWidth = 20; float ReadValues[6] = {0, 0, 0, 0, 0, 0}; float maxValue = 0.0; - int j = 0; void setup() { //DIPLAY settings @@ -68,16 +68,16 @@ void setup() { // for (;;); // Don't proceed, loop forever // } // display.begin(SSD1306_SWITCHCAPVCC, SCREEN_ADDRESS); - display.clearDisplay(); - display.setTextColor(WHITE); - display.setRotation(0); - display.setTextSize(3); - display.setCursor(0, 0); - display.println("Version:"); - display.setCursor(0, 25); - display.println(Version); - display.display(); - delay(500); +// display.clearDisplay(); +// display.setTextColor(WHITE); +// display.setRotation(0); +// display.setTextSize(3); +// display.setCursor(0, 0); +// display.println("Version:"); +// display.setCursor(0, 25); +// display.println(Version); +// display.display(); +// delay(500); Wire.begin(); Serial.begin(115200); display.begin(SSD1306_SWITCHCAPVCC, 0x3C); @@ -307,48 +307,5 @@ void loop() { display.display(); delay(1000); - -// j = j+1; -// -// switch (j) { -// case 1: -// menu_number = 0; -// break; -// case 2: -// menu_number = 0; -// break; -// case 3: -// menu_number = 0; -// break; -// case 4: -// menu_number = 1; -// break; -// case 5: -// menu_number = 1; -// break; -// case 6: -// menu_number = 1; -// break; -// case 7: -// menu_number = 2; -// break; -// case 8: -// menu_number = 2; -// break; -// case 9: -// menu_number = 2; -// break; -// case 10: -// menu_number = 3; -// break; -// case 11: -// menu_number = 3; -// break; -// case 12: -// menu_number = 3; -// break; -// case 13: -// j = 0; -// break; -// } + }