From aa176b6593c8be4ba462155f1bc4b2170b1042cf Mon Sep 17 00:00:00 2001 From: Kevin Hester Date: Sat, 2 Jan 2021 12:38:18 +0800 Subject: [PATCH] portuino now kinda works with the pinetab lora USB module. still need to add an AEX256 impl for the linux port and optimize a bit --- platformio.ini | 2 +- src/configuration.h | 2 +- src/mesh/RF95Interface.h | 3 ++ src/portduino/PortduinoGlue.cpp | 50 +++++++++++++++++++++++++++++++-- 4 files changed, 53 insertions(+), 4 deletions(-) diff --git a/platformio.ini b/platformio.ini index 78da2c6e1..5be5ac571 100644 --- a/platformio.ini +++ b/platformio.ini @@ -65,7 +65,7 @@ lib_deps = 1202 ; CRC32, explicitly needed because dependency is missing in the ble ota update lib https://github.com/meshtastic/arduino-fsm.git#2f106146071fc7bc620e1e8d4b88dc4e0266ce39 https://github.com/meshtastic/SparkFun_Ublox_Arduino_Library.git#31015a55e630a2df77d9d714669c621a5bf355ad - https://github.com/meshtastic/RadioLib.git#8657380241bce681c33aab46598bbf13b11f876c + https://github.com/meshtastic/RadioLib.git#07de964e929238949035fb0d5887026a3058df1a https://github.com/meshtastic/TinyGPSPlus.git#9c1d584d2469523381e077b0b9c1bf868d6c0206 https://github.com/meshtastic/AXP202X_Library.git#8404abb6d4b486748636bc6ad72d2a47baaf5460 Wire ; explicitly needed here because the AXP202 library forgets to add it diff --git a/src/configuration.h b/src/configuration.h index dda2b8d0b..460e1a245 100644 --- a/src/configuration.h +++ b/src/configuration.h @@ -365,7 +365,7 @@ along with this program. If not, see . #define USE_RF95 #define LORA_DIO0 26 // a No connect on the SX1262 module -#define LORA_RESET 23 +#define LORA_RESET RADIOLIB_NC #define LORA_DIO1 33 // Not really used #define LORA_DIO2 32 // Not really used diff --git a/src/mesh/RF95Interface.h b/src/mesh/RF95Interface.h index 91f5728c5..ebebe3c79 100644 --- a/src/mesh/RF95Interface.h +++ b/src/mesh/RF95Interface.h @@ -14,6 +14,9 @@ class RF95Interface : public RadioLibInterface public: RF95Interface(RADIOLIB_PIN_TYPE cs, RADIOLIB_PIN_TYPE irq, RADIOLIB_PIN_TYPE rst, SPIClass &spi); + /// Some boards (Pinetab Lora module) have broken IRQ wires, so we need to poll via i2c registers + bool isIRQPending() { return lora->getPendingIRQ(); } + /// Initialise the Driver transport hardware and software. /// Make sure the Driver is properly configured before calling init(). /// \return true if initialisation succeeded. diff --git a/src/portduino/PortduinoGlue.cpp b/src/portduino/PortduinoGlue.cpp index ce63f8dc4..00513843f 100644 --- a/src/portduino/PortduinoGlue.cpp +++ b/src/portduino/PortduinoGlue.cpp @@ -37,6 +37,52 @@ CryptoEngine *crypto = new CryptoEngine(); void updateBatteryLevel(uint8_t level) NOT_IMPLEMENTED("updateBatteryLevel"); +#include +#include "mesh/RF95Interface.h" + +/** Dear pinetab hardware geeks! + * + * The current pinetab lora module has a slight bug. The ch341 part only provides ISR assertions on edges. + * This makes sense because USB interrupts happen through fast/repeated special irq urbs that are constantly + * chattering on the USB bus. + * + * But this isn't sufficient for level triggered ISR sources like the sx127x radios. The common way that seems to + * be addressed by cs341 users is to **always** connect the INT# (pin 26 on the ch341f) signal to one of the GPIO signals + * on the part. I'd recommend connecting that LORA_DIO0/INT# line to pin 19 (data 4) on the pinetab board. This would + * provide an efficent mechanism so that the (kernel) code in the cs341 driver that I've slightly hacked up to see the + * current state of LORA_DIO0. Without that access, I can't know if the interrupt is still pending - which would create + * race conditions in packet handling. + * + * My workaround is to poll the status register internally to the sx127x. Which is expensive because it involves a number of + * i2c transactions and many trips back and forth between kernel and my userspace app. I think shipping the current version + * of the pinetab lora device would be fine because I can poll slowly (because lora is slow). But if you ever have cause to + * rev this board. I highly encourage this small change. + * + * Btw - your little "USB lora dongle" is really neat. I encourage you to sell it, because even non pinetab customers could + * use it to easily add lora to rasberry pi, desktop pcs etc... + * + * Porduino helper class to do this i2c based polling: + */ +class R595PolledIrqPin : public GPIOPin { +public: + R595PolledIrqPin() : GPIOPin(LORA_DIO0, "LORA_DIO0") {} + + /// Read the low level hardware for this pin + virtual PinStatus readPinHardware() + { + if(isrPinStatus < 0) + return LOW; // No interrupt handler attached, don't bother polling i2c right now + else { + extern RadioInterface *rIf; // FIXME, temporary hack until we know if we need to keep this + + assert(rIf); + RF95Interface *rIf95 = static_cast(rIf); + bool p = rIf95->isIRQPending(); + // log(SysGPIO, LogDebug, "R595PolledIrqPin::readPinHardware(%s, %d, %d)", getName(), getPinNum(), p); + return p ? HIGH : LOW; + } + } +}; /** apps run under portduino can optionally define a portduinoSetup() to @@ -45,7 +91,7 @@ void updateBatteryLevel(uint8_t level) NOT_IMPLEMENTED("updateBatteryLevel"); */ void portduinoSetup() { printf("Setting up Meshtastic on Porduino...\n"); - gpioBind((new SimGPIOPin(LORA_DIO0, "LORA_DIO0"))); - gpioBind((new SimGPIOPin(LORA_RESET, "LORA_RESET"))); + gpioBind(new R595PolledIrqPin()); + // gpioBind((new SimGPIOPin(LORA_RESET, "LORA_RESET"))); gpioBind((new SimGPIOPin(RF95_NSS, "RF95_NSS"))->setSilent()); }