2017-05-20 13:03:34 +01:00
|
|
|
/*
|
2019-10-27 10:13:24 +00:00
|
|
|
xsns_01_counter.ino - Counter sensors (water meters, electricity meters etc.) sensor support for Tasmota
|
2017-05-20 13:03:34 +01:00
|
|
|
|
2019-12-31 13:23:34 +00:00
|
|
|
Copyright (C) 2020 Maarten Damen and Theo Arends
|
2017-05-20 13:03:34 +01:00
|
|
|
|
|
|
|
This program is free software: you can redistribute it and/or modify
|
|
|
|
it under the terms of the GNU General Public License as published by
|
|
|
|
the Free Software Foundation, either version 3 of the License, or
|
|
|
|
(at your option) any later version.
|
|
|
|
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
GNU General Public License for more details.
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
*/
|
|
|
|
|
2019-06-16 15:43:23 +01:00
|
|
|
#ifdef USE_COUNTER
|
2017-05-20 13:03:34 +01:00
|
|
|
/*********************************************************************************************\
|
|
|
|
* Counter sensors (water meters, electricity meters etc.)
|
|
|
|
\*********************************************************************************************/
|
|
|
|
|
2018-11-06 16:33:51 +00:00
|
|
|
#define XSNS_01 1
|
|
|
|
|
2019-08-11 17:12:18 +01:00
|
|
|
#define D_PRFX_COUNTER "Counter"
|
|
|
|
#define D_CMND_COUNTERTYPE "Type"
|
|
|
|
#define D_CMND_COUNTERDEBOUNCE "Debounce"
|
2020-03-29 16:05:52 +01:00
|
|
|
#define D_CMND_COUNTERDEBOUNCELOW "DebounceLow"
|
|
|
|
#define D_CMND_COUNTERDEBOUNCEHIGH "DebounceHigh"
|
2019-08-11 14:18:11 +01:00
|
|
|
|
2019-08-11 17:12:18 +01:00
|
|
|
const char kCounterCommands[] PROGMEM = D_PRFX_COUNTER "|" // Prefix
|
2020-03-29 16:05:52 +01:00
|
|
|
"|" D_CMND_COUNTERTYPE "|" D_CMND_COUNTERDEBOUNCE "|" D_CMND_COUNTERDEBOUNCELOW "|" D_CMND_COUNTERDEBOUNCEHIGH ;
|
2019-08-11 17:12:18 +01:00
|
|
|
|
2019-11-24 11:24:35 +00:00
|
|
|
void (* const CounterCommand[])(void) PROGMEM = {
|
2020-03-29 16:05:52 +01:00
|
|
|
&CmndCounter, &CmndCounterType, &CmndCounterDebounce, &CmndCounterDebounceLow, &CmndCounterDebounceHigh };
|
2019-08-11 14:18:11 +01:00
|
|
|
|
2019-10-22 13:56:06 +01:00
|
|
|
struct COUNTER {
|
|
|
|
uint32_t timer[MAX_COUNTERS]; // Last counter time in micro seconds
|
2020-03-29 16:05:52 +01:00
|
|
|
uint32_t timer_low_high[MAX_COUNTERS]; // Last low/high counter time in micro seconds
|
2019-10-22 13:56:06 +01:00
|
|
|
uint8_t no_pullup = 0; // Counter input pullup flag (1 = No pullup)
|
2020-03-29 16:05:52 +01:00
|
|
|
uint8_t pin_state = 0; // LSB0..3 Last state of counter pin; LSB7==0 IRQ is FALLING, LSB7==1 IRQ is CHANGE
|
2019-10-22 13:56:06 +01:00
|
|
|
bool any_counter = false;
|
|
|
|
} Counter;
|
2017-05-20 13:03:34 +01:00
|
|
|
|
2020-07-01 16:46:13 +01:00
|
|
|
uint32_t last_cycle;
|
|
|
|
uint32_t cycle_time;
|
|
|
|
|
2019-10-22 13:56:06 +01:00
|
|
|
#ifndef ARDUINO_ESP8266_RELEASE_2_3_0 // Fix core 2.5.x ISR not in IRAM Exception
|
2019-05-22 12:51:33 +01:00
|
|
|
void CounterUpdate(uint8_t index) ICACHE_RAM_ATTR;
|
|
|
|
void CounterUpdate1(void) ICACHE_RAM_ATTR;
|
|
|
|
void CounterUpdate2(void) ICACHE_RAM_ATTR;
|
|
|
|
void CounterUpdate3(void) ICACHE_RAM_ATTR;
|
|
|
|
void CounterUpdate4(void) ICACHE_RAM_ATTR;
|
|
|
|
#endif // ARDUINO_ESP8266_RELEASE_2_3_0
|
|
|
|
|
2019-01-28 13:08:33 +00:00
|
|
|
void CounterUpdate(uint8_t index)
|
2017-05-20 13:03:34 +01:00
|
|
|
{
|
2019-10-22 13:56:06 +01:00
|
|
|
uint32_t time = micros();
|
2020-03-29 16:05:52 +01:00
|
|
|
uint32_t debounce_time;
|
|
|
|
|
|
|
|
if (Counter.pin_state) {
|
|
|
|
// handle low and high debounce times when configured
|
2020-04-27 10:54:23 +01:00
|
|
|
if (digitalRead(Pin(GPIO_CNTR1, index)) == bitRead(Counter.pin_state, index)) {
|
2020-03-29 16:05:52 +01:00
|
|
|
// new pin state to be ignored because debounce time was not met during last IRQ
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
debounce_time = time - Counter.timer_low_high[index];
|
|
|
|
if bitRead(Counter.pin_state, index) {
|
|
|
|
// last valid pin state was high, current pin state is low
|
|
|
|
if (debounce_time <= Settings.pulse_counter_debounce_high * 1000) return;
|
|
|
|
} else {
|
|
|
|
// last valid pin state was low, current pin state is high
|
|
|
|
if (debounce_time <= Settings.pulse_counter_debounce_low * 1000) return;
|
|
|
|
}
|
|
|
|
// passed debounce check, save pin state and timing
|
|
|
|
Counter.timer_low_high[index] = time;
|
|
|
|
Counter.pin_state ^= (1<<index);
|
|
|
|
// do not count on rising edge
|
2020-07-01 16:46:13 +01:00
|
|
|
if bitRead(Counter.pin_state, index) {
|
|
|
|
// PWMfrequency 100
|
|
|
|
// restart PWM each second (german 50Hz has to up to 0.01% deviation)
|
|
|
|
// Zero-HIGH is typical 2ms
|
2020-07-07 15:26:44 +01:00
|
|
|
if (RtcSettings.pulse_counter[index]%100 == 0 && PinUsed(GPIO_PWM1, index) && Settings.flag4.zerocross_dimmer) {
|
2020-07-01 16:46:13 +01:00
|
|
|
const uint32_t current_cycle = ESP.getCycleCount();
|
|
|
|
// stop pwm on PIN to start in Sync with rising edge
|
|
|
|
// calculate timeoffset to fire PWM
|
2020-07-07 15:22:55 +01:00
|
|
|
uint16_t cur_col = Light.fade_start_10[0 + Light.pwm_offset];
|
|
|
|
uint32_t dimm_time= 1000000 / Settings.pwm_frequency * (1024 - cur_col) / 1024;
|
2020-07-01 16:46:13 +01:00
|
|
|
digitalWrite(Pin(GPIO_PWM1, index), LOW);
|
|
|
|
// 1000µs to ensure not to fire on the next sinus wave
|
|
|
|
if (dimm_time < (1000000 / Settings.pwm_frequency)-1000) {
|
|
|
|
delayMicroseconds(dimm_time);
|
|
|
|
// fire small PWM signal to start TRIAC/SSR. Kill on next
|
|
|
|
// zero phase automatic.
|
|
|
|
// calculate actual cycle time and adapt frequency im milli Hz steps
|
|
|
|
// add 100.000 cpu ticks to ensure right step calculation
|
|
|
|
uint32_t steps = (current_cycle-last_cycle+100000)/(clockCyclesPerMicrosecond() * 10000);
|
|
|
|
cycle_time = (current_cycle-last_cycle)/steps;
|
2020-07-02 07:42:43 +01:00
|
|
|
#ifdef ESP8266
|
2020-07-03 08:01:02 +01:00
|
|
|
pinMode(Pin(GPIO_PWM1, index), OUTPUT);
|
|
|
|
uint32_t high = (cycle_time * 5) / 1023;
|
|
|
|
uint32_t low = cycle_time - high;
|
|
|
|
// Find the first GPIO being generated by checking GCC's find-first-set (returns 1 + the bit of the first 1 in an int32_t
|
|
|
|
startWaveformClockCycles(Pin(GPIO_PWM1, index), high, low, 0, -1, 0, true);
|
2020-07-02 07:42:43 +01:00
|
|
|
#else
|
|
|
|
analogWrite(Pin(GPIO_PWM1, index), 5);
|
|
|
|
#endif
|
2020-07-01 16:46:13 +01:00
|
|
|
}
|
|
|
|
last_cycle = current_cycle;
|
|
|
|
}
|
|
|
|
return;
|
|
|
|
}
|
2020-03-29 16:05:52 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
debounce_time = time - Counter.timer[index];
|
2019-10-22 13:56:06 +01:00
|
|
|
if (debounce_time > Settings.pulse_counter_debounce * 1000) {
|
|
|
|
Counter.timer[index] = time;
|
|
|
|
if (bitRead(Settings.pulse_counter_type, index)) {
|
|
|
|
RtcSettings.pulse_counter[index] = debounce_time;
|
2017-05-20 13:03:34 +01:00
|
|
|
} else {
|
2019-10-22 13:56:06 +01:00
|
|
|
RtcSettings.pulse_counter[index]++;
|
2017-05-20 13:03:34 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-11-14 13:32:09 +00:00
|
|
|
void CounterUpdate1(void)
|
2017-05-20 13:03:34 +01:00
|
|
|
{
|
2019-10-22 13:56:06 +01:00
|
|
|
CounterUpdate(0);
|
2017-05-20 13:03:34 +01:00
|
|
|
}
|
|
|
|
|
2018-11-14 13:32:09 +00:00
|
|
|
void CounterUpdate2(void)
|
2017-05-20 13:03:34 +01:00
|
|
|
{
|
2019-10-22 13:56:06 +01:00
|
|
|
CounterUpdate(1);
|
2017-05-20 13:03:34 +01:00
|
|
|
}
|
|
|
|
|
2018-11-14 13:32:09 +00:00
|
|
|
void CounterUpdate3(void)
|
2017-05-20 13:03:34 +01:00
|
|
|
{
|
2019-10-22 13:56:06 +01:00
|
|
|
CounterUpdate(2);
|
2017-05-20 13:03:34 +01:00
|
|
|
}
|
|
|
|
|
2018-11-14 13:32:09 +00:00
|
|
|
void CounterUpdate4(void)
|
2017-05-20 13:03:34 +01:00
|
|
|
{
|
2019-10-22 13:56:06 +01:00
|
|
|
CounterUpdate(3);
|
2017-05-20 13:03:34 +01:00
|
|
|
}
|
|
|
|
|
2017-12-16 19:11:12 +00:00
|
|
|
/********************************************************************************************/
|
|
|
|
|
2019-08-13 16:33:35 +01:00
|
|
|
bool CounterPinState(void)
|
2017-05-20 13:03:34 +01:00
|
|
|
{
|
2020-06-24 14:50:14 +01:00
|
|
|
if ((XdrvMailbox.index >= AGPIO(GPIO_CNTR1_NP)) && (XdrvMailbox.index < (AGPIO(GPIO_CNTR1_NP) + MAX_COUNTERS))) {
|
|
|
|
bitSet(Counter.no_pullup, XdrvMailbox.index - AGPIO(GPIO_CNTR1_NP));
|
|
|
|
XdrvMailbox.index -= (AGPIO(GPIO_CNTR1_NP) - AGPIO(GPIO_CNTR1));
|
2019-08-13 13:52:46 +01:00
|
|
|
return true;
|
2017-05-20 13:03:34 +01:00
|
|
|
}
|
2019-08-13 13:52:46 +01:00
|
|
|
return false;
|
2017-05-20 13:03:34 +01:00
|
|
|
}
|
|
|
|
|
2018-11-14 13:32:09 +00:00
|
|
|
void CounterInit(void)
|
2017-05-20 13:03:34 +01:00
|
|
|
{
|
|
|
|
typedef void (*function) () ;
|
2017-10-18 17:22:34 +01:00
|
|
|
function counter_callbacks[] = { CounterUpdate1, CounterUpdate2, CounterUpdate3, CounterUpdate4 };
|
2017-09-02 13:37:02 +01:00
|
|
|
|
2019-06-30 15:44:36 +01:00
|
|
|
for (uint32_t i = 0; i < MAX_COUNTERS; i++) {
|
2020-04-27 11:54:07 +01:00
|
|
|
if (PinUsed(GPIO_CNTR1, i)) {
|
2019-10-22 13:56:06 +01:00
|
|
|
Counter.any_counter = true;
|
2020-04-27 10:54:23 +01:00
|
|
|
pinMode(Pin(GPIO_CNTR1, i), bitRead(Counter.no_pullup, i) ? INPUT : INPUT_PULLUP);
|
2020-03-29 16:05:52 +01:00
|
|
|
if ((0 == Settings.pulse_counter_debounce_low) && (0 == Settings.pulse_counter_debounce_high)) {
|
|
|
|
Counter.pin_state = 0;
|
2020-04-27 10:54:23 +01:00
|
|
|
attachInterrupt(Pin(GPIO_CNTR1, i), counter_callbacks[i], FALLING);
|
2020-03-29 16:05:52 +01:00
|
|
|
} else {
|
|
|
|
Counter.pin_state = 0x8f;
|
2020-04-27 10:54:23 +01:00
|
|
|
attachInterrupt(Pin(GPIO_CNTR1, i), counter_callbacks[i], CHANGE);
|
2020-03-29 16:05:52 +01:00
|
|
|
}
|
2017-05-20 13:03:34 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-10-22 13:56:06 +01:00
|
|
|
void CounterEverySecond(void)
|
|
|
|
{
|
|
|
|
for (uint32_t i = 0; i < MAX_COUNTERS; i++) {
|
2020-04-27 11:54:07 +01:00
|
|
|
if (PinUsed(GPIO_CNTR1, i)) {
|
2019-10-22 13:56:06 +01:00
|
|
|
if (bitRead(Settings.pulse_counter_type, i)) {
|
|
|
|
uint32_t time = micros() - Counter.timer[i];
|
|
|
|
if (time > 4200000000) { // 70 minutes
|
|
|
|
RtcSettings.pulse_counter[i] = 4200000000; // Set Timer to max in case of no more interrupts due to stall of measured device
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-08-13 13:52:46 +01:00
|
|
|
void CounterSaveState(void)
|
|
|
|
{
|
|
|
|
for (uint32_t i = 0; i < MAX_COUNTERS; i++) {
|
2020-04-27 11:54:07 +01:00
|
|
|
if (PinUsed(GPIO_CNTR1, i)) {
|
2019-08-13 13:52:46 +01:00
|
|
|
Settings.pulse_counter[i] = RtcSettings.pulse_counter[i];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-01-28 13:08:33 +00:00
|
|
|
void CounterShow(bool json)
|
2017-05-20 13:03:34 +01:00
|
|
|
{
|
2019-08-11 14:18:11 +01:00
|
|
|
bool header = false;
|
2019-01-28 13:08:33 +00:00
|
|
|
uint8_t dsxflg = 0;
|
2019-06-30 15:44:36 +01:00
|
|
|
for (uint32_t i = 0; i < MAX_COUNTERS; i++) {
|
2020-04-27 11:54:07 +01:00
|
|
|
if (PinUsed(GPIO_CNTR1, i)) {
|
2018-12-21 15:17:06 +00:00
|
|
|
char counter[33];
|
2017-10-18 17:22:34 +01:00
|
|
|
if (bitRead(Settings.pulse_counter_type, i)) {
|
2018-08-09 12:24:13 +01:00
|
|
|
dtostrfd((double)RtcSettings.pulse_counter[i] / 1000000, 6, counter);
|
2017-05-20 13:03:34 +01:00
|
|
|
} else {
|
|
|
|
dsxflg++;
|
2019-02-18 10:06:16 +00:00
|
|
|
snprintf_P(counter, sizeof(counter), PSTR("%lu"), RtcSettings.pulse_counter[i]);
|
2017-05-20 13:03:34 +01:00
|
|
|
}
|
2017-11-04 15:36:51 +00:00
|
|
|
|
|
|
|
if (json) {
|
2018-04-28 14:55:38 +01:00
|
|
|
if (!header) {
|
2019-03-23 16:57:31 +00:00
|
|
|
ResponseAppend_P(PSTR(",\"COUNTER\":{"));
|
2018-04-28 14:55:38 +01:00
|
|
|
}
|
2019-08-11 14:18:11 +01:00
|
|
|
ResponseAppend_P(PSTR("%s\"C%d\":%s"), (header)?",":"", i +1, counter);
|
|
|
|
header = true;
|
2017-05-20 13:03:34 +01:00
|
|
|
#ifdef USE_DOMOTICZ
|
2018-04-11 09:11:20 +01:00
|
|
|
if ((0 == tele_period) && (1 == dsxflg)) {
|
2017-11-04 15:36:51 +00:00
|
|
|
DomoticzSensor(DZ_COUNT, RtcSettings.pulse_counter[i]);
|
|
|
|
dsxflg++;
|
|
|
|
}
|
2017-05-20 13:03:34 +01:00
|
|
|
#endif // USE_DOMOTICZ
|
2019-12-28 15:26:15 +00:00
|
|
|
if ((0 == tele_period ) && (Settings.flag3.counter_reset_on_tele)) {
|
|
|
|
RtcSettings.pulse_counter[i] = 0;
|
|
|
|
}
|
2017-05-20 13:03:34 +01:00
|
|
|
#ifdef USE_WEBSERVER
|
|
|
|
} else {
|
2019-08-11 14:18:11 +01:00
|
|
|
WSContentSend_PD(PSTR("{s}" D_COUNTER "%d{m}%s%s{e}"),
|
|
|
|
i +1, counter, (bitRead(Settings.pulse_counter_type, i)) ? " " D_UNIT_SECOND : "");
|
2017-11-04 15:36:51 +00:00
|
|
|
#endif // USE_WEBSERVER
|
2017-05-20 13:03:34 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2019-08-11 14:18:11 +01:00
|
|
|
if (header) {
|
|
|
|
ResponseJsonEnd();
|
2018-04-28 14:55:38 +01:00
|
|
|
}
|
2017-05-20 13:03:34 +01:00
|
|
|
}
|
|
|
|
|
2019-07-26 09:21:36 +01:00
|
|
|
/*********************************************************************************************\
|
|
|
|
* Commands
|
|
|
|
\*********************************************************************************************/
|
|
|
|
|
2019-08-11 14:18:11 +01:00
|
|
|
void CmndCounter(void)
|
2019-07-26 09:21:36 +01:00
|
|
|
{
|
2019-08-11 14:18:11 +01:00
|
|
|
if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_COUNTERS)) {
|
2020-04-27 11:54:07 +01:00
|
|
|
if ((XdrvMailbox.data_len > 0) && PinUsed(GPIO_CNTR1, XdrvMailbox.index -1)) {
|
2019-08-11 14:18:11 +01:00
|
|
|
if ((XdrvMailbox.data[0] == '-') || (XdrvMailbox.data[0] == '+')) {
|
|
|
|
RtcSettings.pulse_counter[XdrvMailbox.index -1] += XdrvMailbox.payload;
|
|
|
|
Settings.pulse_counter[XdrvMailbox.index -1] += XdrvMailbox.payload;
|
|
|
|
} else {
|
|
|
|
RtcSettings.pulse_counter[XdrvMailbox.index -1] = XdrvMailbox.payload;
|
|
|
|
Settings.pulse_counter[XdrvMailbox.index -1] = XdrvMailbox.payload;
|
2019-07-26 09:21:36 +01:00
|
|
|
}
|
|
|
|
}
|
2019-08-11 17:12:18 +01:00
|
|
|
ResponseCmndIdxNumber(RtcSettings.pulse_counter[XdrvMailbox.index -1]);
|
2019-07-26 09:21:36 +01:00
|
|
|
}
|
2019-08-11 14:18:11 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
void CmndCounterType(void)
|
|
|
|
{
|
|
|
|
if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_COUNTERS)) {
|
2020-04-27 11:54:07 +01:00
|
|
|
if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 1) && PinUsed(GPIO_CNTR1, XdrvMailbox.index -1)) {
|
2019-08-11 14:18:11 +01:00
|
|
|
bitWrite(Settings.pulse_counter_type, XdrvMailbox.index -1, XdrvMailbox.payload &1);
|
|
|
|
RtcSettings.pulse_counter[XdrvMailbox.index -1] = 0;
|
|
|
|
Settings.pulse_counter[XdrvMailbox.index -1] = 0;
|
2019-07-26 09:21:36 +01:00
|
|
|
}
|
2019-08-11 14:18:11 +01:00
|
|
|
ResponseCmndIdxNumber(bitRead(Settings.pulse_counter_type, XdrvMailbox.index -1));
|
2019-07-26 09:21:36 +01:00
|
|
|
}
|
2019-08-11 14:18:11 +01:00
|
|
|
}
|
2019-07-26 09:21:36 +01:00
|
|
|
|
2019-08-11 14:18:11 +01:00
|
|
|
void CmndCounterDebounce(void)
|
|
|
|
{
|
|
|
|
if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 32001)) {
|
|
|
|
Settings.pulse_counter_debounce = XdrvMailbox.payload;
|
|
|
|
}
|
|
|
|
ResponseCmndNumber(Settings.pulse_counter_debounce);
|
2019-07-26 09:21:36 +01:00
|
|
|
}
|
|
|
|
|
2020-03-29 16:05:52 +01:00
|
|
|
void CmndCounterDebounceLow(void)
|
|
|
|
{
|
|
|
|
if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 32001)) {
|
|
|
|
Settings.pulse_counter_debounce_low = XdrvMailbox.payload;
|
|
|
|
CounterInit();
|
|
|
|
}
|
|
|
|
ResponseCmndNumber(Settings.pulse_counter_debounce_low);
|
|
|
|
}
|
|
|
|
|
|
|
|
void CmndCounterDebounceHigh(void)
|
|
|
|
{
|
|
|
|
if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 32001)) {
|
|
|
|
Settings.pulse_counter_debounce_high = XdrvMailbox.payload;
|
|
|
|
CounterInit();
|
|
|
|
}
|
|
|
|
ResponseCmndNumber(Settings.pulse_counter_debounce_high);
|
|
|
|
}
|
|
|
|
|
2017-11-03 17:07:25 +00:00
|
|
|
/*********************************************************************************************\
|
|
|
|
* Interface
|
|
|
|
\*********************************************************************************************/
|
|
|
|
|
2019-01-28 13:08:33 +00:00
|
|
|
bool Xsns01(uint8_t function)
|
2017-11-03 17:07:25 +00:00
|
|
|
{
|
2019-01-28 13:08:33 +00:00
|
|
|
bool result = false;
|
2017-11-03 17:07:25 +00:00
|
|
|
|
2019-10-22 13:56:06 +01:00
|
|
|
if (Counter.any_counter) {
|
|
|
|
switch (function) {
|
|
|
|
case FUNC_EVERY_SECOND:
|
|
|
|
CounterEverySecond();
|
|
|
|
break;
|
|
|
|
case FUNC_JSON_APPEND:
|
|
|
|
CounterShow(1);
|
|
|
|
break;
|
2017-11-03 17:07:25 +00:00
|
|
|
#ifdef USE_WEBSERVER
|
2019-10-22 13:56:06 +01:00
|
|
|
case FUNC_WEB_SENSOR:
|
|
|
|
CounterShow(0);
|
|
|
|
break;
|
2017-11-03 17:07:25 +00:00
|
|
|
#endif // USE_WEBSERVER
|
2019-10-22 13:56:06 +01:00
|
|
|
case FUNC_SAVE_BEFORE_RESTART:
|
|
|
|
case FUNC_SAVE_AT_MIDNIGHT:
|
|
|
|
CounterSaveState();
|
|
|
|
break;
|
|
|
|
case FUNC_COMMAND:
|
|
|
|
result = DecodeCommand(kCounterCommands, CounterCommand);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
switch (function) {
|
|
|
|
case FUNC_INIT:
|
|
|
|
CounterInit();
|
|
|
|
break;
|
|
|
|
case FUNC_PIN_STATE:
|
|
|
|
result = CounterPinState();
|
|
|
|
break;
|
|
|
|
}
|
2017-11-03 17:07:25 +00:00
|
|
|
}
|
|
|
|
return result;
|
|
|
|
}
|
2019-06-16 15:43:23 +01:00
|
|
|
|
|
|
|
#endif // USE_COUNTER
|