rbxii3/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-12-23 19:20:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make SPI frequency and TOPHONE queue size configurable on Native (#4369)

Browse Source 
* Make SPI frequency configurable on Native

* Make the tophone queue size configurable for Portduino

* The modified SPISettings must be configured in setup(), after config.yaml is processed

* make MeshService a pointer, so we can configure MAX_RX_TOPHONE at run time

* Got a little over excited with refactoring

* Silence a warning
This commit is contained in:
Jonathan Bennett
2024-08-01 19:29:49 -05:00
committed by GitHub
parent 4c1c5b070e
commit d2ea430a3e
36 changed files with 110 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -97,6 +97,7 @@ void portduinoSetup()
settingsStrings[webserverrootpath] = "";
settingsStrings[spidev] = "";
settingsStrings[displayspidev] = "";
settingsMap[spiSpeed] = 2000000;
YAML::Node yamlConfig;
@@ -173,6 +174,7 @@ void portduinoSetup()
settingsMap[rxen] = yamlConfig["Lora"]["RXen"].as<int>(RADIOLIB_NC);
settingsMap[gpiochip] = yamlConfig["Lora"]["gpiochip"].as<int>(0);
settingsMap[ch341Quirk] = yamlConfig["Lora"]["ch341_quirk"].as<bool>(false);
settingsMap[spiSpeed] = yamlConfig["Lora"]["spiSpeed"].as<int>(2000000);
gpioChipName += std::to_string(settingsMap[gpiochip]);
settingsStrings[spidev] = "/dev/" + yamlConfig["Lora"]["spidev"].as<std::string>("spidev0.0");
@@ -280,6 +282,7 @@ void portduinoSetup()
}
settingsMap[maxnodes] = (yamlConfig["General"]["MaxNodes"]).as<int>(200);
settingsMap[maxtophone] = (yamlConfig["General"]["MaxMessageQueue"]).as<int>(100);
} catch (YAML::Exception &e) {
std::cout << "*** Exception " << e.what() << std::endl;

2
src/platform/portduino/PortduinoGlue.h
View File

@@ -19,6 +19,7 @@ enum configNames {
user,
gpiochip,
spidev,
spiSpeed,
i2cdev,
has_gps,
touchscreenModule,
@@ -51,6 +52,7 @@ enum configNames {
webserver,
webserverport,
webserverrootpath,
maxtophone,
maxnodes
};
enum { no_screen, x11, st7789, st7735, st7735s, st7796, ili9341, ili9488, hx8357d };

4
src/platform/portduino/SimRadio.cpp
View File

@@ -199,8 +199,8 @@ void SimRadio::startSend(meshtastic_MeshPacket *txp)
pb_encode_to_bytes(p->decoded.payload.bytes, sizeof(p->decoded.payload.bytes), &meshtastic_Compressed_msg, &c);
p->decoded.portnum = meshtastic_PortNum_SIMULATOR_APP;
service.sendQueueStatusToPhone(router->getQueueStatus(), 0, p->id);
service.sendToPhone(p); // Sending back to simulator
service->sendQueueStatusToPhone(router->getQueueStatus(), 0, p->id);
service->sendToPhone(p); // Sending back to simulator
}
void SimRadio::startReceive(meshtastic_MeshPacket *p)