KB8PMY
/
CubeSatSim
mirror of https://github.com/alanbjohnston/CubeSatSim.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update Payload_BME280_MPU6050_XS.ino fixed board conditionals

Browse Source
pull/296/head
Alan Johnston 2 years ago committed by GitHub
parent c6c4e88704
commit db113151ac
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File

51
stempayload/Payload_BME280_MPU6050_XS/Payload_BME280_MPU6050_XS.ino
Unescape View File

@ -7,12 +7,12 @@
#include <Adafruit_BME280.h> #include <Adafruit_BME280.h>
#include <MPU6050_tockn.h> #include <MPU6050_tockn.h>
#if defined(ARDUINO_ARCH_MBED_RP2040) // if Arduino Mbed OS RP2040 Boards is used in Arduino IDE #if defined(ARDUINO_ARCH_MBED_RP2040) && defined(ARDUINO_ARCH_RP2040) // if Arduino Mbed OS RP2040 Boards is used in Arduino IDE
#include <TinyGPS++.h> #include <TinyGPS++.h>
TinyGPSPlus gps; TinyGPSPlus gps;
UART Serial2(8, 9, 0, 0); UART Serial2(8, 9, 0, 0);
#elif defined(ARDUINO_ARCH_RP2040) // if Raspberry Pi RP2040 Boards in Arduino IDE #elif !defined(ARDUINO_ARCH_MBED_RP2040) && defined(ARDUINO_ARCH_RP2040) // if Raspberry Pi RP2040 Boards in Arduino IDE
#include <TinyGPS++.h> #include <TinyGPS++.h>
TinyGPSPlus gps; TinyGPSPlus gps;
bool check_for_wifi(); bool check_for_wifi();
@ -76,30 +76,32 @@ void setup() {
Serial.begin(115200); // Serial Monitor for testing Serial.begin(115200); // Serial Monitor for testing
#if defined (ARDUINO_ARCH_MBED_RP2040) || (ARDUINO_ARCH_RP2040) #if defined (!ARDUINO_ARCH_MBED_RP2040) || (ARDUINO_ARCH_RP2040)
Serial.println("Pico with Mbed");
#elif defined (!ARDUINO_ARCH_MBED_RP2040) || (ARDUINO_ARCH_RP2040)
Serial.println("Pico with RP2040");
#else
Serial.println("Pro Micro");
#endif
/*
#ifdef ARDUINO_ARCH_RP2040
Serial1.setRX(1); Serial1.setRX(1);
delay(100); delay(100);
Serial1.setTX(0); Serial1.setTX(0);
delay(100); delay(100);
#endif #endif
*/
Serial1.begin(115200); // for communication with Pi Zero Serial1.begin(115200); // for communication with Pi Zero
delay(1000); delay(2000);
#if defined (ARDUINO_ARCH_MBED_RP2040) && (ARDUINO_ARCH_RP2040)
Serial.println("Pico with Mbed");
#elif !defined(ARDUINO_ARCH_MBED_RP2040) && defined(ARDUINO_ARCH_RP2040)
Serial.println("Pico with RP2040");
#elif defined(ARDUINO_ARCH_STM32F0) || defined(ARDUINO_ARCH_STM32F1) || defined(ARDUINO_ARCH_STM32F3) || defined(ARDUINO_ARCH_STM32F4) || defined(ARDUINO_ARCH_STM32L4)
Serial.println("STM32");
#elif defined __AVR_ATmega32U4__
Serial.println("Pro Micro");
#else
Serial.println("Unknown board");
#endif
Serial.println("Starting!"); Serial.println("Starting!");
#if defined (ARDUINO_ARCH_MBED_RP2040) || (ARDUINO_ARCH_RP2040) #if defined (ARDUINO_ARCH_MBED_RP2040) || (ARDUINO_ARCH_RP2040)
Serial.println("This code is for the Raspberry Pi Pico hardware.");
Serial.println("Starting Serial2 for optional GPS on JP12"); Serial.println("Starting Serial2 for optional GPS on JP12");
// Serial2.begin(9600); // serial from - some modules need 115200 // Serial2.begin(9600); // serial from - some modules need 115200
Serial2.begin(9600); // serial from GPS or other serial sensor. Some GPS need 115200 Serial2.begin(9600); // serial from GPS or other serial sensor. Some GPS need 115200
@ -111,8 +113,7 @@ void setup() {
pinMode(26, INPUT); pinMode(26, INPUT);
pinMode(27, INPUT); pinMode(27, INPUT);
pinMode(28, INPUT); pinMode(28, INPUT);
pinMode(15, INPUT_PULLUP); // squelch pinMode(15, INPUT_PULLUP); // squelch
#endif #endif
blink_setup(); blink_setup();
@ -373,13 +374,13 @@ void blink_setup()
pinMode(blueLED,OUTPUT); pinMode(blueLED,OUTPUT);
#endif #endif
#if defined ARDUINO_ARCH_MBED_RP2040 if defined(ARDUINO_ARCH_MBED_RP2040) && defined(ARDUINO_ARCH_RP2040)
pinMode(LED_BUILTIN, OUTPUT); pinMode(LED_BUILTIN, OUTPUT);
pinMode(18, OUTPUT); // blue LED on STEM Payload Board v1.3.2 pinMode(18, OUTPUT); // blue LED on STEM Payload Board v1.3.2
pinMode(19, OUTPUT); // green LED on STEM Payload Board v1.3.2 pinMode(19, OUTPUT); // green LED on STEM Payload Board v1.3.2
#endif #endif
#if defined ARDUINO_ARCH_RP2040 if !defined(ARDUINO_ARCH_MBED_RP2040) && defined(ARDUINO_ARCH_RP2040)
if (check_for_wifi()) { if (check_for_wifi()) {
wifi = true; wifi = true;
led_builtin_pin = LED_BUILTIN; // use default GPIO for Pico W led_builtin_pin = LED_BUILTIN; // use default GPIO for Pico W
@ -407,11 +408,11 @@ void blink(int length)
TXLED0; //TX LED is not tied to a normally controlled pin so a macro is needed, turn LED OFF TXLED0; //TX LED is not tied to a normally controlled pin so a macro is needed, turn LED OFF
#endif #endif
#if defined ARDUINO_ARCH_MBED_RP2040 if defined(ARDUINO_ARCH_MBED_RP2040) && defined(ARDUINO_ARCH_RP2040)
digitalWrite(LED_BUILTIN, HIGH); // set the built-in LED ON digitalWrite(LED_BUILTIN, HIGH); // set the built-in LED ON
#endif #endif
#if defined ARDUINO_ARCH_RP2040 if !defined(ARDUINO_ARCH_MBED_RP2040) && defined(ARDUINO_ARCH_RP2040)
if (wifi) if (wifi)
digitalWrite(LED_BUILTIN, HIGH); // set the built-in LED ON digitalWrite(LED_BUILTIN, HIGH); // set the built-in LED ON
else else
@ -429,11 +430,11 @@ delay(length);
TXLED0; //TX LED macro to turn LED ON TXLED0; //TX LED macro to turn LED ON
#endif #endif
#if defined ARDUINO_ARCH_MBED_RP2040 if defined(ARDUINO_ARCH_MBED_RP2040) && defined(ARDUINO_ARCH_RP2040)
digitalWrite(LED_BUILTIN, LOW); // set the built-in LED OFF digitalWrite(LED_BUILTIN, LOW); // set the built-in LED OFF
#endif #endif
#if defined ARDUINO_ARCH_RP2040 if !defined(ARDUINO_ARCH_MBED_RP2040) && defined(ARDUINO_ARCH_RP2040)
if (wifi) if (wifi)
digitalWrite(LED_BUILTIN, LOW); // set the built-in LED ON digitalWrite(LED_BUILTIN, LOW); // set the built-in LED ON
else else
@ -478,7 +479,7 @@ int read_analog()
return(sensorValue); return(sensorValue);
} }
#if defined (ARDUINO_ARCH_MBED_RP2040) if !defined(ARDUINO_ARCH_MBED_RP2040) && defined(ARDUINO_ARCH_RP2040)
bool check_for_wifi() { bool check_for_wifi() {
pinMode(29, INPUT); pinMode(29, INPUT);

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.