From 3b3fafbd26c331addac7547220e9cd05ceec2fe0 Mon Sep 17 00:00:00 2001 From: Alan Johnston Date: Sat, 9 Mar 2024 16:15:36 -0500 Subject: [PATCH 01/34] Update Payload_BME280_MPU6050_XS.ino enable EEPROM for Pico --- .../Payload_BME280_MPU6050_XS.ino | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 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 b75ea949..ff68e18e 100644 --- a/stempayload/Payload_BME280_MPU6050_XS/Payload_BME280_MPU6050_XS.ino +++ b/stempayload/Payload_BME280_MPU6050_XS/Payload_BME280_MPU6050_XS.ino @@ -6,6 +6,7 @@ #include #include #include +#include #if defined(ARDUINO_ARCH_MBED_RP2040) && defined(ARDUINO_ARCH_RP2040) // if Arduino Mbed OS RP2040 Boards is used in Arduino IDE #include @@ -84,7 +85,8 @@ void setup() { #endif Serial1.begin(115200); // for communication with Pi Zero - + EEPROM.begin(512); + delay(2000); #if defined (ARDUINO_ARCH_MBED_RP2040) && (ARDUINO_ARCH_RP2040) @@ -156,7 +158,7 @@ void setup() { { Serial.println("Calculating gyro offsets\n"); mpu6050.calcGyroOffsets(true); -#if !defined (ARDUINO_ARCH_RP2040) +//#if !defined (ARDUINO_ARCH_RP2040) Serial.println("Storing gyro offsets in EEPROM\n"); eeprom_word_write(0, 0xA07); @@ -168,7 +170,7 @@ void setup() { Serial.println(((float)eeprom_word_read(1)) / 100.0, DEC); Serial.println(((float)eeprom_word_read(2)) / 100.0, DEC); Serial.println(((float)eeprom_word_read(3)) / 100.0, DEC); -#endif +//#endif } payload_setup(); // sensor extension setup function defined in payload_extension.cpp } @@ -343,18 +345,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) 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) result = ((EEPROM.read(addr * 2 + 1) << 8) | EEPROM.read(addr * 2)); -#endif +//#endif return result; } From 3113347b4028e176ef6384e3bbe8c936db85069c Mon Sep 17 00:00:00 2001 From: Alan Johnston Date: Sat, 9 Mar 2024 16:18:38 -0500 Subject: [PATCH 02/34] Update Payload_BME280_MPU6050_XS.ino add EEPROM commit --- .../Payload_BME280_MPU6050_XS/Payload_BME280_MPU6050_XS.ino | 6 ++++++ 1 file changed, 6 insertions(+) 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 ff68e18e..bbba9461 100644 --- a/stempayload/Payload_BME280_MPU6050_XS/Payload_BME280_MPU6050_XS.ino +++ b/stempayload/Payload_BME280_MPU6050_XS/Payload_BME280_MPU6050_XS.ino @@ -165,6 +165,12 @@ void setup() { eeprom_word_write(1, (int)(mpu6050.getGyroXoffset() * 100.0) + 0.5); eeprom_word_write(2, (int)(mpu6050.getGyroYoffset() * 100.0) + 0.5); eeprom_word_write(3, (int)(mpu6050.getGyroZoffset() * 100.0) + 0.5); + + if (EEPROM.commit()) { + Serial.println("EEPROM successfully committed"); + } else { + Serial.println("ERROR! EEPROM commit failed"); + } Serial.println(eeprom_word_read(0), HEX); Serial.println(((float)eeprom_word_read(1)) / 100.0, DEC); From 6a013b70afd28b09feb6e7db3327aed288fc99c1 Mon Sep 17 00:00:00 2001 From: Alan Johnston Date: Sat, 9 Mar 2024 16:26:24 -0500 Subject: [PATCH 03/34] Update Payload_BME280_MPU6050_XS.ino add in temp calibration --- .../Payload_BME280_MPU6050_XS.ino | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 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 bbba9461..eee3afa0 100644 --- a/stempayload/Payload_BME280_MPU6050_XS/Payload_BME280_MPU6050_XS.ino +++ b/stempayload/Payload_BME280_MPU6050_XS/Payload_BME280_MPU6050_XS.ino @@ -153,6 +153,19 @@ void setup() { Serial.println(zOffset, DEC); mpu6050.setGyroOffsets(xOffset, yOffset, zOffset); + + Serial.println("Temperature calibration data from EEPROM\n"); + + T1 = ((float)eeprom_word_read(4)) / 10.0; + R1 = ((float)eeprom_word_read(5)); + T2 = ((float)eeprom_word_read(6)) / 10.0; + R2 = ((float)eeprom_word_read(7)); + + Serial.println(T1, DEC); + Serial.println(R1, DEC); + Serial.println(T2, DEC); + Serial.println(R2, DEC); + } else { @@ -322,7 +335,7 @@ void loop() { // Serial.println(result); // Serial.println("OK"); // Serial.println(counter++); -#if !defined (ARDUINO_ARCH_RP2040) +//#if !defined (ARDUINO_ARCH_RP2040) if (result == 'R') { Serial1.println("OK"); delay(100); @@ -335,7 +348,7 @@ void loop() { first_time = true; setup(); } -#endif +//#endif } #if defined (ARDUINO_ARCH_MBED_RP2040) || (ARDUINO_ARCH_RP2040) From a864da15dd18700df56ba75c0bd430a20de2d0a3 Mon Sep 17 00:00:00 2001 From: Alan Johnston Date: Sat, 9 Mar 2024 16:29:01 -0500 Subject: [PATCH 04/34] Update Payload_BME280_MPU6050_XS.ino clear EEPROM --- .../Payload_BME280_MPU6050_XS/Payload_BME280_MPU6050_XS.ino | 5 +++++ 1 file changed, 5 insertions(+) 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 eee3afa0..770c51cc 100644 --- a/stempayload/Payload_BME280_MPU6050_XS/Payload_BME280_MPU6050_XS.ino +++ b/stempayload/Payload_BME280_MPU6050_XS/Payload_BME280_MPU6050_XS.ino @@ -345,6 +345,11 @@ void loop() { else if (result == 'C') { Serial.println("Clearing stored gyro offsets in EEPROM\n"); eeprom_word_write(0, 0x00); + if (EEPROM.commit()) { + Serial.println("EEPROM successfully committed"); + } else { + Serial.println("ERROR! EEPROM commit failed"); + } first_time = true; setup(); } From 1ad8da03624b7f6f54c26c193834f8b76a8f6437 Mon Sep 17 00:00:00 2001 From: Alan Johnston Date: Sat, 9 Mar 2024 16:36:04 -0500 Subject: [PATCH 05/34] Update Payload_BME280_MPU6050_XS.ino write temp cal to eprom --- .../Payload_BME280_MPU6050_XS.ino | 26 ++++++++++++++----- 1 file changed, 19 insertions(+), 7 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 770c51cc..15a2649e 100644 --- a/stempayload/Payload_BME280_MPU6050_XS/Payload_BME280_MPU6050_XS.ino +++ b/stempayload/Payload_BME280_MPU6050_XS/Payload_BME280_MPU6050_XS.ino @@ -177,18 +177,30 @@ void setup() { eeprom_word_write(0, 0xA07); eeprom_word_write(1, (int)(mpu6050.getGyroXoffset() * 100.0) + 0.5); eeprom_word_write(2, (int)(mpu6050.getGyroYoffset() * 100.0) + 0.5); - eeprom_word_write(3, (int)(mpu6050.getGyroZoffset() * 100.0) + 0.5); - - if (EEPROM.commit()) { - Serial.println("EEPROM successfully committed"); - } else { - Serial.println("ERROR! EEPROM commit failed"); - } + eeprom_word_write(3, (int)(mpu6050.getGyroZoffset() * 100.0) + 0.5); Serial.println(eeprom_word_read(0), HEX); Serial.println(((float)eeprom_word_read(1)) / 100.0, DEC); Serial.println(((float)eeprom_word_read(2)) / 100.0, DEC); Serial.println(((float)eeprom_word_read(3)) / 100.0, DEC); + + Serial.println("Storing emperature calibration data in EEPROM\n"); + + eeprom_word_write(4, (int)(T1 * 10.0) + 0.5); + eeprom_word_write(5, (int) R1); + eeprom_word_write(6, (int)(T2 * 10.0) + 0.5); + eeprom_word_write(7, (int) R2); + + T1 = ((float)eeprom_word_read(4)) / 10.0; + R1 = ((float)eeprom_word_read(5)); + T2 = ((float)eeprom_word_read(6)) / 10.0; + R2 = ((float)eeprom_word_read(7)); + + if (EEPROM.commit()) { + Serial.println("EEPROM successfully committed"); + } else { + Serial.println("ERROR! EEPROM commit failed"); + } //#endif } payload_setup(); // sensor extension setup function defined in payload_extension.cpp From 91cea2499ee6a13bacd0d47e75d6a18003070c0e Mon Sep 17 00:00:00 2001 From: Alan Johnston Date: Sat, 9 Mar 2024 16:39:10 -0500 Subject: [PATCH 06/34] Update Payload_BME280_MPU6050_XS.ino fix eprom write --- .../Payload_BME280_MPU6050_XS.ino | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 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 15a2649e..943d47e3 100644 --- a/stempayload/Payload_BME280_MPU6050_XS/Payload_BME280_MPU6050_XS.ino +++ b/stempayload/Payload_BME280_MPU6050_XS/Payload_BME280_MPU6050_XS.ino @@ -164,7 +164,8 @@ void setup() { Serial.println(T1, DEC); Serial.println(R1, DEC); Serial.println(T2, DEC); - Serial.println(R2, DEC); + Serial.println(R2, DEC); + Serial.println(" "); } else @@ -184,7 +185,7 @@ void setup() { Serial.println(((float)eeprom_word_read(2)) / 100.0, DEC); Serial.println(((float)eeprom_word_read(3)) / 100.0, DEC); - Serial.println("Storing emperature calibration data in EEPROM\n"); + Serial.println("Storing temperature calibration data in EEPROM\n"); eeprom_word_write(4, (int)(T1 * 10.0) + 0.5); eeprom_word_write(5, (int) R1); @@ -196,6 +197,12 @@ void setup() { T2 = ((float)eeprom_word_read(6)) / 10.0; R2 = ((float)eeprom_word_read(7)); + Serial.println(T1, DEC); + Serial.println(R1, DEC); + Serial.println(T2, DEC); + Serial.println(R2, DEC); + Serial.println(" "); + if (EEPROM.commit()) { Serial.println("EEPROM successfully committed"); } else { From ede71743ef6a3a2381a139682c8858ed993bc83f Mon Sep 17 00:00:00 2001 From: Alan Johnston Date: Sat, 9 Mar 2024 16:40:52 -0500 Subject: [PATCH 07/34] Update Payload_BME280_MPU6050_XS.ino try negative temp --- .../Payload_BME280_MPU6050_XS/Payload_BME280_MPU6050_XS.ino | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 943d47e3..048c1802 100644 --- a/stempayload/Payload_BME280_MPU6050_XS/Payload_BME280_MPU6050_XS.ino +++ b/stempayload/Payload_BME280_MPU6050_XS/Payload_BME280_MPU6050_XS.ino @@ -42,7 +42,7 @@ int first_time = true; int first_read = true; #if defined (ARDUINO_ARCH_MBED_RP2040) || (ARDUINO_ARCH_RP2040) -float T2 = 24; // Temperature data point 1 +float T2 = -24; // Temperature data point 1 float R2 = 169; // Reading data point 1 float T1 = 6; // Temperature data point 2 float R1 = 181; // Reading data point 2 From d5b0ead399cbce8958e90baa3830190000095e96 Mon Sep 17 00:00:00 2001 From: Alan Johnston Date: Sat, 9 Mar 2024 16:49:56 -0500 Subject: [PATCH 08/34] Update Payload_BME280_MPU6050_XS.ino 'S' writes cal point --- .../Payload_BME280_MPU6050_XS.ino | 25 ++++++++++++++++--- 1 file changed, 22 insertions(+), 3 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 048c1802..b27a94fc 100644 --- a/stempayload/Payload_BME280_MPU6050_XS/Payload_BME280_MPU6050_XS.ino +++ b/stempayload/Payload_BME280_MPU6050_XS/Payload_BME280_MPU6050_XS.ino @@ -36,13 +36,14 @@ int greenLED = 9; int blueLED = 8; int Sensor1 = 0; float Sensor2 = 0; +float temp; void ee_prom_word_write(int addr, int val); short ee_prom_word_read(int addr); int first_time = true; int first_read = true; #if defined (ARDUINO_ARCH_MBED_RP2040) || (ARDUINO_ARCH_RP2040) -float T2 = -24; // Temperature data point 1 +float T2 = 24; // Temperature data point 1 float R2 = 169; // Reading data point 1 float T1 = 6; // Temperature data point 2 float R1 = 181; // Reading data point 2 @@ -241,7 +242,8 @@ void loop() { Serial1.print(bme.readHumidity()); Serial.print("OK BME280 "); - Serial.print(bme.readTemperature()); + temp = bme.readTemperature(); + Serial.print(temp); Serial.print(" "); Serial.print(bme.readPressure() / 100.0F); Serial.print(" "); @@ -371,7 +373,24 @@ void loop() { } first_time = true; setup(); - } + } + else if (result == 'S') { + Serial.println("Storing temperature calibration data point in EEPROM\n"); + + Serial.println(temp); + Serial.println(sensorValue); + Serial.println(" "); + + eeprom_word_write(4, (int)(temp * 10.0) + 0.5); + eeprom_word_write(5, sensorValue); + + if (EEPROM.commit()) { + Serial.println("EEPROM successfully committed"); + } else { + Serial.println("ERROR! EEPROM commit failed"); + } + + } //#endif } From c776306078f01e238ed49071dc10c139f474623f Mon Sep 17 00:00:00 2001 From: Alan Johnston Date: Sat, 9 Mar 2024 16:51:17 -0500 Subject: [PATCH 09/34] Update Payload_BME280_MPU6050_XS.ino test storing --- .../Payload_BME280_MPU6050_XS/Payload_BME280_MPU6050_XS.ino | 4 ++-- 1 file changed, 2 insertions(+), 2 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 b27a94fc..b15dc7c9 100644 --- a/stempayload/Payload_BME280_MPU6050_XS/Payload_BME280_MPU6050_XS.ino +++ b/stempayload/Payload_BME280_MPU6050_XS/Payload_BME280_MPU6050_XS.ino @@ -381,8 +381,8 @@ void loop() { Serial.println(sensorValue); Serial.println(" "); - eeprom_word_write(4, (int)(temp * 10.0) + 0.5); - eeprom_word_write(5, sensorValue); + eeprom_word_write(6, (int)(temp * 10.0) + 0.5); + eeprom_word_write(7, sensorValue); if (EEPROM.commit()) { Serial.println("EEPROM successfully committed"); From 42f95fde867cd298f4c5d86af080a0ab6bbbfa19 Mon Sep 17 00:00:00 2001 From: Alan Johnston Date: Sat, 9 Mar 2024 16:59:45 -0500 Subject: [PATCH 10/34] Update Payload_BME280_MPU6050_XS.ino switch between calibration points --- .../Payload_BME280_MPU6050_XS.ino | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 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 b15dc7c9..b00e730a 100644 --- a/stempayload/Payload_BME280_MPU6050_XS/Payload_BME280_MPU6050_XS.ino +++ b/stempayload/Payload_BME280_MPU6050_XS/Payload_BME280_MPU6050_XS.ino @@ -37,6 +37,8 @@ int blueLED = 8; int Sensor1 = 0; float Sensor2 = 0; float temp; +int calibration = 0; + void ee_prom_word_write(int addr, int val); short ee_prom_word_read(int addr); int first_time = true; @@ -375,20 +377,24 @@ void loop() { setup(); } else if (result == 'S') { - Serial.println("Storing temperature calibration data point in EEPROM\n"); - + Serial.print("Storing temperature calibration data point "); // in EEPROM\n"); + Serial.print(calibration + 1); + Serial.print(" in EEPROM\n"); + Serial.println(temp); Serial.println(sensorValue); Serial.println(" "); - eeprom_word_write(6, (int)(temp * 10.0) + 0.5); - eeprom_word_write(7, sensorValue); + eeprom_word_write(calibration * 2 + 4 , (int)(temp * 10.0) + 0.5); + eeprom_word_write(calibration * 2 + 5, sensorValue); + + calibration = (calibration++) % 1 - if (EEPROM.commit()) { + if (EEPROM.commit()) { Serial.println("EEPROM successfully committed"); - } else { + } else { Serial.println("ERROR! EEPROM commit failed"); - } + } } //#endif From 8df96f8988cc706a3e45e58778e42137597e7b85 Mon Sep 17 00:00:00 2001 From: Alan Johnston Date: Sat, 9 Mar 2024 17:00:36 -0500 Subject: [PATCH 11/34] Update Payload_BME280_MPU6050_XS.ino typo --- .../Payload_BME280_MPU6050_XS/Payload_BME280_MPU6050_XS.ino | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 b00e730a..240e3d2e 100644 --- a/stempayload/Payload_BME280_MPU6050_XS/Payload_BME280_MPU6050_XS.ino +++ b/stempayload/Payload_BME280_MPU6050_XS/Payload_BME280_MPU6050_XS.ino @@ -388,7 +388,7 @@ void loop() { eeprom_word_write(calibration * 2 + 4 , (int)(temp * 10.0) + 0.5); eeprom_word_write(calibration * 2 + 5, sensorValue); - calibration = (calibration++) % 1 + calibration = (calibration++) % 1; if (EEPROM.commit()) { Serial.println("EEPROM successfully committed"); From 59faf8e0d76cbbb9f6fc345227ebb507fe65f8df Mon Sep 17 00:00:00 2001 From: Alan Johnston Date: Sat, 9 Mar 2024 17:03:40 -0500 Subject: [PATCH 12/34] Update Payload_BME280_MPU6050_XS.ino typos --- .../Payload_BME280_MPU6050_XS.ino | 10 +++++----- 1 file changed, 5 insertions(+), 5 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 240e3d2e..2eb48405 100644 --- a/stempayload/Payload_BME280_MPU6050_XS/Payload_BME280_MPU6050_XS.ino +++ b/stempayload/Payload_BME280_MPU6050_XS/Payload_BME280_MPU6050_XS.ino @@ -207,9 +207,9 @@ void setup() { Serial.println(" "); if (EEPROM.commit()) { - Serial.println("EEPROM successfully committed"); + Serial.println("EEPROM successfully committed\n"); } else { - Serial.println("ERROR! EEPROM commit failed"); + Serial.println("ERROR! EEPROM commit failed\n"); } //#endif } @@ -369,15 +369,15 @@ void loop() { Serial.println("Clearing stored gyro offsets in EEPROM\n"); eeprom_word_write(0, 0x00); if (EEPROM.commit()) { - Serial.println("EEPROM successfully committed"); + Serial.println("EEPROM successfully committed\n"); } else { - Serial.println("ERROR! EEPROM commit failed"); + Serial.println("ERROR! EEPROM commit failed\n"); } first_time = true; setup(); } else if (result == 'S') { - Serial.print("Storing temperature calibration data point "); // in EEPROM\n"); + Serial.print("\nStoring temperature calibration data point "); // in EEPROM\n"); Serial.print(calibration + 1); Serial.print(" in EEPROM\n"); From 97ab2defc89514797c88b1fbb94a7f2d95b132d9 Mon Sep 17 00:00:00 2001 From: Alan Johnston Date: Sat, 9 Mar 2024 17:04:55 -0500 Subject: [PATCH 13/34] Update Payload_BME280_MPU6050_XS.ino change to %2 --- .../Payload_BME280_MPU6050_XS/Payload_BME280_MPU6050_XS.ino | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 2eb48405..15787ffe 100644 --- a/stempayload/Payload_BME280_MPU6050_XS/Payload_BME280_MPU6050_XS.ino +++ b/stempayload/Payload_BME280_MPU6050_XS/Payload_BME280_MPU6050_XS.ino @@ -388,7 +388,7 @@ void loop() { eeprom_word_write(calibration * 2 + 4 , (int)(temp * 10.0) + 0.5); eeprom_word_write(calibration * 2 + 5, sensorValue); - calibration = (calibration++) % 1; + calibration = (calibration++) % 2; if (EEPROM.commit()) { Serial.println("EEPROM successfully committed"); From 1a89ad8a2dd77f2ffeb47bc69fafbd7b54e2e3e7 Mon Sep 17 00:00:00 2001 From: Alan Johnston Date: Sat, 9 Mar 2024 17:07:06 -0500 Subject: [PATCH 14/34] Update Payload_BME280_MPU6050_XS.ino print calibration --- .../Payload_BME280_MPU6050_XS/Payload_BME280_MPU6050_XS.ino | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 15787ffe..5034d3c5 100644 --- a/stempayload/Payload_BME280_MPU6050_XS/Payload_BME280_MPU6050_XS.ino +++ b/stempayload/Payload_BME280_MPU6050_XS/Payload_BME280_MPU6050_XS.ino @@ -388,7 +388,8 @@ void loop() { eeprom_word_write(calibration * 2 + 4 , (int)(temp * 10.0) + 0.5); eeprom_word_write(calibration * 2 + 5, sensorValue); - calibration = (calibration++) % 2; + calibration = (calibration + 1) % 2; + Serial.println(calibration + 1); if (EEPROM.commit()) { Serial.println("EEPROM successfully committed"); From da073dbce3919c25cec7255e629ea6d03744cc2d Mon Sep 17 00:00:00 2001 From: Alan Johnston Date: Sat, 9 Mar 2024 17:10:02 -0500 Subject: [PATCH 15/34] Update Payload_BME280_MPU6050_XS.ino remove prints --- .../Payload_BME280_MPU6050_XS.ino | 8 ++++---- 1 file changed, 4 insertions(+), 4 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 5034d3c5..ff171d14 100644 --- a/stempayload/Payload_BME280_MPU6050_XS/Payload_BME280_MPU6050_XS.ino +++ b/stempayload/Payload_BME280_MPU6050_XS/Payload_BME280_MPU6050_XS.ino @@ -359,13 +359,13 @@ void loop() { // Serial.println("OK"); // Serial.println(counter++); //#if !defined (ARDUINO_ARCH_RP2040) - if (result == 'R') { + if (result == 'R' || result == 'r') { Serial1.println("OK"); delay(100); first_read = true; setup(); } - else if (result == 'C') { + else if (result == 'C' result == 'c') { Serial.println("Clearing stored gyro offsets in EEPROM\n"); eeprom_word_write(0, 0x00); if (EEPROM.commit()) { @@ -376,7 +376,7 @@ void loop() { first_time = true; setup(); } - else if (result == 'S') { + else if (result == 'S' result == 's') { Serial.print("\nStoring temperature calibration data point "); // in EEPROM\n"); Serial.print(calibration + 1); Serial.print(" in EEPROM\n"); @@ -389,7 +389,7 @@ void loop() { eeprom_word_write(calibration * 2 + 5, sensorValue); calibration = (calibration + 1) % 2; - Serial.println(calibration + 1); +// Serial.println(calibration + 1); if (EEPROM.commit()) { Serial.println("EEPROM successfully committed"); From df662f3536ece0fd3a903fc28d72e223d27613c4 Mon Sep 17 00:00:00 2001 From: Alan Johnston Date: Sat, 9 Mar 2024 17:10:42 -0500 Subject: [PATCH 16/34] Update Payload_BME280_MPU6050_XS.ino missing || --- .../Payload_BME280_MPU6050_XS/Payload_BME280_MPU6050_XS.ino | 4 ++-- 1 file changed, 2 insertions(+), 2 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 ff171d14..e1355c97 100644 --- a/stempayload/Payload_BME280_MPU6050_XS/Payload_BME280_MPU6050_XS.ino +++ b/stempayload/Payload_BME280_MPU6050_XS/Payload_BME280_MPU6050_XS.ino @@ -365,7 +365,7 @@ void loop() { first_read = true; setup(); } - else if (result == 'C' result == 'c') { + else if (result == 'C' || result == 'c') { Serial.println("Clearing stored gyro offsets in EEPROM\n"); eeprom_word_write(0, 0x00); if (EEPROM.commit()) { @@ -376,7 +376,7 @@ void loop() { first_time = true; setup(); } - else if (result == 'S' result == 's') { + else if (result == 'S' || result == 's') { Serial.print("\nStoring temperature calibration data point "); // in EEPROM\n"); Serial.print(calibration + 1); Serial.print(" in EEPROM\n"); From 147936ff02c301b98dce506f69b0cef9e8577144 Mon Sep 17 00:00:00 2001 From: Alan Johnston Date: Sat, 9 Mar 2024 17:12:16 -0500 Subject: [PATCH 17/34] Update Payload_BME280_MPU6050_XS.ino extra space --- .../Payload_BME280_MPU6050_XS/Payload_BME280_MPU6050_XS.ino | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 e1355c97..1d7c5b7e 100644 --- a/stempayload/Payload_BME280_MPU6050_XS/Payload_BME280_MPU6050_XS.ino +++ b/stempayload/Payload_BME280_MPU6050_XS/Payload_BME280_MPU6050_XS.ino @@ -379,7 +379,7 @@ void loop() { else if (result == 'S' || result == 's') { Serial.print("\nStoring temperature calibration data point "); // in EEPROM\n"); Serial.print(calibration + 1); - Serial.print(" in EEPROM\n"); + Serial.print(" in EEPROM\n"); Serial.println(temp); Serial.println(sensorValue); From 25181d7df273269fbdfe9dcb4b193eb4f7ef0abc Mon Sep 17 00:00:00 2001 From: Alan Johnston Date: Sat, 9 Mar 2024 17:13:41 -0500 Subject: [PATCH 18/34] Update Payload_BME280_MPU6050_XS.ino try bed --- .../Payload_BME280_MPU6050_XS/Payload_BME280_MPU6050_XS.ino | 2 ++ 1 file changed, 2 insertions(+) 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 1d7c5b7e..f79aa6fd 100644 --- a/stempayload/Payload_BME280_MPU6050_XS/Payload_BME280_MPU6050_XS.ino +++ b/stempayload/Payload_BME280_MPU6050_XS/Payload_BME280_MPU6050_XS.ino @@ -6,7 +6,9 @@ #include #include #include +#if !defined(ARDUINO_ARCH_MBED_RP2040) && defined(ARDUINO_ARCH_RP2040) #include +#endif #if defined(ARDUINO_ARCH_MBED_RP2040) && defined(ARDUINO_ARCH_RP2040) // if Arduino Mbed OS RP2040 Boards is used in Arduino IDE #include From 82983e476aa04d84475e70ee2ea43cc7f84fc7a8 Mon Sep 17 00:00:00 2001 From: Alan Johnston Date: Sat, 9 Mar 2024 17:23:19 -0500 Subject: [PATCH 19/34] 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; } From 06756be1f0ebc7e286441352336c171ba60d928c Mon Sep 17 00:00:00 2001 From: Alan Johnston Date: Sat, 9 Mar 2024 17:38:29 -0500 Subject: [PATCH 20/34] Update Payload_BME280_MPU6050_XS.ino fix board tests --- .../Payload_BME280_MPU6050_XS.ino | 10 +++++----- 1 file changed, 5 insertions(+), 5 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 e27779a7..5b2fe022 100644 --- a/stempayload/Payload_BME280_MPU6050_XS/Payload_BME280_MPU6050_XS.ino +++ b/stempayload/Payload_BME280_MPU6050_XS/Payload_BME280_MPU6050_XS.ino @@ -208,7 +208,7 @@ void setup() { 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 !defined(ARDUINO_ARCH_MBED_RP2040) && defined(ARDUINO_ARCH_RP2040) // if Raspberry Pi RP2040 Boards is used in Arduino IDE if (EEPROM.commit()) { Serial.println("EEPROM successfully committed\n"); } else { @@ -371,7 +371,7 @@ 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 !defined(ARDUINO_ARCH_MBED_RP2040) && defined(ARDUINO_ARCH_RP2040) // if Raspberry Pi RP2040 Boards is used in Arduino IDE if (EEPROM.commit()) { Serial.println("EEPROM successfully committed\n"); @@ -397,7 +397,7 @@ void loop() { calibration = (calibration + 1) % 2; // 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 !defined(ARDUINO_ARCH_MBED_RP2040) && defined(ARDUINO_ARCH_RP2040) // if Raspberry Pi RP2040 Boards is used in Arduino IDE if (EEPROM.commit()) { Serial.println("EEPROM successfully committed"); @@ -423,7 +423,7 @@ void loop() { void eeprom_word_write(int addr, int val) { -#if defined(ARDUINO_ARCH_MBED_RP2040) && defined(ARDUINO_ARCH_RP2040) // if Arduino Mbed OS RP2040 Boards is used in Arduino IDE +#if !defined(ARDUINO_ARCH_MBED_RP2040) && defined(ARDUINO_ARCH_RP2040) // if Raspberry Pi RP2040 Boards is used in Arduino IDE EEPROM.write(addr * 2, lowByte(val)); EEPROM.write(addr * 2 + 1, highByte(val)); #endif @@ -432,7 +432,7 @@ void eeprom_word_write(int addr, int val) short eeprom_word_read(int addr) { int result = 0; -#if defined(ARDUINO_ARCH_MBED_RP2040) && defined(ARDUINO_ARCH_RP2040) // if Arduino Mbed OS RP2040 Boards is used in Arduino IDE +#if !defined(ARDUINO_ARCH_MBED_RP2040) && defined(ARDUINO_ARCH_RP2040) // if Raspberry Pi RP2040 Boards is used in Arduino IDE result = ((EEPROM.read(addr * 2 + 1) << 8) | EEPROM.read(addr * 2)); #endif return result; From 8bac9755b9b0f4f74eb628a785dbaa586b78409c Mon Sep 17 00:00:00 2001 From: Alan Johnston Date: Sat, 9 Mar 2024 17:40:20 -0500 Subject: [PATCH 21/34] Update Payload_BME280_MPU6050_XS.ino missing \n --- .../Payload_BME280_MPU6050_XS/Payload_BME280_MPU6050_XS.ino | 4 ++-- 1 file changed, 2 insertions(+), 2 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 5b2fe022..dc7c755b 100644 --- a/stempayload/Payload_BME280_MPU6050_XS/Payload_BME280_MPU6050_XS.ino +++ b/stempayload/Payload_BME280_MPU6050_XS/Payload_BME280_MPU6050_XS.ino @@ -400,9 +400,9 @@ void loop() { #if !defined(ARDUINO_ARCH_MBED_RP2040) && defined(ARDUINO_ARCH_RP2040) // if Raspberry Pi RP2040 Boards is used in Arduino IDE if (EEPROM.commit()) { - Serial.println("EEPROM successfully committed"); + Serial.println("EEPROM successfully committed\n"); } else { - Serial.println("ERROR! EEPROM commit failed"); + Serial.println("ERROR! EEPROM commit failed\n"); } #endif From 1b4d58ce1b5d372edbf4a916d6ef5c362e9aadcb Mon Sep 17 00:00:00 2001 From: Alan Johnston Date: Sat, 9 Mar 2024 17:41:37 -0500 Subject: [PATCH 22/34] Update Payload_BME280_MPU6050_XS.ino test before eprom begin --- .../Payload_BME280_MPU6050_XS/Payload_BME280_MPU6050_XS.ino | 3 +++ 1 file changed, 3 insertions(+) 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 dc7c755b..e709e140 100644 --- a/stempayload/Payload_BME280_MPU6050_XS/Payload_BME280_MPU6050_XS.ino +++ b/stempayload/Payload_BME280_MPU6050_XS/Payload_BME280_MPU6050_XS.ino @@ -90,7 +90,10 @@ void setup() { #endif Serial1.begin(115200); // for communication with Pi Zero + +#elif !defined(ARDUINO_ARCH_MBED_RP2040) && defined(ARDUINO_ARCH_RP2040) // if Raspberry Pi RP2040 Boards in Arduino IDE EEPROM.begin(512); +#endif delay(2000); From 04126f97d07dffe0ceed69c486f3fa70f329b8d6 Mon Sep 17 00:00:00 2001 From: Alan Johnston Date: Sat, 9 Mar 2024 17:42:29 -0500 Subject: [PATCH 23/34] Update Payload_BME280_MPU6050_XS.ino if typo --- .../Payload_BME280_MPU6050_XS/Payload_BME280_MPU6050_XS.ino | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 e709e140..eddb85b4 100644 --- a/stempayload/Payload_BME280_MPU6050_XS/Payload_BME280_MPU6050_XS.ino +++ b/stempayload/Payload_BME280_MPU6050_XS/Payload_BME280_MPU6050_XS.ino @@ -91,7 +91,7 @@ void setup() { Serial1.begin(115200); // for communication with Pi Zero -#elif !defined(ARDUINO_ARCH_MBED_RP2040) && defined(ARDUINO_ARCH_RP2040) // if Raspberry Pi RP2040 Boards in Arduino IDE +#if !defined(ARDUINO_ARCH_MBED_RP2040) && defined(ARDUINO_ARCH_RP2040) // if Raspberry Pi RP2040 Boards in Arduino IDE EEPROM.begin(512); #endif From 828615d2a2c57856c20d623ac55ef02db871bb14 Mon Sep 17 00:00:00 2001 From: Alan Johnston Date: Sat, 9 Mar 2024 17:45:33 -0500 Subject: [PATCH 24/34] Update Payload_BME280_MPU6050_XS.ino bed don't overwrite calibration --- .../Payload_BME280_MPU6050_XS/Payload_BME280_MPU6050_XS.ino | 6 +++--- 1 file changed, 3 insertions(+), 3 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 eddb85b4..629a5e36 100644 --- a/stempayload/Payload_BME280_MPU6050_XS/Payload_BME280_MPU6050_XS.ino +++ b/stempayload/Payload_BME280_MPU6050_XS/Payload_BME280_MPU6050_XS.ino @@ -179,8 +179,9 @@ void setup() { else { Serial.println("Calculating gyro offsets\n"); - mpu6050.calcGyroOffsets(true); -//#if !defined (ARDUINO_ARCH_RP2040) + mpu6050.calcGyroOffsets(true); + +#if !defined(ARDUINO_ARCH_MBED_RP2040) && defined(ARDUINO_ARCH_RP2040) // if Raspberry Pi RP2040 Boards is used in Arduino IDE Serial.println("Storing gyro offsets in EEPROM\n"); eeprom_word_write(0, 0xA07); @@ -211,7 +212,6 @@ void setup() { Serial.println(R2, DEC); Serial.println(" "); -#if !defined(ARDUINO_ARCH_MBED_RP2040) && defined(ARDUINO_ARCH_RP2040) // if Raspberry Pi RP2040 Boards is used in Arduino IDE if (EEPROM.commit()) { Serial.println("EEPROM successfully committed\n"); } else { From 3681046e7fb17f431ee0b6509b56579a55cb0e40 Mon Sep 17 00:00:00 2001 From: Alan Johnston Date: Sat, 9 Mar 2024 17:48:55 -0500 Subject: [PATCH 25/34] Update Payload_BME280_MPU6050_XS.ino use the new calibration values --- .../Payload_BME280_MPU6050_XS.ino | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 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 629a5e36..eb0c2074 100644 --- a/stempayload/Payload_BME280_MPU6050_XS/Payload_BME280_MPU6050_XS.ino +++ b/stempayload/Payload_BME280_MPU6050_XS/Payload_BME280_MPU6050_XS.ino @@ -397,8 +397,18 @@ void loop() { eeprom_word_write(calibration * 2 + 4 , (int)(temp * 10.0) + 0.5); eeprom_word_write(calibration * 2 + 5, sensorValue); - calibration = (calibration + 1) % 2; -// Serial.println(calibration + 1); + if (calibration == 0) { + T1 = temp; + R1 = sensorValue; + calibration = 1; + } else + T2 = temp; + R2 = sensorValue; + calibration = 0; + } + +// calibration = (calibration + 1) % 2; +// Serial.println(calibration + 1); #if !defined(ARDUINO_ARCH_MBED_RP2040) && defined(ARDUINO_ARCH_RP2040) // if Raspberry Pi RP2040 Boards is used in Arduino IDE From c5505ff69e9b6c0a5e1226f27333e463ef34722b Mon Sep 17 00:00:00 2001 From: Alan Johnston Date: Sat, 9 Mar 2024 17:49:56 -0500 Subject: [PATCH 26/34] Update Payload_BME280_MPU6050_XS.ino missing { --- .../Payload_BME280_MPU6050_XS/Payload_BME280_MPU6050_XS.ino | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 eb0c2074..7c456a73 100644 --- a/stempayload/Payload_BME280_MPU6050_XS/Payload_BME280_MPU6050_XS.ino +++ b/stempayload/Payload_BME280_MPU6050_XS/Payload_BME280_MPU6050_XS.ino @@ -401,7 +401,7 @@ void loop() { T1 = temp; R1 = sensorValue; calibration = 1; - } else + } else { T2 = temp; R2 = sensorValue; calibration = 0; From 063576959cc49579bcf24124b86da252b495f662 Mon Sep 17 00:00:00 2001 From: Alan Johnston Date: Sat, 9 Mar 2024 17:57:57 -0500 Subject: [PATCH 27/34] Update Payload_BME280_MPU6050_XS.ino print calibration on 'd' --- .../Payload_BME280_MPU6050_XS.ino | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 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 7c456a73..64f80bf4 100644 --- a/stempayload/Payload_BME280_MPU6050_XS/Payload_BME280_MPU6050_XS.ino +++ b/stempayload/Payload_BME280_MPU6050_XS/Payload_BME280_MPU6050_XS.ino @@ -171,6 +171,7 @@ void setup() { Serial.println(T1, DEC); Serial.println(R1, DEC); + Serial.println(" "); Serial.println(T2, DEC); Serial.println(R2, DEC); Serial.println(" "); @@ -208,6 +209,7 @@ void setup() { Serial.println(T1, DEC); Serial.println(R1, DEC); + Serial.println(" "); Serial.println(T2, DEC); Serial.println(R2, DEC); Serial.println(" "); @@ -366,11 +368,20 @@ void loop() { // Serial.println(counter++); //#if !defined (ARDUINO_ARCH_RP2040) if (result == 'R' || result == 'r') { - Serial1.println("OK"); - delay(100); +// Serial1.println("OK"); +// delay(100); first_read = true; setup(); } + else if (result == 'D' || result == 'd') { + Serial.println("Current temperature calibration data\n"); + Serial.println(T1, DEC); + Serial.println(R1, DEC); + Serial.println(" "); + Serial.println(T2, DEC); + Serial.println(R2, DEC); + Serial.println(" "); + } else if (result == 'C' || result == 'c') { Serial.println("Clearing stored gyro offsets in EEPROM\n"); eeprom_word_write(0, 0x00); From f46b42b3e9af561ff03d7d552dce0b712415914c Mon Sep 17 00:00:00 2001 From: Alan Johnston Date: Sat, 9 Mar 2024 17:59:56 -0500 Subject: [PATCH 28/34] Update Payload_BME280_MPU6050_XS.ino add blank lines --- .../Payload_BME280_MPU6050_XS/Payload_BME280_MPU6050_XS.ino | 5 +++-- 1 file changed, 3 insertions(+), 2 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 64f80bf4..d338095a 100644 --- a/stempayload/Payload_BME280_MPU6050_XS/Payload_BME280_MPU6050_XS.ino +++ b/stempayload/Payload_BME280_MPU6050_XS/Payload_BME280_MPU6050_XS.ino @@ -370,11 +370,12 @@ void loop() { if (result == 'R' || result == 'r') { // Serial1.println("OK"); // delay(100); + Serial.println("Resetting\n"); first_read = true; setup(); } else if (result == 'D' || result == 'd') { - Serial.println("Current temperature calibration data\n"); + Serial.println("\nCurrent temperature calibration data\n"); Serial.println(T1, DEC); Serial.println(R1, DEC); Serial.println(" "); @@ -383,7 +384,7 @@ void loop() { Serial.println(" "); } else if (result == 'C' || result == 'c') { - Serial.println("Clearing stored gyro offsets in EEPROM\n"); + Serial.println("\nClearing stored gyro offsets in EEPROM\n"); eeprom_word_write(0, 0x00); #if !defined(ARDUINO_ARCH_MBED_RP2040) && defined(ARDUINO_ARCH_RP2040) // if Raspberry Pi RP2040 Boards is used in Arduino IDE From 0fc271f25b87945bbcdb9fe3386cb42b9623d94d Mon Sep 17 00:00:00 2001 From: Alan Johnston Date: Sat, 9 Mar 2024 18:07:38 -0500 Subject: [PATCH 29/34] Update Payload_BME280_MPU6050_XS.ino try with pro micro --- .../Payload_BME280_MPU6050_XS.ino | 14 +++++++------- 1 file changed, 7 insertions(+), 7 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 d338095a..2767dd64 100644 --- a/stempayload/Payload_BME280_MPU6050_XS/Payload_BME280_MPU6050_XS.ino +++ b/stempayload/Payload_BME280_MPU6050_XS/Payload_BME280_MPU6050_XS.ino @@ -6,7 +6,7 @@ #include #include #include -#if !defined(ARDUINO_ARCH_MBED_RP2040) && defined(ARDUINO_ARCH_RP2040) +#if !defined(ARDUINO_ARCH_MBED_RP2040) // && defined(ARDUINO_ARCH_RP2040) #include #endif @@ -91,7 +91,7 @@ void setup() { Serial1.begin(115200); // for communication with Pi Zero -#if !defined(ARDUINO_ARCH_MBED_RP2040) && defined(ARDUINO_ARCH_RP2040) // if Raspberry Pi RP2040 Boards in Arduino IDE +#if !defined(ARDUINO_ARCH_MBED_RP2040) // && defined(ARDUINO_ARCH_RP2040) // if Raspberry Pi RP2040 Boards in Arduino IDE EEPROM.begin(512); #endif @@ -182,7 +182,7 @@ void setup() { Serial.println("Calculating gyro offsets\n"); mpu6050.calcGyroOffsets(true); -#if !defined(ARDUINO_ARCH_MBED_RP2040) && defined(ARDUINO_ARCH_RP2040) // if Raspberry Pi RP2040 Boards is used in Arduino IDE +#if !defined(ARDUINO_ARCH_MBED_RP2040) // && defined(ARDUINO_ARCH_RP2040) // if Raspberry Pi RP2040 Boards is used in Arduino IDE Serial.println("Storing gyro offsets in EEPROM\n"); eeprom_word_write(0, 0xA07); @@ -386,7 +386,7 @@ void loop() { else if (result == 'C' || result == 'c') { Serial.println("\nClearing stored gyro offsets in EEPROM\n"); eeprom_word_write(0, 0x00); -#if !defined(ARDUINO_ARCH_MBED_RP2040) && defined(ARDUINO_ARCH_RP2040) // if Raspberry Pi RP2040 Boards is used in Arduino IDE +#if !defined(ARDUINO_ARCH_MBED_RP2040) // && defined(ARDUINO_ARCH_RP2040) // if Raspberry Pi RP2040 Boards is used in Arduino IDE if (EEPROM.commit()) { Serial.println("EEPROM successfully committed\n"); @@ -422,7 +422,7 @@ void loop() { // calibration = (calibration + 1) % 2; // Serial.println(calibration + 1); -#if !defined(ARDUINO_ARCH_MBED_RP2040) && defined(ARDUINO_ARCH_RP2040) // if Raspberry Pi RP2040 Boards is used in Arduino IDE +#if !defined(ARDUINO_ARCH_MBED_RP2040) // && defined(ARDUINO_ARCH_RP2040) // if Raspberry Pi RP2040 Boards is used in Arduino IDE if (EEPROM.commit()) { Serial.println("EEPROM successfully committed\n"); @@ -448,7 +448,7 @@ void loop() { void eeprom_word_write(int addr, int val) { -#if !defined(ARDUINO_ARCH_MBED_RP2040) && defined(ARDUINO_ARCH_RP2040) // if Raspberry Pi RP2040 Boards is used in Arduino IDE +#if !defined(ARDUINO_ARCH_MBED_RP2040) // && defined(ARDUINO_ARCH_RP2040) // if Raspberry Pi RP2040 Boards is used in Arduino IDE EEPROM.write(addr * 2, lowByte(val)); EEPROM.write(addr * 2 + 1, highByte(val)); #endif @@ -457,7 +457,7 @@ void eeprom_word_write(int addr, int val) short eeprom_word_read(int addr) { int result = 0; -#if !defined(ARDUINO_ARCH_MBED_RP2040) && defined(ARDUINO_ARCH_RP2040) // if Raspberry Pi RP2040 Boards is used in Arduino IDE +#if !defined(ARDUINO_ARCH_MBED_RP2040) // && defined(ARDUINO_ARCH_RP2040) // if Raspberry Pi RP2040 Boards is used in Arduino IDE result = ((EEPROM.read(addr * 2 + 1) << 8) | EEPROM.read(addr * 2)); #endif return result; From 4d2cdc4da1a60d571ebd0959865ff6faac3aa761 Mon Sep 17 00:00:00 2001 From: Alan Johnston Date: Sat, 9 Mar 2024 18:10:22 -0500 Subject: [PATCH 30/34] Update Payload_BME280_MPU6050_XS.ino only commit pico --- .../Payload_BME280_MPU6050_XS.ino | 8 +++++--- 1 file changed, 5 insertions(+), 3 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 2767dd64..2cef20c6 100644 --- a/stempayload/Payload_BME280_MPU6050_XS/Payload_BME280_MPU6050_XS.ino +++ b/stempayload/Payload_BME280_MPU6050_XS/Payload_BME280_MPU6050_XS.ino @@ -214,11 +214,13 @@ void setup() { Serial.println(R2, DEC); Serial.println(" "); +#if !defined(ARDUINO_ARCH_MBED_RP2040) && defined(ARDUINO_ARCH_RP2040) // if Raspberry Pi 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 @@ -386,7 +388,7 @@ void loop() { else if (result == 'C' || result == 'c') { Serial.println("\nClearing stored gyro offsets in EEPROM\n"); eeprom_word_write(0, 0x00); -#if !defined(ARDUINO_ARCH_MBED_RP2040) // && defined(ARDUINO_ARCH_RP2040) // if Raspberry Pi RP2040 Boards is used in Arduino IDE +#if !defined(ARDUINO_ARCH_MBED_RP2040) && defined(ARDUINO_ARCH_RP2040) // if Raspberry Pi RP2040 Boards is used in Arduino IDE if (EEPROM.commit()) { Serial.println("EEPROM successfully committed\n"); @@ -422,7 +424,7 @@ void loop() { // calibration = (calibration + 1) % 2; // Serial.println(calibration + 1); -#if !defined(ARDUINO_ARCH_MBED_RP2040) // && defined(ARDUINO_ARCH_RP2040) // if Raspberry Pi RP2040 Boards is used in Arduino IDE +#if !defined(ARDUINO_ARCH_MBED_RP2040) && defined(ARDUINO_ARCH_RP2040) // if Raspberry Pi RP2040 Boards is used in Arduino IDE if (EEPROM.commit()) { Serial.println("EEPROM successfully committed\n"); From ec251245ccd88f609f026df8a7d2c7a6c0a1ce93 Mon Sep 17 00:00:00 2001 From: Alan Johnston Date: Sat, 9 Mar 2024 18:11:19 -0500 Subject: [PATCH 31/34] Update Payload_BME280_MPU6050_XS.ino only begin pico --- .../Payload_BME280_MPU6050_XS/Payload_BME280_MPU6050_XS.ino | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 2cef20c6..795312e7 100644 --- a/stempayload/Payload_BME280_MPU6050_XS/Payload_BME280_MPU6050_XS.ino +++ b/stempayload/Payload_BME280_MPU6050_XS/Payload_BME280_MPU6050_XS.ino @@ -91,7 +91,7 @@ void setup() { Serial1.begin(115200); // for communication with Pi Zero -#if !defined(ARDUINO_ARCH_MBED_RP2040) // && defined(ARDUINO_ARCH_RP2040) // if Raspberry Pi RP2040 Boards in Arduino IDE +#if !defined(ARDUINO_ARCH_MBED_RP2040) && defined(ARDUINO_ARCH_RP2040) // if Raspberry Pi RP2040 Boards in Arduino IDE EEPROM.begin(512); #endif From cfe21d4903d9d82b83558b9273f9e463eadda316 Mon Sep 17 00:00:00 2001 From: Alan Johnston Date: Sat, 9 Mar 2024 18:13:57 -0500 Subject: [PATCH 32/34] Update Payload_BME280_MPU6050_XS.ino extra space --- .../Payload_BME280_MPU6050_XS/Payload_BME280_MPU6050_XS.ino | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 795312e7..5c785be1 100644 --- a/stempayload/Payload_BME280_MPU6050_XS/Payload_BME280_MPU6050_XS.ino +++ b/stempayload/Payload_BME280_MPU6050_XS/Payload_BME280_MPU6050_XS.ino @@ -195,7 +195,7 @@ void setup() { Serial.println(((float)eeprom_word_read(2)) / 100.0, DEC); Serial.println(((float)eeprom_word_read(3)) / 100.0, DEC); - Serial.println("Storing temperature calibration data in EEPROM\n"); + Serial.println("\nStoring temperature calibration data in EEPROM\n"); eeprom_word_write(4, (int)(T1 * 10.0) + 0.5); eeprom_word_write(5, (int) R1); From e44d8287788372050d689e177b904667bf6a8cb6 Mon Sep 17 00:00:00 2001 From: Alan Johnston Date: Sat, 9 Mar 2024 18:15:56 -0500 Subject: [PATCH 33/34] Update Payload_BME280_MPU6050_XS.ino another blank line --- .../Payload_BME280_MPU6050_XS/Payload_BME280_MPU6050_XS.ino | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 5c785be1..904dcc31 100644 --- a/stempayload/Payload_BME280_MPU6050_XS/Payload_BME280_MPU6050_XS.ino +++ b/stempayload/Payload_BME280_MPU6050_XS/Payload_BME280_MPU6050_XS.ino @@ -162,7 +162,7 @@ void setup() { mpu6050.setGyroOffsets(xOffset, yOffset, zOffset); - Serial.println("Temperature calibration data from EEPROM\n"); + Serial.println("\nTemperature calibration data from EEPROM\n"); T1 = ((float)eeprom_word_read(4)) / 10.0; R1 = ((float)eeprom_word_read(5)); From c851d2cf209183367cf3635578b7835b9854a8fd Mon Sep 17 00:00:00 2001 From: Alan Johnston Date: Sat, 9 Mar 2024 20:55:18 -0500 Subject: [PATCH 34/34] Update Payload_BME280_MPU6050_XS.ino display raw sensor in d --- .../Payload_BME280_MPU6050_XS/Payload_BME280_MPU6050_XS.ino | 3 +++ 1 file changed, 3 insertions(+) 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 904dcc31..748989b7 100644 --- a/stempayload/Payload_BME280_MPU6050_XS/Payload_BME280_MPU6050_XS.ino +++ b/stempayload/Payload_BME280_MPU6050_XS/Payload_BME280_MPU6050_XS.ino @@ -383,6 +383,9 @@ void loop() { Serial.println(" "); Serial.println(T2, DEC); Serial.println(R2, DEC); + + Serial.println("\nCurrent raw temperature reading\n"); + Serial.println(sensorValue, DEC); Serial.println(" "); } else if (result == 'C' || result == 'c') {