Browse Source

io release build elf

main
gsd 7 months ago
parent
commit
b1624175d6
  1. 16
      pipboyIO/extDisplay.cpp
  2. 30
      pipboyIO/pipboyIO.ino

16
pipboyIO/extDisplay.cpp

@ -186,27 +186,11 @@ void overlayOnExtDisplay() {
void lineCalcOnExtDisplay(int16_t x, int16_t y, int radius) { void lineCalcOnExtDisplay(int16_t x, int16_t y, int radius) {
extDisplay.clearDisplay(); extDisplay.clearDisplay();
overlayOnExtDisplay(); overlayOnExtDisplay();
/*for (int r = -180; r < 180; r ++) {
float rad = r * PI / 180.0;
int endX = x + (radius * sin(rad));
int endY = y - (radius * cos(rad));
if (endX <= 128 && endX >= 0 && endY <= 64 && endY >= 0) {
Serial.print(endX);
Serial.print(" ");
Serial.println(endY);
extDisplay.drawPixel(endX, endY, WHITE);
}
}*/
float rad = x * PI / 180.0; float rad = x * PI / 180.0;
int endX = 64 + (radius * sin(rad)); int endX = 64 + (radius * sin(rad));
int endY = -70 - (radius * cos(rad)); int endY = -70 - (radius * cos(rad));
Serial.print(endX);
Serial.print(" ");
Serial.println(endY);
if (endX <= 128 && endX >= 0 && endY <= 64 && endY >= 0) { if (endX <= 128 && endX >= 0 && endY <= 64 && endY >= 0) {
extDisplay.drawPixel(endX, endY, WHITE); extDisplay.drawPixel(endX, endY, WHITE);
} }

30
pipboyIO/pipboyIO.ino

@ -19,7 +19,7 @@ String inputBuffer = "";
#define RXD2 (16) #define RXD2 (16)
#define TXD2 (17) #define TXD2 (17)
#define DEBUGIO //#define DEBUGIO
void setup() { void setup() {
#ifdef DEBUGIO #ifdef DEBUGIO
@ -92,15 +92,27 @@ void loop() {
} }
//читаем кал //читаем кал
while (Serial.available() > 0) { #ifdef DEBUGIO
char chr = Serial.read(); while (Serial.available() > 0) {
if (chr == '\n') { char chr = Serial.read();
processInput(inputBuffer); if (chr == '\n') {
inputBuffer = ""; processInput(inputBuffer);
} else { inputBuffer = "";
inputBuffer += chr; } else {
inputBuffer += chr;
}
} }
} #else
while (Serial2.available() > 0) {
char chr = Serial2.read();
if (chr == '\n') {
processInput(inputBuffer);
inputBuffer = "";
} else {
inputBuffer += chr;
}
}
#endif
delay(50); delay(50);
} }

Loading…
Cancel
Save