Add support to X-NUCLEO-S2915A1 and improve stability

Author: cparata

src/S2LP.cpp

@@ -55,12 +55,6 @@
 
 #define LINEAR_FIFO_ADDRESS		0xFF  /*!< Linear FIFO address*/
 
-#define XTAL_FREQUENCY          50000000U
-
-#define PREAMBLE_LENGTH (64*4)
-#define DATARATE 38400
-#define MIN_PERIOD_WAKEUP ((8000*((PREAMBLE_LENGTH/4)-2))/DATARATE)
-
 /* Class Implementation ------------------------------------------------------*/
 
 /** Constructor
@@ -89,7 +83,6 @@ S2LP::S2LP(SPIClass *spi, int csn, int sdn, int irqn, uint32_t frequency, uint32
   memset((void *)vectcTxBuff, 0, FIFO_SIZE*sizeof(uint8_t));
   cRxData = 0;
   is_waiting_for_read = false;
-  is_tx_done_before_read = false;
   is_bypass_enabled = false;
 }
 
@@ -125,7 +118,7 @@ void S2LP::begin(void)
   SRadioInit xRadioInit = {
     lFrequencyBase, /* base carrier frequency */
     MOD_2FSK,       /* modulation type */
-    DATARATE,       /* data rate */
+    38400,          /* data rate */
     20000,          /* frequency deviation */
     100000          /* bandwidth */
   };
