Add support to X-NUCLEO-S2915A1

Author: cparata

library.properties

@@ -1,5 +1,5 @@
 name=STM32duino S2-LP
-version=1.0.1
+version=1.1.0
 author=SRA
 maintainer=stm32duino
 sentence=This library includes drivers for ST S2-LP sub-1GHz transceiver.

src/S2LP.cpp

@@ -90,6 +90,7 @@ S2LP::S2LP(SPIClass *spi, int csn, int sdn, int irqn, uint32_t frequency, uint32
   cRxData = 0;
   is_waiting_for_read = false;
   is_tx_done_before_read = false;
+  is_bypass_enabled = false;
 }
 
 /**
@@ -146,9 +147,14 @@ void S2LP::begin(void)
 
     if(s_paInfo.paRfRangeExtender == RANGE_EXT_SKYWORKS_SE2435L)
     {
-      S2LPGpioInit(&s_paInfo.paSignalCSD);
-      S2LPGpioInit(&s_paInfo.paSignalCPS);
-      S2LPGpioInit(&s_paInfo.paSignalCTX);
+      S2LPGpioInit(&s_paInfo.paSignalCSD_S2LP);
+      S2LPGpioInit(&s_paInfo.paSignalCPS_S2LP);
+      S2LPGpioInit(&s_paInfo.paSignalCTX_S2LP);
+    } else if(s_paInfo.paRfRangeExtender == RANGE_EXT_SKYWORKS_SKY66420)
+    {
+      pinMode(s_paInfo.paSignalCSD_MCU, OUTPUT);
+      pinMode(s_paInfo.paSignalCPS_MCU, OUTPUT);
+      pinMode(s_paInfo.paSignalCTX_MCU, OUTPUT);
     }
   }
 
@@ -230,6 +236,14 @@ void S2LP::begin(void)
   /* enable the fast rx timer */
   S2LpTimerFastRxTermTimer(S_ENABLE);
 
+  uint8_t tmp = 0x90;
+  S2LPSpiWriteRegisters(0x76, 1, &tmp);
+
+  if(s_paInfo.paRfRangeExtender == RANGE_EXT_SKYWORKS_SKY66420)
+  {
+    FEM_Operation_SKY66420(FEM_RX);
+  }
+
   /* the RX command triggers the LDC in fast RX termination mode */
   S2LPCmdStrobeCommand(CMD_RX);
 
@@ -261,6 +275,14 @@ void S2LP::end(void)
   /* Reset SDN pin */
   pinMode(sdn_pin, INPUT);
 
+  /* Reset CSD, CPS and CTX if it is needed */
+  if(s_paInfo.paRfRangeExtender == RANGE_EXT_SKYWORKS_SKY66420)
+  {
+    pinMode(s_paInfo.paSignalCSD_MCU, INPUT);
+    pinMode(s_paInfo.paSignalCPS_MCU, INPUT);
+    pinMode(s_paInfo.paSignalCTX_MCU, INPUT);
+  }
+
   /* Reset all internal variables */  
   memset((void *)&g_xStatus, 0, sizeof(S2LPStatus));
   s_cWMbusSubmode = WMBUS_SUBMODE_NOT_CONFIGURED;
@@ -272,6 +294,7 @@ void S2LP::end(void)
   cRxData = 0;
   is_waiting_for_read = false;
   is_tx_done_before_read = false;
+  is_bypass_enabled = false;
 }
 
 /**
@@ -337,6 +360,14 @@ uint8_t S2LP::send(uint8_t *payload, uint8_t payload_len, uint8_t dest_addr, boo
 
   enableS2LPIrq();
 
+  uint8_t tmp=0x9C;
+  S2LPSpiWriteRegisters(0x76,1,&tmp);
+
+  if(s_paInfo.paRfRangeExtender == RANGE_EXT_SKYWORKS_SKY66420)
+  {
+    FEM_Operation_SKY66420(FEM_TX);
+  }
+
   S2LPCmdStrobeCommand(CMD_TX);
 
   start_time = millis();
@@ -361,6 +392,14 @@ uint8_t S2LP::send(uint8_t *payload, uint8_t payload_len, uint8_t dest_addr, boo
     is_tx_done_before_read = true;
   } else
   {
+    uint8_t tmp = 0x90;
+    S2LPSpiWriteRegisters(0x76, 1, &tmp);
+
+    if(s_paInfo.paRfRangeExtender == RANGE_EXT_SKYWORKS_SKY66420)
+    {
+      FEM_Operation_SKY66420(FEM_RX);
+    }
+
     /* Return to RX state */
     S2LPCmdStrobeCommand(CMD_RX);
   }
