From 82983e476aa04d84475e70ee2ea43cc7f84fc7a8 Mon Sep 17 00:00:00 2001 From: Alan Johnston Date: Sat, 9 Mar 2024 17:23:19 -0500 Subject: [PATCH] Update Payload_BME280_MPU6050_XS.ino only eeprom for pico --- .../Payload_BME280_MPU6050_XS.ino | 23 ++++++++++++------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/stempayload/Payload_BME280_MPU6050_XS/Payload_BME280_MPU6050_XS.ino b/stempayload/Payload_BME280_MPU6050_XS/Payload_BME280_MPU6050_XS.ino index f79aa6fd..e27779a7 100644 --- a/stempayload/Payload_BME280_MPU6050_XS/Payload_BME280_MPU6050_XS.ino +++ b/stempayload/Payload_BME280_MPU6050_XS/Payload_BME280_MPU6050_XS.ino @@ -207,13 +207,14 @@ void setup() { Serial.println(T2, DEC); Serial.println(R2, DEC); Serial.println(" "); - + +#if defined(ARDUINO_ARCH_MBED_RP2040) && defined(ARDUINO_ARCH_RP2040) // if Arduino Mbed OS RP2040 Boards is used in Arduino IDE if (EEPROM.commit()) { Serial.println("EEPROM successfully committed\n"); } else { Serial.println("ERROR! EEPROM commit failed\n"); } -//#endif +#endif } payload_setup(); // sensor extension setup function defined in payload_extension.cpp } @@ -370,11 +371,14 @@ void loop() { else if (result == 'C' || result == 'c') { Serial.println("Clearing stored gyro offsets in EEPROM\n"); eeprom_word_write(0, 0x00); +#if defined(ARDUINO_ARCH_MBED_RP2040) && defined(ARDUINO_ARCH_RP2040) // if Arduino Mbed OS RP2040 Boards is used in Arduino IDE + if (EEPROM.commit()) { Serial.println("EEPROM successfully committed\n"); } else { Serial.println("ERROR! EEPROM commit failed\n"); - } + } +#endif first_time = true; setup(); } @@ -391,13 +395,16 @@ void loop() { eeprom_word_write(calibration * 2 + 5, sensorValue); calibration = (calibration + 1) % 2; -// Serial.println(calibration + 1); +// Serial.println(calibration + 1); + +#if defined(ARDUINO_ARCH_MBED_RP2040) && defined(ARDUINO_ARCH_RP2040) // if Arduino Mbed OS RP2040 Boards is used in Arduino IDE if (EEPROM.commit()) { Serial.println("EEPROM successfully committed"); } else { Serial.println("ERROR! EEPROM commit failed"); } +#endif } //#endif @@ -416,18 +423,18 @@ void loop() { void eeprom_word_write(int addr, int val) { -//#if !defined(ARDUINO_ARCH_MBED_RP2040) && !defined(ARDUINO_ARCH_RP2040) +#if defined(ARDUINO_ARCH_MBED_RP2040) && defined(ARDUINO_ARCH_RP2040) // if Arduino Mbed OS RP2040 Boards is used in Arduino IDE EEPROM.write(addr * 2, lowByte(val)); EEPROM.write(addr * 2 + 1, highByte(val)); -//#endif +#endif } short eeprom_word_read(int addr) { int result = 0; -//#if !defined(ARDUINO_ARCH_MBED_RP2040) && !defined(ARDUINO_ARCH_RP2040) +#if defined(ARDUINO_ARCH_MBED_RP2040) && defined(ARDUINO_ARCH_RP2040) // if Arduino Mbed OS RP2040 Boards is used in Arduino IDE result = ((EEPROM.read(addr * 2 + 1) << 8) | EEPROM.read(addr * 2)); -//#endif +#endif return result; }