One more little addition : decoding of field ADCO/ADSC

rename Compteur/CompteurType to Meter/MeterType

Signed-off-by: Laurent ARNAL <[email protected]>

Author: lo92fr

bundles/org.openhab.binding.linky/src/main/java/org/openhab/binding/linky/internal/constants/LinkyBindingConstants.java

@@ -67,6 +67,8 @@ public class LinkyBindingConstants {
     public static final String LINKY_TEMPO_CALENDAR_GROUP = "linky-tempo-calendar";
     public static final String LINKY_REMOTE_LOAD_CURVE_GROUP = "linky-remote-load-curve";
 
+    public static final String LINKY_LOCAL_METER_BASE_GROUP = "linky-local-meter-base";
+
     public static final String LINKY_LOCAL_STANDARD_3PHASE_GROUP = "linky-local-standard-3phase";
     public static final String LINKY_LOCAL_STANDARD_BASE_GROUP = "linky-local-standard-base";
     public static final String LINKY_LOCAL_STANDARD_PRODUCER_GROUP = "linky-local-standard-producer";
@@ -392,6 +394,14 @@ public class LinkyBindingConstants {
     public static final String CHANNEL_BLUE_HP_HT = "blue-hp-ht";
     public static final String CHANNEL_BLUE_HP_TTC = "blue-hp-ttc";
 
+    //
+
+    public static final String CHANNEL_METER_MANUFACTURER = "meter-manufacturer";
+    public static final String CHANNEL_METER_TYPE = "meter-type";
+    public static final String CHANNEL_METER_CATEGORY = "meter-category";
+    public static final String CHANNEL_METER_MATRICULE = "meter-matricule";
+    public static final String CHANNEL_METER_MANUFACTURE_YEAR = "meter-manufacture-year";
+
     public static final Currency CURRENCY_EUR = Currency.getInstance("EUR");
 
     public static final String NOT_A_CHANNEL = "";

bundles/org.openhab.binding.linky/src/main/java/org/openhab/binding/linky/internal/handler/ThingLinkyLocalHandler.java

@@ -33,6 +33,7 @@
 import org.openhab.binding.linky.internal.types.InvalidFrameException;
 import org.openhab.binding.linky.internal.types.LinkyChannel;
 import org.openhab.binding.linky.internal.types.LinkyTicMode;
+import org.openhab.binding.linky.internal.types.Meter;
 import org.openhab.binding.linky.internal.types.Phase;
 import org.openhab.binding.linky.internal.types.ValueType;
 import org.openhab.core.config.core.Configuration;
@@ -285,6 +286,31 @@ protected void handleFrame(LinkyFrame frame) {
 
                     if (channel == LinkyChannel.STGE) {
                         handleStgePayload(value);
+                    }
+                    if (channel == LinkyChannel.ADSC || channel == LinkyChannel.ADCO) {
+                        String adco = frame.get(LinkyChannel.ADCO) != null ? frame.get(LinkyChannel.ADCO)
+                                : frame.get(LinkyChannel.ADSC);
+
+                        if (adco.length() != 12) {
+
+                        } else {
+                            String manufacturer = adco.substring(0, 2);
+                            String year = adco.substring(2, 4);
+                            String type = adco.substring(4, 6);
+                            String matricule = adco.substring(6, 12);
+
+                            Meter cpt = Meter.getCompteurForId(Integer.parseInt(type));
+
+                            updateState(LINKY_LOCAL_METER_BASE_GROUP, CHANNEL_METER_MANUFACTURER,
+                                    new DecimalType(manufacturer));
+                            updateState(LINKY_LOCAL_METER_BASE_GROUP, CHANNEL_METER_TYPE, new DecimalType(type));
+                            updateState(LINKY_LOCAL_METER_BASE_GROUP, CHANNEL_METER_MATRICULE,
+                                    new StringType(matricule));
+                            updateState(LINKY_LOCAL_METER_BASE_GROUP, CHANNEL_METER_CATEGORY,
+                                    new DecimalType(cpt.getCompteurType().getId()));
+                            updateState(LINKY_LOCAL_METER_BASE_GROUP, CHANNEL_METER_MANUFACTURE_YEAR,
+                                    new StringType("" + (Integer.parseInt(year) + 2000)));
+                        }
                     } else if (channel == LinkyChannel.RELAIS) {
                         handleRelaisPayload(value);
                     } else if (channel == LinkyChannel.PJOURF_PLUS_1) {
@@ -319,11 +345,6 @@ protected void handleFrame(LinkyFrame frame) {
         }
 
         updateCalcVars(urms, sinst);
-
-        // updateState(LINKY_DIRECT_MAIN_GROUP, "_ID_D2L", new StringType(payLoad.get("_ID_D2L")));
-        // updateState(LINKY_DIRECT_MAIN_GROUP, "SINSTS", new StringType(payLoad.get("SINSTS")));
-        // updateState(LINKY_DIRECT_MAIN_GROUP, "DATE", new StringType(payLoad.get("DATE")));
-        // updateState(LINKY_DIRECT_MAIN_GROUP, "IRMS1", new StringType(payLoad.get("IRMS1")));
     }
 
     private void updateCalcVars(double urms, double sinst) {

bundles/org.openhab.binding.linky/src/main/java/org/openhab/binding/linky/internal/types/Compteur.java

@@ -21,7 +21,7 @@
  *
  */
 @NonNullByDefault
-public enum Constructor {
+public enum Manufacturer {
 
     NotAttrib000(0x00, "Non attribué"),
 
@@ -137,7 +137,7 @@ public enum Constructor {
     private final int id;
     private final String label;
 
-    Constructor(int id, String label) {
+    Manufacturer(int id, String label) {
         this.id = id;
         this.label = label;
     }