diff --git a/CyanBusInjector-FW/CyanBusInjector.cpp b/CyanBusInjector-FW/CyanBusInjector.cpp index 936901d5ea4efd1691d0de19dabbd3783779e456..50d1a875459e97c7d2ef8161aab325fec0b24662 100644 --- a/CyanBusInjector-FW/CyanBusInjector.cpp +++ b/CyanBusInjector-FW/CyanBusInjector.cpp @@ -1,6 +1,7 @@ #include "CyanBusInjector.hpp" // C++ system level +#include <string> #include <cinttypes> // #include <functional> @@ -16,7 +17,7 @@ #include "CyanBusTX.hpp" // qthing stuff -// #include "" +#include <qthing> // TODO: Needed…? @@ -27,8 +28,14 @@ namespace SiliconTorch { namespace CyanBusInjector { + const std::string BreakHeader("[CyanBusBreak]"); + const std::string PacketHeader("[CyanBusInjector]"); + CyanBusInjector::CyanBusInjector(uint8_t tx, uint8_t rx, uint8_t de, uint8_t re, uint32_t baudRate, uint8_t uartChannel) : cbTX(tx, rx, de, re, baudRate, uartChannel) { + + // qthing::addUDPPacketCallback(); + } diff --git a/CyanBusInjector-FW/CyanBusInjector.hpp b/CyanBusInjector-FW/CyanBusInjector.hpp index de708d53026437e1371891d6983b8c51005984cb..434602748ac26f21657c29aef5794040d9626ecb 100644 --- a/CyanBusInjector-FW/CyanBusInjector.hpp +++ b/CyanBusInjector-FW/CyanBusInjector.hpp @@ -1,4 +1,5 @@ // C++ system level +#include <string> #include <cinttypes> // ESP32 specific @@ -15,6 +16,9 @@ namespace SiliconTorch { namespace CyanBusInjector { + extern const std::string BreakHeader; + extern const std::string PacketHeader; + class CyanBusInjector { public: @@ -29,12 +33,10 @@ namespace SiliconTorch { }; - - // Pinout proto board: - // TX -> 23 - // RX -> 34 - // DE -> 32 - // RE -> 33 + class CyanBusInjector_ProtoPCB : public CyanBusInjector { + public: + CyanBusInjector_ProtoPCB() : CyanBusInjector(23, 34, 32, 33) {}; + }; } } diff --git a/CyanBusInjector-FW/device_main.cpp b/CyanBusInjector-FW/device_main.cpp index f916f71598eb939ab9b2f8cc74d62dcad679f031..51f1acd9c67261564af91568ae056b3bfc21bcf7 100644 --- a/CyanBusInjector-FW/device_main.cpp +++ b/CyanBusInjector-FW/device_main.cpp @@ -20,7 +20,8 @@ void device_main() { qthing::enable_ethernet_lan8720(); - injector = new SiliconTorch::CyanBusInjector::CyanBusInjector(23, 34, 32, 33); + // injector = new SiliconTorch::CyanBusInjector::CyanBusInjector(23, 34, 32, 33); + injector = new SiliconTorch::CyanBusInjector::CyanBusInjector_ProtoPCB(); }