Circuit-Forge/easypiezi
3
0
Fork 0
Code Issues 4 Pull requests Projects Releases Packages Wiki Activity Actions

fixed syntax preventing compilation

Browse source
This commit is contained in:
pyr0ball 2019-03-15 22:17:51 -07:00
parent 55c6f867c2
commit bd64d8f707
1 changed files with 93 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

126
firmware/AVR-Source/Pyr0_Piezo_Sensor_v2.x.x/Pyr0_Piezo_Sensor_v2.x.x.ino
View file

@ -56,16 +56,18 @@ The gain STATE is representative of these values:
4 = 11x 4 = 11x
*/ */
//#include <Wire.h> #include <Wire.h>
// Set variables for working parameters // Set variables for working parameters
int GAIN_FACTOR = 2; // Gain adjustment factor. 0=2x, 1=2.5x, 2=3.33x, 3=5x, 4=10x int GAIN_FACTOR = 2; // Gain adjustment factor. 0=2x, 1=2.5x, 2=3.33x, 3=5x, 4=10x
int InitCount = 6; // Number of times to blink the LED on start int InitCount = 6; // Number of times to blink the LED on start
int TRG_DUR = 120; // duration of the Z-axis pulse sent, in ms int TRG_DUR = 120; // duration of the Z-axis pulse sent, in ms
float senseHighThrs = 2.35; // Upper threshold of Voltage Follower before adjustment float senseThrs = 2.15;
float senseLowThrs = 1.8; // Lower threshold of Voltage Follower before adjustment //float senseHighThrs = 2.35; // Upper threshold of Voltage Follower before adjustment
float compHighThrs = 2.75; // Upper threshold of Comparator before adjustment //float senseLowThrs = 1.8; // Lower threshold of Voltage Follower before adjustment
float compLowThrs = 2.54; // Lower threshold of Comparator before adjustment float compThrs = 2.75;
//float compHighThrs = 2.75; // Upper threshold of Comparator before adjustment
//float compLowThrs = 2.54; // Lower threshold of Comparator before adjustment
int Vin = 5; // input reference voltage int Vin = 5; // input reference voltage
// Analog Pin Assignments // Analog Pin Assignments
@ -92,23 +94,29 @@ volatile int ADJ_COMP = 0; // Variable for Comparator adjustment
volatile int ERR_STATE = 0; volatile int ERR_STATE = 0;
// Convert float to integer for adjustment functions // Convert float to integer for adjustment functions
int senseHighInt = (senseHighThrs / 5) * 1024; // Voltage Follower upper converted to adg interger int senseInt = (senseThrs / 5) * 1024; // Voltage Follower upper converted to adg interger
int senseLowInt = (senseLowThrs / 5) * 1024; // Voltage Follower lower converted to adg interger //int senseHighInt = (senseHighThrs / 5) * 1024; // Voltage Follower upper converted to adg interger
int compHighInt = (compHighThrs / 5) * 1024; // Upper threshold of Comparator before adjustment //int senseLowInt = (senseLowThrs / 5) * 1024; // Voltage Follower lower converted to adg interger
int compLowInt = (compLowThrs / 5) * 1024; // Lower threshold of Comparator before adjustment int compInt = (compThrs / 5) * 1024; // Upper threshold of Comparator before adjustment
//int compHighInt = (compHighThrs / 5) * 1024; // Upper threshold of Comparator before adjustment
//int compLowInt = (compLowThrs / 5) * 1024; // Lower threshold of Comparator before adjustment
// Voltage Comparator Adjustment parameters // Voltage Comparator Adjustment parameters
float VCompRef = 0.00; // variable to store the float value read from the comparator reference float VCompRef = 0.00; // variable to store the float value read from the comparator reference
int VComp = 0; int VComp = 0;
int diffCompL = VComp - compLowInt; int diffCompL = VComp - compInt;
int diffCompH = compHighInt - VComp; int diffCompH = compInt - VComp;
//int diffCompL = VComp - compLowInt;
//int diffCompH = compHighInt - VComp;
// Voltage Follower Adjustment parameters // Voltage Follower Adjustment parameters
float vAdjRead = 0.00; // variable to store the value read from the follower float vAdjRead = 0.00; // variable to store the value read from the follower
int VAdj = 0; int VAdj = 0;
int diffAdjL = VAdj - senseLowInt; int diffAdjL = VAdj - senseInt;
int diffAdjH = senseHighInt - VAdj; int diffAdjH = senseInt - VAdj;
//int diffAdjL = VAdj - senseLowInt;
//int diffAdjH = senseHighInt - VAdj;
// Error blink parameters // Error blink parameters
int BlinkState = LOW; int BlinkState = LOW;
@ -145,7 +153,7 @@ void setup() {
// Uncomment the followoing line to use hardware interrupt pin // Uncomment the followoing line to use hardware interrupt pin
attachInterrupt(digitalPinToInterrupt(Z_TRG), pulse, FALLING); attachInterrupt(digitalPinToInterrupt(Z_TRG), pulse, FALLING);
Serial.println("Initializing Piezo Sensor..."); Serial.println("Initializing Pyr0-Piezo Sensor...");
} }
@ -253,8 +261,6 @@ void serialInput() {
if(Serial.available() > 0) { if(Serial.available() > 0) {
char x = Serial.read();
// the order of these IF clauses is significant // the order of these IF clauses is significant
identifyMarkers(); identifyMarkers();
@ -268,9 +274,6 @@ void i2cInput() {
// receive data from Serial and save it into inputBuffer // receive data from Serial and save it into inputBuffer
while(Wire.available()) { while(Wire.available()) {
char x = Wire.read();
identifyMarkers(); identifyMarkers();
updateParams(); updateParams();
i2cReply(); i2cReply();
@ -279,7 +282,10 @@ void i2cInput() {
/*------------------------------------------------*/ /*------------------------------------------------*/
void identifyMarkers(){ void identifyMarkers() {
char x = Serial.read();
char y = Wire.read();
if (x == endMarker) { if (x == endMarker) {
readInProgress = false; readInProgress = false;
@ -300,6 +306,26 @@ void identifyMarkers(){
bytesRecvd = 0; bytesRecvd = 0;
readInProgress = true; readInProgress = true;
} }
if (y == endMarker) {
readInProgress = false;
serialIncoming = true;
inputBuffer[bytesRecvd] = 0;
parseData();
}
if(readInProgress) {
inputBuffer[bytesRecvd] = y;
bytesRecvd ++;
if (bytesRecvd == buffSize) {
bytesRecvd = buffSize - 1;
}
}
if (y == startMarker) {
bytesRecvd = 0;
readInProgress = true;
}
} }
/*------------------------------------------------*/ /*------------------------------------------------*/
@ -330,18 +356,24 @@ void updateParams() {
if (strcmp(serialMessageIn, "GAIN_F") == 0) { if (strcmp(serialMessageIn, "GAIN_F") == 0) {
updateGainFactor(); updateGainFactor();
} }
if (strcmp(serialMessageIn, "VCOMPH") == 0) { if (strcmp(serialMessageIn, "VCOMP") == 0) {
updateVCompH(); updateVComp();
} }
if (strcmp(serialMessageIn, "VCOMPL") == 0) { //if (strcmp(serialMessageIn, "VCOMPH") == 0) {
updateVCompL(); // updateVCompH();
} //}
if (strcmp(serialMessageIn, "VADJH") == 0) { //if (strcmp(serialMessageIn, "VCOMPL") == 0) {
updateVAdjH(); // updateVCompL();
} //}
if (strcmp(serialMessageIn, "VADJL") == 0) { if (strcmp(serialMessageIn, "VADJ") == 0) {
updateVAdjL(); updateVAdj();
} }
//if (strcmp(serialMessageIn, "VADJH") == 0) {
// updateVAdjH();
//}
//if (strcmp(serialMessageIn, "VADJL") == 0) {
// updateVAdjL();
//}
} }
/*------------------------------------------------*/ /*------------------------------------------------*/
@ -359,33 +391,47 @@ void updateGainFactor() {
} }
/*------------------------------------------------*/ /*------------------------------------------------*/
void updateVComp() {
if (serialInt >= 0) {
compThrs = ((float)serialFloat);
}
}
/*------------------------------------------------*
void updateVCompH() { void updateVCompH() {
if (serialInt >= 0) { if (serialInt >= 0) {
compHighThrs = ((float)serialFloat); compHighThrs = ((float)serialFloat);
} }
} }
/*------------------------------------------------*/ *------------------------------------------------*
void updateVCompL() { void updateVCompL() {
if (serialInt >= 0) { if (serialInt >= 0) {
compLowThrs = ((float)serialFloat); compLowThrs = ((float)serialFloat);
} }
} }
/*------------------------------------------------*/ *------------------------------------------------*/
void updateVAdj() {
if (serialInt >= 0) {
senseThrs = ((float)serialFloat);
}
}
/*------------------------------------------------*
void updateVAdjH() { void updateVAdjH() {
if (serialInt >= 0) { if (serialInt >= 0) {
senseHighThrs = ((float)serialFloat); senseHighThrs = ((float)serialFloat);
} }
} }
/*------------------------------------------------*/ *------------------------------------------------*
void updateVAdjL() { void updateVAdjL() {
if (serialInt >= 0) { if (serialInt >= 0) {
senseLowThrs = ((float)serialFloat); senseLowThrs = ((float)serialFloat);
} }
} }
/*------------------------------------------------*/ *------------------------------------------------*/
void serialReply() { void serialReply() {
if (serialIncoming) { if (serialIncoming) {
@ -439,13 +485,17 @@ void loop() {
// Check voltage of first and second stages and compare against thresholds // Check voltage of first and second stages and compare against thresholds
VComp = analogRead(VCOMP_SENSE_PIN); VComp = analogRead(VCOMP_SENSE_PIN);
diffCompL = VComp - compLowInt; diffCompL = VComp - compInt;
diffCompH = compHighInt - VComp; diffCompH = compInt - VComp;
//diffCompL = VComp - compLowInt;
//diffCompH = compHighInt - VComp;
VCompRef = (VComp * 5) / 1024; VCompRef = (VComp * 5) / 1024;
VAdj = analogRead(V_FOLLOW_PIN); VAdj = analogRead(V_FOLLOW_PIN);
diffAdjL = VAdj - senseLowInt; diffAdjL = VAdj - senseInt;
diffAdjH = senseHighInt - VAdj; diffAdjH = senseInt - VAdj;
//diffAdjL = VAdj - senseLowInt;
//diffAdjH = senseHighInt - VAdj;
vAdjRead = (VAdj * 5) / 1024; vAdjRead = (VAdj * 5) / 1024;