Fix Examples for new BSP versions

beegee-tokyo · beegee-tokyo · commit e06e9add5ce9 · 2021-10-08T20:41:06.000+08:00
diff --git a/examples/RAK11200/solutions/weather_display/wifi.ino b/examples/RAK11200/solutions/weather_display/wifi.ino
@@ -160,8 +160,8 @@ void wifi_disconnect_callback(WiFiEvent_t event, WiFiEventInfo_t info)
 void wifi_init()
 {
   // set event function for specific event
-  WiFi.onEvent(wifi_got_ip_callback, WiFiEvent_t::SYSTEM_EVENT_STA_GOT_IP);
-  WiFi.onEvent(wifi_disconnect_callback, WiFiEvent_t::SYSTEM_EVENT_STA_DISCONNECTED);
+  WiFi.onEvent(wifi_got_ip_callback, WiFiEvent_t::ARDUINO_EVENT_WIFI_STA_GOT_IP);
+  WiFi.onEvent(wifi_disconnect_callback, WiFiEvent_t::ARDUINO_EVENT_WIFI_STA_DISCONNECTED);
   // start wifi with stored wifi config
   WiFi.begin();
 }
diff --git a/examples/RAK4630/IO/RAK18000_Stereo/RAK18000_Stereo.ino b/examples/RAK4630/IO/RAK18000_Stereo/RAK18000_Stereo.ino
@@ -21,6 +21,7 @@
    WB_A0      <->  P0.04/AIN2 (AnalogIn A2)
    WB_A1      <->  P0.31/AIN7 (AnalogIn A7)
  */
+#include <Wire.h>
 
 #include <PDM.h>
 
diff --git a/examples/RAK4630/IO/RAK5801_4-20mA/RAK5801_4-20mA.ino b/examples/RAK4630/IO/RAK5801_4-20mA/RAK5801_4-20mA.ino
@@ -8,6 +8,7 @@
  */
  
 #include <Arduino.h>
+#include <Wire.h>
 
 #define NO_OF_SAMPLES 32
 
diff --git a/examples/RAK4630/IO/RAK5802_RS485/Receiver/Receiver.ino b/examples/RAK4630/IO/RAK5802_RS485/Receiver/Receiver.ino
@@ -6,6 +6,7 @@
  * @date 2020-07-28
  * @copyright Copyright (c) 2020 
  */
+#include <Wire.h>
  
 #include <ArduinoRS485.h> //Click here to get the library: http://librarymanager/All#ArduinoRS485
 
diff --git a/examples/RAK4630/IO/RAK5802_RS485/Sender/Sender.ino b/examples/RAK4630/IO/RAK5802_RS485/Sender/Sender.ino
@@ -6,6 +6,7 @@
  * @date 2020-07-28
  * @copyright Copyright (c) 2020
  */
+#include <Wire.h>
  
 #include <ArduinoRS485.h> //Click here to get the library: http://librarymanager/All#ArduinoRS485
 
diff --git a/examples/RAK4630/IO/RAK5811_0-5V/RAK5811_0-5V.ino b/examples/RAK4630/IO/RAK5811_0-5V/RAK5811_0-5V.ino
@@ -8,6 +8,7 @@
  */
  
 #include <Arduino.h>
+#include <Wire.h>
 
 #define NO_OF_SAMPLES 32
 
diff --git a/examples/RAK4630/communications/BLE/BLE_Health/BLE_Health.ino b/examples/RAK4630/communications/BLE/BLE_Health/BLE_Health.ino
@@ -8,6 +8,7 @@
 **/
 
 #include <bluefruit.h>
+#include <Wire.h>
 
 BLEService        hrms = BLEService(UUID16_SVC_HEART_RATE);
 BLECharacteristic hrmc = BLECharacteristic(UUID16_CHR_HEART_RATE_MEASUREMENT);
