pingu_98/CosmicPiArduino
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update to include libraries in local folder

Browse source 
Inclusion of Adafruit libraries for prototype development
This commit is contained in:
James Devine 2015-12-08 11:49:52 +01:00
parent 644d1e4a41
commit c2a7a80aa3
1 changed files with 73 additions and 85 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

158
CosmicPiArduino.ino
View file

@ -1,13 +1,10 @@
//this code works pretty well. Not awesome, but well enough. #include "Adafruit_BMP085_U.h"
//requires the Adafruit libraries to be installed in your /libraries directory #include "Adafruit_GPS.h"
#include "Adafruit_Sensor.h"
#include <Adafruit_BMP085_U.h> #include "Adafruit_L3GD20_U.h"
#include <Adafruit_GPS.h> #include "Adafruit_LSM303_U.h"
#include <Adafruit_Sensor.h> #include "Adafruit_10DOF.h"
#include <Adafruit_L3GD20_U.h> #include "Adafruit_HTU21DF.h"
#include <Adafruit_LSM303_U.h>
#include <Adafruit_10DOF.h>
#include <Adafruit_HTU21DF.h>
#include <Wire.h> #include <Wire.h>
#include <SPI.h> #include <SPI.h>
@ -21,15 +18,6 @@ const int slaveAPin = 52;
//integer array for data sampling //integer array for data sampling
unsigned int values[200]; unsigned int values[200];
//byte outputbuffer[1200]; //byte outputbuffer[1200];
//temperature voltage matrix. index 0, 0xFF is the minimum value - i.e. doesn't work.
int tempvoltage[50] =
{0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
0x6D,0x6D,0x6D,0x6D,0x6D,0x6E,0x6F,0x70,0x71,0x72,
0x73,0x74,0x75,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF};
//define trigger pin //define trigger pin
const int eventtrigger = 49; const int eventtrigger = 49;
boolean eventhappened = false; boolean eventhappened = false;
@ -64,9 +52,8 @@ boolean timereset = false; //has an event been detected?
String lastgpsread = ""; String lastgpsread = "";
//lastgpsread.reserve(100); //lastgpsread.reserve(100);
int deviceid = random(1, 10000); int deviceid = random(1, 10000);
float temperature = 0; float temperature;
double temperatureh = 0; double temperatureh = 0;
int localtemp = 0;
double humidity = 0; double humidity = 0;
double baroaltitude = 0; double baroaltitude = 0;
double accelx = 0; double accelx = 0;
@ -75,7 +62,6 @@ double accelz = 0;
double magx = 0; double magx = 0;
double magy = 0; double magy = 0;
double magz = 0; double magz = 0;
int targethv = 0xFF;
int currentval = 0xFF; int currentval = 0xFF;
long exacttime = 0; long exacttime = 0;
int uptime = 0; int uptime = 0;
@ -101,7 +87,7 @@ void setup()
pinMode(timeresetpin, INPUT); pinMode(timeresetpin, INPUT);
attachInterrupt(timeresetpin, timeset, RISING); attachInterrupt(timeresetpin, timeset, RISING);
pinMode(eventtrigger, INPUT); pinMode(eventtrigger, INPUT);
attachInterrupt(eventtrigger, triggermonkey, FALLING); attachInterrupt(eventtrigger, monkey, FALLING);
Serial.begin(115200); // initialize the serial port: Serial.begin(115200); // initialize the serial port:
//setup ADC //setup ADC
@ -111,23 +97,12 @@ void setup()
adcloopctr = 0; adcloopctr = 0;
Serial.println("ADC Alive"); Serial.println("ADC Alive");
//check the temperature and set the target voltage
Serial.println(F("checking temp for target voltage - temp is"));
sensorreadout();
localtemp = int(temperatureh);
Serial.println(localtemp);
targethv = tempvoltage[localtemp];
Serial.println(F("Target voltage is"));
Serial.println(targethv);
//setup SPI interface and start the HV DC ramp
pinMode (slaveAPin, OUTPUT); pinMode (slaveAPin, OUTPUT);
digitalWrite(slaveAPin, LOW); digitalWrite(slaveAPin, LOW);
SPI.begin(); SPI.begin();
Serial.println(F("ramping start")); Serial.println(F("ramping start"));
ramp(targethv); ramp(0x6D);
} }
void loop() { void loop() {
@ -171,13 +146,6 @@ if (eventhappened) {
eventhappened = false; eventhappened = false;
} }
if (int(temperatureh)!=localtemp)
{
localtemp = int(temperatureh);
Serial.println(F("Change in temperature"));
stepset(tempvoltage[localtemp]);
}
if (adcloopctr == sampledepth) { if (adcloopctr == sampledepth) {
adcloopctr = 0; adcloopctr = 0;
} }
@ -242,60 +210,94 @@ void printdatajson()
{ {
//rewritten to use a buffer //rewritten to use a buffer
//start the data output on in json format //start the data output on in json format
outputbuffer = "{\"gps\":\""; outputbuffer = "{\"gps\": \"";
outputbuffer = outputbuffer + lastgpsread; outputbuffer = outputbuffer + lastgpsread;
outputbuffer = outputbuffer + "\",\"timing\":"; outputbuffer = outputbuffer + "\" ,\"timing\":";
outputbuffer = outputbuffer + exacttime; outputbuffer = outputbuffer + exacttime;
outputbuffer = outputbuffer +",\"energy\":{\"energy1\":["; outputbuffer = outputbuffer +",\"energy\": { \"energy1\": [";
for (int firsthalf = adcloopctr + 1; firsthalf < sampledepth; firsthalf++) for (int firsthalf = adcloopctr + 1; firsthalf < sampledepth; firsthalf++)
{ {
outputbuffer = outputbuffer + (values[firsthalf]); outputbuffer = outputbuffer + (values[firsthalf]);
if (readoutctr != 1) outputbuffer = outputbuffer + (","); if (readoutctr != 1) outputbuffer = outputbuffer + (", ");
readoutctr--; readoutctr--;
} }
for (int secondhalf = 0; secondhalf < adcloopctr + 1; secondhalf++) for (int secondhalf = 0; secondhalf < adcloopctr + 1; secondhalf++)
{ {
outputbuffer = outputbuffer + (values[secondhalf]); outputbuffer = outputbuffer + (values[secondhalf]);
if (readoutctr != 1) outputbuffer = outputbuffer + (","); if (readoutctr != 1) outputbuffer = outputbuffer + (", ");
readoutctr--; readoutctr--;
} }
Serial.print((outputbuffer));
outputbuffer = outputbuffer + "],"; outputbuffer = "";
outputbuffer = outputbuffer + "\"energy2\":["; Serial.print(" ],");
Serial.print(" \"energy2\": [");
readoutctr = 10; readoutctr = 10;
for (int firsthalf = adcloopctr + 1; firsthalf < sampledepth; firsthalf++) for (int firsthalf = adcloopctr + 1; firsthalf < sampledepth; firsthalf++)
{ {
outputbuffer = outputbuffer + values[firsthalf + 100]; Serial.print(values[firsthalf + 100]);
if (readoutctr != 1) outputbuffer = outputbuffer + ","; if (readoutctr != 1) Serial.print(", ");
readoutctr--; readoutctr--;
} }
for (int secondhalf = 0; secondhalf < adcloopctr + 1; secondhalf++) for (int secondhalf = 0; secondhalf < adcloopctr + 1; secondhalf++)
{ {
outputbuffer = outputbuffer + values[secondhalf + 100]; Serial.print(values[secondhalf + 100]);
if (readoutctr != 1) outputbuffer = outputbuffer + ","; if (readoutctr != 1) Serial.print(", ");
readoutctr--; readoutctr--;
} }
outputbuffer = outputbuffer + "]},\"altitude\": "+ baroaltitude + ",\"humidity\": " + humidity + ",\"gravitationalOrientation\":{\"x\":" + accelx; Serial.print(" ]");
outputbuffer = outputbuffer + ",\"y\": "+ accely + ",\"z\":"+ accelz+ "},"; Serial.print(" },");
outputbuffer = outputbuffer + "\"magneticOrientation\":{\"x\":" + magx + ",\"y\":"+ magy+ ",\"z\":" + magz + "},"; Serial.print(" \"altitude\": ");
Serial.print(baroaltitude);
Serial.print(",");
outputbuffer = outputbuffer + "\"temperature\":{\"value1\":" + temperatureh; //val1 is from the humidity sensor Serial.print(" \"humidity\": ");
outputbuffer = outputbuffer + ",\"value2\":"; Serial.print(humidity);
outputbuffer = outputbuffer + temperature; Serial.print(",");
outputbuffer = outputbuffer + "}, \"uptime\":";
outputbuffer = outputbuffer + uptime; Serial.print(" \"gravitationalOrientation\": {");
outputbuffer = outputbuffer + ",\"id\":"; Serial.print(" \"x\": ");
outputbuffer = outputbuffer + deviceid; Serial.print(accelx);
outputbuffer = outputbuffer + "}"; Serial.print(",");
Serial.println((outputbuffer)); Serial.print(" \"y\": ");
outputbuffer = ""; Serial.print(accely);
Serial.print(",");
Serial.print(" \"z\": ");
Serial.print(accelz);
Serial.print(" },");
Serial.print(" \"magneticOrientation\": {");
Serial.print(" \"x\": ");
Serial.print(magx);
Serial.print(",");
Serial.print(" \"y\": ");
Serial.print(magy);
Serial.print(",");
Serial.print(" \"z\": ");
Serial.print(magz);
Serial.print(" },");
Serial.print(" \"temperature\": {");
Serial.print(" \"value1\": ");
Serial.print(temperatureh); //val1 is from the humidity sensor
Serial.print(",");
Serial.print(" \"value2\": ");
Serial.print(temperature);
Serial.print(" },");
Serial.print(" \"uptime\": ");
Serial.print(uptime);
Serial.print(",");
Serial.print(" \"id\": ");
Serial.print(deviceid);
Serial.println("}");
} }
void triggermonkey() void monkey()
{ {
//Serial.println("trigger"); //Serial.println("trigger");
eventhappened = true; eventhappened = true;
@ -351,12 +353,12 @@ void timeset()
timereset = true; timereset = true;
} }
void ramp(int localtarget) void ramp(int target)
{ {
//wait 100ms before ramp up //wait 100ms before ramp up
int difference = currentval - localtarget; int difference = currentval - target;
while (currentval > localtarget) while (currentval > target)
{ {
digitalWrite(slaveAPin, LOW); digitalWrite(slaveAPin, LOW);
SPI.beginTransaction(SPISettings(2000000, MSBFIRST, SPI_MODE0)); SPI.beginTransaction(SPISettings(2000000, MSBFIRST, SPI_MODE0));
@ -371,17 +373,3 @@ void ramp(int localtarget)
currentval = currentval - 2; currentval = currentval - 2;
} }
} }
void stepset(int localtarget)
{
digitalWrite(slaveAPin, LOW);
SPI.beginTransaction(SPISettings(2000000, MSBFIRST, SPI_MODE0));
delay(180);
SPI.transfer(localtarget);
Serial.println(F("temperature change, new HV setpoint"));
Serial.println(localtarget);
delay(180);
SPI.endTransaction();
digitalWrite(slaveAPin, HIGH);
//}
}