Skip to content

Commit

Permalink
fix: typo in modbus write function name
Browse files Browse the repository at this point in the history
  • Loading branch information
haveyouseenf committed Sep 4, 2023
1 parent 0de28a8 commit 3201350
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
12 changes: 6 additions & 6 deletions src/Finder7M.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ bool Finder7M::resetCounter(uint8_t address, uint8_t counterNumber)
return false;
}
uint16_t toWrite = 0x0001 << (counterNumber - 1);
if (modbus6MWrite16(address, FINDER_7M_REG_RESET_ENERGY, toWrite) == 1)
if (modbus7MWrite16(address, FINDER_7M_REG_RESET_ENERGY, toWrite) == 1)
{
bool res = saveSettings(address);
return res;
Expand All @@ -187,7 +187,7 @@ bool Finder7M::resetCounter(uint8_t address, uint8_t counterNumber)

bool Finder7M::resetCounters(uint8_t address)
{
if (modbus6MWrite16(address, FINDER_7M_REG_RESET_ENERGY, 0xFFFF) == 1)
if (modbus7MWrite16(address, FINDER_7M_REG_RESET_ENERGY, 0xFFFF) == 1)
{
bool res = saveSettings(address);
return res;
Expand Down Expand Up @@ -236,7 +236,7 @@ uint32_t Finder7M::modbus7MRead32(uint8_t addr, uint16_t reg)
return INVALID_DATA;
};

bool Finder7M::modbus6MWrite16(uint8_t address, uint16_t reg, uint16_t toWrite)
bool Finder7M::modbus7MWrite16(uint8_t address, uint16_t reg, uint16_t toWrite)
{
uint8_t attempts = 3;
while (attempts > 0)
Expand Down Expand Up @@ -295,17 +295,17 @@ Measure Finder7M::convertT6(uint32_t n)

bool Finder7M::saveSettings(uint8_t address)
{
return modbus6MWrite16(address, FINDER_7M_REG_OPERATOR_COMMAND, 0x0001) == 1;
return modbus7MWrite16(address, FINDER_7M_REG_OPERATOR_COMMAND, 0x0001) == 1;
};

bool Finder7M::resetSettings(uint8_t address)
{
return modbus6MWrite16(address, FINDER_7M_REG_OPERATOR_COMMAND, 0x0002) == 1;
return modbus7MWrite16(address, FINDER_7M_REG_OPERATOR_COMMAND, 0x0002) == 1;
};

bool Finder7M::restartDevice(uint8_t address)
{
return modbus6MWrite16(address, FINDER_7M_REG_OPERATOR_COMMAND, 0x0003) == 1;
return modbus7MWrite16(address, FINDER_7M_REG_OPERATOR_COMMAND, 0x0003) == 1;
};

Measure Finder7M::generateMeasure(uint32_t mantissa, uint32_t exponent)
Expand Down
4 changes: 2 additions & 2 deletions src/Finder7M.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

constexpr int FINDER_7M_REG_SERIAL_NUMBER = 9; // Serial Number (T_Str8)
constexpr int FINDER_7M_REG_SOFTWARE_REFERENCE = 13; // Software Reference (T1)
constexpr int FINDER_7M_REG_HARDWARE_REFERENCE = 14; // Hawrdware Reference (T_Str2)
constexpr int FINDER_7M_REG_HARDWARE_REFERENCE = 14; // Hardware Reference (T_Str2)
constexpr int FINDER_7M_REG_RUN_TIME = 103; // Run time (T3)
constexpr int FINDER_7M_REG_FREQUENCY = 105; // Frequency (T5)
constexpr int FINDER_7M_REG_U1 = 107; // Voltage U1 (T5)
Expand Down Expand Up @@ -268,7 +268,7 @@ class Finder7M
*
* @return true in case of success, false otherwise.
*/
bool modbus6MWrite16(uint8_t address, uint16_t reg, uint16_t toWrite);
bool modbus7MWrite16(uint8_t address, uint16_t reg, uint16_t toWrite);
/** Convert T5 encoding to Measure.*/
Measure convertT5(uint32_t n);
/** Convert T6 encoding to Measure.*/
Expand Down

0 comments on commit 3201350

Please sign in to comment.