From 4f31ac84bd97363d45a1f69bd764639b882c6a08 Mon Sep 17 00:00:00 2001
From: Kimmo Huoman <kipenroskaposti@gmail.com>
Date: Mon, 28 Dec 2020 18:04:18 +0200
Subject: [PATCH] Add F6-02-01 and expand A5-20-01 (#111)

* Update EEP.xml

Added F6-02-01 EEP profile
Expanded A5-20-01 EEP profile

* Update EEP.xml

Added A5-06-02 EEP profile
Expanded A5-06-01 EEP profile

* Remove Lean bits, as they are handled by the Packet.

Co-authored-by: Vadzim Kichyhin <kikotokens@gmail.com>
---
 enocean/protocol/EEP.xml | 80 ++++++++++++++++++++++++++++++++++++----
 1 file changed, 72 insertions(+), 8 deletions(-)

diff --git a/enocean/protocol/EEP.xml b/enocean/protocol/EEP.xml
index ee3c73d..bd391f4 100644
--- a/enocean/protocol/EEP.xml
+++ b/enocean/protocol/EEP.xml
@@ -11,6 +11,32 @@
       </profile>
     </profiles>
     <profiles func="0x02" description="Rocker Switch, 2 Rocker">
+      <profile type="0x01" description="Light and Blind Control - Application Style 1">
+        <data>
+          <enum description="Rocker 1st action" shortcut="R1" offset="0" size="3">
+            <item description="Button AI" value="0" />
+            <item description="Button AO" value="1" />
+            <item description="Button BI" value="2" />
+            <item description="Button BO" value="3" />
+          </enum>
+          <enum description="Energy bow" shortcut="EB" offset="3" size="1">
+            <item description="released" value="0" />
+            <item description="pressed" value="1" />
+          </enum>
+          <enum description="Rocker 2nd action" shortcut="R2" offset="4" size="3">
+            <item description="Button AI" value="0" />
+            <item description="Button AO" value="1" />
+            <item description="Button BI" value="2" />
+            <item description="Button BO" value="3" />
+          </enum>
+          <enum description="2nd action" shortcut="SA" offset="7" size="1">
+            <item description="No 2nd action" value="0" />
+            <item description="2nd action valid" value="1" />
+          </enum>
+          <status description="T21" shortcut="T21" offset="2" size="1" />
+          <status description="NU" shortcut="NU" offset="3" size="1" />
+        </data>
+      </profile>
       <profile type="0x02" description="Light and Blind Control - Application Style 2">
         <data>
           <enum description="Rocker 1st action" shortcut="R1" offset="0" size="3">
@@ -469,7 +495,7 @@
           </enum>
         </data>
       </profile>
-      <profile type="0x03" description="Range -20°C  to +60°C 10bit-measurement  and 0% to 100%">
+      <profile type="0x03" description="Range -20°C to +60°C 10bit-measurement and 0% to 100%">
         <data>
           <value description="Rel. Humidity (linear)" shortcut="HUM" offset="0" size="8" unit="%">
             <range>
@@ -537,6 +563,44 @@
           </enum>
         </data>
       </profile>
+      <profile type="0x02" description="Range 0lx to 1.020lx">
+        <data>
+          <value description="Supply voltage (linear)" shortcut="SVC" offset="0" size="8" unit="V">
+            <range>
+              <min>0</min>
+              <max>255</max>
+            </range>
+            <scale>
+              <min>0.000000</min>
+              <max>5.100000</max>
+            </scale>
+          </value>
+          <value description="Illumination 2 (linear)" shortcut="ILL2" offset="8" size="8" unit="lx">
+            <range>
+              <min>0</min>
+              <max>255</max>
+            </range>
+            <scale>
+              <min>0.000000</min>
+              <max>510.000000</max>
+            </scale>
+          </value>
+          <value description="Illumination 1 (linear)" shortcut="ILL1" offset="16" size="8" unit="lx">
+            <range>
+              <min>0</min>
+              <max>255</max>
+            </range>
+            <scale>
+              <min>0.000000</min>
+              <max>1020.000000</max>
+            </scale>
+          </value>
+          <enum description="Range select" shortcut="RS" offset="31" size="1">
+            <item description="Range acc. to DB_1 (ILL1)" value="0" />
+            <item description="Range acc. to DB_2 (ILL2)" value="1" />
+          </enum>
+        </data>
+      </profile>
     </profiles>
     <profiles func="0x07" description="Occupancy Sensor">
       <profile type="0x01" description="Occupancy with Supply voltage monitor">
@@ -681,8 +745,8 @@
         </data>
       </profile>
     </profiles>
-    <profiles description="Room Operating Panel" func="0x10">
-      <profile description="Temperature Sensor and Set Point" type="0x03">
+    <profiles func="0x10" description="Room Operating Panel">
+      <profile type="0x03" description="Temperature Sensor and Set Point">
         <data>
           <value shortcut="SP" description="Set Point (linear)" offset="8" size="8" unit="%">
             <range>
@@ -835,8 +899,8 @@
         </data>
       </profile>
     </profiles>
-    <profiles description="Controller Status" func="0x11">
-      <profile description="Temperature Controller Output" type="0x02">
+    <profiles func="0x11" description="Controller Status">
+      <profile type="0x02" description="Temperature Controller Output">
         <data>
           <value shortcut="CVAR" description="Actual value of controller" offset="0" size="8" unit="%">
             <range>
@@ -915,8 +979,8 @@
         </data>
       </profile>
     </profiles>
-    <profiles description="HVAC Components" func="0x20">
-      <profile description="Battery Powered Actuator (BI-DIR)" type="0x01">
+    <profiles func="0x20" description="HVAC Components">
+      <profile type="0x01" description="Battery Powered Actuator (BI-DIR)">
         <data direction="1">
           <value shortcut="CV" description="Current Value" offset="0" size="8" unit="%">
             <range>
@@ -972,7 +1036,7 @@
           </value>
         </data>
         <data direction="2">
-          <value shortcut="SP" description="Valve Position" offset="0" size="8" unit="%">
+          <value shortcut="SP" description="Valve Position or Temperature Setpoint" offset="0" size="8" unit="%">
             <range>
               <min>0</min>
               <max>100</max>