jct/MAX7456JSON
1
0
Fork 0
Code Releases 1 Activity

Streamline to other arduino projects, upgrade ArduinoJson

Browse Source
This commit is contained in:
Jens Christian True 2019-09-04 13:00:53 +02:00
parent 174d5082ed
commit 96fd2967b3
3 changed files with 71 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
.drone.yml Normal file
View File

@ -0,0 +1,19 @@
kind: pipeline
name: default
steps:
- name: build
image: python:3
commands:
- pip install platformio
- pio run
- name: release
image: plugins/gitea-release
settings:
api_key: a7f3afc9f77e721951e48b4af66d7565700b7a2e
base_url: https://code.jcktrue.dk
files:
- .pio/build/max7456board/firmware.hex
- .pio/build/max7456board/firmware.elf
when:
event: tag

2
platformio.ini
View File

@ -8,7 +8,7 @@
; Please visit documentation for the other options and examples
; https://docs.platformio.org/page/projectconf.html
[env:pro16MHzatmega328]
[env:max7456board]
platform = atmelavr
board = pro16MHzatmega328
framework = arduino

95
src/HelloWorld.ino → src/main.cpp
View File

@ -1,4 +1,4 @@
#include "Arduino.h"
#include <SPI.h>
#include "config.h"
@ -6,55 +6,27 @@
#include "max7456.h"
Max7456 osd;
void setup()
{
Serial.begin(BAUDRATE);
Serial.println("================================================================================");
Serial.println("Firmware: " PROJECT_NAME);
Serial.println("Version: " VERSION_STRING);
Serial.println("Built: " __DATE__ ", " __TIME__);
Serial.println("================================================================================");
Serial.println("Initialize...");
SPI.begin();
osd.init(6);
osd.clearScreen();
osd.setDisplayOffsets(DISP_OFFSET_X, DISP_OFFSET_Y);
osd.setBlinkParams(_8fields, _BT_3BT);
osd.activateOSD();
osd.activateExternalVideo(false);
osd.print("==========================", 0, 0);
osd.print("Firmware: " PROJECT_NAME, 0, 1);
osd.print("Version: " VERSION_STRING, 0, 2);
osd.print("Built: " __DATE__ ", " __TIME__, 0, 3);
osd.print("==========================", 0, 4);
delay(3000);
osd.clearScreen();
Serial.println("Ready!");
}
void loop()
{
processSerial();
}
void handleRPC(char *cmd)
{
Serial.print("Handling: ");
Serial.println(cmd);
const size_t capacity = JSON_OBJECT_SIZE(4) + 50;
DynamicJsonBuffer jsonBuffer(capacity);
StaticJsonDocument<200> doc;
DeserializationError error = deserializeJson(doc, cmd);
JsonObject &root = jsonBuffer.parseObject(cmd);
// Test if parsing succeeds.
if (error)
{
Serial.print(F("deserializeJson() failed: "));
Serial.println(error.c_str());
return;
}
const char *command = root["command"]; // "write"
const char *command = doc["command"]; // "write"
if (strcmp("write", command) == 0)
{
const char *text = root["text"]; // "1351824120"
int x = root["x"]; // 13
int y = root["y"]; // 10
const char *text = doc["text"]; // "1351824120"
int x = doc["x"]; // 13
int y = doc["y"]; // 10
osd.print(text, x, y);
return;
}
@ -67,9 +39,10 @@ void handleRPC(char *cmd)
if (strcmp("offset", command) == 0)
{
int x = root["x"]; // 13
int y = root["y"]; // 10
int x = doc["x"]; // 13
int y = doc["y"]; // 10
osd.setDisplayOffsets(x, y);
return;
}
}
@ -102,4 +75,38 @@ void processSerial()
handleRPC(receivedChars);
}
}
}
void setup()
{
Serial.begin(BAUDRATE);
Serial.println("================================================================================");
Serial.println("Firmware: " PROJECT_NAME);
Serial.println("Version: " VERSION_STRING);
Serial.println("Built: " __DATE__ ", " __TIME__);
Serial.println("================================================================================");
Serial.println("Initialize...");
SPI.begin();
osd.init(6);
osd.clearScreen();
osd.setDisplayOffsets(DISP_OFFSET_X, DISP_OFFSET_Y);
osd.setBlinkParams(_8fields, _BT_3BT);
osd.activateOSD();
osd.activateExternalVideo(false);
osd.print("==========================", 0, 0);
osd.print("Firmware: " PROJECT_NAME, 0, 1);
osd.print("Version: " VERSION_STRING, 0, 2);
osd.print("Built: " __DATE__ ", " __TIME__, 0, 3);
osd.print("==========================", 0, 4);
delay(3000);
osd.clearScreen();
Serial.println("Ready!");
}
void loop()
{
processSerial();
}