@@ -418,6 +457,13 @@ uint8_t S2LP::read(uint8_t *payload, uint8_t payload_len)
   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);
+    }
 
     /* Return to RX state */
     S2LPCmdStrobeCommand(CMD_RX);
@@ -560,6 +606,79 @@ void S2LP::enableS2LPIrq(void)
   }
 }
 
+/**
+* @brief  Commands for external PA of type SKY66420.
+* @param  operation the command to be executed.
+* @retval None.
+*/
+void S2LP::FEM_Operation_SKY66420(FEM_OperationType operation)
+{
+  switch (operation)
+  {
+    case FEM_SHUTDOWN:
+    {
+      /* Puts CSD high to turn on PA */
+      digitalWrite(s_paInfo.paSignalCSD_MCU, LOW);
+
+      /* Puts CTX high to go in TX state DON'T CARE */
+      digitalWrite(s_paInfo.paSignalCTX_MCU, HIGH);
+
+      /* No Bypass mode select DON'T CARE */
+      digitalWrite(s_paInfo.paSignalCPS_MCU, HIGH);
+
+      break;
+    }
+    case FEM_TX_BYPASS:
+    {
+      /* Puts CSD high to turn on PA */
+      digitalWrite(s_paInfo.paSignalCSD_MCU, HIGH);
+
+      /* Puts CTX high to go in TX state */
+      digitalWrite(s_paInfo.paSignalCTX_MCU, HIGH);
+
+      /* Bypass mode select */
+      digitalWrite(s_paInfo.paSignalCPS_MCU, LOW);
+
+      break;
+    }
+    case FEM_TX:
+    {
+      /* Puts CSD high to turn on PA */
+      digitalWrite(s_paInfo.paSignalCSD_MCU, HIGH);
+
+      /* Puts CTX high to go in TX state */
+      digitalWrite(s_paInfo.paSignalCTX_MCU, HIGH);
+
+      /* No Bypass mode select DON'T CARE */
+      digitalWrite(s_paInfo.paSignalCPS_MCU, HIGH);
+
+      break;
+    }
+    case FEM_RX:
+    {
+      /* Puts CSD high to turn on PA */
+      digitalWrite(s_paInfo.paSignalCSD_MCU, HIGH);
+
+      /* Puts CTX low */
+      digitalWrite(s_paInfo.paSignalCTX_MCU, LOW);
+
+      /* Check Bypass mode */
+      if (is_bypass_enabled)
+      {
+        digitalWrite(s_paInfo.paSignalCPS_MCU, LOW);
+      } else
+      {
+        digitalWrite(s_paInfo.paSignalCPS_MCU, HIGH);
+      }
+
+      break;
+    }
+    default:
+      /* Error */
+      break;
+  }
+}
+
 /**
 * @brief  Write single or multiple registers.
 * @param  cRegAddress: base register's address to be write

src/S2LP.h

@@ -85,9 +85,12 @@ typedef void (*S2LPEventHandler)(void);
 
 typedef struct PAInfo_s {
   RangeExtType paRfRangeExtender;
-  SGpioInit paSignalCSD;
-  SGpioInit paSignalCPS;
-  SGpioInit paSignalCTX;
+  SGpioInit paSignalCSD_S2LP;
+  SGpioInit paSignalCPS_S2LP;
+  SGpioInit paSignalCTX_S2LP;
+  int paSignalCSD_MCU;
+  int paSignalCPS_MCU;
+  int paSignalCTX_MCU;
   uint8_t paLevelValue;
 } PAInfo_t;
 
@@ -99,7 +102,7 @@ typedef struct PAInfo_s {
 class S2LP
 {
   public:
-    S2LP(SPIClass *spi, int csn, int sdn, int irqn, uint32_t frequency=868000000, uint32_t xtalFrequency=50000000, PAInfo_t paInfo={.paRfRangeExtender=RANGE_EXT_NONE, .paSignalCSD={S2LP_GPIO_0, S2LP_GPIO_MODE_DIGITAL_OUTPUT_LP, S2LP_GPIO_DIG_OUT_TX_RX_MODE}, .paSignalCPS={S2LP_GPIO_1, S2LP_GPIO_MODE_DIGITAL_OUTPUT_LP, S2LP_GPIO_DIG_OUT_RX_STATE}, .paSignalCTX={S2LP_GPIO_2, S2LP_GPIO_MODE_DIGITAL_OUTPUT_LP, S2LP_GPIO_DIG_OUT_TX_STATE}, .paLevelValue=0x25}, S2LPGpioPin irq_gpio=S2LP_GPIO_3, uint8_t my_addr=0x44, uint8_t multicast_addr=0xEE, uint8_t broadcast_addr=0xFF);
+    S2LP(SPIClass *spi, int csn, int sdn, int irqn, uint32_t frequency=868000000, uint32_t xtalFrequency=50000000, PAInfo_t paInfo={.paRfRangeExtender=RANGE_EXT_NONE, .paSignalCSD_S2LP={S2LP_GPIO_0, S2LP_GPIO_MODE_DIGITAL_OUTPUT_LP, S2LP_GPIO_DIG_OUT_TX_RX_MODE}, .paSignalCPS_S2LP={S2LP_GPIO_1, S2LP_GPIO_MODE_DIGITAL_OUTPUT_LP, S2LP_GPIO_DIG_OUT_RX_STATE}, .paSignalCTX_S2LP={S2LP_GPIO_2, S2LP_GPIO_MODE_DIGITAL_OUTPUT_LP, S2LP_GPIO_DIG_OUT_TX_STATE}, .paSignalCSD_MCU=A0, .paSignalCPS_MCU=A2, .paSignalCTX_MCU=A3, .paLevelValue=0x25}, S2LPGpioPin irq_gpio=S2LP_GPIO_3, uint8_t my_addr=0x44, uint8_t multicast_addr=0xEE, uint8_t broadcast_addr=0xFF);
     void begin(void);
     void end(void);
     void attachS2LPReceive(S2LPEventHandler func);
@@ -114,6 +117,7 @@ class S2LP
     void S2LPIrqHandler(void);
     void disableS2LPIrq(void);
     void enableS2LPIrq(void);
+    void FEM_Operation_SKY66420(FEM_OperationType operation);
     S2LPStatus S2LPSpiWriteRegisters(uint8_t cRegAddress, uint8_t cNbBytes, uint8_t* pcBuffer);
     S2LPStatus S2LPSpiReadRegisters(uint8_t cRegAddress, uint8_t cNbBytes, uint8_t* pcBuffer);
     S2LPStatus S2LPSpiCommandStrobes(uint8_t cCommandCode);
@@ -368,6 +372,7 @@ class S2LP
     uint8_t cRxData;
     volatile bool is_waiting_for_read;
     volatile bool is_tx_done_before_read;
+	bool is_bypass_enabled;
 };
 
 #endif /* __S2LP_H__ */