diff --git a/examples/RAK4630/communications/BLE/ble_ota_dfu/ble_ota_dfu.ino b/examples/RAK4630/communications/BLE/ble_ota_dfu/ble_ota_dfu.ino
@@ -21,6 +21,7 @@
  */
 #include <Arduino.h>
 #include <bluefruit.h>
+#include <Wire.h>
 
 // Forward declarations for functions
 void connect_callback(uint16_t conn_handle);
diff --git a/examples/RAK4630/communications/BLE/ble_proximity_sensing/ble_proximity_sensing.ino b/examples/RAK4630/communications/BLE/ble_proximity_sensing/ble_proximity_sensing.ino
@@ -25,6 +25,7 @@
  */
 
 #include <bluefruit.h>
+#include <Wire.h>
 
 #define MAX_COUNT_NUM (5)
 #define AVERAGE_RSSI_VAL (-40)
diff --git a/examples/RAK4630/communications/BLE/ble_uart/ble_uart.ino b/examples/RAK4630/communications/BLE/ble_uart/ble_uart.ino
@@ -21,6 +21,7 @@
  */
 #include <Arduino.h>
 #include <bluefruit.h>
+#include <Wire.h>
 
 // Forward declarations for functions
 void ble_connect_callback(uint16_t conn_handle);
diff --git a/examples/RAK4630/communications/WiFi/AT_Command_Test/AT_Command_Test.ino b/examples/RAK4630/communications/WiFi/AT_Command_Test/AT_Command_Test.ino
@@ -21,7 +21,7 @@
    WB_A0      <->  P0.04/AIN2 (AnalogIn A2)
    WB_A1      <->  P0.31/AIN7 (AnalogIn A7)
  */
