diff --git a/config.c b/config.c index 5946d98..3b89c9f 100644 --- a/config.c +++ b/config.c @@ -306,7 +306,8 @@ void readCfg(char *inifile) _sdconfig_.zonecfg[i].dz_idx = ini_getl(str, "DOMOTICZ_IDX", -1, inifile); //_sdconfig_.zonecfg[i].master_valve = ini_getl(str, "MASTER_VALVE", NO, inifile); _sdconfig_.zonecfg[i].default_runtime = ini_getl(str, "DEFAULT_RUNTIME", 10, inifile); - ini_gets(str, "NAME", NULL, _sdconfig_.zonecfg[idx].name, sizearray(_sdconfig_.zonecfg[idx].name), inifile); + //ini_gets(str, "NAME", NULL, _sdconfig_.zonecfg[idx].name, sizearray(_sdconfig_.zonecfg[idx].name), inifile); + ini_gets(str, "NAME", NULL, _sdconfig_.zonecfg[i].name, sizearray(_sdconfig_.zonecfg[i].name), inifile); /* logMessage (LOG_DEBUG,"Zone Config : %s\n%25s : %d\n%25s : %d\n%25s : %d\n%25s : %d\n%25s : %d\n", _sdconfig_.zonecfg[i].name, diff --git a/json_messages.c b/json_messages.c index 45d1a0a..94c1e3a 100644 --- a/json_messages.c +++ b/json_messages.c @@ -173,7 +173,7 @@ int build_homebridge_sprinkler_JSON(char* buffer, int size) length += sprintf(buffer+length, "{ \"title\" : \"%s\", ", _sdconfig_.name); length += sprintf(buffer+length, " \"devices\": ["); - for (i=0; i <= _sdconfig_.zones ; i++) + for (i=(_sdconfig_.master_valve?0:1); i <= _sdconfig_.zones ; i++) { length += sprintf(buffer+length, "{\"type\" : \"zone\", \"zone\": %d, \"name\": \"%s\", \"state\": \"%s\", \"duration\": %d, \"id\" : \"zone%d\" },", _sdconfig_.zonecfg[i].zone, diff --git a/release/sprinklerd b/release/sprinklerd index 97bf5ab..1551fae 100755 Binary files a/release/sprinklerd and b/release/sprinklerd differ diff --git a/version.h b/version.h index 47a3064..3c22a92 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #ifndef SD_VERSION_H #define SD_VERSION_H -#define SD_VERSION "1.0c" +#define SD_VERSION "1.0d" #endif