Merge branch 'master' of https://github.com/HelTecAutomation/CubeCell…

…-Arduino
HelTecAutomation · Apr 11, 2023 · 595f02b · 595f02b
2 parents 44aacee + 64bcf01
commit 595f02b
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 17 deletions.
diff --git a/...xamples/LoRaWAN/LoRaWAN_Sensors/LoRaWan_OnBoardGPS_Air530Z/LoRaWan_OnBoardGPS_Air530Z.ino b/...xamples/LoRaWAN/LoRaWAN_Sensors/LoRaWan_OnBoardGPS_Air530Z/LoRaWan_OnBoardGPS_Air530Z.ino
@@ -98,7 +98,7 @@ void VextOFF(void) //Vext default OFF
  pinMode(Vext,OUTPUT);
  digitalWrite(Vext, HIGH);
 }
-void displayGPSInof()
+void displayGPSInfo()
 {
  char str[30];
  display.clear();
@@ -143,7 +143,7 @@ void displayGPSInof()
  display.display();
 }
 
-void printGPSInof()
+void printGPSInfo()
 {
  Serial.print("Date/Time: ");
  if (GPS.date.isValid())
@@ -243,8 +243,8 @@ static void prepareTxFrame( uint8_t port )
  if( (millis()-start) > printinfo )
  {
  printinfo += 1000;
- printGPSInof();
- displayGPSInof();
+ printGPSInfo();
+ displayGPSInfo();
  }
  }
  }

diff --git a/libraries/LoraWan102/src/radio/radio.c b/libraries/LoraWan102/src/radio/radio.c
@@ -1158,22 +1158,24 @@ void RadioIrqProcess( void )
 
  if( ( irqRegs & IRQ_RX_DONE ) == IRQ_RX_DONE )
  {
- //printf("rx done\r\n");
- uint8_t size;
- TimerStop( &RxTimeoutTimer );
- SX126xGetPayload( RadioRxPayload, &size , 255 );
- SX126xGetPacketStatus( &RadioPktStatus );
- if( ( RadioEvents != NULL ) && ( RadioEvents->RxDone != NULL ) && ( irqRegs & IRQ_CRC_ERROR ) != IRQ_CRC_ERROR)
+ if( ( irqRegs & IRQ_CRC_ERROR ) == IRQ_CRC_ERROR )
  {
- RadioEvents->RxDone( RadioRxPayload, size, RadioPktStatus.Params.LoRa.RssiPkt, RadioPktStatus.Params.LoRa.SnrPkt );
+ if( ( RadioEvents != NULL ) && ( RadioEvents->RxError ) )
+ {
+ RadioEvents->RxError( );
+ }
  }
- }
-
- if( ( irqRegs & IRQ_CRC_ERROR ) == IRQ_CRC_ERROR )
- {
- if( ( RadioEvents != NULL ) && ( RadioEvents->RxError ) )
+ else
  {
- RadioEvents->RxError( );
+ //printf("rx done\r\n");
+ uint8_t size;
+ TimerStop( &RxTimeoutTimer );
+ SX126xGetPayload( RadioRxPayload, &size , 255 );
+ SX126xGetPacketStatus( &RadioPktStatus );
+ if( ( RadioEvents != NULL ) && ( RadioEvents->RxDone != NULL ) && ( irqRegs & IRQ_CRC_ERROR ) != IRQ_CRC_ERROR)
+ {
+ RadioEvents->RxDone( RadioRxPayload, size, RadioPktStatus.Params.LoRa.RssiPkt, RadioPktStatus.Params.LoRa.SnrPkt );
+ }
  }
  }