converted Service Group names to upper case

docs/ServiceList.md

@@ -26,7 +26,8 @@ The pre-defined constant expressions for enumerated Characteristics are in names
 
 <!-- AUTOGENERATED_TEXT.  DO NOT EDIT THIS LINE OR ANYTHING BELOW -->
 
-##  Mandatory Services
+
+##  MANDATORY SERVICES
 ### AccessoryInformation (3E)
 <i> Required Identification Information.  For each Accessory in a HomeSpan device this must be included as the first Service.</i><br><table>
 <tr><th>Characteristic</th><th>Format</th><th>Perms</th><th>Min</th><th>Max</th><th>Constants/Defaults</th></tr>
@@ -39,7 +40,7 @@ The pre-defined constant expressions for enumerated Characteristics are in names
 <tr><td><b>HardwareRevision (53) </b><ul><li> must be in form x[.y[.z]] - informational only</li></ul></td><td align="center">string</td><td align="center">PR</td><td align="center">-</td><td align="center">-</td><td align="center">"1.0.0"</td></tr>
 </table>
 
-##  Lights, Power, and Switches
+##  LIGHTS, POWER, AND SWITCHES
 ### BatteryService (96)
 <i> Defines a standalone Battery Service.</i><br><table>
 <tr><th>Characteristic</th><th>Format</th><th>Perms</th><th>Min</th><th>Max</th><th>Constants/Defaults</th></tr>
@@ -82,7 +83,7 @@ The pre-defined constant expressions for enumerated Characteristics are in names
 <tr><td><b>ConfiguredName (E3) </b><ul><li> a "configurable" Service name - any updates made from within the Home App trigger an update in HomeSpan and vice versa.</li></ul></td><td align="center">string</td><td align="center">PW+PR+EV</td><td align="center">-</td><td align="center">-</td><td align="center">"unnamed"</td></tr>
 </table>
 
-##  Heating, Ventilation, and Air Conditioning (HVAC)
+##  HEATING, VENTILATION, AND AIR CONDITIONING (HVAC)
 ### AirPurifier (BB)
 <i> Defines a basic Air Purifier with an optional fan.  Optional Linked Services: <b>FilterMaintenance</b>, <b>AirQualitySensor</b>, <b>Fan</b>, and <b>Slat</b></i><br><table>
 <tr><th>Characteristic</th><th>Format</th><th>Perms</th><th>Min</th><th>Max</th><th>Constants/Defaults</th></tr>
@@ -175,7 +176,7 @@ The pre-defined constant expressions for enumerated Characteristics are in names
 <tr><td><b>ConfiguredName (E3) </b><ul><li> a "configurable" Service name - any updates made from within the Home App trigger an update in HomeSpan and vice versa.</li></ul></td><td align="center">string</td><td align="center">PW+PR+EV</td><td align="center">-</td><td align="center">-</td><td align="center">"unnamed"</td></tr>
 </table>
 
-##  Standalone Sensors
+##  STANDALONE SENSORS
 ### AirQualitySensor (8D)
 <i> Defines an Air Quality Sensor. </i><br><table>
 <tr><th>Characteristic</th><th>Format</th><th>Perms</th><th>Min</th><th>Max</th><th>Constants/Defaults</th></tr>
@@ -307,7 +308,7 @@ The pre-defined constant expressions for enumerated Characteristics are in names
 <tr><td><b>ConfiguredName (E3) </b><ul><li> a "configurable" Service name - any updates made from within the Home App trigger an update in HomeSpan and vice versa.</li></ul></td><td align="center">string</td><td align="center">PW+PR+EV</td><td align="center">-</td><td align="center">-</td><td align="center">"unnamed"</td></tr>
 </table>
 
-##  Doors, Locks, and Windows
+##  DOORS, LOCKS, AND WINDOWS
 ### Door (81)
 <i> Defines a motorized Door.</i><br><table>
 <tr><th>Characteristic</th><th>Format</th><th>Perms</th><th>Min</th><th>Max</th><th>Constants/Defaults</th></tr>
