diff --git a/include/loraprs_service.h b/include/loraprs_service.h index bf76a5b..f92744b 100644 --- a/include/loraprs_service.h +++ b/include/loraprs_service.h @@ -119,7 +119,7 @@ private: } __attribute__((packed)); private: - const String CfgLoraprsVersion = "LoRAPRS 1.0.7"; + const String CfgLoraprsVersion = "LoRAPRS 1.0.8"; // processor config const int CfgConnRetryMs = 500; // connection retry delay, e.g. wifi diff --git a/src/loraprs_service.cpp b/src/loraprs_service.cpp index 09e48d6..495d182 100644 --- a/src/loraprs_service.cpp +++ b/src/loraprs_service.cpp @@ -326,8 +326,7 @@ ICACHE_RAM_ATTR void Service::onRigIsrRxPacket() { BaseType_t xHigherPriorityTaskWoken; if (rigIsRxIsrEnabled_) { rigIsRxActive_ = true; - uint32_t radioReceiveBit = RadioTaskBits::Receive; - xTaskNotifyFromISR(rigTaskHandle_, radioReceiveBit, eSetBits, &xHigherPriorityTaskWoken); + xTaskNotifyFromISR(rigTaskHandle_, RadioTaskBits::Receive, eSetBits, &xHigherPriorityTaskWoken); } } @@ -337,10 +336,10 @@ void Service::rigTask(void *self) { uint32_t commandBits = 0; xTaskNotifyWaitIndexed(0, 0x00, ULONG_MAX, &commandBits, portMAX_DELAY); if (commandBits & RadioTaskBits::Receive) { - ((Service*)self)->onRigTaskRxPacket(); + static_cast(self)->onRigTaskRxPacket(); } else if (commandBits & RadioTaskBits::Transmit) { - ((Service*)self)->onRigTaskTxPacket(); + static_cast(self)->onRigTaskTxPacket(); } } } @@ -471,7 +470,7 @@ void Service::sendSignalReportEvent(int rssi, float snr) bool Service::sendModemTelemetryTimer(void *param) { - ((Service *)param)->sendModemTelemetry(); + static_cast(param)->sendModemTelemetry(); return true; } @@ -536,7 +535,7 @@ void Service::performFrequencyCorrection() { } void Service::setFreq(long loraFreq) const { - rig_->setFrequency((float)config_.LoraFreqRx / 1e6); + rig_->setFrequency((float)loraFreq / 1e6); int state = rig_->startReceive(); if (state != RADIOLIB_ERR_NONE) { LOG_ERROR("Start receive error:", state);