Add support for GSM and GPS libraries

Author: multiplemonomials

.gitmodules

@@ -4,3 +4,6 @@
 [submodule "mbed-os"]
 	path = mbed-os
 	url = https://github.com/mbed-ce/mbed-os.git
+[submodule "libraries/GPS/MicroNMEA"]
+	path = libraries/GPS/MicroNMEA
+	url = https://github.com/stevemarple/MicroNMEA.git

.idea/vcs.xml

@@ -11,7 +11,7 @@ include(mbed-os/tools/cmake/mbed_toolchain_setup.cmake)
 
 project(ArduinoCore-mbed-ce
 		LANGUAGES C CXX ASM
-		VERSION 1.2.1) # This is the version of the Mbed CE Arduino core, not of Mbed CE
+		VERSION 1.3.0) # This is the version of the Mbed CE Arduino core, not of Mbed CE
 
 include(mbed_project_setup)
 
@@ -81,6 +81,9 @@ set(MBED_LIBS_TO_INSTALL
 	mbed-storage-littlefs-v2
 	mbed-storage-securestore
 	mbed-storage-tdbstore
+
+	# Cellular
+	mbed-cellular
 )
 
 if("DEVICE_USBDEVICE=1" IN_LIST MBED_TARGET_DEFINITIONS)

CMakeLists.txt

@@ -0,0 +1,10 @@
+set(ARDUINO_CAN_SOURCES
+	src/Arduino_CAN.cpp)
+
+add_library(arduino-Arduino_CAN STATIC ${ARDUINO_CAN_SOURCES})
+target_link_libraries(arduino-Arduino_CAN PUBLIC arduino-core)
+target_include_directories(arduino-Arduino_CAN PUBLIC src)
+
+build_arduino_examples(Arduino_CAN examples)
+
+install(DIRECTORY . DESTINATION libraries/Arduino_CAN)

libraries/Arduino_CAN/CMakeLists.txt

@@ -61,14 +61,16 @@ if("ARDUINO_PORTENTA_H7" IN_LIST MBED_TARGET_LABELS)
 	add_subdirectory(USBAudio)
 	add_subdirectory(KernelDebug)
 	add_subdirectory(Ethernet)
+	add_subdirectory(Arduino_CAN)
+	add_subdirectory(GSM)
+	add_subdirectory(GPS)
 	# TODO add missing libraries for Portenta
 #   add_subdirectory(PDM)
 #	add_subdirectory(Arduino_H7_Video)
 #	add_subdirectory(Himax_HM01B0)
 #	add_subdirectory(Himax_HM0360)
 #	add_subdirectory(Portenta_Audio)
 #	add_subdirectory(RPC)
-#	add_subdirectory(GSM)
 #	add_subdirectory(Portenta_lvgl)
 #	add_subdirectory(Camera)
 #	add_subdirectory(rpclib)
@@ -77,7 +79,7 @@ if("ARDUINO_PORTENTA_H7" IN_LIST MBED_TARGET_LABELS)
 #	add_subdirectory(Portenta_SDCARD)
 #	add_subdirectory(GPS)
 #	add_subdirectory(MCUboot)
-#	add_subdirectory(Arduino_CAN)
+#
 endif()
 
 # Libraries for all targets

libraries/CMakeLists.txt

@@ -0,0 +1,10 @@
+set(GPS_SOURCES
+	src/GPS.cpp
+	MicroNMEA/src/MicroNMEA.cpp)
+
+add_library(arduino-GPS STATIC ${GPS_SOURCES})
+target_link_libraries(arduino-GPS PUBLIC arduino-core arduino-GSM)
+target_include_directories(arduino-GPS PUBLIC src MicroNMEA/src)
+
+install(DIRECTORY . DESTINATION libraries/GPS)
+install(FILES MicroNMEA/src/MicroNMEA.cpp MicroNMEA/src/MicroNMEA.h DESTINATION libraries/GPS)

libraries/GPS/CMakeLists.txt

@@ -0,0 +1,19 @@
+set(GSM_SOURCES
+	src/buffercmux.c
+	src/CMUXClass.cpp
+	src/GSM.cpp
+	src/GSMClient.cpp
+	src/GSMDebug.cpp
+	src/GSMSSLClient.cpp
+	src/GSMTrace.cpp
+	src/PTYSerial.cpp)
+
+add_library(arduino-GSM STATIC ${GSM_SOURCES})
+target_link_libraries(arduino-GSM PUBLIC arduino-core arduino-SocketWrapper mbed-cellular)
+target_include_directories(arduino-GSM PUBLIC src)
+
+build_arduino_examples(GSM examples)
+target_link_libraries(GSM-example-GNSSClient arduino-GPS)
+target_link_libraries(GSM-example-MicroNMEA_integration arduino-GPS)
+
+install(DIRECTORY . DESTINATION libraries/GSM)