@@ -365,7 +366,7 @@ The pre-defined constant expressions for enumerated Characteristics are in names
 <tr><td><b>ConfiguredName (E3) </b><ul><li> a "configurable" Service name - any updates made from within the Home App trigger an update in HomeSpan and vice versa.</li></ul></td><td align="center">string</td><td align="center">PW+PR+EV</td><td align="center">-</td><td align="center">-</td><td align="center">"unnamed"</td></tr>
 </table>
 
-##  Water Systems
+##  WATER SYSTEMS
 ### Faucet (D7)
 <i> Defines the master control for a multi-Valve appliance.  Linked Services: <b>Valve</b> (at least one required), and <b>HeaterCooler</b> (optional).</i><br><table>
 <tr><th>Characteristic</th><th>Format</th><th>Perms</th><th>Min</th><th>Max</th><th>Constants/Defaults</th></tr>
@@ -399,7 +400,7 @@ The pre-defined constant expressions for enumerated Characteristics are in names
 <tr><td><b>ConfiguredName (E3) </b><ul><li> a "configurable" Service name - any updates made from within the Home App trigger an update in HomeSpan and vice versa.</li></ul></td><td align="center">string</td><td align="center">PW+PR+EV</td><td align="center">-</td><td align="center">-</td><td align="center">"unnamed"</td></tr>
 </table>
 
-##  Security Systems
+##  SECURITY SYSTEMS
 ### SecuritySystem (7E)
 <i> Defines a Security System.  Often combined with <b>MotionSensor</b> and <b>ContactSensor</b> Services.</i><br><table>
 <tr><th>Characteristic</th><th>Format</th><th>Perms</th><th>Min</th><th>Max</th><th>Constants/Defaults</th></tr>
@@ -411,7 +412,7 @@ The pre-defined constant expressions for enumerated Characteristics are in names
 <tr><td><b>ConfiguredName (E3) </b><ul><li> a "configurable" Service name - any updates made from within the Home App trigger an update in HomeSpan and vice versa.</li></ul></td><td align="center">string</td><td align="center">PW+PR+EV</td><td align="center">-</td><td align="center">-</td><td align="center">"unnamed"</td></tr>
 </table>
 
-##  Televisions
+##  TELEVISIONS
 ### InputSource (D9)
 <i> Defines an Input Source for a TV.  Use only as a Linked Service for the <b>Television</b> Service.</i><br><table>
 <tr><th>Characteristic</th><th>Format</th><th>Perms</th><th>Min</th><th>Max</th><th>Constants/Defaults</th></tr>
@@ -440,18 +441,11 @@ The pre-defined constant expressions for enumerated Characteristics are in names
 <tr><td><b>ConfiguredName (E3) </b><ul><li> a "configurable" Service name - any updates made from within the Home App trigger an update in HomeSpan and vice versa.</li></ul></td><td align="center">string</td><td align="center">PW+PR+EV</td><td align="center">-</td><td align="center">-</td><td align="center">"unnamed"</td></tr>
 </table>
 
-##  Miscellaneous
+##  MISCELLANEOUS
 ### ServiceLabel (CC)
 <i> Groups together un-named (or un-nameable) Services by Linking them to this Service.  When used, those other Services must each include a <b>ServiceLabelIndex</b> Characteristic with a unique value.  Rarely needed.</i><br><table>
 <tr><th>Characteristic</th><th>Format</th><th>Perms</th><th>Min</th><th>Max</th><th>Constants/Defaults</th></tr>
 <tr><td><b>ServiceLabelNamespace (CD) :small_blue_diamond:</b><ul><li> indicates how un-named Services linked together with a <b>ServiceLabel</b> Service should be displayed in the Home App  </li></ul></td><td align="center">uint8</td><td align="center">PR</td><td align="center">0</td><td align="center">1</td><td><ul><li><span>DOTS&nbsp(0)&nbsp;</span></li><li><span>NUMERALS&nbsp(1)&nbsp;</span>:heavy_check_mark:</li></ul></td></tr>
