Some changes for DLMS

UtilitechAS · Nov 16, 2023 · 56b6a72 · 56b6a72
1 parent 76d7684
commit 56b6a72
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 38 deletions.
diff --git a/lib/AmsData/include/OBIScodes.h b/lib/AmsData/include/OBIScodes.h
@@ -37,6 +37,8 @@ struct OBIS_t {
 
 const OBIS_code_t OBIS_NULL PROGMEM =                  {   0,   0,   0 };
 
+const OBIS_code_t OBIS_FIRMWARE_VERSION PROGMEM =      {   0,   2,   0 };
+
 const OBIS_code_t OBIS_VERSION PROGMEM =               {   0,   2, 129 };
 const OBIS_code_t OBIS_METER_MODEL PROGMEM =           {  96,   1,   1 };
 const OBIS_code_t OBIS_METER_MODEL_2 PROGMEM =         {  96,   1,   7 };

diff --git a/lib/SvelteUi/app/dist/index.js b/lib/SvelteUi/app/dist/index.js
diff --git a/lib/SvelteUi/app/src/App.svelte b/lib/SvelteUi/app/src/App.svelte
@@ -1,9 +1,3 @@
-/**
- * @copyright Utilitech AS 2023
- * License: Fair Source
- * 
- */
-
 <script>
   import { Router, Route, navigate } from "svelte-navigator";
   import { getSysinfo, sysinfoStore, dataStore } from './lib/DataStores.js';

diff --git a/src/KamstrupPullCommunicator.cpp b/src/KamstrupPullCommunicator.cpp
@@ -263,7 +263,9 @@ AmsData* KamstrupPullCommunicator::getData(AmsData& meterState) {
     }
 
 	if(hanBuffer[11] == DATA_TAG_RES) {
-		if(obisPosition == 1) { // Meter model string
+		if(obisPosition == 1) { // Version string
+			debugger->printf_P(PSTR("RECEIVED Firmware version\n"));
+		} else if(obisPosition == 1) { // Meter model string
 			debugger->printf_P(PSTR("RECEIVED Meter model\n"));
 		} else { // All other uint32
 			uint32_t value = ntohl(*((uint32_t*) (hanBuffer + 16)));
@@ -603,13 +605,14 @@ bool KamstrupPullCommunicator::requestData() {
 
 	OBIS_t obis = {1,1,OBIS_NULL,OBIS_RANGE_NA};
 	switch(obisPosition) {
-		case 1: obis.code = OBIS_METER_MODEL; break;
-		case 2: obis.code = OBIS_METER_ID; break;
-
-		case 3: obis.code = OBIS_ACTIVE_IMPORT; break;
-		case 4: obis.code = OBIS_REACTIVE_IMPORT; break;
-		case 5: obis.code = OBIS_ACTIVE_EXPORT; break;
-		case 6: obis.code = OBIS_REACTIVE_EXPORT; break;
+		case 1: obis.code = OBIS_FIRMWARE_VERSION; break;
+		case 2: obis.code = OBIS_METER_MODEL; break;
+		case 3: obis.code = OBIS_METER_ID; break;
+
+		case 4: obis.code = OBIS_ACTIVE_IMPORT; break;
+		case 5: obis.code = OBIS_REACTIVE_IMPORT; break;
+		case 6: obis.code = OBIS_ACTIVE_EXPORT; break;
+		case 7: obis.code = OBIS_REACTIVE_EXPORT; break;
 		default:
 		obisPosition = 0; return false;
 	}

diff --git a/src/KamstrupPullCommunicator.h b/src/KamstrupPullCommunicator.h
@@ -59,10 +59,10 @@ class KamstrupPullCommunicator : public PassiveMeterCommunicator  {
     uint8_t state = STATE_DISCONNECTED;
     uint64_t lastLoop = 0;
     uint64_t lastMessageTime = 0;
-    String passkey = "12345";
-    uint8_t clientSap = 0x25;
-    uint8_t serverSap = 0x21;
-    uint8_t obisPosition = 2;
+    String passkey = "";
+    uint8_t clientSap = 0x21;
+    uint8_t serverSap = 0x03;
+    uint8_t obisPosition = 0;
     OBIS_code_t currentObis = OBIS_NULL;
 
     void setupHanPort(uint32_t baud, uint8_t parityOrdinal, bool invert);