src/S2LP_Commands.h

@@ -110,24 +110,6 @@ typedef enum
  * @{
  */
 
-/**
- * @brief  Sends the TX command to S2-LP. Start to transmit.
- * @param  None.
- * @retval None.
- * @note: this macro sets the SMPS switching frequency to 5.46MHz about for ETSI regulation compliancy.
- */
-#define S2LPCmdStrobeTx()         {uint8_t tmp=0x9C; S2LPSpiWriteRegisters(0x76,1,&tmp);\
-                                        S2LPCmdStrobeCommand(CMD_TX);}
-
-/**
- * @brief  Sends the RX command to S2-LP. Start to receive.
- * @param  None.
- * @retval None.
- * @note: this macro sets the SMPS switching frequency to 3.12MHz.
- */
-#define S2LPCmdStrobeRx()         {uint8_t tmp=0x90; S2LPSpiWriteRegisters(0x76,1,&tmp);\
-                                    S2LPCmdStrobeCommand(CMD_RX);}
-
 #define S2LPCmdStrobeReady()      S2LPCmdStrobeCommand(CMD_READY)
 #define S2LPCmdStrobeStandby()    S2LPCmdStrobeCommand(CMD_STANDBY)
 #define S2LPCmdStrobeSleep()      S2LPCmdStrobeCommand(CMD_SLEEP)

src/S2LP_Types.h

@@ -150,6 +150,17 @@ typedef enum
   S2LP_CUT_3_0 = 0xC1,
 } S2LPCutType;
 
+/**
+ * @brief FEM Operation type. This definition represents the structure to manage External PA.
+ */
+typedef enum
+{
+  FEM_SHUTDOWN	= 0x00,
+  FEM_TX_BYPASS	= 0x01,
+  FEM_TX		= 0x02,
+  FEM_RX		= 0x03,
+} FEM_OperationType;
+
 
 /**
  * @}