[P013_HCSR04] Add COMBINED mode #3157

clumsy-stefan · 2020-07-06T09:10:47Z

Add a "COMBINED" mode to HCSR04 plugin to be able to use the switch feature together with periodic distance metering. Should be 100% backwards compatible.

uzi18 · 2020-07-06T10:38:14Z

src/_P013_HCSR04.ino

-              event->sensorType = SENSOR_TYPE_SWITCH;
+              if (operatingMode == OPMODE_STATE) {
+                UserVar[event->BaseVarIndex] = state;
+                event->sensorType = SENSOR_TYPE_SWITCH;


+ValueCount

@uzi18 Can you explain what you meant with your comment?
I also don't really see what you're missing here.

clumsy-stefan · 2020-07-29T10:54:11Z

@TD-er this PR runs for some weeks now stable at my site as well with "traditional" distance meters as in combined mode. So it would be great if it could be merged into mega, if there are no objections….

cheers.

TD-er · 2020-07-29T17:35:03Z

I can only think of a possible issue when it is used to send data to specific controllers (e.g. Domoticz) or shared via p2p to another node running the 'older' version of this plugin.

So I guess that may be the warning @uzi18 tried to make here, that changing the number of output values may lead to these issues I mention here now.

clumsy-stefan · 2020-07-29T17:37:21Z

hmm… but the number of output values only changes in COMBINED mode, in the (old) switch or distance mode the output count is still the same…

TD-er · 2020-07-29T17:44:11Z

Nope, this is what is set as the default: Device[deviceCount].ValueCount = 2;

clumsy-stefan · 2020-07-29T17:45:17Z

could that be changed at runtime?

TD-er · 2020-07-29T18:26:52Z

Well... that's what I do for the sysinfo, dummy and SenseAir plugin.
But it also has some drawbacks.

For example for the Dummy plugin, if you have multiple instances of that plugin, all tasks with that plugin will be set to the.... last changed one :(

…o P013_OPMODE_COMBINED

clumsy-stefan · 2020-09-15T13:55:55Z

Hmm… Any chance this is beeing integrated? If not, what should be adapted?

TD-er · 2020-09-15T16:01:08Z

I still don't know for sure what @uzi18 meant.

Right now you do seem to make it selectable to output multiple values instead of 1.
But if you make the valueCount fixed to 2, even though you output only one value, you may break stuff.
At least Domoticz is very picky in the valueCount and order of values.

uzi18 · 2020-09-17T11:07:59Z

@TD-er @clumsy-stefan when change from/to combined mode please change also valuecount and device type in device configuration.

…o P013_OPMODE_COMBINED

TD-er · 2020-09-23T11:23:54Z

For this PR, it is good to know I am now dealing with the buggy handling of changing number of output values.
So if that's merged this PR should be changed accordingly and then this can also be merged.

clumsy-stefan · 2020-09-24T07:02:00Z

Ok, I'm happy to change this PR accordingly, but first have to find out how to do that (changing the number of output values at runtime)…

TD-er · 2020-09-24T07:03:40Z

I will add some documentation to the PR, and you may be the first one to check if it is sufficient :)

TD-er · 2020-09-25T22:26:22Z

It has been merged, good luck :)

TD-er · 2020-09-26T21:05:10Z

src/_P013_HCSR04.ino

