aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndre Geldenhuis <andregrey@gmail.com>2016-08-27 14:45:36 +1200
committerAndre Geldenhuis <andregrey@gmail.com>2016-08-27 14:45:36 +1200
commit4f247be0f29d273d02f12060cf835632eba33320 (patch)
treef609ef5b65446f52c52f1b95715a5bcaf05bd5c2
parent933a4abe5911b289a73879d94eacb99d0c8f4659 (diff)
downloadmetis-1-onboard-4f247be0f29d273d02f12060cf835632eba33320.tar.gz
metis-1-onboard-4f247be0f29d273d02f12060cf835632eba33320.tar.bz2
metis-1-onboard-4f247be0f29d273d02f12060cf835632eba33320.zip
Simplifiying pinoutsHEADmaster
-rw-r--r--test_flight_basic_logging/test_flight_basic_logging.ino24
1 files changed, 12 insertions, 12 deletions
diff --git a/test_flight_basic_logging/test_flight_basic_logging.ino b/test_flight_basic_logging/test_flight_basic_logging.ino
index 2894b8f..3b917db 100644
--- a/test_flight_basic_logging/test_flight_basic_logging.ino
+++ b/test_flight_basic_logging/test_flight_basic_logging.ino
@@ -8,7 +8,7 @@
The circuit:
* Components supplying input:
- - Momentary switch
+ - Momentary switch
* Measurement - pin 1
- 9-Axis motion sensor MPU9250 Shield
* Connected to the SMT pads on the underside of the Teensy
@@ -28,8 +28,8 @@
* CLK - pin 13
* CS - as defined in radioChipSelect field
* SDN - pin 17
- * RX-ANT - pin 18
- * TX-ANT - pin 19
+ * RX-ANT - ground - as we are always in TX mode
+ * TX-ANT - vcc (3.3v) - As we are always in TX mode
@@ -133,15 +133,15 @@ void setup() {
if (serialDebug) {
// block until serial sent to micro
Serial.begin(115200);
-
+
while(!Serial.available()){}
- }
+ }
while (!digitalRead(buttonPin));
- setupRFM22B();
+ setupRFM22B();
setupSD();
-
+
delay(100);
printData("\nBeginning radio test:\n");
@@ -162,7 +162,7 @@ void setup() {
printData("\nGPS waiting on lock...\n");
long timeStarted = millis();
-
+
while (!gpsLocked) {
if (gpsSerial.available()) {
gps.encode(gpsSerial.read());
@@ -193,11 +193,11 @@ void setup() {
setupMPU9250();
setupAK8963();
setupMS5637();
-
+
while (!initialiseOK);
- printData("\nFinalising init logs and beginning main iteration");
-
+ printData("\nFinalising init logs and beginning main iteration");
+
// finalise init logs
initFileName.toCharArray(fileNameBuffer, 20);
datafile = SD.open(fileNameBuffer, O_CREAT | O_WRITE);
@@ -250,7 +250,7 @@ void runPreApogeeIteration() {
ay = (float)accelCount[1]*aRes;
az = (float)accelCount[2]*aRes;
- if (ay < -2.0 && flightStartTime == 0) { // Start timer when pulling more than 3.0G
+ if (ay < -2.0 && flightStartTime == 0) { // Start timer when pulling more than 3.0G
flightStartTime = millis();
}