From e5e156915e5492ad2dded37b0ee485ac3970d120 Mon Sep 17 00:00:00 2001 From: Linar Yusupov Date: Mon, 3 Jun 2024 16:46:15 +0300 Subject: [PATCH] [RA4M1] bump Renesas Core up to 1.2.0 --- .github/workflows/main.yml | 2 +- software/firmware/source/SoftRF/src/platform/nRF52.cpp | 2 +- software/firmware/source/SoftRF/src/platform/nRF52.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7e55c06d7..e2f28aa36 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -358,7 +358,7 @@ jobs: fi if [[ "$BOARD" =~ "arduino:renesas_uno:" ]]; then arduino --pref "boardsmanager.additional.urls=https://downloads.arduino.cc/packages/package_index.json" --save-prefs ; - arduino --install-boards arduino:renesas_uno:1.1.0 ; + arduino --install-boards arduino:renesas_uno:1.2.0 ; arduino --board $BOARD --save-prefs ; wget https://github.com/arduino-libraries/ArduinoBLE/archive/refs/tags/${ARDUINO_BLE_VERSION}.tar.gz ; tar xzf ${ARDUINO_BLE_VERSION}.tar.gz ; diff --git a/software/firmware/source/SoftRF/src/platform/nRF52.cpp b/software/firmware/source/SoftRF/src/platform/nRF52.cpp index 36b29c891..50563704f 100644 --- a/software/firmware/source/SoftRF/src/platform/nRF52.cpp +++ b/software/firmware/source/SoftRF/src/platform/nRF52.cpp @@ -796,7 +796,7 @@ static void nRF52_setup() hw_info.mag = MAG_AK8963; IMU_Time_Marker = millis(); } else { - if (nRF52_has_imu && imu_2.begin() == ICM_20948_Stat_Ok) { + if (nRF52_has_imu && imu_2.begin(Wire, false) == ICM_20948_Stat_Ok) { hw_info.imu = IMU_ICM20948; hw_info.mag = MAG_AK09916; IMU_Time_Marker = millis(); diff --git a/software/firmware/source/SoftRF/src/platform/nRF52.h b/software/firmware/source/SoftRF/src/platform/nRF52.h index 9b1a06cf1..9914894f0 100644 --- a/software/firmware/source/SoftRF/src/platform/nRF52.h +++ b/software/firmware/source/SoftRF/src/platform/nRF52.h @@ -104,7 +104,7 @@ struct rst_info { #define DFU_MAGIC_SKIP (0x6d) #define BME280_ADDRESS (0x77) #define MPU9250_ADDRESS (0x68) -#define ICM20948_ADDRESS (0x69) +#define ICM20948_ADDRESS (0x68) #if defined(ARDUINO_ARCH_MBED) #define PCF8563_SLAVE_ADDRESS (0x51)