Michel2/ESPEasy
1
0
Fork 0
mirror of https://github.com/letscontrolit/ESPEasy.git synced 2026-09-12 01:24:04 +00:00
Code Issues Releases Activity

[P013] Allow Interval = 0, inhibit setting for suppressing State-events on Interval

Browse Source
This commit is contained in:
Ton Huisman
2023-02-25 13:58:42 +01:00
parent 79d379abbe
commit d60e5cb751
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/_P013_HCSR04.ino
+12 -2
View File
@@ -7,6 +7,9 @@
// #######################################################################################################
/** Changelog:
* 2023-02-25 tonhuisman: Make Interval optional, and also disable the added feature P013_FEATURE_INTERVALEVENT, as setting Interval
* to 0 is effectively the same. (Small code reduction)
* Changed second value label for Combined mode to State
* 2023-02-19 tonhuisman: Suggested modification with variable trigger width was only partly accepted by NewPing library, and as
* we already have a modified library using the DIRECT_Gpio functions, I'm not merging back that change
* (compile-time setting, default now: 12 usec) but keep the proposed changes for a runtime configurable setting.
@@ -21,10 +24,10 @@
*/
# define PLUGIN_013
# define PLUGIN_ID_013 13
# define PLUGIN_ID_013 13
# define PLUGIN_NAME_013 "Position - HC-SR04, RCW-0001, etc."
# define PLUGIN_VALUENAME1_013 "Distance"
# define PLUGIN_VALUENAME2_013 "Switch"
# define PLUGIN_VALUENAME2_013 "State"
# include "src/PluginStructs/P013_data_struct.h"
@@ -52,6 +55,7 @@ boolean Plugin_013(uint8_t function, struct EventStruct *even
Device[deviceCount].ValueCount = 1;
Device[deviceCount].SendDataOption = true;
Device[deviceCount].TimerOption = true;
Device[deviceCount].TimerOptional = true;
Device[deviceCount].GlobalSyncOption = true;
Device[deviceCount].PluginStats = true;
@@ -201,6 +205,12 @@ boolean Plugin_013(uint8_t function, struct EventStruct *even
# endif // if P013_FEATURE_INTERVALEVENT
P013_THRESHOLD = getFormItemInt(F("thres"));
}
# if P013_FEATURE_COMBINED_MODE
if ((P013_OPERATINGMODE == OPMODE_COMBINED) && (ExtraTaskSettings.TaskDeviceValueNames[1][0] == '\0')) {
strcpy_P(ExtraTaskSettings.TaskDeviceValueNames[1], PSTR(PLUGIN_VALUENAME2_013));
}
# endif // if P013_FEATURE_COMBINED_MODE
P013_MAX_DISTANCE = getFormItemInt(F("max_d"));
P013_MEASURINGUNIT = getFormItemInt(F("pUnit"));
src/src/PluginStructs/P013_data_struct.h
+1 -1
View File
@@ -17,7 +17,7 @@
# endif // ifdef ESP8266_1M
# ifndef P013_FEATURE_TRIGGERWIDTH
# define P013_FEATURE_TRIGGERWIDTH 1 // Enabled by default
# define P013_FEATURE_INTERVALEVENT 1
# define P013_FEATURE_INTERVALEVENT 0
# define P013_FEATURE_COMBINED_MODE 1
# define P013_EXTENDED_LOG 1
# endif // ifndef P013_FEATURE_TRIGGERWIDTH