Skip to content

Fixed mpu9250 43 second bug and other sensor class bugs #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JLefebvre55 merged 3 commits into from
Jul 18, 2021
Merged

Fixed mpu9250 43 second bug and other sensor class bugs #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f8c87a1
fixed mpu9250 43 second bug and other sensor class bugs
urmilmodi Jul 17, 2021
2444873
formatting
urmilmodi Jul 17, 2021
9b193e6
formatting
urmilmodi Jul 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 15 additions & 16 deletions MPU9250/MPU9250.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,23 +50,22 @@ void loop(){
SensorState* state = sensors[i]->update();
// Print/send sensor post-setup state data here. For example:
bool _success = (state->error == ERR_NONE);
bool _new = (state->debug == DS_NEWREAD);
if(_success){
if(_new){

// vv Recommend commenting this bit out to see FFT printout vv
Serial.print("Sensor ");
Serial.print(sensors[i]->sensor);
Serial.print(" read success: ");
for(int x = 0; x < state->numdata; x++){
Serial.print(state->data[x].data);
Serial.print(' ');
Serial.print(state->data[x].units);
if(x < state->numdata-1){Serial.print(", ");}else{Serial.println();}
}
// ^^ ----------------------------------------------------- ^^
bool _new = (state->debug == DS_SUCCESS);
if(_success && _new) {

// vv Recommend commenting this bit out to see FFT printout vv
Serial.print("Sensor ");
Serial.print(sensors[i]->sensor);
Serial.print(" read success: ");
for(int x = 0; x < state->numdata; x++){
Serial.print(state->data[x].data);
Serial.print(' ');
Serial.print(state->data[x].units);
if(x < state->numdata-1){Serial.print(", ");}else{Serial.println();}
}
} else {
// ^^ ----------------------------------------------------- ^^

} else if (!_success) {
Serial.print("Sensor ");
Serial.print(sensors[i]->sensor);
Serial.println(" failed to update!");
Expand Down
24 changes: 11 additions & 13 deletions RTD/RTD.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,20 +49,18 @@ void loop(){
SensorState* state = sensors[i]->update();
// Print/send sensor post-setup state data here. For example:
bool _success = (state->error == ERR_NONE);
bool _new = (state->debug == DS_NEWREAD);
if(_success){
if(_new){
Serial.print("Sensor ");
Serial.print(sensors[i]->sensor);
Serial.print(" read success: ");
for(int x = 0; x < state->numdata; x++){
Serial.print(state->data[x].data);
Serial.print(' ');
Serial.print(state->data[x].units);
if(x < state->numdata-1){Serial.print(", ");}else{Serial.println();}
}
bool _new = (state->debug == DS_SUCCESS);
if(_success && _new) {
Serial.print("Sensor ");
Serial.print(sensors[i]->sensor);
Serial.print(" read success: ");
for(int x = 0; x < state->numdata; x++){
Serial.print(state->data[x].data);
Serial.print(' ');
Serial.print(state->data[x].units);
if(x < state->numdata-1){Serial.print(", ");}else{Serial.println();}
}
} else {
} else if (!_success) {
Serial.print("Sensor ");
Serial.print(sensors[i]->sensor);
Serial.println(" failed to update!");
Expand Down
24 changes: 11 additions & 13 deletions SPT25-20-0200A/SPT25-20-0200A.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,20 +49,18 @@ void loop(){
SensorState* state = sensors[i]->update();
// Print/send sensor post-setup state data here. For example:
bool _success = (state->error == ERR_NONE);
bool _new = (state->debug == DS_NEWREAD);
if(_success){
if(_new){
Serial.print("Sensor ");
Serial.print(sensors[i]->sensor);
Serial.print(" read success: ");
for(int x = 0; x < state->numdata; x++){
Serial.print(state->data[x].data);
Serial.print(' ');
Serial.print(state->data[x].units);
if(x < state->numdata-1){Serial.print(", ");}else{Serial.println();}
}
bool _new = (state->debug == DS_SUCCESS);
if(_success && _new) {
Serial.print("Sensor ");
Serial.print(sensors[i]->sensor);
Serial.print(" read success: ");
for(int x = 0; x < state->numdata; x++){
Serial.print(state->data[x].data);
Serial.print(' ');
Serial.print(state->data[x].units);
if(x < state->numdata-1){Serial.print(", ");}else{Serial.println();}
}
} else {
} else if (!_success) {
Serial.print("Sensor ");
Serial.print(sensors[i]->sensor);
Serial.println(" failed to update!");
Expand Down
24 changes: 11 additions & 13 deletions SPTD25-20-1000H/SPTD25-20-1000H.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,20 +49,18 @@ void loop(){
SensorState* state = sensors[i]->update();
// Print/send sensor post-setup state data here. For example:
bool _success = (state->error == ERR_NONE);
bool _new = (state->debug == DS_NEWREAD);
if(_success){
if(_new){
Serial.print("Sensor ");
Serial.print(sensors[i]->sensor);
Serial.print(" read success: ");
for(int x = 0; x < state->numdata; x++){
Serial.print(state->data[x].data);
Serial.print(' ');
Serial.print(state->data[x].units);
if(x < state->numdata-1){Serial.print(", ");}else{Serial.println();}
}
bool _new = (state->debug == DS_SUCCESS);
if(_success && _new) {
Serial.print("Sensor ");
Serial.print(sensors[i]->sensor);
Serial.print(" read success: ");
for(int x = 0; x < state->numdata; x++){
Serial.print(state->data[x].data);
Serial.print(' ');
Serial.print(state->data[x].units);
if(x < state->numdata-1){Serial.print(", ");}else{Serial.println();}
}
} else {
} else if (!_success) {
Serial.print("Sensor ");
Serial.print(sensors[i]->sensor);
Serial.println(" failed to update!");
Expand Down
2 changes: 1 addition & 1 deletion Sensor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
* @param setup - t_datasetup - How many datasets are there? What are their units?
* @param delta - uint16_t - The minimum time (in ms) between sensor read attempts.
**/
Sensor::Sensor(sensors_t sensor, arduino_t arduino, t_datasetup setup, uint16_t delta){
Sensor::Sensor(sensors_t sensor, arduino_t arduino, t_datasetup setup, unsigned long delta){
// Set up cache
this->sensor = sensor;
this->arduino = arduino;
Expand Down
6 changes: 3 additions & 3 deletions Sensor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ struct t_datasetup {
// Sensor class - note the difference in exposure and implementation in read/init and getRead/begin
class Sensor{
private:
uint16_t delta; //The minimum time (milliseconds) between sensor updates.
uint16_t lastread; //Timestamp of last read ATTEMPT
unsigned long delta; //The minimum time (milliseconds) between sensor updates.
unsigned long lastread; //Timestamp of last read ATTEMPT
protected:
// Sensor-specific functionality initialize and read functions - to be implemented by sensor classes
virtual errorlevel_t init() = 0; //Connect to sensor, calibrate, set data count and units, and update state accordingly
Expand All @@ -62,7 +62,7 @@ class Sensor{
// Wrappers return pointer to updated state
SensorState* update(); //Calls read(), manages delta, and wraps all t_datum
SensorState* begin(); //Sets state in accordance with init()
Sensor(sensors_t sensor, arduino_t arduino, t_datasetup setup, uint16_t delta);
Sensor(sensors_t sensor, arduino_t arduino, t_datasetup setup, unsigned long delta);
};

#endif
24 changes: 11 additions & 13 deletions TMP006/TMP006.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,20 +51,18 @@ void loop(){
SensorState* state = sensors[i]->update();
// Print/send sensor post-setup state data here. For example:
bool _success = (state->error == ERR_NONE);
bool _new = (state->debug == DS_NEWREAD);
if(_success){
if(_new){
Serial.print("Sensor ");
Serial.print(sensors[i]->sensor);
Serial.print(" read success: ");
for(int x = 0; x < state->numdata; x++){
Serial.print(state->data[x].data);
Serial.print(' ');
Serial.print(state->data[x].units);
if(x < state->numdata-1){Serial.print(", ");}else{Serial.println();}
}
bool _new = (state->debug == DS_SUCCESS);
if(_success && _new) {
Serial.print("Sensor ");
Serial.print(sensors[i]->sensor);
Serial.print(" read success: ");
for(int x = 0; x < state->numdata; x++){
Serial.print(state->data[x].data);
Serial.print(' ');
Serial.print(state->data[x].units);
if(x < state->numdata-1){Serial.print(", ");}else{Serial.println();}
}
} else {
} else if (!_success) {
Serial.print("Sensor ");
Serial.print(sensors[i]->sensor);
Serial.println(" failed to update!");
Expand Down
8 changes: 4 additions & 4 deletions Template.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,17 +88,17 @@ void loop(){
// Print/send sensor post-setup state data here. For example:
bool _success = (state->error == ERR_NONE);
bool _new = (state->debug == DS_SUCCESS);
if(_success && _new){
if(_success && _new) {
Serial.print("Sensor ");
Serial.print(sensors[i]->sensor);
Serial.print(" read success: ");
for(int x = 0; x < state.numdata; x++){
for(int x = 0; x < state->numdata; x++) {
Serial.print(state->data[x].data);
Serial.print(' ');
Serial.print(state->data[x].units);
if(x < state.numdata-1){Serial.print(", ");}
if(x < state->numdata-1){Serial.print(", ");}
}
} else {
} else if (!_success) {
Serial.print("Sensor ");
Serial.print(sensors[i]->sensor);
Serial.println(" failed to update!");
Expand Down
24 changes: 11 additions & 13 deletions VFS500/VFS500.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,20 +49,18 @@ void loop(){
SensorState* state = sensors[i]->update();
// Print/send sensor post-setup state data here. For example:
bool _success = (state->error == ERR_NONE);
bool _new = (state->debug == DS_NEWREAD);
if(_success){
if(_new){
Serial.print("Sensor ");
Serial.print(sensors[i]->sensor);
Serial.print(" read success: ");
for(int x = 0; x < state->numdata; x++){
Serial.print(state->data[x].data);
Serial.print(' ');
Serial.print(state->data[x].units);
if(x < state->numdata-1){Serial.print(", ");}else{Serial.println();}
}
bool _new = (state->debug == DS_SUCCESS);
if(_success && _new) {
Serial.print("Sensor ");
Serial.print(sensors[i]->sensor);
Serial.print(" read success: ");
for(int x = 0; x < state->numdata; x++){
Serial.print(state->data[x].data);
Serial.print(' ');
Serial.print(state->data[x].units);
if(x < state->numdata-1){Serial.print(", ");}else{Serial.println();}
}
} else {
} else if (!_success) {
Serial.print("Sensor ");
Serial.print(sensors[i]->sensor);
Serial.println(" failed to update!");
Expand Down