sfeakes
/
SprinklerD
mirror of https://github.com/sfeakes/SprinklerD.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Bug fix for homekit

master
shaun feakes 2018-12-02 08:57:59 -06:00
parent 32ffe1509b
commit 5a99180c5b
5 changed files with 15 additions and 12 deletions

4
net_services.c
View File

@ -686,7 +686,7 @@ void action_mqtt_message(struct mg_connection *nc, struct mg_mqtt_message *msg){
logMessage(LOG_DEBUG, "MQTT: topic %.*s %.*s\n",msg->topic.len, msg->topic.p, msg->payload.len, msg->payload.p);
logMessage(LOG_DEBUG, "MQTT: pt2 %s\n", pt2);
//logMessage(LOG_DEBUG, "MQTT: pt2 %s\n", pt2);
//logMessage(LOG_DEBUG, "MQTT: pt2 %.*s == %s %c\n", 4, pt2, strncmp(pt2, "zone", 4) == 0?"YES":"NO", pt2[4]);
/*
@ -708,6 +708,8 @@ void action_mqtt_message(struct mg_connection *nc, struct mg_mqtt_message *msg){
_sdconfig_.zonecfg[zone].default_runtime = v / 60;
_sdconfig_.eventToUpdateHappened = true;
logMessage(LOG_DEBUG, "MQTT: Default runtime zone %d is %d\n",zone,_sdconfig_.zonecfg[zone].default_runtime);
} else {
logMessage(LOG_DEBUG, "MQTT: BAD Default runtime zone %d is %d\n",zone,_sdconfig_.zonecfg[zone].default_runtime);
}
} else if (pt2 != NULL && pt3 != NULL && strncmp(pt2, "24hdelay", 8) == 0 && strncmp(pt3, "set", 3) == 0 ) {
enable_delay24h(status==zcON?true:false);

BIN
release/sprinklerd
View File

Binary file not shown.

19
release/sprinklerd.conf
View File

@ -8,10 +8,11 @@ CACHE = /var/cache/sprinklerd.cache
LOG_LEVEL = NOTICE
# mqtt stuff
#MQTT_ADDRESS = trident:1883
#MQTT_ADDRESS = localhost:1883
#MQTT_USER = someusername
#MQTT_PASSWD = somepassword
#MQT_TOPIC = sprinklerd
#MQTT_DZ_PUB_TOPIC = domoticz/in
#MQTT_DZ_SUB_TOPIC = domoticz/out
@ -54,7 +55,7 @@ GPIO_PIN=18
WPI_PIN=1
GPIO_PULL_UPDN=1
GPIO_ON_STATE=0
DOMOTICZ_IDX=200
#DOMOTICZ_IDX=200
[ZONE:2]
NAME=Driveway
@ -63,7 +64,7 @@ GPIO_PIN=27
WPI_PIN=2
GPIO_PULL_UPDN=1
GPIO_ON_STATE=0
DOMOTICZ_IDX=201
#DOMOTICZ_IDX=201
[ZONE:3]
NAME=Diningroom Flowerbeds
@ -72,7 +73,7 @@ GPIO_PIN=22
WPI_PIN=3
GPIO_PULL_UPDN=1
GPIO_ON_STATE=0
DOMOTICZ_IDX=202
#DOMOTICZ_IDX=202
[ZONE:4]
NAME=Front Flowerbeds
@ -81,7 +82,7 @@ GPIO_PIN=23
WPI_PIN=4
GPIO_PULL_UPDN=1
GPIO_ON_STATE=0
DOMOTICZ_IDX=203
#DOMOTICZ_IDX=203
[ZONE:5]
NAME=Backgarden Left
@ -90,7 +91,7 @@ GPIO_PIN=24
WPI_PIN=5
GPIO_PULL_UPDN=1
GPIO_ON_STATE=0
DOMOTICZ_IDX=204
#DOMOTICZ_IDX=204
[ZONE:6]
NAME=Backgarden Right
@ -99,7 +100,7 @@ GPIO_PIN=25
WPI_PIN=6
GPIO_PULL_UPDN=1
GPIO_ON_STATE=0
DOMOTICZ_IDX=205
#DOMOTICZ_IDX=205
[ZONE:7]
NAME=Garage Flowerbeds
@ -108,7 +109,7 @@ GPIO_PIN=5
WPI_PIN=21
GPIO_PULL_UPDN=1
GPIO_ON_STATE=0
DOMOTICZ_IDX=206
#DOMOTICZ_IDX=206
[ZONE:8]
NAME=Golfcart path
@ -117,6 +118,6 @@ GPIO_PIN=6
WPI_PIN=22
GPIO_PULL_UPDN=1
GPIO_ON_STATE=0
DOMOTICZ_IDX=207
#DOMOTICZ_IDX=207

2
version.h
View File

@ -1,6 +1,6 @@
#ifndef SD_VERSION_H
#define SD_VERSION_H
#define SD_VERSION "1.0b"
#define SD_VERSION "1.0c"
#endif

2
zone_ctrl.c
View File

@ -132,7 +132,7 @@ bool zc_zone(zcRunType type, int zone, zcState state, int length) {
if (length == 0) {
//get default length here
length = _sdconfig_.zonecfg[zone].default_runtime;
logMessage (LOG_DEBUG, "Use default time of %s\n",length);
logMessage (LOG_DEBUG, "Use default time of %d\n",length);
}
// NSF need to Check the array is valid