@@ -42,12 +44,12 @@ boolean Plugin_013(byte function, struct EventStruct *event, String& string)
      {
        Device[++deviceCount].Number = PLUGIN_ID_013;
        Device[deviceCount].Type = DEVICE_TYPE_DUAL;
-        Device[deviceCount].VType = Sensor_VType::SENSOR_TYPE_SINGLE;
+        Device[deviceCount].VType = SENSOR_TYPE_DUAL;


Should be using the Sensor_VType:: prefix.

Yep, sure, otherwise it won't compile anyway… I changed it but did not yet commit…

TD-er · 2020-09-26T21:06:49Z

src/_P013_HCSR04.ino

        Device[deviceCount].Ports = 0;
        Device[deviceCount].PullUpOption = false;
        Device[deviceCount].InverseLogicOption = false;
        Device[deviceCount].FormulaOption = true;
-        Device[deviceCount].ValueCount = 1;
+        Device[deviceCount].ValueCount = 2;


You should leave the default to 1, as it is used by all instances out there.
And make it configurable to select a different number of outputs.
See the P026_Sysinfo.ino for an example and I also added the new Plugin functions to the Pxxx_Template.ino.

For example, also add this:

Device[deviceCount].OutputDataType = Output_Data_type_t::Simple;

ok, I'll have a look at it

TD-er · 2020-09-26T21:07:32Z

src/_P013_HCSR04.ino

@@ -257,7 +262,7 @@ boolean Plugin_013(byte function, struct EventStruct *event, String& string)
              addLog(LOG_LEVEL_INFO,log);
              switchstate[event->TaskIndex] = state;
              UserVar[event->BaseVarIndex] = state;
-              event->sensorType = Sensor_VType::SENSOR_TYPE_SWITCH;
+              event->sensorType = SENSOR_TYPE_SWITCH;


Should use the Sensor_VType:: prefix

TD-er · 2020-09-26T21:07:43Z

src/_P013_HCSR04.ino

        if (operatingMode == OPMODE_VALUE)
+           event->sensorType = SENSOR_TYPE_SINGLE;


…o P013_OPMODE_COMBINED

Adapt to new VType definition

…o P013_OPMODE_COMBINED

TD-er · 2023-04-11T19:07:03Z

Is included in #4442

clumsy-stefan added 2 commits July 6, 2020 10:31

Merge branch 'mega' into P013_OPMODE_COMBINED

df81d3d

[P013_HCSR04] Add COMBINED mode

f2c4065

Add a "COMBINED" mode to HCSR04 plugin to be able to use the switch feature together with periodic distance metering. Should be 100% backwards compatible.

uzi18 reviewed Jul 6, 2020

View reviewed changes

TD-er added 2 commits July 19, 2020 13:13

Merge branch 'mega' into P013_OPMODE_COMBINED

6ce1bee

Merge branch 'mega' into P013_OPMODE_COMBINED

7ede755

TD-er and others added 9 commits July 31, 2020 02:13

Merge branch 'mega' into P013_OPMODE_COMBINED

1554b26

Merge remote-tracking branch 'origin/mega' into P013_OPMODE_COMBINED

3478e3a

Merge remote-tracking branch 'origin/mega' into P013_OPMODE_COMBINED

f1f3f9e

Merge remote-tracking branch 'origin/mega' into P013_OPMODE_COMBINED

45d2c35

Merge branch 'mega' into P013_OPMODE_COMBINED

f99b762

Merge remote-tracking branch 'clumsy-stefan/P013_OPMODE_COMBINED' int…

fdb602d

…o P013_OPMODE_COMBINED

Merge branch 'mega' into P013_OPMODE_COMBINED

05c2216

Merge remote-tracking branch 'clumsy-stefan/P013_OPMODE_COMBINED' int…

6e40555

…o P013_OPMODE_COMBINED

Merge remote-tracking branch 'origin/mega' into P013_OPMODE_COMBINED

489547c

Merge branch 'mega' into P013_OPMODE_COMBINED

b8c7b8c

clumsy-stefan added 2 commits September 17, 2020 16:44

Merge remote-tracking branch 'clumsy-stefan/P013_OPMODE_COMBINED' int…

28d73ab

…o P013_OPMODE_COMBINED

Merge remote-tracking branch 'origin/mega' into P013_OPMODE_COMBINED

7f8c9c6

Merge remote-tracking branch 'origin/mega' into P013_OPMODE_COMBINED

1bcd01c

clumsy-stefan and others added 3 commits September 26, 2020 08:23

Merge remote-tracking branch 'origin/mega' into P013_OPMODE_COMBINED

d37a9a8

Merge branch 'ArduinoIDE' into P013_OPMODE_COMBINED

00660ad

Merge branch 'mega' into P013_OPMODE_COMBINED

8e05631

TD-er requested changes Sep 26, 2020

View reviewed changes

clumsy-stefan and others added 12 commits September 30, 2020 20:13

Merge remote-tracking branch 'origin/mega' into P013_OPMODE_COMBINED

8ced635

Merge remote-tracking branch 'clumsy-stefan/P013_OPMODE_COMBINED' int…

6522b3e

…o P013_OPMODE_COMBINED

Change Sensor VType

284ac5b

Adapt to new VType definition

Merge remote-tracking branch 'origin/mega' into P013_OPMODE_COMBINED

a252b52

Merge remote-tracking branch 'origin/mega' into P013_OPMODE_COMBINED

f9443da

Merge remote-tracking branch 'origin/mega' into P013_OPMODE_COMBINED

d22646a

Merge branch 'mega' into P013_OPMODE_COMBINED

eefb48b

Merge branch 'mega' into P013_OPMODE_COMBINED

e45843e

Merge branch 'mega' into P013_OPMODE_COMBINED

775cf07

Merge remote-tracking branch 'origin/mega' into P013_OPMODE_COMBINED

4c4d667

Merge remote-tracking branch 'clumsy-stefan/P013_OPMODE_COMBINED' int…

9815dc8

…o P013_OPMODE_COMBINED

Merge branch 'mega' into P013_OPMODE_COMBINED

c780808

tonhuisman added a commit to tonhuisman/ESPEasy-1 that referenced this pull request Jan 28, 2023

[P013] Add Combined mode, as started in letscontrolit#3157

efc178d

tonhuisman mentioned this pull request Jan 28, 2023

[P013] Add setting for trigger-width and Combined mode #4442

Merged

3 tasks

TD-er closed this Apr 11, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[P013_HCSR04] Add COMBINED mode #3157

[P013_HCSR04] Add COMBINED mode #3157

clumsy-stefan commented Jul 6, 2020

uzi18 Jul 6, 2020

clumsy-stefan Jul 6, 2020

TD-er Jul 19, 2020

clumsy-stefan commented Jul 29, 2020

TD-er commented Jul 29, 2020

clumsy-stefan commented Jul 29, 2020

TD-er commented Jul 29, 2020

clumsy-stefan commented Jul 29, 2020

TD-er commented Jul 29, 2020

clumsy-stefan commented Sep 15, 2020

TD-er commented Sep 15, 2020

uzi18 commented Sep 17, 2020

TD-er commented Sep 23, 2020

clumsy-stefan commented Sep 24, 2020

TD-er commented Sep 24, 2020

TD-er commented Sep 25, 2020

TD-er Sep 26, 2020

clumsy-stefan Sep 26, 2020

TD-er Sep 26, 2020

clumsy-stefan Sep 26, 2020

TD-er Sep 26, 2020

TD-er Sep 26, 2020

TD-er commented Apr 11, 2023

		if (operatingMode == OPMODE_VALUE)
		event->sensorType = SENSOR_TYPE_SINGLE;

[P013_HCSR04] Add COMBINED mode #3157

[P013_HCSR04] Add COMBINED mode #3157

Conversation

clumsy-stefan commented Jul 6, 2020

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

clumsy-stefan commented Jul 29, 2020

TD-er commented Jul 29, 2020

clumsy-stefan commented Jul 29, 2020

TD-er commented Jul 29, 2020

clumsy-stefan commented Jul 29, 2020

TD-er commented Jul 29, 2020

clumsy-stefan commented Sep 15, 2020

TD-er commented Sep 15, 2020

uzi18 commented Sep 17, 2020

TD-er commented Sep 23, 2020

clumsy-stefan commented Sep 24, 2020

TD-er commented Sep 24, 2020

TD-er commented Sep 25, 2020

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

TD-er commented Apr 11, 2023