@@ -161,7 +154,7 @@ void S2LP::begin(void)
   S2LPRadioSetPALevelMaxIndex(7);
 
   PktBasicInit xBasicInit={
-    PREAMBLE_LENGTH,    /* Preamble length */
+    16,                 /* Preamble length */
     32,                 /* Sync length */
     0x88888888,         /* Sync word */
     S_ENABLE,           /* Variable length */
@@ -186,7 +179,7 @@ void S2LP::begin(void)
   S2LPPktBasicAddressesInit(&xAddressInit);
 
   SCsmaInit xCsmaInit={
-    S_DISABLE,          /* Persistent mode enable/disable */
+    S_ENABLE,           /* Persistent mode enable/disable */
     CSMA_PERIOD_64TBIT, /* CS Period */
     3,                  /* CS Timeout */
     5,                  /* Max number of backoffs */
@@ -215,26 +208,15 @@ void S2LP::begin(void)
   S2LPGpioIrqConfig(RX_DATA_READY,S_ENABLE);
   S2LPGpioIrqConfig(TX_DATA_SENT , S_ENABLE);
 
-  /* IRQ registers blanking */
-  S2LPGpioIrqClearStatus();
-
   /* clear FIFO if needed */
   S2LPCmdStrobeFlushRxFifo();
 
-  /* set the LDC mode wkup */
-  S2LPTimerSetWakeUpTimerUs(1000*MIN_PERIOD_WAKEUP);
+  /* Set infinite Timeout */
+  S2LPTimerSetRxTimerCounter(0);
+  S2LPTimerSetRxTimerStopCondition(ANY_ABOVE_THRESHOLD);
 
-  /* set the rx timeout */
-  S2LPTimerSetRxTimerUs(30000);
-
-  /* use SLEEP_A mode (default) */
-  S2LPTimerSleepB(S_DISABLE);
-
-  /* enable LDC mode, FAST RX TERM and start Rx */
-  S2LPTimerLdcrMode(S_ENABLE);
-
-  /* enable the fast rx timer */
-  S2LpTimerFastRxTermTimer(S_ENABLE);
+  /* IRQ registers blanking */
+  S2LPGpioIrqClearStatus();
 
   uint8_t tmp = 0x90;
   S2LPSpiWriteRegisters(0x76, 1, &tmp);
@@ -293,7 +275,6 @@ void S2LP::end(void)
   memset((void *)vectcTxBuff, 0, FIFO_SIZE*sizeof(uint8_t));
   cRxData = 0;
   is_waiting_for_read = false;
-  is_tx_done_before_read = false;
   is_bypass_enabled = false;
 }
 
@@ -335,10 +316,6 @@ uint8_t S2LP::send(uint8_t *payload, uint8_t payload_len, uint8_t dest_addr, boo
     return 1;
   }
 
-  /* Disable LDC */
-  S2LPTimerLdcrMode(S_DISABLE);
-  S2LpTimerFastRxTermTimer(S_DISABLE);
-
   S2LPPktBasicSetPayloadLength(payload_len);
 
   S2LPSetRxSourceReferenceAddress(dest_addr);
@@ -383,14 +360,7 @@ uint8_t S2LP::send(uint8_t *payload, uint8_t payload_len, uint8_t dest_addr, boo
     S2LPCsma(S_DISABLE);
   }
 
-  /* Enable LDC */
-  S2LPTimerLdcrMode(S_ENABLE);
-  S2LpTimerFastRxTermTimer(S_ENABLE);
-
-  if(is_waiting_for_read)
-  {
-    is_tx_done_before_read = true;
-  } else
+  if(!is_waiting_for_read)
   {
     uint8_t tmp = 0x90;
     S2LPSpiWriteRegisters(0x76, 1, &tmp);
@@ -454,37 +424,64 @@ uint8_t S2LP::read(uint8_t *payload, uint8_t payload_len)
 
   is_waiting_for_read = false;
 
-  if(is_tx_done_before_read)
-  {
-    is_tx_done_before_read = false;
-    uint8_t tmp = 0x90;
-    S2LPSpiWriteRegisters(0x76, 1, &tmp);
-
-    if(s_paInfo.paRfRangeExtender == RANGE_EXT_SKYWORKS_SKY66420)
-    {
-      FEM_Operation_SKY66420(FEM_RX);
-    }
+  uint8_t tmp = 0x90;
+  S2LPSpiWriteRegisters(0x76, 1, &tmp);
 
-    /* Return to RX state */
-    S2LPCmdStrobeCommand(CMD_RX);
-  } else
+  if(s_paInfo.paRfRangeExtender == RANGE_EXT_SKYWORKS_SKY66420)
   {
-    /* Return to Sleep state */
-    S2LPCmdStrobeCommand(CMD_SLEEP);
-
-    if(S2LPManagementGetCut()==S2LP_CUT_2_0)
-    {
-      /* apply the workaround to exit from SLEEP (2nd part) */
-      delay(6);
-      S2LPTimerLdcIrqWa(S_DISABLE);
-    }
+    FEM_Operation_SKY66420(FEM_RX);
   }
 
+  /* Return to RX state */
+  S2LPCmdStrobeCommand(CMD_RX);
+
   enableS2LPIrq();
 
   return ret_val;
 }
 
+/**
+* @brief  Sets the channel number.
+* @param  cChannel the channel number.
+* @retval None.
+*/
+void S2LP::setRadioChannel(uint8_t cChannel)
+{
+  return S2LPRadioSetChannel(cChannel);
+}
+
+/**
+* @brief  Returns the actual channel number.
+* @param  None.
+* @retval uint8_t Actual channel number.
+*/
+uint8_t S2LP::getRadioChannel(void)
+{
+  return S2LPRadioGetChannel();
+}
+
+/**
+* @brief  Set the channel space factor in channel space register.
+*         The channel spacing step is computed as F_Xo/32768.
+* @param  fChannelSpace the channel space expressed in Hz.
+* @retval None.
+*/
+void S2LP::setRadioChannelSpace(uint32_t lChannelSpace)
+{
+  return S2LPRadioSetChannelSpace(lChannelSpace);
+}
+
+/**
+* @brief  Return the channel space register.
+* @param  None.
+* @retval uint32_t Channel space. The channel space is: CS = channel_space_factor x XtalFrequency/2^15
+*         where channel_space_factor is the CHSPACE register value.
+*/
+uint32_t S2LP::getRadioChannelSpace(void)
+{
+  return S2LPRadioGetChannelSpace();
+}
+
 /**
 * @brief  Set the Ready state.
 * @param  None.
@@ -496,22 +493,14 @@ uint8_t S2LP::S2LPSetReadyState(void)
   uint32_t start_time;
   uint32_t current_time;
 
+  S2LPCmdStrobeCommand(CMD_SABORT);
+
   start_time = millis();
 
   do
   {
     S2LPRefreshStatus();
 
-    if(g_xStatus.MC_STATE == MC_STATE_RX || g_xStatus.MC_STATE == MC_STATE_TX)
-    {
-      S2LPCmdStrobeCommand(CMD_SABORT);
-    } else
-    {
-      S2LPCmdStrobeCommand(CMD_READY);
-    }
-
-    S2LPRefreshStatus();
-
     current_time = millis();
   } while(g_xStatus.MC_STATE != MC_STATE_READY && (current_time - start_time) <= 1000);
 
@@ -554,11 +543,6 @@ void S2LP::S2LPIrqHandler(void)
   /* Check the S2LP RX_DATA_READY IRQ flag */
   if(xIrqStatus.IRQ_RX_DATA_READY)
   {
-    if(S2LPManagementGetCut()==S2LP_CUT_2_0)
-    {/* apply the workaround to exit from SLEEP (1st part) */
-      S2LPTimerLdcIrqWa(S_ENABLE);
-    }
-
     /* Get the RX FIFO size */
     cRxData = S2LPFifoReadNumberBytesRxFifo();
 

src/S2LP.h

@@ -109,6 +109,10 @@ class S2LP
     uint8_t send(uint8_t *payload, uint8_t payload_len, uint8_t dest_addr, bool use_csma_ca = true);
     uint8_t getRecvPayloadLen(void);
     uint8_t read(uint8_t *payload, uint8_t payload_len);
+    void setRadioChannel(uint8_t cChannel);
+    uint8_t getRadioChannel(void);
+    void setRadioChannelSpace(uint32_t lChannelSpace);
+    uint32_t getRadioChannelSpace(void);
 
   protected:
     uint8_t S2LPSetReadyState(void);
@@ -371,8 +375,7 @@ class S2LP
     uint8_t vectcTxBuff[FIFO_SIZE];
     uint8_t cRxData;
     volatile bool is_waiting_for_read;
-    volatile bool is_tx_done_before_read;
-	bool is_bypass_enabled;
+    bool is_bypass_enabled;
 };
 
 #endif /* __S2LP_H__ */