Changing ListID to ListSize

This commit is contained in:
Roar Fredriksen
2017-10-26 00:34:56 +02:00
parent 72203a2b18
commit 54b5c139f4
4 changed files with 12 additions and 12 deletions

View File

@@ -35,7 +35,7 @@ bool HanReader::read(byte data)
if (reader.Read(data))
{
bytesRead = reader.GetRawData(buffer, 0, 512);
list = getInt(1, buffer, 0, bytesRead);
listSize = getInt(1, buffer, 0, bytesRead);
return true;
}
}
@@ -50,9 +50,9 @@ bool HanReader::read()
return false;
}
int HanReader::getList()
int HanReader::getListSize()
{
return list;
return listSize;
}
time_t HanReader::getPackageTime()

View File

@@ -22,7 +22,7 @@ public:
void setup(HardwareSerial *hanPort, unsigned long baudrate, SerialConfig config, Stream *debugPort);
bool read();
bool read(byte data);
int getList();
int getListSize();
time_t getPackageTime();
int getInt(int objectId);
String getString(int objectId);
@@ -34,7 +34,7 @@ private:
byte buffer[512];
int bytesRead;
DlmsReader reader;
int list;
int listSize;
int findValuePosition(int dataPosition, byte *buffer, int start, int length);

View File

@@ -9,14 +9,14 @@ enum class Kaifa : byte {
enum class Kaifa_List1 {
Time,
ListID,
ListSize,
ActivePowerImported
};
enum class Kaifa_List2 {
Time,
ListID,
ObisListVersionIdentifier,
ListSize,
ListVersionIdentifier,
MeterID,
MeterType,
ActiveImportPower,
@@ -33,8 +33,8 @@ enum class Kaifa_List2 {
enum class Kaifa_List3 {
Time,
ListID,
ObisListVersionIdentifier,
ListSize,
ListVersionIdentifier,
MeterID,
MeterType,
ActiveImportPower,

View File

@@ -13,7 +13,7 @@ enum class Kamstrup
enum class Kamstrup_List1
{
Time,
ListID,
ListSize,
ListVersionIdentifier,
MeterID_OBIS,
MeterID,
@@ -45,7 +45,7 @@ enum class Kamstrup_List1
enum class Kamstrup_List2
{
Time,
ListID,
ListSize,
ListVersionIdentifier,
MeterID_OBIS,
MeterID,