Commit7581ba5

committed

Added analog_activation_threshold

1 parent63551e8 commit7581ba5Copy full SHA for 7581ba5

File tree

+17

-8

lines changed

+17

-8

lines changed

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -31,13 +31,16 @@`
`31`	`31`	`#defineDIGITAL_OUT BUILTIN_LED`
`32`	`32`	`#defineANALOG_IN A0`
`33`	`33`	`#defineANALOG_OUT D8`
	`34`	`+#defineANALOG_ACTIVATION_THRESHOLD0.1`
	`35`	`+`
`34`	`36`
`35`	`37`	`thing::Config config = {`
`36`	`38`	`FIREBASE_HOST,`
`37`	`39`	`FIREBASE_AUTH,`
`38`	`40`	`FIREBASE_PATH,`
`39`	`41`	`WIFI_SSID,`
`40`	`42`	`WIFI_PASSWORD,`
	`43`	`+ ANALOG_ACTIVATION_THRESHOLD,`
`41`	`44`	`DIGITAL_IN,`
`42`	`45`	`DIGITAL_OUT,`
`43`	`46`	`ANALOG_IN,`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,10 @@ struct Config {`
`11`	`11`	`std::string wifi_ssid;`
`12`	`12`	`std::string wifi_key;`
`13`	`13`
	`14`	`+// If the change is analog value is less than this amount we don't send an`
	`15`	`+// update.`
	`16`	`+float analog_activation_threshold;`
	`17`	`+`
`14`	`18`	`int pin_digital_in;`
`15`	`19`	`int pin_digital_out;`
`16`	`20`	`int pin_analog_in;`

Lines changed: 9 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ void Transcriber::UpdateConfig(const Config& config) {`
`20`	`20`
`21`	`21`	`voidTranscriber::Init(const Config& config) {`
`22`	`22`	`path_ = config.path;`
	`23`	`+ analog_activation_threshold_ = config.analog_activation_threshold;`
`23`	`24`	`pin_digital_out_ = config.pin_digital_out;`
`24`	`25`	`pin_digital_in_ = config.pin_digital_in;`
`25`	`26`	`pin_analog_out_ = config.pin_analog_out;`
`@@ -52,16 +53,16 @@ void Transcriber::Loop() {`
`52`	`53`	`}`
`53`	`54`
`54`	`55`	`// Send values to cloud`
`55`		`-intdigital_in =digitalRead(pin_digital_in_);`
`56`		`-if (digital_in != digital_in_) {`
`57`		`-SetValue(path_ +kSubPathDigitalIn,String(digital_in).c_str());`
`58`		`- digital_in_ =digital_in;`
	`56`	`+intnew_digital_in =digitalRead(pin_digital_in_);`
	`57`	`+if (new_digital_in != digital_in_) {`
	`58`	`+SetValue(path_ +kSubPathDigitalIn,String(new_digital_in).c_str());`
	`59`	`+ digital_in_ =new_digital_in;`
`59`	`60`	`}`
`60`	`61`
`61`		`-floatanalog_in =analogRead(pin_analog_in_);`
`62`		`-if (analog_in != analog_in_) {`
`63`		`-SetValue(path_ +kSubPathAnalogIn,String(analog_in).c_str());`
`64`		`- analog_in_ =analog_in;`
	`62`	`+floatnew_analog_in =analogRead(pin_analog_in_);`
	`63`	`+if (abs(new_analog_in - analog_in_) > analog_activation_threshold_) {`
	`64`	`+SetValue(path_ +kSubPathAnalogIn,String(new_analog_in).c_str());`
	`65`	`+ analog_in_ =new_analog_in;`
`65`	`66`	`}`
`66`	`67`	`}`
`67`	`68`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,7 @@ class Transcriber {`
`48`	`48`	`std::unique_ptr<FirebaseStream> stream_;`
`49`	`49`
`50`	`50`	`int digital_in_ =0;`
	`51`	`+float analog_activation_threshold_ =0.0f;`
`51`	`52`	`float analog_in_ =0.0f;`
`52`	`53`
`53`	`54`	`int pin_digital_out_;`

Comments

(0)