From 141c823600fa9c681212a6b2c7a6a72893b65161 Mon Sep 17 00:00:00 2001 From: LaCocoRoco Date: Tue, 2 Jul 2019 01:43:27 +0200 Subject: [PATCH] Update --- README.md | 19 ++++++++++--------- keywords.txt | 1 - src/AtmelDataGatewayUart.h | 2 +- src/DataVisualizer.cpp | 15 ++++++++++----- src/DataVisualizer.h | 5 +++-- src/DataVisualizerDashboardSignal.cpp | 6 ++++-- 6 files changed, 28 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index 3741058..b31dfd1 100644 --- a/README.md +++ b/README.md @@ -4,9 +4,9 @@ The Atmel Data Protocol is a content independent protocol intended for transferr The connection can be established via a Serial Port or the Data Gateway Interface (EDBG-based Debugger). ## Quick Guide -1. Download [Michrochip Data Visualizer](https://gallery.microchip.com/api/v2/package/AtmelDataVisualizerInstaller-Standalone/2.20.674). -2. Download [Arduino Data Visualizer](https://www.arduinolibraries.info/libraries/data-visualizer). -3. Open Arduino, select example, compile and upload project. +1. Download Michrochip Data Visualizer. `Link` +2. Download Arduino Data Visualizer Library. +3. Open Arduino, select default example, compile and upload project. 4. Open Data Visualizer, select Serial Port Panel and press Connect. ## Known Issues & Solution @@ -23,9 +23,9 @@ The connection can be established via a Serial Port or the Data Gateway Interfac > The Slider has to be moved slowly. ## Reference -- [Data Visualizer User's Guid (HTML)](https://www.microchip.com/webdoc/GUID-F897CF19-8EAC-457A-BE11-86BDAC9B59CF/index.html?GUID-477A2070-3316-4E56-BEA7-293CCCFB3EBA) -- [Data Visualizer User's Guid (PDF)](http://ww1.microchip.com/downloads/en/DeviceDoc/40001903B.pdf) -- [Microchip Data Visualizer](https://www.microchip.com/mplab/avr-support/data-visualizer) +- `Data Visualizer User's Guid (HTML)` +- `Data Visualizer User's Guid (PDF)` +- `Microchip Data Visualizer` ## Functions Tree Overview ```bash @@ -43,7 +43,8 @@ DataVisualizer ├── void begin(SPIClass* spi, SPISettings settings, uint8_t ss); ├── void addInfo(const char* title, const char* description); ├── Terminal addTerminal(const char* title); -├── Terminal addTerminal(const char* title, RgbColor bgColor, RgbColor fgColor); +├── Terminal addTerminal(const char* title, uint16_t height); +├── Terminal addTerminal(const char* title, uint16_t height, RgbColor bgColor, RgbColor fgColor); │ ├── uint16_t available(void); │ ├── void print(int n); │ ├── void print(long n); @@ -64,8 +65,8 @@ DataVisualizer │ ├── GraphAxisCursor addCursor(const char *label); │ └── GraphAxisCursor addCursor(const char *label, RgbColor color); ├── Dashboard addDashboard(const char* title); -├── Dashboard addDashboard(const char* title); -└── Dashboard addDashboard(const char* title, uint16_t height, RgbColor color, uint16_t height); +├── Dashboard addDashboard(const char* title, uint16_t height); +└── Dashboard addDashboard(const char* title, uint16_t height, RgbColor color); ├── 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/keywords.txt b/keywords.txt index b7d513d..a3203de 100644 --- a/keywords.txt +++ b/keywords.txt @@ -216,7 +216,6 @@ GATEWAY_EXTERNAL LITERAL1 GATEWAY_TWI LITERAL1 GATEWAY_SPI LITERAL1 GATEWAY_UART LITERAL1 -GATEWAY_SERIAL LITERAL1 UART_BAUDRATE_19200 LITERAL1 UART_BAUDRATE_38400 LITERAL1 diff --git a/src/AtmelDataGatewayUart.h b/src/AtmelDataGatewayUart.h index 9639ba8..c2ecc92 100644 --- a/src/AtmelDataGatewayUart.h +++ b/src/AtmelDataGatewayUart.h @@ -19,7 +19,7 @@ #define UART_BAUDRATE_1000000 1000000 #define UART_BAUDRATE_2000000 2000000 -#define DEFAULT_UART_BAUDRATE UART_BAUDRATE_230400 +#define DEFAULT_UART_BAUDRATE UART_BAUDRATE_19200 #define DEFAULT_UART_TIMEOUT 0 class AtmelDataGatewayUart { diff --git a/src/DataVisualizer.cpp b/src/DataVisualizer.cpp index 67d598b..30b66ef 100644 --- a/src/DataVisualizer.cpp +++ b/src/DataVisualizer.cpp @@ -160,10 +160,14 @@ void DataVisualizer::addInfo(const char *title, const char *description) { } DataVisualizerTerminal DataVisualizer::addTerminal(const char *title) { - return this->addTerminal(title, COLOR_WHITE, COLOR_BLACK); + return this->addTerminal(title, 400, COLOR_WHITE, COLOR_BLACK); } -DataVisualizerTerminal DataVisualizer::addTerminal(const char *title, RgbColor bgColor, RgbColor fgColor) { +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 terminal; if (!this->handshake) return terminal; @@ -179,6 +183,7 @@ DataVisualizerTerminal DataVisualizer::addTerminal(const char *title, RgbColor b 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); @@ -235,14 +240,14 @@ DataVisualizerGraph DataVisualizer::addGraph(const char* title, RgbColor bgColor } DataVisualizerDashboard DataVisualizer::addDashboard(const char* title) { - return this->addDashboard(title, COLOR_WHITE, 500); + return this->addDashboard(title, 500, COLOR_WHITE); } DataVisualizerDashboard DataVisualizer::addDashboard(const char* title, uint16_t height) { - return this->addDashboard(title, COLOR_WHITE, height); + return this->addDashboard(title, height, COLOR_WHITE); } -DataVisualizerDashboard DataVisualizer::addDashboard(const char* title, RgbColor color, uint16_t height) { +DataVisualizerDashboard DataVisualizer::addDashboard(const char* title, uint16_t height, RgbColor color) { DataVisualizerDashboard dashboard; if (!this->handshake) return dashboard; diff --git a/src/DataVisualizer.h b/src/DataVisualizer.h index 4094a79..fc1de51 100644 --- a/src/DataVisualizer.h +++ b/src/DataVisualizer.h @@ -130,14 +130,15 @@ class DataVisualizer : AtmelDataGateway { void addInfo(const char* title, const char* description); DataVisualizerTerminal addTerminal(const char* title); - DataVisualizerTerminal addTerminal(const char* title, RgbColor bgColor, RgbColor fgColor); + DataVisualizerTerminal addTerminal(const char* title, uint16_t height); + DataVisualizerTerminal addTerminal(const char* title, uint16_t height, 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, RgbColor color, uint16_t height); + DataVisualizerDashboard addDashboard(const char* title, uint16_t height, RgbColor color); /*********************************************************/ /* Gateway */ diff --git a/src/DataVisualizerDashboardSignal.cpp b/src/DataVisualizerDashboardSignal.cpp index 211ed85..aefafb9 100644 --- a/src/DataVisualizerDashboardSignal.cpp +++ b/src/DataVisualizerDashboardSignal.cpp @@ -9,12 +9,14 @@ void DataVisualizerDashboardSignal::on(void) { if (!this->visualizer) return; if (!this->visualizer->handshake) return; - this->visualizer->write(this->id, (uint8_t*) true, 1); + uint8_t value = 1; + this->visualizer->write(this->id, &value, 1); } void DataVisualizerDashboardSignal::off(void) { if (!this->visualizer) return; if (!this->visualizer->handshake) return; - this->visualizer->write(this->id, (uint8_t*) false, 1); + uint8_t value = 0; + this->visualizer->write(this->id, &value, 1); } \ No newline at end of file