-
+#include <Wire.h>
 void setup()
 {
     time_t timeout = millis();
diff --git a/examples/RAK4630/communications/WiFi/connect_ap/connect_ap.ino b/examples/RAK4630/communications/WiFi/connect_ap/connect_ap.ino
@@ -21,6 +21,7 @@
    WB_A0      <->  P0.04/AIN2 (AnalogIn A2)
    WB_A1      <->  P0.31/AIN7 (AnalogIn A7)
  */
+#include <Wire.h>
 
 #define WIFI_SSID "Room-905"
 #define WIFI_PASSWORD "Mxjmxj_905"
diff --git a/examples/common/IO/RAK12006_MotionDetection/RAK12006_MotionDetection.ino b/examples/common/IO/RAK12006_MotionDetection/RAK12006_MotionDetection.ino
@@ -6,6 +6,7 @@
  * @date 2021-06-15
  * @copyright Copyright (c) 2021
  */
+#include <Wire.h>
 #define SENSOR_PIN  WB_IO6   // Attach AM312 sensor to Arduino Digital Pin WB_IO6
 
 int gCurrentStatus = 0;         // variable for reading the pin current status
diff --git a/examples/common/IO/RAK12017_IR_ITR20001T/RAK12017_Detect_Color/RAK12017_Detect_Color.ino b/examples/common/IO/RAK12017_IR_ITR20001T/RAK12017_Detect_Color/RAK12017_Detect_Color.ino
@@ -6,6 +6,7 @@
    @date 2021-8-28
    @copyright Copyright (c) 2020
 **/
+#include <Wire.h>
 
 void setup()
 {
diff --git a/examples/common/IO/RAK12017_IR_ITR20001T/RAK12017_Detect_Switch/RAK12017_Detect_Switch.ino b/examples/common/IO/RAK12017_IR_ITR20001T/RAK12017_Detect_Switch/RAK12017_Detect_Switch.ino
@@ -6,6 +6,7 @@
    @date 2021-8-28
    @copyright Copyright (c) 2020
 **/
+#include <Wire.h>
 
 void setup()
 {
diff --git a/examples/common/IO/RAK12018_CodeReader_LV3296/RAK12018_CodeReader_LV3296.ino b/examples/common/IO/RAK12018_CodeReader_LV3296/RAK12018_CodeReader_LV3296.ino
@@ -6,6 +6,7 @@
    @date 2021-8-28
    @copyright Copyright (c) 2020
 **/
+#include <Wire.h>
 
 void setup()
 {
diff --git a/examples/common/IO/RAK13001_Relay_OUT_Optocoupled_IN/RAK13001_Relay_OUT_Optocoupled_IN.ino b/examples/common/IO/RAK13001_Relay_OUT_Optocoupled_IN/RAK13001_Relay_OUT_Optocoupled_IN.ino
@@ -6,6 +6,7 @@
    @date 2021-3-18
    @copyright Copyright (c) 2021
 **/
+#include <Wire.h>
 
 #define OC_PIN    WB_IO3
 #define RELAY_PIN WB_IO4
diff --git a/examples/common/IO/RAK13005_LIN_BUS/LINBusCommunication/RAK13005_linbus_master/RAK13005_linbus_master.ino b/examples/common/IO/RAK13005_LIN_BUS/LINBusCommunication/RAK13005_linbus_master/RAK13005_linbus_master.ino
@@ -6,6 +6,7 @@
  * @date 2021-05-01
  * @copyright Copyright (c) 2021
  */
+#include <Wire.h>
 #include  "lin_bus.h"    //library: http://librarymanager/All#RAKwireless_TLE7259_LIN_Bus_library
 
 #if defined(_VARIANT_RAK4630_)  
diff --git a/examples/common/IO/RAK13005_LIN_BUS/LINBusCommunication/RAK13005_linbus_slaver/RAK13005_linbus_slaver.ino b/examples/common/IO/RAK13005_LIN_BUS/LINBusCommunication/RAK13005_linbus_slaver/RAK13005_linbus_slaver.ino
@@ -6,6 +6,7 @@
  * @date 2021-05-01
  * @copyright Copyright (c) 2021
  */
+#include <Wire.h>
 #include  "lin_bus.h"    //library: http://librarymanager/All#RAKwireless_TLE7259_LIN_Bus_library
 
 #if defined(_VARIANT_RAK4630_)  
diff --git a/examples/common/IO/RAK13005_LIN_BUS/LINBusControlLED/RAK13005_linbus_master/RAK13005_linbus_master.ino b/examples/common/IO/RAK13005_LIN_BUS/LINBusControlLED/RAK13005_linbus_master/RAK13005_linbus_master.ino
@@ -6,6 +6,7 @@
  * @date 2021-05-01
  * @copyright Copyright (c) 2021
  */
+#include <Wire.h>
 #include  "lin_bus.h"   //library: http://librarymanager/All#RAKwireless_TLE7259_LIN_Bus_library
 
 #if defined(_VARIANT_RAK4630_)
diff --git a/examples/common/IO/RAK13005_LIN_BUS/LINBusControlLED/RAK13005_linbus_slaver/RAK13005_linbus_slaver.ino b/examples/common/IO/RAK13005_LIN_BUS/LINBusControlLED/RAK13005_linbus_slaver/RAK13005_linbus_slaver.ino
@@ -6,6 +6,7 @@
  * @date 2021-05-01
  * @copyright Copyright (c) 2021
  */
+#include <Wire.h>
 #include  "lin_bus.h"  //library: http://librarymanager/All#RAKwireless_TLE7259_LIN_Bus_library
 
 #if defined(_VARIANT_RAK4630_)
diff --git a/examples/common/IO/RAK14000-Epaper-TriColor/RAK14000-Epaper-TriColor.ino b/examples/common/IO/RAK14000-Epaper-TriColor/RAK14000-Epaper-TriColor.ino
@@ -10,6 +10,7 @@
 
 */
 #include <Arduino.h>
+#include <Wire.h>
 
 #include <Adafruit_GFX.h>
 #include <Adafruit_EPD.h>
diff --git a/examples/common/IO/RAK14006_Rotary_Encoder/RAK14006_Rotary_Encoder.ino b/examples/common/IO/RAK14006_Rotary_Encoder/RAK14006_Rotary_Encoder.ino
@@ -6,6 +6,7 @@
    @date 2021-7-28
    @copyright Copyright (c) 2020
 **/
+#include <Wire.h>
 
 #define ENCODER_A_PIN WB_IO6  //clockwise
 #define ENCODER_B_PIN WB_IO4  //anticlockwise
diff --git a/examples/common/communications/Cellular/RAK13101_MC20_Module/GPS/GPS.ino b/examples/common/communications/Cellular/RAK13101_MC20_Module/GPS/GPS.ino
@@ -7,6 +7,7 @@
    @copyright Copyright (c) 2020
 **/
 #include <TinyGPS.h>    //http://librarymanager/All#TinyGPS
+#include <Wire.h>
 
 TinyGPS gps;
 String tmp_data = "";
diff --git a/examples/common/communications/Cellular/RAK13101_MC20_Module/GSM_TCP/GSM_TCP.ino b/examples/common/communications/Cellular/RAK13101_MC20_Module/GSM_TCP/GSM_TCP.ino
@@ -6,6 +6,7 @@
    @date 2021-6-28
    @copyright Copyright (c) 2020
 **/
+#include <Wire.h>
 
 #define POWER_KEY WB_IO5
 String at_rsp = "";
diff --git a/examples/common/communications/Cellular/RAK13101_MC20_Module/Unvarnished_Transmission/Unvarnished_Transmission.ino b/examples/common/communications/Cellular/RAK13101_MC20_Module/Unvarnished_Transmission/Unvarnished_Transmission.ino
@@ -7,6 +7,8 @@
    @copyright Copyright (c) 2020
 **/
 
+#include <Wire.h>
+
 #define POWER_KEY WB_IO5
 
 void setup()
diff --git a/examples/common/communications/Cellular/RAK5860_BG77_Module/BG77_Unvarnished_Transmission/BG77_Unvarnished_Transmission.ino b/examples/common/communications/Cellular/RAK5860_BG77_Module/BG77_Unvarnished_Transmission/BG77_Unvarnished_Transmission.ino
@@ -6,8 +6,7 @@
    @date 2020-12-28
    @copyright Copyright (c) 2020
 **/
-
-#include "SPI.h"
+#include <Wire.h>
 
 #define BG77_POWER_KEY WB_IO1
 
diff --git a/examples/common/communications/Cellular/RAK5860_BG77_Module/Cellular_Ping/Cellular_Ping.ino b/examples/common/communications/Cellular/RAK5860_BG77_Module/Cellular_Ping/Cellular_Ping.ino
@@ -6,9 +6,7 @@
    @date 2020-12-28
    @copyright Copyright (c) 2020
 **/
-
-
-#include "SPI.h"
+#include <Wire.h>
 
 #define BG77_POWER_KEY WB_IO1
 String bg77_rsp = "";
diff --git a/examples/common/communications/Cellular/RAK5860_BG77_Module/Hologram_Ping_LTE/Hologram_Ping_LTE.ino b/examples/common/communications/Cellular/RAK5860_BG77_Module/Hologram_Ping_LTE/Hologram_Ping_LTE.ino
@@ -20,8 +20,7 @@
    A1        <->  P0.31/AIN7 (Arduino Analog A7
    SPI_CS    <->  P0.26 (Arduino GPIO number 26) 
  */
-
-#include "SPI.h"
+#include <Wire.h>
 
 #define BG77_POWER_KEY 17
 char cArr[128] = {0};
diff --git a/examples/common/communications/Cellular/RAK5860_BG77_Module/Hologram_Tcp/Hologram_Tcp.ino b/examples/common/communications/Cellular/RAK5860_BG77_Module/Hologram_Tcp/Hologram_Tcp.ino
@@ -6,9 +6,7 @@
    @date 2020-12-28
    @copyright Copyright (c) 2020
 **/
-
-
-#include "SPI.h"
+#include <Wire.h>
 
 #define BG77_POWER_KEY WB_IO1
 #define BG77_GPS_ENABLE WB_IO2
diff --git a/examples/common/sensors/RAK12500_GPS_ZOE-M8Q/RAK12500_GPS_ZOE-M8Q_UART/RAK12500_GPS_ZOE-M8Q_UART.ino b/examples/common/sensors/RAK12500_GPS_ZOE-M8Q/RAK12500_GPS_ZOE-M8Q_UART/RAK12500_GPS_ZOE-M8Q_UART.ino
@@ -6,6 +6,7 @@
    @date 2021-1-28
    @copyright Copyright (c) 2021
 **/
+#include <Wire.h>
 
 #include <SparkFun_u-blox_GNSS_Arduino_Library.h> //http://librarymanager/All#SparkFun_u-blox_GNSS
 
diff --git a/examples/common/sensors/RAK1910_GPS_UBLOX7/RAK1910_GPS_UBLOX7.ino b/examples/common/sensors/RAK1910_GPS_UBLOX7/RAK1910_GPS_UBLOX7.ino
@@ -7,6 +7,8 @@
    @copyright Copyright (c) 2020
 **/
 
+#include <Wire.h>
+
 #include <TinyGPS.h>    //http://librarymanager/All#TinyGPS
 
 TinyGPS gps;
diff --git a/examples/common/sensors/RAK1920_Grove_PIR_AS312/RAK1920_Grove_PIR_AS312.ino b/examples/common/sensors/RAK1920_Grove_PIR_AS312/RAK1920_Grove_PIR_AS312.ino
@@ -7,6 +7,8 @@
    @copyright Copyright (c) 2020
 **/
 
+#include <Wire.h>
+
 void setup()
 {
 	pinMode(WB_IO2, OUTPUT);

Original file line number	Diff line number	Diff line change
`@@ -160,8 +160,8 @@ void wifi_disconnect_callback(WiFiEvent_t event, WiFiEventInfo_t info)`
`160`	`160`	`void wifi_init()`
`161`	`161`	`{`
`162`	`162`	`// set event function for specific event`
`163`		`- WiFi.onEvent(wifi_got_ip_callback, WiFiEvent_t::SYSTEM_EVENT_STA_GOT_IP);`
`164`		`- WiFi.onEvent(wifi_disconnect_callback, WiFiEvent_t::SYSTEM_EVENT_STA_DISCONNECTED);`
	`163`	`+ WiFi.onEvent(wifi_got_ip_callback, WiFiEvent_t::ARDUINO_EVENT_WIFI_STA_GOT_IP);`
	`164`	`+ WiFi.onEvent(wifi_disconnect_callback, WiFiEvent_t::ARDUINO_EVENT_WIFI_STA_DISCONNECTED);`
`165`	`165`	`// start wifi with stored wifi config`
`166`	`166`	`WiFi.begin();`
`167`	`167`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`WB_A0 <-> P0.04/AIN2 (AnalogIn A2)`
`22`	`22`	`WB_A1 <-> P0.31/AIN7 (AnalogIn A7)`
`23`	`23`	`*/`
`24`		`-`
	`24`	`+#include <Wire.h>`
`25`	`25`	`void setup()`
`26`	`26`	`{`
`27`	`27`	`time_t timeout = millis();`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`@date 2021-8-28`
`7`	`7`	`@copyright Copyright (c) 2020`
`8`	`8`	`**/`
	`9`	`+#include <Wire.h>`
`9`	`10`
`10`	`11`	`void setup()`
`11`	`12`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,8 @@`
`7`	`7`	`@copyright Copyright (c) 2020`
`8`	`8`	`**/`
`9`	`9`
	`10`	`+#include <Wire.h>`
	`11`	`+`
`10`	`12`	`void setup()`
`11`	`13`	`{`
`12`	`14`	`pinMode(WB_IO2, OUTPUT);`