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

added spreadsheet

Browse source
This commit is contained in:
James Devine 2017-03-14 01:19:44 +01:00
parent 9b053b3c87
commit ae47874639
4 changed files with 198 additions and 152 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.~lock.CosmicPiHVSetpoints.ods# Normal file
View file

@ -0,0 +1 @@
,jimmy,jimmy-Edgar,14.03.2017 01:17,file:///home/jimmy/.config/libreoffice/4;

345
CosmicPiArduino.ino
View file

@ -7,13 +7,21 @@
float ADCTempValue = 0; //buffer for the internal temperature
String SerialNumberValue = ""; //Buffer for the serial number
long PPSLength = 0; //The number of internal clock cycles in a GPS PPS
long PPSUptime = 0; //The number of PPS pulses counted since the last reboot.
long PPSUptime = 0; //The number of PPS pulses counted since the last reboot.
long PreviousPPS = 0; //The value of the previous PPS (to define which second we're in)
int EventsThisSecond = 0; //The number of events since the last PPS
bool dump = false; //if there's an event, dump the data.
bool dump = false; //if there's an event, dump the data.
int Ch1Offset = 240; //Channel 1 trigger offset
int Ch2Offset = 240; //Channel 2 trigger offset
bool tempflipvar = true; //flash the light when GPS is locked
bool tempevtvar = false; //temp event value
int readthresholdCh1 = 0; //read in values for the thresholds; for software triggering
int readthresholdCh2 = 0;
int calcthreshCh1 = 0; //calcualte the thresholds
int calcthreshCh2 = 0;
//SoftSPI pin assignments
#define SS_pin 42
#define SS_pin 42
#define SCK_pin 44
#define MISO_pin 22
#define MOSI_pin 43
@ -43,16 +51,19 @@ bool dump = false; //if there's an event, dump the data.
#define AccelFullScale 2.0 // +-2g 16 bit 2's compliment
#define GravityEarth 9.80665 //The earth's gravity
const int HVSetpoints[50] = {0x8F,0x8F,0x8E,0x8D,0x8D,0x8C,0x8B,0x8B,0x8A,0x89,
0x89,0x88,0x87,0x87,0x86,0x86,0x85,0x84,0x84,0x83,
0x82,0x82,0x81,0x80,0x80,0x7F,0x7E,0x7E,0x7D,0x7D,
0x7C,0x7B,0x7B,0x7A,0x79,0x79,0x78,0x77,0x77,0x76,
0x75,0x75,0x74,0x73,0x73,0x72,0x72,0x71,0x70,0x70};
//this table is WAY OFF
const int HVSetpoints[50] = {98,98,97,97,96, 96,95,95,94,94,
93,93,92,92,91, 91,90,90,89,88,
88,87,87,86,86, 85,85,84,84,83,
83,82,82,81,81, 80,80,79,79,78,
78,77,77,76,76, 75,75,74,74,73
};
//HV setpoints, starting from 0 to 50 degrees (i.e. 0th element is 0 degrees) - add 0.5 and cast as an int for the index.
String StringEventBuf[3] = {"Output String Buffer Event 1", "Output String Buffer Event 2", "Output String Buffer Event 3"};
long EventTimestamp[3] = {0,0,0};
float Accel[3]; //Accelerometer array, 0 is X, 1 is Y and 2 is Z.
long EventTimestamp[3] = {0, 0, 0};
float Accel[3]; //Accelerometer array, 0 is X, 1 is Y and 2 is Z.
unsigned long timeX = 0;
unsigned long oldtime = 0;
@ -60,162 +71,196 @@ unsigned long oldtime = 0;
void setup() {
//Start Wire (I2C comms)
Wire.begin();
Wire1.begin();
Wire.begin();
Wire1.begin();
//LED output pins
pinMode(Power_LED, OUTPUT); //Power LED
pinMode(Event_LED, OUTPUT); //Event LED
pinMode(Event_Input, INPUT); //Event LED
pinMode(Power_LED, OUTPUT); //Power LED
pinMode(Event_LED, OUTPUT); //Event LED
pinMode(Event_Input, INPUT); //Event LED
//SoftSPI output pins
digitalWrite(SS, HIGH); // Start with SS high
pinMode(SS_pin, OUTPUT);
pinMode(SCK_pin, OUTPUT);
pinMode(MISO_pin, INPUT); //note this is the avalanche output from the MAX1932, but not yet used
pinMode(MOSI_pin, OUTPUT);
digitalWrite(SS, HIGH); // Start with SS high
pinMode(SS_pin, OUTPUT);
pinMode(SCK_pin, OUTPUT);
pinMode(MISO_pin, INPUT); //note this is the avalanche output from the MAX1932, but not yet used
pinMode(MOSI_pin, OUTPUT);
//I2CPot output pins
pinMode(I2CPot1_PIN, OUTPUT);
pinMode(I2CPot2_PIN, OUTPUT);
pinMode(I2CPot3_PIN, OUTPUT);
//and write them low
digitalWrite(I2CPot1_PIN, LOW);
digitalWrite(I2CPot2_PIN, LOW);
digitalWrite(I2CPot3_PIN, LOW);
pinMode(I2CPot1_PIN, OUTPUT);
pinMode(I2CPot2_PIN, OUTPUT);
pinMode(I2CPot3_PIN, OUTPUT);
//and write them low
digitalWrite(I2CPot1_PIN, LOW);
digitalWrite(I2CPot2_PIN, LOW);
digitalWrite(I2CPot3_PIN, LOW);
// Pressure sensor address setup
pinMode(AccelSA1, OUTPUT); //Pressure Sensor
digitalWrite(AccelSA1, LOW);
//make sure the LED's are off
digitalWrite(Power_LED, 0);
digitalWrite(Event_LED, 0);
//Turn on the ON led
PowerOn();
ThresholdSet(255, 255);
//debug output
Serial.begin(9600);//we run the serial at 9600 for debugging only.
PressureSetup();
Serial.println("Temp:");
Serial.println(PressureTemp());
VbiasSet(HVSetpoints[int(PressureTemp() + 0.5)]+5);
delay(1000);
//set the thresholds; rewrite this to not echo in future
//read the threshold setpoints
Serial.println("Initial Threshold values");
int Ch1 = analogRead(A1);
int Ch2 = analogRead(A2);
Serial.print(Ch1);
Serial.print(" ");
Serial.println(Ch2);
Serial.println("Backed-off Analogue values");
Ch1 = analogRead(A6);
Ch2 = analogRead(A7);
Serial.print(Ch1);
Serial.print(" ");
Serial.println(Ch2);
calcthreshCh1 =(Ch1+Ch1Offset) >> 2;
calcthreshCh2 =(Ch2+Ch2Offset) >> 2;
ThresholdSet(calcthreshCh1,calcthreshCh2);
Serial.println("Calculated threshold values");
// Pressure sensor address setup
pinMode(AccelSA1, OUTPUT); //Pressure Sensor
digitalWrite(AccelSA1, LOW);
Serial.begin(9600);//we run the serial at 9600 for debugging only.
Serial.print(calcthreshCh1);
Serial.print(" ");
Serial.println(calcthreshCh2);
//make sure the LED's are off
digitalWrite(Power_LED, 0);
digitalWrite(Event_LED, 0);
PressureSetup();
VbiasSet(HVSetpoints[int(PressureTemp()+0.5)]);
//VbiasSet(100);
ThresholdSet(130,130);
//ADCSetup();
//TimerInit();
PowerOn();
//AccelSetup();
SerialNumberValue = SerialNumberReadout();
Serial.println(SerialNumberValue);
Serial.println("finished init");
timeX = millis();
Serial.print("analogue values ");
int Ch1 = analogRead(A6);
int Ch2 = analogRead(A7);
Serial.print(Ch1);
Serial.print(" ");
Serial.println(Ch2);
Serial.println("New Threshold values");
readthresholdCh1 = analogRead(A1);
readthresholdCh2 = analogRead(A2);
Serial.print(readthresholdCh1);
Serial.print(" ");
Serial.println(readthresholdCh2);
VbiasSet(HVSetpoints[int(PressureTemp() + 0.5)]);
delay(1000);
/*
//ADCSetup();
//AccelSetup();
SerialNumberValue = SerialNumberReadout();
Serial.println(SerialNumberValue);
Serial.println("finished init");
//timeX = millis();
Serial.println("analogue values ");
//) + " " + int(analogRead(A7)));
//TimerInit();
*/
}
void loop() {
//Serial.println(String(analogRead(A6))+" "+String(analogRead(A7))+" " +int(digitalRead(Event_Input)));
Serial.println(PressureTemp());
// for (int i = 0; i < 220; i++)
// {
// VbiasSet(i);
// delay(100);
// for (int i = 0; i < 5; i++)
// {
int Ch1 = analogRead(A6);
int Ch2 = analogRead(A7);
if (Ch1 > readthresholdCh1) {
if (Ch2 > readthresholdCh2) {
Serial.print(Ch1);
Serial.print(" ");
Serial.println(Ch2);
}
}
delay(1000);
/*
if (digitalRead(Event_Input)) {
Serial.print("Event ");
oldtime = timeX;
timeX = millis();
//prints time since program started
Serial.println(timeX - oldtime);
EventFlashOn();
delay(50);
EventFlashOff();
}
// Serial.println("temp");
// Serial.println(HumReadTemp());
//delay(1000);
// Serial.println("Hum");
// Serial.println(HumReadHum());
//delay(1000);
//ThresholdSet(200,20);
//Serial.println("Accel");
//AccelRead();
// Serial.println(String(Accel[0])+" "+ String(Accel[1])+" "+ String(Accel[2]));
*/
//}
//}
}
void TimerInit() {
uint32_t config = 0;
uint32_t config = 0;
// Set up the power management controller for TC0 and TC2
pmc_set_writeprotect(false); // Enable write access to power management chip
pmc_enable_periph_clk(ID_TC0); // Turn on power for timer block 0 channel 0
pmc_enable_periph_clk(ID_TC6); // Turn on power for timer block 2 channel 0
pmc_set_writeprotect(false); // Enable write access to power management chip
pmc_enable_periph_clk(ID_TC0); // Turn on power for timer block 0 channel 0
pmc_enable_periph_clk(ID_TC6); // Turn on power for timer block 2 channel 0
// Timer block zero channel zero is connected only to the PPS
// Timer block zero channel zero is connected only to the PPS
// We set it up to load regester RA on each PPS and reset
// So RA will contain the number of clock ticks between two PPS, this
// value should be very stable +/- one tick
config = TC_CMR_TCCLKS_TIMER_CLOCK1 | // Select fast clock MCK/2 = 42 MHz
TC_CMR_ETRGEDG_RISING | // External trigger rising edge on TIOA0
TC_CMR_ABETRG | // Use the TIOA external input line
TC_CMR_LDRA_RISING; // Latch counter value into RA
config = TC_CMR_TCCLKS_TIMER_CLOCK1 | // Select fast clock MCK/2 = 42 MHz
TC_CMR_ETRGEDG_RISING | // External trigger rising edge on TIOA0
TC_CMR_ABETRG | // Use the TIOA external input line
TC_CMR_LDRA_RISING; // Latch counter value into RA
TC_Configure(TC0, 0, config); // Configure channel 0 of TC0
TC_Start(TC0, 0); // Start timer running
TC_Configure(TC0, 0, config); // Configure channel 0 of TC0
TC_Start(TC0, 0); // Start timer running
TC0->TC_CHANNEL[0].TC_IER = TC_IER_LDRAS; // Enable the load AR channel 0 interrupt each PPS
TC0->TC_CHANNEL[0].TC_IDR = ~TC_IER_LDRAS; // and disable the rest of the interrupt sources
NVIC_EnableIRQ(TC0_IRQn); // Enable interrupt handler for channel 0
TC0->TC_CHANNEL[0].TC_IER = TC_IER_LDRAS; // Enable the load AR channel 0 interrupt each PPS
TC0->TC_CHANNEL[0].TC_IDR = ~TC_IER_LDRAS; // and disable the rest of the interrupt sources
NVIC_EnableIRQ(TC0_IRQn); // Enable interrupt handler for channel 0
// Timer block 2 channel zero is connected to the OR of the PPS and the RAY event
config = TC_CMR_TCCLKS_TIMER_CLOCK1 | // Select fast clock MCK/2 = 42 MHz
TC_CMR_ETRGEDG_RISING | // External trigger rising edge on TIOA1
TC_CMR_ABETRG | // Use the TIOA external input line
TC_CMR_LDRA_RISING; // Latch counter value into RA
config = TC_CMR_TCCLKS_TIMER_CLOCK1 | // Select fast clock MCK/2 = 42 MHz
TC_CMR_ETRGEDG_RISING | // External trigger rising edge on TIOA1
TC_CMR_ABETRG | // Use the TIOA external input line
TC_CMR_LDRA_RISING; // Latch counter value into RA
TC_Configure(TC2, 0, config); // Configure channel 0 of TC2
TC_Start(TC2, 0); // Start timer running
TC2->TC_CHANNEL[0].TC_IER = TC_IER_LDRAS; // Enable the load AR channel 0 interrupt each PPS
TC2->TC_CHANNEL[0].TC_IDR = ~TC_IER_LDRAS; // and disable the rest of the interrupt sources
NVIC_EnableIRQ(TC6_IRQn); // Enable interrupt handler for channel 0
// Set up the PIO controller to route input pins for TC0 and TC2
PIO_Configure(PIOC,PIO_INPUT,
PIO_PB25B_TIOA0, // D2 Input for PPS
PIO_DEFAULT);
PIO_Configure(PIOC, PIO_INPUT,
PIO_PB25B_TIOA0, // D2 Input for PPS
PIO_DEFAULT);
PIO_Configure(PIOC,PIO_INPUT,
PIO_PC25B_TIOA6, // D5 Input for Trigger
PIO_DEFAULT);
PIO_Configure(PIOC, PIO_INPUT,
PIO_PC25B_TIOA6, // D5 Input for Trigger
PIO_DEFAULT);
}
void TC0_Handler() {
//This is called the one second event interrupt in documentation
//This is called the one second event interrupt in documentation
//when the PPS event occurs
PPSLength = TC0->TC_CHANNEL[0].TC_RA; // Read the RA reg (PPS period)
TC_GetStatus(TC0, 0); // Read status and clear load bits
tempflipvar = !tempflipvar;
digitalWrite(Power_LED, tempflipvar);
digitalWrite(Event_LED, 0);
PPSUptime++; // PPS count
EventsThisSecond=0; //reset the event counter for this second
EventsThisSecond = 0; //reset the event counter for this second
}
void TC6_Handler() {
Serial.println("Cosmic");
//rega1 = TC2->TC_CHANNEL[0].TC_RA; // Read the RA on channel 1 (PPS period)
//stsr1 =
// tempevtvar=!tempevtvar;
digitalWrite(Event_LED, 1);
EventTimestamp[EventsThisSecond] = TC0->TC_CHANNEL[0].TC_RA; //read the main clock and copy it to the event register
EventsThisSecond++; //increment the event counter for this second
TC_GetStatus(TC2, 0); // Read status clear load bits, unlocking this interrupt.
@ -229,16 +274,16 @@ void ADCSetup() {
}
void PowerOn(){
digitalWrite(Power_LED, 1);
void PowerOn() {
digitalWrite(Power_LED, 1);
}
void EventFlashOn(){
digitalWrite(Event_LED, 1);
void EventFlashOn() {
digitalWrite(Event_LED, 1);
}
void EventFlashOff(){
digitalWrite(Event_LED, 0);
void EventFlashOff() {
digitalWrite(Event_LED, 0);
}
@ -246,60 +291,60 @@ digitalWrite(Event_LED, 0);
__attribute__ ((section (".ramfunc")))
String SerialNumberReadout() {
unsigned int status;
unsigned int pdwUniqueID[4];
/* Send the Start Read unique Identifier command (STUI)
* by writing the Flash Command Register with the STUI command.
*/
unsigned int pdwUniqueID[4];
/* Send the Start Read unique Identifier command (STUI)
by writing the Flash Command Register with the STUI command.
*/
EFC1->EEFC_FCR = (0x5A << 24) | EFC_FCMD_STUI;
do {
status = EFC1->EEFC_FSR ;
} while ((status & EEFC_FSR_FRDY) == EEFC_FSR_FRDY);
/* The Unique Identifier is located in the first 128 bits of the
* Flash memory mapping. So, at the address 0x400000-0x400003.
*/
/* The Unique Identifier is located in the first 128 bits of the
Flash memory mapping. So, at the address 0x400000-0x400003.
*/
pdwUniqueID[0] = *(uint32_t *)IFLASH1_ADDR;
pdwUniqueID[1] = *(uint32_t *)(IFLASH1_ADDR + 4);
pdwUniqueID[2] = *(uint32_t *)(IFLASH1_ADDR + 8);
pdwUniqueID[3] = *(uint32_t *)(IFLASH1_ADDR + 12);
/* To stop the Unique Identifier mode, the user needs to send the Stop Read unique Identifier
* command (SPUI) by writing the Flash Command Register with the SPUI command.
*/
command (SPUI) by writing the Flash Command Register with the SPUI command.
*/
EFC1->EEFC_FCR = (0x5A << 24) | EFC_FCMD_SPUI ;
/* When the Stop read Unique Unique Identifier command (SPUI) has been performed, the
* FRDY bit in the Flash Programming Status Register (EEFC_FSR) rises.
*/
FRDY bit in the Flash Programming Status Register (EEFC_FSR) rises.
*/
do {
status = EFC1->EEFC_FSR ;
} while ((status & EEFC_FSR_FRDY) != EEFC_FSR_FRDY);
int uid_ok = 0;
String uidtxt;
uidtxt = String(pdwUniqueID[0]) + String(pdwUniqueID[1]) + String(pdwUniqueID[2]) + String(pdwUniqueID[3]);
return uidtxt;
int uid_ok = 0;
String uidtxt;
uidtxt = String(pdwUniqueID[0]) + String(pdwUniqueID[1]) + String(pdwUniqueID[2]) + String(pdwUniqueID[3]);
return uidtxt;
}
float ADCTemp(){
//Routine uses the internal temperature sensor in the Arduino DUE
//Note this uses the ADC
float trans = 3.3/4096;
float offset = 0.8;
float factor = 0.00256;
int fixtemp = 27;
uint32_t ulValue = 0;
uint32_t ulChannel;
//BUG: The ADC needs to be reset using these register values; otherwise the values read out are WRONG.
float ADCTemp() {
//Routine uses the internal temperature sensor in the Arduino DUE
//Note this uses the ADC
float trans = 3.3 / 4096;
float offset = 0.8;
float factor = 0.00256;
int fixtemp = 27;
uint32_t ulValue = 0;
uint32_t ulChannel;
//BUG: The ADC needs to be reset using these register values; otherwise the values read out are WRONG.
//REG_ADC_MR = 0x00000000; // Void this register
//REG_ADC_CHER = 0; // No channels running
// Enable the corresponding channel
adc_enable_channel(ADC, ADC_TEMPERATURE_SENSOR);
@ -318,8 +363,8 @@ uint32_t ulChannel;
// Disable the corresponding channel
adc_disable_channel(ADC, ADC_TEMPERATURE_SENSOR);
float treal = fixtemp + (( trans * ulValue ) - offset ) / factor;
float treal = fixtemp + (( trans * ulValue ) - offset ) / factor;
return treal;
return treal;
}

BIN
CosmicPiHVSetpoints.ods Normal file
View file

Binary file not shown.

4
peripherals.ino
View file

@ -7,7 +7,7 @@ void ThresholdSet(int ThreshA, int ThreshB) {
// Serial.println("Test of threshold setting");
// Serial.print(ThreshA);
//Serial.println(analogRead(A1)); //internal readback of the DREF value only, not returned to main code.
Wire.beginTransmission(0x28); // transmit to device #94 (0x5F)
Wire.beginTransmission(I2CPot); // transmit to device #94 (0x5F)
// device address is specified in datasheet
Wire.write(0x11); // sends instruction byte
Wire.write(ThreshA); // sends potentiometer value byte
@ -59,7 +59,7 @@ void VbiasSet(int Vbias) {
digitalWrite(SS_pin, LOW); // SS low
for (int i = 0; i < 8; i++) // There are 8 bits in a byte
{
digitalWrite(MOSI_pin, bitRead(_send, i-7)); // Set MOSI
digitalWrite(MOSI_pin, bitRead(_send, 7-i)); // Set MOSI
digitalWrite(SCK_pin, HIGH); // SCK high
//bitWrite(_receive, i, digitalRead(MISO_pin)); // Capture MISO
digitalWrite(SCK_pin, LOW); // SCK low