forks/RadioLibSmol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NonArduino: Tock: A collection of fixes for LoRaWAN support (#1145)

Browse source
This commit is contained in:
Alistair Francis 2024-07-04 02:23:00 +10:00 • committed by GitHub
parent 71a7ebf86e
commit ace0997359
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 30 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
examples/NonArduino/Tock/libtockHal.h
View file

@ -55,6 +55,9 @@
typedef void (*gpioIrqFn)(void); typedef void (*gpioIrqFn)(void);
gpioIrqFn gpio_funcs[4] = { NULL, NULL, NULL, NULL};
uint32_t frequency = 0;
/* /*
* Get the the timer frequency in Hz. * Get the the timer frequency in Hz.
*/ */
@ -73,7 +76,7 @@ static void lora_phy_gpio_Callback (int gpioPin,
__attribute__ ((unused)) int arg3, __attribute__ ((unused)) int arg3,
void* userdata) void* userdata)
{ {
gpioIrqFn fn = *(gpioIrqFn*)(&userdata); gpioIrqFn fn = gpio_funcs[gpioPin - 1];
if (fn != NULL ) { if (fn != NULL ) {
fn(); fn();
@ -136,7 +139,8 @@ class TockHal : public RadioLibHal {
return; return;
} }
libtock_lora_phy_gpio_command_interrupt_callback(lora_phy_gpio_Callback, &interruptCb); gpio_funcs[interruptNum - 1] = interruptCb;
libtock_lora_phy_gpio_command_interrupt_callback(lora_phy_gpio_Callback, NULL);
// set GPIO as input and enable interrupts on it // set GPIO as input and enable interrupts on it
libtock_lora_phy_gpio_enable_input(interruptNum, libtock_pull_down); libtock_lora_phy_gpio_enable_input(interruptNum, libtock_pull_down);
@ -148,24 +152,43 @@ class TockHal : public RadioLibHal {
return; return;
} }
gpio_funcs[interruptNum - 1] = NULL;
libtock_lora_phy_gpio_disable_interrupt(interruptNum); libtock_lora_phy_gpio_disable_interrupt(interruptNum);
} }
void delay(unsigned long ms) override { void delay(unsigned long ms) override {
libtocksync_alarm_delay_ms( ms ); #if !defined(RADIOLIB_CLOCK_DRIFT_MS)
libtocksync_alarm_delay_ms(ms);
#else
libtocksync_alarm_delay_ms(ms * 1000 / (1000 + RADIOLIB_CLOCK_DRIFT_MS));
#endif
} }
void delayMicroseconds(unsigned long us) override { void delayMicroseconds(unsigned long us) override {
libtocksync_alarm_delay_ms( us / 1000 ); #if !defined(RADIOLIB_CLOCK_DRIFT_MS)
libtocksync_alarm_delay_ms(us / 1000);
#else
libtocksync_alarm_delay_ms((us * 1000 / (1000 + RADIOLIB_CLOCK_DRIFT_MS)) / 1000);
#endif
} }
unsigned long millis() override { unsigned long millis() override {
uint32_t frequency, now; uint32_t now;
unsigned long ms;
if (frequency == 0) {
alarm_internal_frequency(&frequency); alarm_internal_frequency(&frequency);
}
alarm_internal_read(&now); alarm_internal_read(&now);
return (now / frequency) / 1000; ms = now / (frequency / 1000);
#if !defined(RADIOLIB_CLOCK_DRIFT_MS)
return ms;
#else
return ms * 1000 / (1000 + RADIOLIB_CLOCK_DRIFT_MS);
#endif
} }
unsigned long micros() override { unsigned long micros() override {