pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-05-11 15:40:48 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Applied trunk fmt

Browse Source
This commit is contained in:
Patrick Siegl 2025-01-13 22:16:02 +00:00
parent cc4bdc26c9
commit 2c41f639fb
2 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/platform/portduino/PortduinoGlue.cpp
View File

@ -196,7 +196,8 @@ void portduinoSetup()
// if we're using a usermode driver, we need to initialize it here, to get a serial number back for mac address // if we're using a usermode driver, we need to initialize it here, to get a serial number back for mac address
if (settingsStrings[spidev] == "ch341") { if (settingsStrings[spidev] == "ch341") {
try { try {
ch341Hal = new Ch341Hal(0, settingsStrings[lora_usb_serial_num], settingsMap[lora_usb_vid], settingsMap[lora_usb_pid]); ch341Hal =
new Ch341Hal(0, settingsStrings[lora_usb_serial_num], settingsMap[lora_usb_vid], settingsMap[lora_usb_pid]);
} catch (std::exception &e) { } catch (std::exception &e) {
std::cerr << e.what() << std::endl; std::cerr << e.what() << std::endl;
std::cerr << "Could not initialize CH341 device!" << std::endl; std::cerr << "Could not initialize CH341 device!" << std::endl;
@ -206,7 +207,7 @@ void portduinoSetup()
ch341Hal->getSerialString(serial, 8); ch341Hal->getSerialString(serial, 8);
std::cout << "Serial " << serial << std::endl; std::cout << "Serial " << serial << std::endl;
if (strlen(serial) == 8 && settingsStrings[mac_address].length() < 12) { if (strlen(serial) == 8 && settingsStrings[mac_address].length() < 12) {
uint8_t *hash = (uint8_t*)serial; uint8_t *hash = (uint8_t *)serial;
crypto->hash(hash, 8); crypto->hash(hash, 8);
char macBuf[13] = {0}; char macBuf[13] = {0};
sprintf(macBuf, "%02X%02X%02X%02X%02X%02X", ((hash[0] << 4) | 2), hash[1], hash[2], hash[3], hash[4], hash[5]); sprintf(macBuf, "%02X%02X%02X%02X%02X%02X", ((hash[0] << 4) | 2), hash[1], hash[2], hash[3], hash[4], hash[5]);

21
src/platform/portduino/USBHal.h
View File

@ -4,10 +4,10 @@
// include RadioLib // include RadioLib
#include "platform/portduino/PortduinoGlue.h" #include "platform/portduino/PortduinoGlue.h"
#include <RadioLib.h> #include <RadioLib.h>
#include <libpinedio-usb.h>
#include <unistd.h>
#include <csignal> #include <csignal>
#include <iostream> #include <iostream>
#include <libpinedio-usb.h>
#include <unistd.h>
// include the library for Raspberry GPIO pins // include the library for Raspberry GPIO pins
@ -27,7 +27,8 @@ class Ch341Hal : public RadioLibHal
{ {
public: public:
// default constructor - initializes the base HAL and any needed private members // default constructor - initializes the base HAL and any needed private members
explicit Ch341Hal(uint8_t spiChannel, std::string serial = "", uint32_t vid = 0x1A86, uint32_t pid = 0x5512, uint32_t spiSpeed = 2000000, uint8_t spiDevice = 0, uint8_t gpioDevice = 0) explicit Ch341Hal(uint8_t spiChannel, std::string serial = "", uint32_t vid = 0x1A86, uint32_t pid = 0x5512,
uint32_t spiSpeed = 2000000, uint8_t spiDevice = 0, uint8_t gpioDevice = 0)
: RadioLibHal(PI_INPUT, PI_OUTPUT, PI_LOW, PI_HIGH, PI_RISING, PI_FALLING) : RadioLibHal(PI_INPUT, PI_OUTPUT, PI_LOW, PI_HIGH, PI_RISING, PI_FALLING)
{ {
if (serial != "") { if (serial != "") {
@ -44,7 +45,7 @@ class Ch341Hal : public RadioLibHal
int32_t ret = pinedio_init(&pinedio, NULL); int32_t ret = pinedio_init(&pinedio, NULL);
if (ret != 0) { if (ret != 0) {
std::string s = "Could not open SPI: "; std::string s = "Could not open SPI: ";
throw (s + std::to_string(ret)); throw(s + std::to_string(ret));
} }
pinedio_set_option(&pinedio, PINEDIO_OPTION_AUTO_CS, 0); pinedio_set_option(&pinedio, PINEDIO_OPTION_AUTO_CS, 0);
@ -52,10 +53,7 @@ class Ch341Hal : public RadioLibHal
pinedio_set_pin_mode(&pinedio, 5, true); pinedio_set_pin_mode(&pinedio, 5, true);
} }
~Ch341Hal() ~Ch341Hal() { pinedio_deinit(&pinedio); }
{
pinedio_deinit(&pinedio);
}
void getSerialString(char *_serial, size_t len) void getSerialString(char *_serial, size_t len)
{ {
@ -110,10 +108,7 @@ class Ch341Hal : public RadioLibHal
pinedio_deattach_interrupt(&this->pinedio, (pinedio_int_pin)interruptNum); pinedio_deattach_interrupt(&this->pinedio, (pinedio_int_pin)interruptNum);
} }
void delay(unsigned long ms) override void delay(unsigned long ms) override { delayMicroseconds(ms * 1000); }
{
delayMicroseconds(ms * 1000);
}
void delayMicroseconds(unsigned long us) override void delayMicroseconds(unsigned long us) override
{ {
@ -153,7 +148,7 @@ class Ch341Hal : public RadioLibHal
{ {
int32_t ret = pinedio_transceive(&this->pinedio, out, in, len); int32_t ret = pinedio_transceive(&this->pinedio, out, in, len);
if (ret < 0) { if (ret < 0) {
std::cerr << "Could not perform SPI transfer: " << ret << std::endl;; std::cerr << "Could not perform SPI transfer: " << ret << std::endl;
} }
} }