From 51b424a7aa25a3d52b8f1b6eb48b2f7cd4b34066 Mon Sep 17 00:00:00 2001 From: LaCocoRoco Date: Wed, 3 Jul 2019 02:49:40 +0200 Subject: [PATCH] Update --- README.md | 9 ++++----- .../moduleDashboardLabel.ino | 2 -- keywords.txt | 3 +-- src/AtmelDataGatewaySpi.cpp | 13 +++---------- src/AtmelDataGatewaySpi.h | 6 ++---- src/DataVisualizer.cpp | 19 +++++++------------ src/DataVisualizer.h | 8 ++++---- src/DataVisualizerDashboardSignal.cpp | 6 ++---- 8 files changed, 23 insertions(+), 43 deletions(-) diff --git a/README.md b/README.md index b31dfd1..8137bd8 100644 --- a/README.md +++ b/README.md @@ -40,11 +40,10 @@ DataVisualizer ├── void begin(DataGateway com); ├── void begin(Stream* uart); ├── void begin(TwoWire* twi, uint8_t address); -├── void begin(SPIClass* spi, SPISettings settings, uint8_t ss); +├── void begin(SPIClass* spi, uint8_t ss); ├── void addInfo(const char* title, const char* description); ├── Terminal addTerminal(const char* title); -├── Terminal addTerminal(const char* title, uint16_t height); -├── Terminal addTerminal(const char* title, uint16_t height, RgbColor bgColor, RgbColor fgColor); +├── Terminal addTerminal(const char* title, RgbColor bgColor, RgbColor fgColor); │ ├── uint16_t available(void); │ ├── void print(int n); │ ├── void print(long n); @@ -65,8 +64,8 @@ DataVisualizer │ ├── GraphAxisCursor addCursor(const char *label); │ └── GraphAxisCursor addCursor(const char *label, RgbColor color); ├── Dashboard addDashboard(const char* title); -├── Dashboard addDashboard(const char* title, uint16_t height); -└── Dashboard addDashboard(const char* title, uint16_t height, RgbColor color); +├── Dashboard addDashboard(const char* title); +└── Dashboard addDashboard(const char* title, uint16_t height, RgbColor color, uint16_t height); ├── DashboardButton addButton(const uint8_t* config); ├── DashboardButton addButton(const char* text, ConfigDashboardButton config); ├── DashboardButton addButton(const char* textOn, const char* textOff, ConfigDashboardButton config); diff --git a/examples/moduleDashboardLabel/moduleDashboardLabel.ino b/examples/moduleDashboardLabel/moduleDashboardLabel.ino index 588d897..68c0596 100644 --- a/examples/moduleDashboardLabel/moduleDashboardLabel.ino +++ b/examples/moduleDashboardLabel/moduleDashboardLabel.ino @@ -1,7 +1,5 @@ #include -Terminal terminal; - void setup() { Visualizer.begin(GATEWAY_UART); } diff --git a/keywords.txt b/keywords.txt index a3203de..5a52488 100644 --- a/keywords.txt +++ b/keywords.txt @@ -216,6 +216,7 @@ GATEWAY_EXTERNAL LITERAL1 GATEWAY_TWI LITERAL1 GATEWAY_SPI LITERAL1 GATEWAY_UART LITERAL1 +GATEWAY_SERIAL LITERAL1 UART_BAUDRATE_19200 LITERAL1 UART_BAUDRATE_38400 LITERAL1 @@ -231,8 +232,6 @@ DEFAULT_UART_TIMEOUT LITERAL1 DEFAULT_TWI_ADDRESS LITERAL1 DEFAULT_TWI_FREQUENCY LITERAL1 DEFAULT_TWI_TIMEOUT LITERAL1 -DEFAULT_SPI_FREQUENCY LITERAL1 -DEFAULT_VIEW LITERAL1 COLOR_WHITE LITERAL1 COLOR_BLACK LITERAL1 diff --git a/src/AtmelDataGatewaySpi.cpp b/src/AtmelDataGatewaySpi.cpp index 868f099..5d7aec7 100644 --- a/src/AtmelDataGatewaySpi.cpp +++ b/src/AtmelDataGatewaySpi.cpp @@ -3,40 +3,33 @@ #ifdef GATEWAY_INCLUDED_SPI void AtmelDataGatewaySpi::begin(void) { - SPISettings settings(DEFAULT_SPI_FREQUENCY, MSBFIRST, SPI_MODE0); SPI.begin(); - this->begin(&SPI, settings, SS); + SPI.setClockDivider(SPI_CLOCK_DIV128); + this->begin(&SPI, SS); } -void AtmelDataGatewaySpi::begin(SPIClass* spi, SPISettings settings, uint8_t ss) { +void AtmelDataGatewaySpi::begin(SPIClass* spi, uint8_t ss) { pinMode(ss, OUTPUT); this->spi = spi; this->ss = ss; - this->settings = settings; } void AtmelDataGatewaySpi::transmit(uint8_t* txBuffer, uint16_t length) { digitalWrite(this->ss, LOW); - this->spi->beginTransaction(this->settings); for (uint8_t i = 0; i < length; i++) this->spi->transfer(txBuffer[i]); - this->spi->endTransaction(); digitalWrite(this->ss, HIGH); } uint16_t AtmelDataGatewaySpi::receive(uint8_t* rxBuffer, uint16_t length) { digitalWrite(this->ss, LOW); - this->spi->beginTransaction(this->settings); for (uint8_t i = 0; i < length; i++) rxBuffer[i] = this->spi->transfer(DEFAULT_TOKEN); - this->spi->endTransaction(); digitalWrite(this->ss, HIGH); return length; } uint16_t AtmelDataGatewaySpi::transceive(uint8_t* txBuffer, uint8_t* rxBuffer, uint16_t length) { digitalWrite(this->ss, LOW); - this->spi->beginTransaction(this->settings); for (uint8_t i = 0; i < length; i++) rxBuffer[i] = this->spi->transfer(txBuffer[i]); - this->spi->endTransaction(); digitalWrite(this->ss, HIGH); return length; } diff --git a/src/AtmelDataGatewaySpi.h b/src/AtmelDataGatewaySpi.h index 86f7d42..1deb23d 100644 --- a/src/AtmelDataGatewaySpi.h +++ b/src/AtmelDataGatewaySpi.h @@ -11,18 +11,16 @@ #include #define DEFAULT_TWI_TIMEOUT 0 -#define DEFAULT_SPI_FREQUENCY 4000000 -#define DEFAULT_TOKEN ADP_TOKEN +#define DEFAULT_TOKEN 0x00 class AtmelDataGatewaySpi { private: SPIClass* spi; - SPISettings settings; uint8_t ss; public: void begin(void); - void begin(SPIClass* spi, SPISettings settings, uint8_t ss); + void begin(SPIClass* spi, uint8_t ss); void transmit(uint8_t* txBuffer, uint16_t length); uint16_t receive(uint8_t* rxBuffer, uint16_t length); uint16_t transceive(uint8_t* txBuffer, uint8_t* rxBuffer, uint16_t length); diff --git a/src/DataVisualizer.cpp b/src/DataVisualizer.cpp index 30b66ef..1657072 100644 --- a/src/DataVisualizer.cpp +++ b/src/DataVisualizer.cpp @@ -160,14 +160,10 @@ void DataVisualizer::addInfo(const char *title, const char *description) { } DataVisualizerTerminal DataVisualizer::addTerminal(const char *title) { - return this->addTerminal(title, 400, COLOR_WHITE, COLOR_BLACK); + return this->addTerminal(title, COLOR_WHITE, COLOR_BLACK); } -DataVisualizerTerminal DataVisualizer::addTerminal(const char *title, uint16_t height) { - return this->addTerminal(title, height, COLOR_WHITE, COLOR_BLACK); -} - -DataVisualizerTerminal DataVisualizer::addTerminal(const char *title, uint16_t height, RgbColor bgColor, RgbColor fgColor) { +DataVisualizerTerminal DataVisualizer::addTerminal(const char *title, RgbColor bgColor, RgbColor fgColor) { DataVisualizerTerminal terminal; if (!this->handshake) return terminal; @@ -183,7 +179,6 @@ DataVisualizerTerminal DataVisualizer::addTerminal(const char *title, uint16_t h MsgConfigTerminal msgConfigTerminal; this->protocol.configureTerminalGetDefaults(&msgConfigTerminal); msgConfigTerminal.terminalId = terminalId; - msgConfigTerminal.height = height; this->protocol.setColor(msgConfigTerminal.backgroundColor, bgColor); this->protocol.setColor(msgConfigTerminal.foregroundColor, fgColor); this->protocol.addTerminal(&msgConfigTerminal, title); @@ -240,14 +235,14 @@ DataVisualizerGraph DataVisualizer::addGraph(const char* title, RgbColor bgColor } DataVisualizerDashboard DataVisualizer::addDashboard(const char* title) { - return this->addDashboard(title, 500, COLOR_WHITE); + return this->addDashboard(title, COLOR_WHITE, 500); } DataVisualizerDashboard DataVisualizer::addDashboard(const char* title, uint16_t height) { - return this->addDashboard(title, height, COLOR_WHITE); + return this->addDashboard(title, COLOR_WHITE, height); } -DataVisualizerDashboard DataVisualizer::addDashboard(const char* title, uint16_t height, RgbColor color) { +DataVisualizerDashboard DataVisualizer::addDashboard(const char* title, RgbColor color, uint16_t height) { DataVisualizerDashboard dashboard; if (!this->handshake) return dashboard; @@ -366,9 +361,9 @@ void DataVisualizer::begin(TwoWire* twi, uint8_t address) { #endif #ifdef GATEWAY_INCLUDED_SPI -void DataVisualizer::begin(SPIClass* spi, SPISettings settings, uint8_t ss) { +void DataVisualizer::begin(SPIClass* spi, uint8_t ss) { this->gateway = GATEWAY_SPI; - this->gatewaySpi.begin(spi, settings, ss); + this->gatewaySpi.begin(spi, ss); } #endif diff --git a/src/DataVisualizer.h b/src/DataVisualizer.h index fc1de51..b256af7 100644 --- a/src/DataVisualizer.h +++ b/src/DataVisualizer.h @@ -7,6 +7,7 @@ #include #include "AtmelDataProtocol.h" +#include "AtmelDataGateway.h" #include "AtmelDataGatewayUart.h" #include "AtmelDataGatewaySpi.h" #include "AtmelDataGatewayTwi.h" @@ -130,15 +131,14 @@ class DataVisualizer : AtmelDataGateway { void addInfo(const char* title, const char* description); DataVisualizerTerminal addTerminal(const char* title); - DataVisualizerTerminal addTerminal(const char* title, uint16_t height); - DataVisualizerTerminal addTerminal(const char* title, uint16_t height, RgbColor bgColor, RgbColor fgColor); + DataVisualizerTerminal addTerminal(const char* title, RgbColor bgColor, RgbColor fgColor); DataVisualizerGraph addGraph(const char* title); DataVisualizerGraph addGraph(const char* title, RgbColor bgColor); DataVisualizerDashboard addDashboard(const char* title); DataVisualizerDashboard addDashboard(const char* title, uint16_t height); - DataVisualizerDashboard addDashboard(const char* title, uint16_t height, RgbColor color); + DataVisualizerDashboard addDashboard(const char* title, RgbColor color, uint16_t height); /*********************************************************/ /* Gateway */ @@ -196,7 +196,7 @@ class DataVisualizer : AtmelDataGateway { AtmelDataGatewaySpi gatewaySpi; public: - void begin(SPIClass* spi, SPISettings settings, uint8_t ss); + void begin(SPIClass* spi, uint8_t ss); #endif }; diff --git a/src/DataVisualizerDashboardSignal.cpp b/src/DataVisualizerDashboardSignal.cpp index aefafb9..211ed85 100644 --- a/src/DataVisualizerDashboardSignal.cpp +++ b/src/DataVisualizerDashboardSignal.cpp @@ -9,14 +9,12 @@ void DataVisualizerDashboardSignal::on(void) { if (!this->visualizer) return; if (!this->visualizer->handshake) return; - uint8_t value = 1; - this->visualizer->write(this->id, &value, 1); + this->visualizer->write(this->id, (uint8_t*) true, 1); } void DataVisualizerDashboardSignal::off(void) { if (!this->visualizer) return; if (!this->visualizer->handshake) return; - uint8_t value = 0; - this->visualizer->write(this->id, &value, 1); + this->visualizer->write(this->id, (uint8_t*) false, 1); } \ No newline at end of file