diff --git a/lib/AmsData/include/AmsData.h b/lib/AmsData/include/AmsData.h index 7f396c15..c28038b7 100644 --- a/lib/AmsData/include/AmsData.h +++ b/lib/AmsData/include/AmsData.h @@ -12,7 +12,6 @@ enum AmsType { AmsTypeIskra = 0x08, AmsTypeLandisGyr = 0x09, AmsTypeSagemcom = 0x0A, - AmsTypeLng = 0x0B, AmsTypeCustom = 0x88, AmsTypeUnknown = 0xFF }; diff --git a/lib/SvelteUi/app/src/lib/Helpers.js b/lib/SvelteUi/app/src/lib/Helpers.js index e5a3e57f..f1a21569 100644 --- a/lib/SvelteUi/app/src/lib/Helpers.js +++ b/lib/SvelteUi/app/src/lib/Helpers.js @@ -34,8 +34,6 @@ export function metertype(mt) { return "Landis+Gyr"; case 10: return "Sagemcom"; - case 11: - return "L&G"; default: return ""; } diff --git a/src/LNG.cpp b/src/LNG.cpp index 23b4ad4e..97c2087e 100644 --- a/src/LNG.cpp +++ b/src/LNG.cpp @@ -5,7 +5,7 @@ LNG::LNG(const char* payload, uint8_t useMeterType, MeterConfig* meterConfig, DataParserContext &ctx, RemoteDebug* debugger) { LngHeader* h = (LngHeader*) payload; if(h->tag == CosemTypeStructure && h->arrayTag == CosemTypeArray) { - meterType = AmsTypeLng; + meterType = AmsTypeLandisGyr; this->packageTimestamp = ctx.timestamp; uint8_t* ptr = (uint8_t*) &h[1];