libraries/GSM/CMakeLists.txt

@@ -27,7 +27,7 @@ void setup() {
   //GSM.setTraceLevel(4);
 
   Serial.println("Starting Carrier Network registration");
-  if(!GSM.begin(pin, apn, username, pass, CATNB, BAND_20 | BAND_19)){
+  if(!GSM.begin(pin, apn, username, pass, CATNB)){
     Serial.println("The board was not able to register to the network...");
     // do nothing forevermore:
     while(1);

libraries/GSM/examples/GSMClient/GSMClient.ino

@@ -42,7 +42,7 @@ void setup() {
   //GSM.setTraceLevel(4);
 
   Serial.println("Starting Carrier Network registration");
-  if(!GSM.begin(pin, apn, username, pass, CATM1, BAND_3 | BAND_20 | BAND_19)){
+  if(!GSM.begin(pin, apn, username, pass, CATM1)){
     Serial.println("The board was not able to register to the network...");
     // do nothing forevermore:
     while(1);

libraries/GSM/examples/GSMSSLClient/GSMSSLClient.ino

@@ -51,7 +51,7 @@ class CMUXClass {
 private:
   void api_lock();
   void api_unlock();
-  PlatformMutex _mutex;
+  rtos::Mutex _mutex;
   bool _cmuxFlag = false;
   int id;
   mbed::CircularBuffer<char, 1500> rx_buffer;

libraries/GSM/src/CMUXClass.h

@@ -30,7 +30,6 @@
 arduino::CMUXClass *arduino::CMUXClass::get_default_instance()
 {
   static mbed::UnbufferedSerial serial(MBED_CONF_GEMALTO_CINTERION_TX, MBED_CONF_GEMALTO_CINTERION_RX, 115200);
-  serial.set_flow_control(mbed::SerialBase::RTSCTS_SW, MBED_CONF_GEMALTO_CINTERION_CTS, NC);
   static arduino::CMUXClass device(&serial);
   return &device;
 }
@@ -40,11 +39,10 @@ mbed::CellularDevice *mbed::CellularDevice::get_default_instance()
   static auto cmux = arduino::CMUXClass::get_default_instance();
   static mbed::GEMALTO_CINTERION device(cmux->get_serial(0));
   nextSerialPort++;
-  device.enableCMUXChannel = mbed::callback(cmux, &arduino::CMUXClass::enableCMUXChannel);
   return &device;
 }
 
-int arduino::GSMClass::begin(const char* pin, const char* apn, const char* username, const char* password, RadioAccessTechnologyType rat, uint32_t band, bool restart) {
+int arduino::GSMClass::begin(const char* pin, const char* apn, const char* username, const char* password, mbed::RadioAccessTechnologyType rat, bool restart) {
 
   if (restart || isCmuxEnable()) {
     reset();
@@ -61,33 +59,35 @@ int arduino::GSMClass::begin(const char* pin, const char* apn, const char* usern
 
   static mbed::DigitalOut rts(MBED_CONF_GEMALTO_CINTERION_RTS, 0);
 
-  _device = _context->get_device();
+  _device = reinterpret_cast<mbed::GEMALTO_CINTERION *>(_context->get_device());
   _device->modem_debug_on(_at_debug);
 
   if (!isReady()) {
     DEBUG_ERROR("Cellular device not ready");
     return 0;
   }
 
-  _device->set_cmux_status_flag(_cmuxGSMenable);
   _device->set_retry_timeout_array(_retry_timeout, sizeof(_retry_timeout) / sizeof(_retry_timeout[0]));
 #if GSM_DEBUG_ENABLE
   _device->attach(mbed::callback(this, &GSMClass::onStatusChange));
 #endif
+
+  if (_cmuxGSMenable) {
+    _device->enable_cmux();
+    CMUXClass::get_default_instance()->enableCMUXChannel();
+  }
   _device->init();
 
   _pin = pin;
   _apn = apn;
   _username = username;
   _password = password;
   _rat = rat;
-  _band = (FrequencyBand) band;
 
   _context->set_sim_pin(pin);
   _context->set_authentication_type(mbed::CellularContext::AuthenticationType::PAP);
   _context->set_credentials(_apn, _username, _password);
   _context->set_access_technology(_rat);
-  _context->set_band(_band);
 
   int connect_status = NSAPI_ERROR_AUTH_FAILURE;
 
@@ -132,9 +132,9 @@ unsigned long arduino::GSMClass::getLocalTime()
   return _device->get_local_time();
 }
 
-bool arduino::GSMClass::setTime(unsigned long const epoch, int const timezone)
+void arduino::GSMClass::setTime(unsigned long const epoch, int const timezone)
 {
-  return _device->set_time(epoch, timezone);
+  _device->set_time(epoch, timezone);
 }
 
 bool arduino::GSMClass::isConnected()

libraries/GSM/src/GSM.cpp

@@ -71,7 +71,7 @@ class GSMClass : public MbedSocketClass {
 public:
 
   GSMClass()
-    : _rat(CATNB) {
+    : _rat(mbed::CATNB) {
       if(_CMUX_ENABLE){
         arduino::GSMClass::enableCmux();
       }
@@ -88,7 +88,7 @@ class GSMClass : public MbedSocketClass {
      * 
      * return: 0 in case of success, negative number in case of failure
      */
-  int begin(const char* pin, const char* apn, const char* username, const char* password, RadioAccessTechnologyType rat = CATNB, uint32_t band = BAND_20, bool restart = true);
+  int begin(const char* pin, const char* apn, const char* username, const char* password, mbed::RadioAccessTechnologyType rat = mbed::CATNB, bool restart = true);
 
   /*
      * Disconnect from the network
@@ -103,7 +103,7 @@ class GSMClass : public MbedSocketClass {
 
   unsigned long getLocalTime();
 
-  bool setTime(unsigned long const epoch, int const timezone = 0);
+  void setTime(unsigned long const epoch, int const timezone = 0);
   void enableCmux();
   bool isCmuxEnable();
 #if MBED_CONF_MBED_TRACE_ENABLE
@@ -126,11 +126,10 @@ class GSMClass : public MbedSocketClass {
   const char* _username = nullptr;
   const char* _password = nullptr;
   bool _cmuxGSMenable = _CMUX_ENABLE;
-  RadioAccessTechnologyType _rat;
-  FrequencyBand _band;
+  mbed::RadioAccessTechnologyType _rat;
   NetworkInterface* gsm_if = nullptr;
   mbed::CellularContext* _context = nullptr;
-  mbed::CellularDevice* _device = nullptr;
+  mbed::GEMALTO_CINTERION* _device = nullptr;
   bool _at_debug = false;
 
   /* Internal cellular state machine retries. Values are in seconds.

libraries/GSM/src/GSM.h

@@ -23,6 +23,10 @@
 #include "GSM.h"
 #include "MbedClient.h"
 
+// Bring these into the global scope
+using mbed::RadioAccessTechnologyType::CATNB;
+using mbed::RadioAccessTechnologyType::CATM1;
+
 namespace arduino {
 
 class GSMClient : public MbedClient {

libraries/GSM/src/GSMClient.h

@@ -17,13 +17,14 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
+#include <Arduino.h>
 #include <mbed.h>
 #include <GSM.h>
 
 #if MBED_CONF_MBED_TRACE_ENABLE
 
 static Stream* trace_stream = nullptr;
-static PlatformMutex trace_mutex;
+static rtos::Mutex trace_mutex;
 static char trace_timestamp[8];
 
 static void trace_wait() {

libraries/GSM/src/GSMTrace.cpp

@@ -29,7 +29,7 @@
 
 #include "platform/FileHandle.h"
 #include "drivers/InterruptIn.h"
-#include "platform/PlatformMutex.h"
+#include "rtos/Mutex.h"
 #include "platform/CircularBuffer.h"
 #include "platform/NonCopyable.h"
 
@@ -101,7 +101,7 @@ class PTYSerial : public mbed::FileHandle
     void api_lock(void);
     void api_unlock(void);
 
-    PlatformMutex _mutex;
+    rtos::Mutex _mutex;
     bool _blocking = true;
     void wake(void);
 

libraries/GSM/src/PTYSerial.h

@@ -103,6 +103,12 @@
         "RPMSG_BUFFER_SIZE=512"
       ],
 
+      // Enable cellular drivers, needed for GSM library to compile
+      "target.components_add": [
+        "GEMALTO_CINTERION",
+        "GENERIC_AT3GPP"
+      ],
+
       // Access the wifi driver from the QSPI flash instead of including it (400kB) in the
       // application image.
       "target.wifi_driver_in_qspi_flash": true