Setting up the environment to develop the new communication method
This commit is contained in:
@@ -32,10 +32,20 @@ go on the screws that screw the wheel to the base:
|
|||||||
- [ ] Dynamic layout/data
|
- [ ] Dynamic layout/data
|
||||||
|
|
||||||
|
|
||||||
### Debugging wires
|
### Development
|
||||||
RX 18 -> yellow -> green
|
#### Debugging wires
|
||||||
|
| CYD | Serial Cable |
|
||||||
|
| -------------- | ------------ |
|
||||||
|
| Yellow [RX 18] | Green |
|
||||||
|
| Blue [TX 19] | White |
|
||||||
|
|
||||||
TX 19 -> blue -> white
|
|
||||||
|
The `RX18` and `TX19` pins are the `IO18` and `IO19` pins on the board and
|
||||||
|
probably are labeled as `UART1` and `USB`.
|
||||||
|
|
||||||
|
|
||||||
|
This is the `Serial2` we define on `main.cpp` currently.
|
||||||
|
Then we listen to it with something like ``.
|
||||||
|
|
||||||
### Cool fonts I like:
|
### Cool fonts I like:
|
||||||
- u8g2_font_bubble_tr (really cool for splash screens)
|
- u8g2_font_bubble_tr (really cool for splash screens)
|
||||||
|
|||||||
+3
-1
@@ -3,7 +3,7 @@ platform = espressif32
|
|||||||
board = esp32-s3-devkitc-1
|
board = esp32-s3-devkitc-1
|
||||||
framework = arduino
|
framework = arduino
|
||||||
monitor_speed = 115200
|
monitor_speed = 115200
|
||||||
upload_port = "/dev/ttyUSB1"
|
# upload_port = "/dev/ttyUSB0"
|
||||||
|
|
||||||
# lib_deps = moononournation/GFX Library for Arduino@
|
# lib_deps = moononournation/GFX Library for Arduino@
|
||||||
# lvgl/lvgl
|
# lvgl/lvgl
|
||||||
@@ -20,3 +20,5 @@ build_flags = -Iinclude/
|
|||||||
# -Ilib/u8g2/csrc
|
# -Ilib/u8g2/csrc
|
||||||
# -Ilib/u8g2/cppsrc
|
# -Ilib/u8g2/cppsrc
|
||||||
board_build.arduino.memory_type = qio_opi
|
board_build.arduino.memory_type = qio_opi
|
||||||
|
|
||||||
|
lib_deps = ../eslabsCurses/
|
||||||
|
|||||||
+32
-216
@@ -9,14 +9,14 @@ to have more ways to run analytics
|
|||||||
|
|
||||||
#include "Arduino_GFX.h"
|
#include "Arduino_GFX.h"
|
||||||
#include "HardwareSerial.h"
|
#include "HardwareSerial.h"
|
||||||
#include "UIDecorations.h"
|
// #include "UIDecorations.h"
|
||||||
#include "UIDrawing.h"
|
// #include "UIDrawing.h"
|
||||||
#include "UIString.h"
|
// #include "UIString.h"
|
||||||
#include "UITable.h"
|
// #include "UITable.h"
|
||||||
#include "data.h"
|
// #include "data.h"
|
||||||
#include "displaySetup.h"
|
#include "displaySetup.h"
|
||||||
#include "esp32-hal-psram.h"
|
#include "esp32-hal-psram.h"
|
||||||
#include "ui.h"
|
// #include "ui.h"
|
||||||
#include <Arduino.h>
|
#include <Arduino.h>
|
||||||
#include <Arduino_GFX_Library.h>
|
#include <Arduino_GFX_Library.h>
|
||||||
#include <cstdint>
|
#include <cstdint>
|
||||||
@@ -46,39 +46,8 @@ Arduino_GFX *gfx = new Arduino_RGB_Display(TFT_HOR_RES, TFT_VER_RES, panel, 16);
|
|||||||
// HardwareSerial debugSerial(1);
|
// HardwareSerial debugSerial(1);
|
||||||
|
|
||||||
// UIelements
|
// UIelements
|
||||||
DashUI *ui = new DashUI();
|
// UIDecorations *gearTextDecor = new UIDecorations();
|
||||||
UIDecorations *rpmBarDecor = new UIDecorations();
|
// UIString gearText(gfx, UIDimensions(0, 0, 0, 0), rpmTextDecor, (char *)"Gear");
|
||||||
UIDecorations *rpmTextDecor = new UIDecorations();
|
|
||||||
UIDecorations *speedTextDecor = new UIDecorations();
|
|
||||||
UIDecorations *gearTextDecor = new UIDecorations();
|
|
||||||
UIDecorations *lapDeltaDecor = new UIDecorations();
|
|
||||||
UIDecorations *bestLapDecor = new UIDecorations();
|
|
||||||
UIDecorations *lastLapDecor = new UIDecorations();
|
|
||||||
UIDecorations *curLapDecor = new UIDecorations();
|
|
||||||
UIDecorations *fuelTankDecor = new UIDecorations();
|
|
||||||
UIDecorations *fuelConsumptionDecor = new UIDecorations();
|
|
||||||
UIDecorations *brakeBiasDecor = new UIDecorations();
|
|
||||||
UIDecorations *relativeDecor = new UIDecorations();
|
|
||||||
|
|
||||||
UIBar rpmBar(gfx, UIDimensions(0, 0, 0, 0), rpmBarDecor, (char *)"Tach");
|
|
||||||
UIString rpmText(gfx, UIDimensions(0, 0, 0, 0), rpmTextDecor, (char *)"RPM");
|
|
||||||
UIString speedText(gfx, UIDimensions(0, 0, 0, 0), speedTextDecor,
|
|
||||||
(char *)"Speed");
|
|
||||||
UIString gearText(gfx, UIDimensions(0, 0, 0, 0), rpmTextDecor, (char *)"Gear");
|
|
||||||
|
|
||||||
UIString lapDelta(gfx, UIDimensions(0, 0, 0, 0), lapDeltaDecor,
|
|
||||||
(char *)"Delta");
|
|
||||||
UIString bestLap(gfx, UIDimensions(0, 0, 0, 0), bestLapDecor,
|
|
||||||
(char *)"Best Lap");
|
|
||||||
UIString lastLap(gfx, UIDimensions(0, 0, 0, 0), lastLapDecor,
|
|
||||||
(char *)"Last Lap");
|
|
||||||
UIString curLap(gfx, UIDimensions(0, 0, 0, 0), curLapDecor, (char *)"Cur. Lap");
|
|
||||||
UIString fuelTank(gfx, UIDimensions(0, 0, 0, 0), fuelTankDecor,
|
|
||||||
(char *)"Fuel Tank");
|
|
||||||
UIString fuelConsumption(gfx, UIDimensions(0, 0, 0, 0), fuelConsumptionDecor,
|
|
||||||
(char *)"Fuel Consumption");
|
|
||||||
UIString brakeBias(gfx, UIDimensions(0, 0, 0, 0), brakeBiasDecor,
|
|
||||||
(char *)"Brakes");
|
|
||||||
|
|
||||||
void setup() {
|
void setup() {
|
||||||
psramInit();
|
psramInit();
|
||||||
@@ -93,188 +62,35 @@ void setup() {
|
|||||||
Serial2.print(F("* Initiating display\r\n"));
|
Serial2.print(F("* Initiating display\r\n"));
|
||||||
initialDisplaySetup(gfx);
|
initialDisplaySetup(gfx);
|
||||||
|
|
||||||
// Setup the relative
|
|
||||||
// Define the width of the columns in number of chars
|
|
||||||
int *colW = (int *)malloc(sizeof(int) * 3);
|
|
||||||
colW[0] = 3;
|
|
||||||
colW[1] = 18;
|
|
||||||
colW[2] = 9;
|
|
||||||
UITable *relative =
|
|
||||||
new UITable(gfx, UIDimensions(250, 250, 0, 0), relativeDecor, 5, 3, colW,
|
|
||||||
(char *)"Relative");
|
|
||||||
relativeDecor->textSize = 2;
|
|
||||||
relative->dims.x = gfx->width() - relative->dims.width;
|
|
||||||
relative->dims.y = gfx->height() - relative->dims.height;
|
|
||||||
relative->refreshRate = 750;
|
|
||||||
relative->setup();
|
|
||||||
relative->drawBox();
|
|
||||||
ui->relative = relative;
|
|
||||||
|
|
||||||
// Setup the rpmBar box
|
|
||||||
rpmBarDecor->textSize = 3;
|
|
||||||
rpmBar.dims.height = 50;
|
|
||||||
rpmBar.dims.width = 450;
|
|
||||||
rpmBar.horizontalCenter(nullptr);
|
|
||||||
rpmBar.dims.x += 10;
|
|
||||||
rpmBar.range = 8;
|
|
||||||
rpmBar.refreshRate = 50;
|
|
||||||
ui->barTacho = &rpmBar;
|
|
||||||
ui->barTacho->Box();
|
|
||||||
ui->barTacho->Update((char*)"");
|
|
||||||
|
|
||||||
// Setup the rpmText box
|
|
||||||
rpmTextDecor->textSize = 7;
|
|
||||||
rpmText.dims.height =
|
|
||||||
calculateHeight(rpmTextDecor->titleSize, rpmTextDecor->textSize, 1);
|
|
||||||
rpmText.dims.width = calculateWidth(rpmTextDecor->textSize, 5);
|
|
||||||
rpmText.placeBelow(&rpmBar);
|
|
||||||
rpmText.horizontalCenter(&rpmBar);
|
|
||||||
rpmText.dims.y += 40; // We gotta fix how the bar declares its height instead
|
|
||||||
// of doing this here
|
|
||||||
rpmText.refreshRate = 100;
|
|
||||||
ui->digiTacho = &rpmText;
|
|
||||||
ui->digiTacho->drawBox();
|
|
||||||
ui->digiTacho->Update("-----");
|
|
||||||
|
|
||||||
// Setup the speedText box
|
|
||||||
speedTextDecor->textSize = 4;
|
|
||||||
speedText.dims.height =
|
|
||||||
calculateHeight(speedTextDecor->titleSize, speedTextDecor->textSize, 1);
|
|
||||||
speedText.dims.width = calculateWidth(speedTextDecor->textSize, 4);
|
|
||||||
speedText.placeBelow(&rpmBar);
|
|
||||||
speedText.placeRight(&rpmText);
|
|
||||||
speedText.dims.y += 40; // We gotta fix how the bar declares its height
|
|
||||||
// instead of doing this here
|
|
||||||
ui->digiSpeedo = &speedText;
|
|
||||||
ui->digiSpeedo->drawBox();
|
|
||||||
ui->digiSpeedo->Update("---");
|
|
||||||
|
|
||||||
// Setup the gear text box
|
// Setup the gear text box
|
||||||
gearTextDecor->textSize = 7;
|
// gearTextDecor->textSize = 7;
|
||||||
gearText.dims.height =
|
// gearText.dims.height =
|
||||||
calculateHeight(gearTextDecor->titleSize, gearTextDecor->textSize, 1);
|
// calculateHeight(gearTextDecor->titleSize, gearTextDecor->textSize, 1);
|
||||||
gearText.dims.width = calculateWidth(gearTextDecor->textSize, 2);
|
// gearText.dims.width = calculateWidth(gearTextDecor->textSize, 2);
|
||||||
gearText.dims.y = rpmText.dims.height + 5;
|
// gearText.dims.y = rpmText.dims.height + 5;
|
||||||
gearText.placeLeft(&rpmText);
|
// gearText.placeLeft(&rpmText);
|
||||||
ui->digiGear = &gearText;
|
|
||||||
ui->digiGear->drawBox();
|
|
||||||
ui->digiGear->Update("-");
|
|
||||||
|
|
||||||
// Setup the lap delta box
|
|
||||||
lapDeltaDecor->textSize = 3;
|
|
||||||
lapDelta.dims.height =
|
|
||||||
calculateHeight(lapDeltaDecor->titleSize, lapDeltaDecor->textSize, 1);
|
|
||||||
lapDelta.dims.width = calculateWidth(lapDeltaDecor->textSize, 6);
|
|
||||||
lapDelta.placeBelow(&rpmText);
|
|
||||||
lapDelta.horizontalCenter(&rpmText);
|
|
||||||
ui->lapDelta = &lapDelta;
|
|
||||||
ui->lapDelta->drawBox();
|
|
||||||
ui->lapDelta->Update("--.-");
|
|
||||||
|
|
||||||
// Setup the best lap box
|
|
||||||
bestLapDecor->textSize = 3;
|
|
||||||
bestLap.dims.height =
|
|
||||||
calculateHeight(bestLapDecor->titleSize, bestLapDecor->textSize, 1);
|
|
||||||
bestLap.dims.width = calculateWidth(bestLapDecor->textSize, 8);
|
|
||||||
ui->bestLap = &bestLap;
|
|
||||||
ui->bestLap->drawBox();
|
|
||||||
ui->bestLap->Update("--:--.--");
|
|
||||||
|
|
||||||
// Setup the last lap box
|
|
||||||
lastLapDecor->textSize = 3;
|
|
||||||
lastLap.dims.height =
|
|
||||||
calculateHeight(lastLapDecor->titleSize, lastLapDecor->textSize, 1);
|
|
||||||
lastLap.dims.width = calculateWidth(lastLapDecor->textSize, 8);
|
|
||||||
lastLap.placeBelow(&bestLap);
|
|
||||||
ui->lastLap = &lastLap;
|
|
||||||
ui->lastLap->drawBox();
|
|
||||||
ui->lastLap->Update("--:--.--");
|
|
||||||
|
|
||||||
// Setup the cur lap box
|
|
||||||
curLapDecor->textSize = 3;
|
|
||||||
curLap.dims.height =
|
|
||||||
calculateHeight(curLapDecor->titleSize, curLapDecor->textSize, 1);
|
|
||||||
curLap.dims.width = calculateWidth(curLapDecor->textSize, 8);
|
|
||||||
curLap.placeBelow(&lastLap);
|
|
||||||
ui->curLap = &curLap;
|
|
||||||
ui->curLap->drawBox();
|
|
||||||
ui->curLap->Update("--:--.--");
|
|
||||||
|
|
||||||
// Fuel tank
|
|
||||||
fuelTankDecor->textSize = 3;
|
|
||||||
fuelTank.dims.height =
|
|
||||||
calculateHeight(fuelTankDecor->titleSize, fuelTankDecor->textSize, 1);
|
|
||||||
fuelTank.dims.width = calculateWidth(fuelTankDecor->textSize, 12);
|
|
||||||
fuelTank.placeBelow(&curLap);
|
|
||||||
ui->fuelTank = &fuelTank;
|
|
||||||
ui->fuelTank->drawBox();
|
|
||||||
ui->fuelTank->Update("--- / ---");
|
|
||||||
|
|
||||||
// Fuel consumption
|
|
||||||
fuelConsumptionDecor->textSize = 3;
|
|
||||||
fuelConsumption.dims.height = calculateHeight(
|
|
||||||
fuelConsumptionDecor->titleSize, fuelConsumptionDecor->textSize, 1);
|
|
||||||
fuelConsumption.dims.width =
|
|
||||||
calculateWidth(fuelConsumptionDecor->textSize, 12);
|
|
||||||
fuelConsumption.placeBelow(&fuelTank);
|
|
||||||
ui->fuelConsumption = &fuelConsumption;
|
|
||||||
ui->fuelConsumption->drawBox();
|
|
||||||
ui->fuelConsumption->Update("--.- | --.-");
|
|
||||||
|
|
||||||
// Brake bias
|
|
||||||
brakeBiasDecor->textSize = 3;
|
|
||||||
brakeBias.dims.height =
|
|
||||||
calculateHeight(brakeBiasDecor->titleSize, brakeBiasDecor->textSize, 1);
|
|
||||||
brakeBias.dims.width = calculateWidth(brakeBiasDecor->textSize, 5);
|
|
||||||
brakeBias.placeBelow(&fuelConsumption);
|
|
||||||
ui->brakeBias = &brakeBias;
|
|
||||||
ui->brakeBias->drawBox();
|
|
||||||
ui->brakeBias->Update("--.-");
|
|
||||||
|
|
||||||
// const char *words[] = {"hel", "wor", "why", "is", "thi", "hap", "to",
|
|
||||||
// "me"};
|
|
||||||
//
|
|
||||||
// int wIndex = 0;
|
|
||||||
// while (1) {
|
|
||||||
// for (int row = 0; row < ROWS; row++) {
|
|
||||||
// for (int col = 0; col < COLUMNS; col++) {
|
|
||||||
// ui->relative->tableData[row * COLUMNS +
|
|
||||||
// col]->Update(words[wIndex++]); if (wIndex >= 8) {
|
|
||||||
// wIndex = 0;
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
|
|
||||||
// nvs_handle_t handle;
|
|
||||||
// nvs_open("storage", NVS_READWRITE, &handle);
|
|
||||||
// nvs_set_i32(handle, "counter", 42);
|
|
||||||
// nvs_commit(handle);
|
|
||||||
// nvs_close(handle);
|
|
||||||
|
|
||||||
Serial2.println("* Ready for loop");
|
Serial2.println("* Ready for loop");
|
||||||
}
|
}
|
||||||
|
|
||||||
uint64_t lastDataRead = 0;
|
uint64_t lastDataRead = 0;
|
||||||
void loop(void) {
|
void loop(void) {
|
||||||
// Request data here
|
Serial2.println("gre we here?");
|
||||||
SendDataRequest();
|
// // Request data here
|
||||||
|
// SendDataRequest();
|
||||||
// Receive data
|
//
|
||||||
DataPacket telemetryPacket;
|
// // Receive data
|
||||||
int res = RecvDataPacket(&telemetryPacket);
|
// DataPacket telemetryPacket;
|
||||||
|
// int res = RecvDataPacket(&telemetryPacket);
|
||||||
if (res == 0) {
|
//
|
||||||
ui->Update(&telemetryPacket);
|
// if (res == 0) {
|
||||||
|
// ui->Update(&telemetryPacket);
|
||||||
lastDataRead = millis();
|
//
|
||||||
}
|
// lastDataRead = millis();
|
||||||
|
// }
|
||||||
// If no data is received for 5 seconds, reset the display
|
//
|
||||||
if (millis() - lastDataRead >= 5000) {
|
// // If no data is received for 5 seconds, reset the display
|
||||||
// ui.speedometer->Update(0);
|
// if (millis() - lastDataRead >= 5000) {
|
||||||
// ui.numberTach->Update(0);
|
// Serial2.print("Resetting the display");
|
||||||
// ui.gear->Update(0);
|
// }
|
||||||
// ui.barTach->Update(0);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user