Revision 11:9d7409ebfa57, committed 2017-08-18

Comitter:

bcostm

Date:

Fri Aug 18 07:45:44 2017 +0000

Parent:

10:f84959c2e044

Commit message:

Update libraries

Changed in this revision

diff -r f84959c2e044 -r 9d7409ebfa57 PinMap.h
--- a/PinMap.h	Tue Jun 06 12:21:21 2017 +0000
+++ b/PinMap.h	Fri Aug 18 07:45:44 2017 +0000
@@ -9,19 +9,12 @@
 #ifdef TARGET_NUCLEO_L476RG
  #define FEATURE_LORA   1
 #elif TARGET_DISCO_L072CZ_LRWAN1
- #define FEATURE_LORA   1
- #define B_L072Z_LRWAN1_LORA    1 // the STM Lora Board
+#define FEATURE_LORA   1
 #endif
 
 
 
-#if  defined(TARGET_STM32L0)
-
-#ifdef B_L072Z_LRWAN1_LORA      // B-L072Z-LRWAN1 LoRa Board using the Murta SX1276
-#define USER_BUTTON     PB_2    // Red not PC13 as used on the Nucleo
-#define LED2            PA_5    // Green
-#define LED3            PB_6    // Blue
-#define LED4            PB_7    // Red
+#if defined(TARGET_DISCO_L072CZ_LRWAN1)
 
 #define LORA_SPI_MOSI   PA_7
 #define LORA_SPI_MISO   PA_6
@@ -31,14 +24,13 @@
 #define LORA_DIO0       PB_4
 #define LORA_DIO1       PB_1
 #define LORA_DIO2       PB_0
-#define LORA_DIO3       (PinName)0x2D //PC_13
+#define LORA_DIO3       PC_13
 #define LORA_DIO4       PA_5
 #define LORA_DIO5       PA_4
 #define LORA_ANT_RX     PA_1
 #define LORA_ANT_TX     PC_2
 #define LORA_ANT_BOOST  PC_1
 #define LORA_TCXO       PA_12   // 32 MHz
-#endif // B_L072Z_LRWAN1_LORA
 
 
 
@@ -56,4 +48,4 @@
 #define LORA_DIO4       PH_0    // ????
 #define LORA_DIO5       NC      // unused?
 
-#endif
\ No newline at end of file
+#endif

diff -r f84959c2e044 -r 9d7409ebfa57 SX1276GenericLib.lib
--- a/SX1276GenericLib.lib	Tue Jun 06 12:21:21 2017 +0000
+++ b/SX1276GenericLib.lib	Fri Aug 18 07:45:44 2017 +0000
@@ -1,1 +1,1 @@
-http://developer.mbed.org/users/Helmut64/code/SX1276GenericLib/#835c5e20834e
+http://developer.mbed.org/users/Helmut64/code/SX1276GenericLib/#49d19df5bbce

diff -r f84959c2e044 -r 9d7409ebfa57 SX1276GenericPingPong/GenericPingPong.cpp
--- a/SX1276GenericPingPong/GenericPingPong.cpp	Tue Jun 06 12:21:21 2017 +0000
+++ b/SX1276GenericPingPong/GenericPingPong.cpp	Fri Aug 18 07:45:44 2017 +0000
@@ -101,7 +101,7 @@
 {
 #if( defined ( TARGET_KL25Z ) || defined ( TARGET_LPC11U6X ) )
     DigitalOut *led = new DigitalOut(LED2);
-#elif defined(TARGET_NUCLEO_L073RZ)
+#elif defined(TARGET_NUCLEO_L073RZ) || defined(TARGET_DISCO_L072CZ_LRWAN1)
     DigitalOut *led = new DigitalOut(LED4);   // RX red
     led3 = new DigitalOut(LED3);  // TX blue
 #else
@@ -365,7 +365,7 @@
     }
 }
 
