Skip to content

Commit 2ec31b6

Browse files
channel value changed improvement & two methods moved to the public scope
1 parent 89b0107 commit 2ec31b6

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

libraries/SuplaDevice/SuplaDevice.cpp

+2-5
Original file line numberDiff line numberDiff line change
@@ -589,10 +589,7 @@ void SuplaDeviceClass::iterate(void) {
589589

590590
channel_pin[a].time_left = 0;
591591

592-
if ( Params.reg_dev.channels[a].Type == SUPLA_CHANNELTYPE_SENSORNO )
593-
channel_pin[a].last_val = -1;
594-
595-
else if ( Params.reg_dev.channels[a].Type == SUPLA_CHANNELTYPE_RELAY )
592+
if ( Params.reg_dev.channels[a].Type == SUPLA_CHANNELTYPE_RELAY )
596593
channelSetValue(a, 0, 0);
597594

598595
} else if ( channel_pin[a].time_left > 0 ) {
@@ -629,7 +626,7 @@ void SuplaDeviceClass::iterate(void) {
629626
channel_pin[a].last_val = val;
630627

631628
if ( channel_pin[a].time_left <= 0 ) {
632-
channel_pin[a].time_left = 500;
629+
channel_pin[a].time_left = 100;
633630
channelValueChanged(Params.reg_dev.channels[a].Number, val == HIGH ? 1 : 0);
634631
}
635632

libraries/SuplaDevice/SuplaDevice.h

+3-2
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,6 @@ class SuplaDeviceClass
110110
void setString(char *dst, const char *src, int max_size);
111111
int addChannel(int pin1, int pin2, bool hiIsLo, bool bistable);
112112
void channelValueChanged(int channel_number, char v, double d, char var);
113-
void channelValueChanged(int channel_number, char v);
114-
void channelDoubleValueChanged(int channel_number, double v);
115113
void channelSetValue(int channel, char value, _supla_int_t DurationMS);
116114
void channelSetDoubleValue(int channelNum, double value);
117115
void setDoubleValue(char value[SUPLA_CHANNELVALUE_SIZE], double v);
@@ -139,6 +137,9 @@ class SuplaDeviceClass
139137
SuplaDeviceClass();
140138
~SuplaDeviceClass();
141139

140+
void channelValueChanged(int channel_number, char v);
141+
void channelDoubleValueChanged(int channel_number, double v);
142+
142143
bool begin(IPAddress *local_ip, char GUID[SUPLA_GUID_SIZE], uint8_t mac[6], const char *Server,
143144
int LocationID, const char *LocationPWD);
144145

0 commit comments

Comments
 (0)