-<tr><td><b>Version (37) :small_blue_diamond:</b><ul><li> unused</li></ul></td><td align="center">string</td><td align="center">PR</td><td align="center">-</td><td align="center">-</td><td align="center">"1.0.0"</td></tr>
-<tr><td><b>Mute (11A) :small_blue_diamond:</b><ul><li> not used</li></ul></td><td align="center">bool</td><td align="center">PW+PR+EV</td><td align="center">0</td><td align="center">1</td><td><ul><li><span>OFF&nbsp(0)&nbsp;</span>:heavy_check_mark:</li><li><span>ON&nbsp(1)&nbsp;</span></li></ul></td></tr>
-<tr><td><b>Volume (119) </b><ul><li> unused</li></ul></td><td align="center">uint8</td><td align="center">PW+PR+EV</td><td align="center">0</td><td align="center">100</td><td align="center">0</td></tr>
-<tr><td><b>ConfiguredName (E3) </b><ul><li> a "configurable" Service name - any updates made from within the Home App trigger an update in HomeSpan and vice versa.</li></ul></td><td align="center">string</td><td align="center">PW+PR+EV</td><td align="center">-</td><td align="center">-</td><td align="center">"unnamed"</td></tr>
-<tr><td><b>Mute (11A) :small_blue_diamond:</b><ul><li> not used</li></ul></td><td align="center">bool</td><td align="center">PW+PR+EV</td><td align="center">0</td><td align="center">1</td><td><ul><li><span>OFF&nbsp(0)&nbsp;</span>:heavy_check_mark:</li><li><span>ON&nbsp(1)&nbsp;</span></li></ul></td></tr>
-<tr><td><b>Volume (119) </b><ul><li> unused</li></ul></td><td align="center">uint8</td><td align="center">PW+PR+EV</td><td align="center">0</td><td align="center">100</td><td align="center">0</td></tr>
-<tr><td><b>ConfiguredName (E3) </b><ul><li> a "configurable" Service name - any updates made from within the Home App trigger an update in HomeSpan and vice versa.</li></ul></td><td align="center">string</td><td align="center">PW+PR+EV</td><td align="center">-</td><td align="center">-</td><td align="center">"unnamed"</td></tr>
 </table>
 
 ---

src/Span.h

@@ -43,6 +43,7 @@
 #define END_SERV }};
 
 #define REQ(HAPCHAR) req.push_back(&hapChars.HAPCHAR)
+#define REQ_DEP(HAPCHAR) req.push_back(&hapChars.HAPCHAR)
 #define OPT(HAPCHAR) opt.push_back(&hapChars.HAPCHAR)
 #define OPT_DEP(HAPCHAR) opt.push_back(&hapChars.HAPCHAR)
 
@@ -448,20 +449,20 @@ namespace Service {
   // Deprecated or unsupported Services
   
   CREATE_SERV_DEP(HAPProtocolInformation,A2)
-    REQ(Version);
+    REQ_DEP(Version);
   END_SERV
 
   CREATE_SERV_DEP(Microphone,112)
-    REQ(Mute);
-    OPT(Volume);
-    OPT(ConfiguredName);
+    REQ_DEP(Mute);
+    OPT_DEP(Volume);
+    OPT_DEP(ConfiguredName);
     OPT_DEP(Name);
   END_SERV
 
   CREATE_SERV_DEP(Speaker,113)
-    REQ(Mute);
-    OPT(Volume);
-    OPT(ConfiguredName);
+    REQ_DEP(Mute);
+    OPT_DEP(Volume);
+    OPT_DEP(ConfiguredName);
     OPT_DEP(Name);
   END_SERV
 

tools/makeServiceList

@@ -4,6 +4,3 @@ grep -B 1000 "AUTOGENERATED_TEXT" ../docs/ServiceList.md > ServiceList.md
 ./makeServices ../src/Characteristics.h  ../src/Span.h >> ServiceList.md
 mv ServiceList.md ../docs/ServiceList.md
 
-#grep -B 1000 "AUTOGENERATED_TEXT" ../docs/ServiceList_Expanded.md > ServiceList_Expanded.md
-#./makeServices -vdetailsAtt=" open" ../src/Characteristics.h  ../src/Span.h >> ServiceList_Expanded.md
-#mv ServiceList_Expanded.md ../docs/ServiceList_Expanded.md

tools/makeServices

@@ -69,7 +69,7 @@ END {
 
 	for(i=0;i<nServs;i++){
 		if(group[i]!="")
-			printf("## %s\n",group[i])
+			printf("## %s\n",toupper(group[i]))
 		s=services[i]
 		printf("### %s (%s)\n",s,uuid[s])
 		printf("<i>%s</i><br><table>\n",desc[s])