-void OnTxDone(void *radio)
+void OnTxDone(void *radio, void *userThisPtr, void *userData)
 {
     Radio->Sleep( );
     State = TX;
@@ -373,7 +373,7 @@
         dprintf("> OnTxDone");
 }
 
-void OnRxDone(void *radio, uint8_t *payload, uint16_t size, int16_t rssi, int8_t snr)
+void OnRxDone(void *radio, void *userThisPtr, void *userData, uint8_t *payload, uint16_t size, int16_t rssi, int8_t snr)
 {
     Radio->Sleep( );
     BufferSize = size;
@@ -384,7 +384,7 @@
     dump("Data:", payload, size);
 }
 
-void OnTxTimeout(void *radio)
+void OnTxTimeout(void *radio, void *userThisPtr, void *userData)
 {
     *led3 = 0;
     Radio->Sleep( );
@@ -393,7 +393,7 @@
         dprintf("> OnTxTimeout");
 }
 
-void OnRxTimeout(void *radio)
+void OnRxTimeout(void *radio, void *userThisPtr, void *userData)
 {
     *led3 = 0;
     Radio->Sleep( );
@@ -403,7 +403,7 @@
         dprintf("> OnRxTimeout");
 }
 
-void OnRxError(void *radio)
+void OnRxError(void *radio, void *userThisPtr, void *userData)
 {
     Radio->Sleep( );
     State = RX_ERROR;

diff -r f84959c2e044 -r 9d7409ebfa57 SX1276GenericPingPong/GenericPingPong.h
--- a/SX1276GenericPingPong/GenericPingPong.h	Tue Jun 06 12:21:21 2017 +0000
+++ b/SX1276GenericPingPong/GenericPingPong.h	Fri Aug 18 07:45:44 2017 +0000
@@ -34,36 +34,36 @@
 /*!
  * @brief Function to be executed on Radio Tx Done event
  */
-void OnTxDone(void *radio);
+void OnTxDone(void *radio, void *userThisPtr, void *userData);
 
 /*!
  * @brief Function to be executed on Radio Rx Done event
  */
-void OnRxDone(void *radio, uint8_t *payload, uint16_t size, int16_t rssi, int8_t snr );
+void OnRxDone(void *radio, void *userThisPtr, void *userData, uint8_t *payload, uint16_t size, int16_t rssi, int8_t snr );
 
 /*!
  * @brief Function executed on Radio Tx Timeout event
  */
-void OnTxTimeout(void *radio);
+void OnTxTimeout(void *radio, void *userThisPtr, void *userData);
 
 /*!
  * @brief Function executed on Radio Rx Timeout event
  */
-void OnRxTimeout(void *radio);
+void OnRxTimeout(void *radio, void *userThisPtr, void *userData);
 
 /*!
  * @brief Function executed on Radio Rx Error event
  */
-void OnRxError(void *radio);
+void OnRxError(void *radio, void *userThisPtr, void *userData);
 
 /*!
  * @brief Function executed on Radio Fhss Change Channel event
  */
-void OnFhssChangeChannel(void *radio, uint8_t channelIndex );
+void OnFhssChangeChannel(void *radio, void *userThisPtr, void *userData, uint8_t channelIndex);
 
 /*!
  * @brief Function executed on CAD Done event
  */
-void OnCadDone(void *radio);
+void OnCadDone(void *radio, void *userThisPtr, void *userData);
 
-#endif // __MAIN_H__
\ No newline at end of file
+#endif // __MAIN_H__

diff -r f84959c2e044 -r 9d7409ebfa57 mbed.bld
--- a/mbed.bld	Tue Jun 06 12:21:21 2017 +0000
+++ b/mbed.bld	Fri Aug 18 07:45:44 2017 +0000
@@ -1,1 +1,1 @@
-https://mbed.org/users/mbed_official/code/mbed/builds/86740a56073b
\ No newline at end of file
+https://mbed.org/users/mbed_official/code/mbed/builds/e2bfab296f20
\ No newline at end of file