typo

README.md

@@ -40,7 +40,7 @@ It does support a master valve or pump. (ie turn on a master device with every z
 * To use WiringPi :-
 * install WiringPI first `http://wiringpi.com/download-and-install/`
 * Make sprinklerd with the below flag
-* `make USR_WIRINGPI=1`
+* `make USE_WIRINGPI=1`
 * Make sure to use the WPI_PIN and not GPIO_PIN in the configuration for the pin numbers.
 * you can also use GPIO_PULL_UPDN option in the configuration.
 
@@ -69,7 +69,7 @@ I have my own scripts to do this for me, and probably won't ever document or pub
 
 ## sprinklerd Configuration
 Please see the [sprinklerd.conf]
-(https://github.com/sfeakes/sprinklerd/blob/master/extras/sprinklerd.conf) 
+(https://github.com/sfeakes/sprinklerd/blob/master/release/sprinklerd.conf) 
 example in the release directory.  Many things are turned off by default, and you may need to enable or configure them for your setup.
 Specifically, make sure you configure your MQTT, Pool Equiptment Labels & Domoticz ID's in there, looking at the file it should be self explanatory. 
 

extras/homekit2mqtt.json

@@ -1,12 +1,38 @@
-{  
-  "Sprinklerd System": {
-    "id": "SprinklerdSystem",
-    "name": "System",
+{
+  "Sprinklerd Zones": {
+    "id": "SprinklerdZones",
+    "name": "Zones",
     "manufacturer": "Feakes Inc",
-    "model": "SprinklerdSystem",
+    "model": "SprinklerdZone",
     "services": [
       {
-        "name": "System",
+        "name": "Sprinklers",
+        "service": "IrrigationSystem",
+        "topic": {
+          "setActive": "sprinklerd/active/set",
+          "statusActive": "sprinklerd/active",
+          "statusInUse": "sprinklerd/zone/0",
+          "statusRemainingDuration": "sprinklerd/remainingduration",
+          "statusProgramMode": "sprinklerd/programmode"
+        },
+        "payload": {
+          "activeTrue": 1,
+          "activeFalse": 0,
+          "inUseTrue": 1
+        },
+        "config": {},
+        "props": {}
+      }
+    ]
+  },
+  "Sprinklerd System": {
+    "id": "SprinklerdCalendar",
+    "name": "Calendar",
+    "manufacturer": "Feakes Inc",
+    "model": "SprinklerdCalendar",
+    "services": [
+      {
+        "name": "Calendar",
         "service": "Switch",
         "topic": {
           "setOn": "sprinklerd/system/set",

release/sprinklerd.conf

@@ -1,30 +1,29 @@
 [SPRINKLERD]
 PORT=80
-NAME=Feakes Sprinkler
+NAME=My Sprinklers
 DOCUMENTROOT = /var/www/sprinklerd 
-#DOCUMENTROOT = /nas/data/Development/Raspberry/sprinklerd/web/
-#DEBUG2LOGFILE = yes
 CACHE = /var/cache/sprinklerd.cache
 # The log level. [DEBUG, INFO, NOTICE, WARNING, ERROR]
 #LOG_LEVEL = DEBUG
 LOG_LEVEL = NOTICE 
 
 # mqtt stuff
-MQTT_ADDRESS = trident:1883
+#MQTT_ADDRESS = trident:1883
 #MQTT_USER = someusername    
 #MQTT_PASSWD = somepassword
-MQT_TOPIC = sprinklerd
-MQTT_DZ_PUB_TOPIC = domoticz/in
-MQTT_DZ_SUB_TOPIC = domoticz/out
+#MQT_TOPIC = sprinklerd
+#MQTT_DZ_PUB_TOPIC = domoticz/in
+#MQTT_DZ_SUB_TOPIC = domoticz/out
 
-DZIDX_SYSTEM = 197
-DZIDX_24HDELAY = 198
-DZIDX_ALL_ZONES = 199
+#DZIDX_SYSTEM = 197
+#DZIDX_24HDELAY = 198
+#DZIDX_ALL_ZONES = 199
 
-# GPIO options.
+# Options for the below ZONE and GPIO configuration
+#
 # LOW        0
 # HIGH       1
-
+#
 # PUD_OFF      0
 # PUD_DOWN     1
 # PUD_UP       2
@@ -37,7 +36,7 @@ DZIDX_ALL_ZONES = 199
 #DOMOTICZ_IDX   = Domoticz IDX 0 or remove entry if you don;t use Domoticz (only if you use domoticz)
 #MASTER_VALVE   = YES=1 NO=0  // turn on with any zone
 
-# Don't use ZONE:0 for anything other than master valve, if you do't have a master valve simply delete it and start from ZONE:1
+# Don't use ZONE:0 for anything other than master valve, if you don't have a master valve simply delete it and start from ZONE:1
 [ZONE]
 [ZONE:0]
 NAME=Master Valve
@@ -119,7 +118,9 @@ GPIO_PULL_UPDN=1
 GPIO_ON_STATE=0
 DOMOTICZ_IDX=207
 
-
+#
+# This is for future support of sensors, not implimented yet
+#
 #PIN
 #NAME name
 #PIN_MODE Setup as input or output