wn/NetMeterbusMaster
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tab size, m_errorCount

Browse Source
This commit is contained in:
Wolfgang Hottgenroth 2017-01-04 17:07:08 +01:00
parent a18234f696
commit 8b34b562f8
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
meterBusMaster.cpp
View File

@ -140,11 +140,11 @@ MeterBusMaster::MeterBusMaster() : m_sendOctets(this), m_measureCurrent(this),
m_calibrationSupport(this),
m_cmdReadyToSend(false), m_cmdReadyFromRecv(false), m_expectResponse(false),
m_sendBufLen(0), m_recvBufLen(0), m_retransmitCount(0), m_token(0),
m_responseCallback(0), m_sampling(true), m_calibration(false) {
pinMode(RX_EN_PIN, OUTPUT);
digitalWrite(RX_EN_PIN, RX_DISABLE);
Serial3.begin(2400);
UART2_C1 |= UART_C1_PE | UART_C1_M;
m_responseCallback(0), m_sampling(true), m_calibration(false), m_errorCount(0) {
pinMode(RX_EN_PIN, OUTPUT);
digitalWrite(RX_EN_PIN, RX_DISABLE);
Serial3.begin(2400);
UART2_C1 |= UART_C1_PE | UART_C1_M;
}
@ -176,6 +176,8 @@ void MeterBusMaster::prepareResponse(bool err, uint8_t in) {
//Serial << "r0" << endl;
if (err) {
m_errorCount++;
//Serial << "r1" << endl;
if (m_responseCallback != 0) {
m_responseCallback->sendError(1, m_token, m_name);

1
meterBusMaster.h
View File

@ -81,6 +81,7 @@ private:
uint8_t m_recvBuffer[RECEIVE_BUFFER_SIZE];
bool m_sampling;
bool m_calibration;
uint16_t m_errorCount;
void prepareResponse(bool err, uint8_t in);
void sample();
void hold();