Skip to content

Commit

Permalink
No commit message
Browse files Browse the repository at this point in the history
  • Loading branch information
ausshir committed Aug 2, 2014
1 parent cbe3da6 commit 127a56b
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 8 deletions.
10 changes: 8 additions & 2 deletions Arduino/balloonMain/balloonMain.ino
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ unsigned long fixAge, speed, course, lastLog, lastTransmit, lastPicture, date, t
unsigned long gpsAlt, ExternalTemp, InternalTemp, humd; // gps and timing data
int ax, ay, az, gx, gy, gz, mx, my, mz; // gyro data

unsigned long chars;
unsigned short sentences, failed;

void setup() // runs once at power up
{
pinMode(4, OUTPUT); //set up keycamera
Expand All @@ -33,7 +36,7 @@ void setup() // runs once at power up
delay(2000);
digitalWrite(4, 0);
Wire.begin(); // fire up the I2C interface
Serial.begin(1200); // main serial port for debug/radio interface
Serial.begin(4800); // main serial port for debug/radio interface
ssGPS.begin(9600); // serial interface for the gps
ssLogger.begin(4800); //serial interface for the DataLogger
gyro.initialize(); // set up IMU
Expand All @@ -52,6 +55,7 @@ void setup() // runs once at power up
lon = 0;
gpsAlt = 0;
time = 0;
ssGPS.listen();
}

void loop()
Expand All @@ -72,11 +76,13 @@ void loop()
{
lastLog = millis();
logData();
ssGPS.listen();
}

if(millis() - lastTransmit > 500) // transmit data every .5 second
if(millis() - lastTransmit > 5000) // transmit data every 1 sec
{
lastTransmit = millis();
transmitData();
ssGPS.listen();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
*/

TinyGPS gps;
SoftwareSerial ss(4, 3);
SoftwareSerial ss(8, 11);

void setup()
{
Serial.begin(115200);
ss.begin(4800);
Serial.begin(1200);
ss.begin(9600);

Serial.print("Simple TinyGPS library v. "); Serial.println(TinyGPS::library_version());
Serial.println("by Mikal Hart");
Expand Down Expand Up @@ -62,4 +62,4 @@ void loop()
Serial.println(failed);
if (chars == 0)
Serial.println("** No characters received from GPS: check wiring **");
}
}
4 changes: 2 additions & 2 deletions BalloonTrack/dataPlot(Untested).py
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ def __init__(self, parent=None):
self.yplot2 = [int(0)]
self.gpsAlt = "0"

self.recvSerial = serial.Serial("COM3", 1200, timeout=0.5)
self.sendSerial = serial.Serial("COM8", 9600, timeout=0.5)
self.recvSerial = serial.Serial("COM6", 4800, timeout=5)
self.sendSerial = serial.Serial("COM8", 9600, timeout=5)
print "Serial Started"

self.create_status_bar(self.gpsAlt)
Expand Down

0 comments on commit 127a56b

Please sign in to comment.