Merge branch 'master' of github.com:arduino/ArduinoCore-mbed

Author: facchinm

README.md

@@ -20,7 +20,7 @@ git clone [email protected]:arduino/ArduinoCore-API
 
 ### Update the `api` symlink
 
-Create a symlink to `ArduinoCore-API/api` in `$sketchbook/hardware/arduino/mbed/cores/arduino`.
+Create a symlink to `ArduinoCore-API/api` in `$sketchbook/hardware/arduino-git/mbed/cores/arduino`.
 
 ### Test things out
 

boards.txt

@@ -414,7 +414,7 @@ pico.upload.transport=
 pico.upload.use_1200bps_touch=true
 pico.upload.wait_for_upload_port=false
 pico.upload.native_usb=true
-pico.upload.maximum_size=16777216
+pico.upload.maximum_size=2097152
 pico.upload.maximum_data_size=270336
 
 pico.bootloader.tool=openocd
@@ -530,4 +530,4 @@ nicla_vision.bootloader.tool=openocd
 nicla_vision.bootloader.config=-f target/stm32h7x_dual_bank.cfg
 nicla_vision.bootloader.programmer=-f interface/stlink.cfg
 nicla_vision.bootloader.extra_action.preflash=stm32h7x option_write 0 0x01c 0xb86aaf0
-nicla_vision.bootloader.file=NICLA_VISION/bootloader.elf
+nicla_vision.bootloader.file=NICLA_VISION/bootloader.elf

libraries/Nicla_System/src/Nicla_System.cpp

@@ -13,20 +13,23 @@ RGBled nicla::leds;
 BQ25120A nicla::_pmic;
 rtos::Mutex nicla::i2c_mutex;
 bool nicla::started = false;
