dani/CommandStation-EX
1
0
Fork 0
mirror of https://github.com/DCC-EX/CommandStation-EX.git synced 2025-01-22 18:48:52 +01:00
Code Releases Activity

Sensors show their status at change (as in classic)

Browse Source
This commit is contained in:
Harald Barth 2020-10-25 23:52:22 +01:00
parent c882c2edfc
commit 9099af3188
3 changed files with 29 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
DCCEXParser.cpp
View File

@ -96,6 +96,7 @@ void DCCEXParser::loop(Stream &stream)
buffer[bufferLength++] = ch;
}
}
Sensor::checkAll(&stream); // Update and print changes
}
int DCCEXParser::splitValues(int result[MAX_PARAMS], const byte *cmd)
@ -359,11 +360,8 @@ void DCCEXParser::parse(Print *stream, byte *com, bool blocking)
return;
case 'Q': // SENSORS <Q>
Sensor::checkAll();
for (Sensor *tt = Sensor::firstSensor; tt != NULL; tt = tt->nextSensor)
{
StringFormatter::send(stream, F("<%c %d>"), tt->active ? 'Q' : 'q', tt->data.snum);
}
Sensor::checkAll(NULL); // Update, don't print changes
Sensor::printAll(stream); // Print all
return;
case 's': // <s>

26
Sensors.cpp
View File

@ -65,27 +65,49 @@ decide to ignore the <q ID> return and only react to <Q ID> triggers.
**********************************************************************/
#include "StringFormatter.h"
#include "Sensors.h"
#include "EEStore.h"
///////////////////////////////////////////////////////////////////////////////
//
// checks all defined sensors and prints _changed_ sensor states
// to stream unless stream is NULL in which case only internal
// state is updated
//
///////////////////////////////////////////////////////////////////////////////
void Sensor::checkAll(){
void Sensor::checkAll(Print *stream){
for(Sensor * tt=firstSensor;tt!=NULL;tt=tt->nextSensor){
tt->signal=tt->signal*(1.0-SENSOR_DECAY)+digitalRead(tt->data.pin)*SENSOR_DECAY;
if(!tt->active && tt->signal<0.5){
tt->active=true;
if (stream != NULL) StringFormatter::send(stream, F("<Q %d>"), tt->data.snum);
} else if(tt->active && tt->signal>0.9){
tt->active=false;
if (stream != NULL) StringFormatter::send(stream, F("<q %d>"), tt->data.snum);
}
} // loop over all sensors
} // Sensor::checkAll
///////////////////////////////////////////////////////////////////////////////
//
// prints all sensor states to stream
//
///////////////////////////////////////////////////////////////////////////////
void Sensor::printAll(Print *stream){
for(Sensor * tt=firstSensor;tt!=NULL;tt=tt->nextSensor){
if (stream != NULL)
StringFormatter::send(stream, F("<%c %d>"), tt->active ? 'Q' : 'q', tt->data.snum);
} // loop over all sensors
} // Sensor::printAll
///////////////////////////////////////////////////////////////////////////////
Sensor *Sensor::create(int snum, int pin, int pullUp){

3
Sensors.h
View File

@ -40,7 +40,8 @@ struct Sensor{
static Sensor *create(int, int, int);
static Sensor* get(int);
static bool remove(int);
static void checkAll();
static void checkAll(Print *);
static void printAll(Print *);
}; // Sensor
#endif