+uint8_t nicla::_chg_reg = 0;
 
 void nicla::pingI2CThd() {
   while(1) {
     // already protected by a mutex on Wire operations
-    readLDOreg();
+    checkChgReg();
     delay(10000);
   }
 }
 
 bool nicla::begin()
 {
+  pinMode(p25, OUTPUT);
   pinMode(P0_10, OUTPUT);
   digitalWrite(P0_10, HIGH);
   Wire1.begin();
+  _chg_reg = _pmic.readByte(BQ25120A_ADDRESS, BQ25120A_FAST_CHG);
 #ifndef NO_NEED_FOR_WATCHDOG_THREAD
   static rtos::Thread th(osPriorityHigh, 1024, nullptr, "ping_thread");
   th.start(&nicla::pingI2CThd);
@@ -98,8 +101,26 @@ bool nicla::enterShipMode()
 
 uint8_t nicla::readLDOreg()
 {
-  uint8_t ldo_reg = _pmic.readByte(BQ25120A_ADDRESS, BQ25120A_LDO_CTRL);
-  return ldo_reg;
+  return _pmic.readByte(BQ25120A_ADDRESS, BQ25120A_LDO_CTRL);
+}
+
+bool nicla::enableCharge(uint8_t mA)
+{
+  digitalWrite(p25, LOW);
+  if (mA < 35) {
+    _chg_reg = ((mA-5) << 2);
+  } else {
+    _chg_reg = (((mA-40)/10) << 2) | 0x80;
+  }
+  _pmic.writeByte(BQ25120A_ADDRESS, BQ25120A_FAST_CHG, _chg_reg);
+  return _pmic.readByte(BQ25120A_ADDRESS, BQ25120A_FAST_CHG) == _chg_reg;
+}
+
+void nicla::checkChgReg()
+{
+  if (_chg_reg != _pmic.readByte(BQ25120A_ADDRESS, BQ25120A_FAST_CHG)) {
+    _pmic.writeByte(BQ25120A_ADDRESS, BQ25120A_FAST_CHG, _chg_reg);
+  }
 }
 
 I2CLed  LEDR(red);

libraries/Nicla_System/src/Nicla_System.h

@@ -8,6 +8,8 @@
 #include <mbed.h>
 #include <I2C.h>
 
+#define USE_FASTCHG_TO_KICK_WATCHDOG 1
+
 class nicla {
 
 public:
@@ -16,6 +18,8 @@ class nicla {
   static bool enable1V8LDO();
   static bool disableLDO();
   static bool enterShipMode();
+  static uint8_t readLDOreg();
+  static bool enableCharge(uint8_t mA = 20);
 
   static RGBled leds;
   static BQ25120A _pmic;
@@ -28,8 +32,9 @@ class nicla {
 
 private:
   static void pingI2CThd();
-  static uint8_t readLDOreg();
+  static void checkChgReg();
   static rtos::Mutex i2c_mutex;
+  static uint8_t _chg_reg;
 };
 
 #endif

libraries/Nicla_System/src/RGBled.cpp

@@ -160,7 +160,9 @@ uint8_t RGBled::readByte(uint8_t address, uint8_t subAddress)
   Wire1.write(subAddress);
   Wire1.endTransmission(false);
   Wire1.requestFrom(address, 1);
-  while(!Wire1.available()) {}
+  uint32_t timeout = 100;
+  uint32_t start_time = millis();
+  while(!Wire1.available() && (millis() - start_time) < timeout) {}
   uint8_t ret = Wire1.read();
   nicla::i2c_mutex.unlock();
   return ret;

libraries/Nicla_System/src/pmic_driver.cpp

@@ -11,16 +11,19 @@ uint8_t BQ25120A::getStatus()
 
 void BQ25120A::writeByte(uint8_t address, uint8_t subAddress, uint8_t data)
 {
+  digitalWrite(p25, HIGH);
   nicla::i2c_mutex.lock();
   Wire1.beginTransmission(address);
   Wire1.write(subAddress);
   Wire1.write(data);
   Wire1.endTransmission();
   nicla::i2c_mutex.unlock();
+  digitalWrite(p25, LOW);
 }
 
 uint8_t BQ25120A::readByte(uint8_t address, uint8_t subAddress)
 {
+  digitalWrite(p25, HIGH);
   nicla::i2c_mutex.lock();
   char response = 0xFF;
   Wire1.beginTransmission(address);
@@ -32,5 +35,6 @@ uint8_t BQ25120A::readByte(uint8_t address, uint8_t subAddress)
   while(!Wire1.available() && (millis() - start_time) < timeout) {}
   uint8_t ret = Wire1.read();
   nicla::i2c_mutex.unlock();
+  digitalWrite(p25, LOW);
   return ret;
 }

libraries/RPC/examples/PortentaX8_EchoServer/PortentaX8_EchoServer.ino

@@ -3,7 +3,7 @@
 
 /*
  * This sketch demonstrates how to interact with the Portenta X8 Serial port (over USB)
- * On the board, launch both 'proxy' and 'example' binaries (from https://github.com/bcmi-labs/portentax8-m4-proxy)
+ * On the board, launch both 'proxy' and 'example' binaries (from https://github.com/arduino/portentax8-m4-proxy)
  * The M4 provides the 'subtract' API (which will be invoked by 'example'
  * It also provides a full duplex Serial-like interface that is proxies through the serial monitor
  * Last but not leas, when you write 'echo' the corresponding function in 'example' will be triggered

platform.txt

@@ -101,7 +101,7 @@ recipe.hooks.objcopy.postobjcopy.1.pattern={build.postbuild.cmd}
 ## Compute size
 recipe.size.pattern="{compiler.path}{compiler.size.cmd}" -A "{build.path}/{build.project_name}.elf"
 recipe.size.regex.data=^(?:\.data|\.bss)\s+([0-9]+).*
-recipe.size.regex=^(?:\.data|\.text)\S*?\s+([0-9]+).*
+recipe.size.regex=^(?:\.data|\.text|\.rodata)\S*?\s+([0-9]+).*
 
 ## Save hex
 recipe.output.tmp_file={build.project_name}.bin