nils/ebusd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

completed individual scanning with definitions in "scan" class, nicer passing of received data to BusRequests

Browse Source
This commit is contained in:
john30
2014-12-14 18:58:15 +01:00
parent 3a55d7552c
commit 118a0ea7d4
2 changed files with 79 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ebusd/bushandler.cpp
+55 -22
View File
@@ -26,6 +26,7 @@
#include "appl.h"
#include <string>
#include <vector>
#include <deque>
#include <cstring>
#include <time.h>
#include <iomanip>
@@ -68,16 +69,18 @@ result_t PollRequest::prepare(unsigned char ownMasterAddress)
return result;
}
void PollRequest::notify(result_t result)
bool PollRequest::notify(result_t result, SymbolString& slave)
{
ostringstream output;
if (result == RESULT_OK) {
result = m_message->decode(pt_slaveData, m_slave, output); // decode data
result = m_message->decode(pt_slaveData, slave, output); // decode data
}
if (result != RESULT_OK)
L.log(bus, error, "poll %s failed: %s", m_message->getName().c_str(), getResultCode(result));
else
L.log(bus, event, "poll %s: %s", m_message->getName().c_str(), output.str().c_str());
return false;
}
@@ -90,27 +93,47 @@ result_t ScanRequest::prepare(unsigned char ownMasterAddress, unsigned char dstA
return result;
}
void ScanRequest::notify(result_t result)
bool ScanRequest::notify(result_t result, SymbolString& slave)
{
unsigned char dstAddress = m_master[1];
bool append = m_scanResults != NULL && m_scanResults->find(dstAddress) != m_scanResults->end();
ostringstream scanResult;
if (result == RESULT_OK) {
scanResult << hex << setw(2) << setfill('0') << static_cast<unsigned>(dstAddress) << UI_FIELD_SEPARATOR;
result = m_message->decode(pt_slaveData, m_slave, scanResult); // decode data
if (append == false)
scanResult << hex << setw(2) << setfill('0') << static_cast<unsigned>(dstAddress) << UI_FIELD_SEPARATOR;
result = m_message->decode(pt_slaveData, slave, scanResult, append); // decode data
}
if (result != RESULT_OK)
if (result != RESULT_OK) {
L.log(bus, error, "scan %2.2x failed: %s", dstAddress, getResultCode(result));
else {
string str = scanResult.str();
L.log(bus, event, "scan: %s", str.c_str());
if (m_scanResults != NULL)
return false;
}
string str = scanResult.str();
L.log(bus, event, "scan: %s", str.c_str());
if (m_scanResults != NULL) {
if (append == true)
(*m_scanResults)[dstAddress] += str;
else
(*m_scanResults)[dstAddress] = str;
}
// check for remaining secondary messages
if (m_messages.empty() == true)
return false;
m_message = m_messages.front();
m_messages.pop_front();
result = prepare(m_master[0], dstAddress);
if (result != RESULT_OK)
return false; // give up
return true;
}
ActiveBusRequest::ActiveBusRequest(SymbolString& master, SymbolString& slave)
: BusRequest(master, slave, false), m_finished(false), m_result(RESULT_SYN)
: BusRequest(master, false), m_finished(false), m_result(RESULT_SYN), m_slave(slave)
{
pthread_mutex_init(&m_mutex, NULL);
pthread_cond_init(&m_cond, NULL);
@@ -144,18 +167,20 @@ bool ActiveBusRequest::wait(int timeout)
return result == 0;
}
void ActiveBusRequest::notify(result_t result)
bool ActiveBusRequest::notify(result_t result, SymbolString& slave)
{
if (result == RESULT_OK)
L.log(bus, event, "read res: %s", m_slave.getDataStr().c_str());
L.log(bus, event, "read res: %s", slave.getDataStr().c_str());
pthread_mutex_lock(&m_mutex);
m_result = result;
m_slave = SymbolString(slave, false, false);
m_finished = true;
pthread_cond_signal(&m_cond);
pthread_mutex_unlock(&m_mutex);
return false;
}
@@ -226,7 +251,7 @@ result_t BusHandler::handleSymbol()
Message* message = m_messages->getNextPoll();
if (message != NULL) {
m_lastPoll = now;
PollRequest* request = new PollRequest(m_response, message);
PollRequest* request = new PollRequest(message);
result_t ret = request->prepare(m_ownMasterAddress);
if (ret != RESULT_OK) {
L.log(bus, error, "prepare poll message: %s", getResultCode(ret));
@@ -574,12 +599,15 @@ result_t BusHandler::setState(BusState state, result_t result, bool firstRepetit
m_request = NULL;
} else if (state == bs_sendSyn || (result != RESULT_OK && firstRepetition == false)) {
L.log(bus, debug, "notify request: %s", getResultCode(result));
m_request->m_slave = SymbolString(m_response, false, false);
bool restart = m_request->notify(result, m_response);
unsigned char dstAddress = m_request->m_master[1];
if (result == RESULT_OK && isValidAddress(dstAddress, false) == true)
m_seenAddresses[dstAddress] = true;
m_request->notify(result);
if (m_request->m_deleteOnFinish == true) {
if (restart == true) {
m_request->m_busLostRetries = 0;
m_requests.add(m_request);
}
else if (m_request->m_deleteOnFinish == true) {
delete m_request;
}
m_request = NULL;
@@ -642,8 +670,14 @@ void BusHandler::receiveCompleted()
result_t BusHandler::startScan(bool full)
{
Message* scanMessage = m_scanMessage;
if (scanMessage == NULL) {
scanMessage = m_messages->find("", "scan", false);
deque<Message*> messages = m_messages->findAll("scan", "", -1);
for (deque<Message*>::iterator it = messages.begin(); it < messages.end();) {
Message* message = *it++;
if (message->getId()[0] == 0x07 && message->getId()[1] == 0x04) {
if (scanMessage == NULL)
scanMessage = message;
messages.erase(it - 1); // query pb 0x07 / sb 0x04 only once
}
}
if (scanMessage == NULL) {
DataFieldSet* identFields = DataFieldSet::createIdentFields();
@@ -652,8 +686,7 @@ result_t BusHandler::startScan(bool full)
if (scanMessage == NULL)
return RESULT_ERR_NOTFOUND;
if (full == true)
m_scanResults.clear();
m_scanResults.clear();
for (unsigned int slave=0; slave<=255; slave++) {
if (isValidAddress(slave, false) == false || isMaster(slave) == true)
@@ -664,7 +697,7 @@ result_t BusHandler::startScan(bool full)
continue;
}
ScanRequest* request = new ScanRequest(m_response, scanMessage, &m_scanResults);
ScanRequest* request = new ScanRequest(scanMessage, messages, &m_scanResults);
result_t result = request->prepare(m_ownMasterAddress, slave);
if (result != RESULT_OK) {
delete request;
src/ebusd/bushandler.h
+24 -19
View File
@@ -71,11 +71,10 @@ public:
/**
* @brief Constructor.
* @param master the master data @a SymbolString to send.
* @param slave the slave data @a SymbolString received.
* @param deleteOnFinish whether to automatically delete this @a BusRequest when finished.
*/
BusRequest(SymbolString& master, SymbolString& slave, bool deleteOnFinish)
: m_master(master), m_slave(slave), m_busLostRetries(0),
BusRequest(SymbolString& master, const bool deleteOnFinish)
: m_master(master), m_busLostRetries(0),
m_deleteOnFinish(deleteOnFinish) {}
/**
@@ -86,22 +85,21 @@ public:
/**
* @brief Notify the request of the specified result.
* @param result the result of the request.
* @param slave the slave data @a SymbolString received.
* @return true if the request needs to be restarted.
*/
virtual void notify(result_t result) = 0;
virtual bool notify(result_t result, SymbolString& slave) = 0;
protected:
/** the master data @a SymbolString to send. */
SymbolString& m_master;
/** the slave data @a SymbolString received. */
SymbolString& m_slave;
/** the number of times a send is repeated due to lost arbitration. */
unsigned int m_busLostRetries;
/** whether to automatically delete this @a BusRequest when finished. */
bool m_deleteOnFinish;
const bool m_deleteOnFinish;
};
@@ -119,8 +117,8 @@ public:
* @param slave the slave data @a SymbolString received.
* @param message the associated @a Message.
*/
PollRequest(SymbolString& slave, Message* message)
: BusRequest(m_master, slave, true), m_message(message) {}
PollRequest(Message* message)
: BusRequest(m_master, true), m_message(message) {}
/**
* @brief Destructor.
@@ -135,7 +133,7 @@ public:
result_t prepare(unsigned char masterAddress);
// @copydoc
virtual void notify(result_t result);
virtual bool notify(result_t result, SymbolString& slave);
private:
@@ -159,12 +157,13 @@ public:
/**
* @brief Constructor.
* @param slave the slave data @a SymbolString received.
* @param message the associated @a Message.
* @param message the primary query @a Message.
* @param messages the optional secondary query @a Message instances (to be queried only when the primary was successful).
* @param scanResults the map in which to store the formatted scan result by slave address.
*/
ScanRequest(SymbolString& slave, Message* message,
ScanRequest(Message* message, deque<Message*> messages,
map<unsigned char, string>* scanResults)
: BusRequest(m_master, slave, true), m_message(message),
: BusRequest(m_master, true), m_message(message), m_messages(messages),
m_scanResults(scanResults) {}
/**
@@ -181,16 +180,19 @@ public:
result_t prepare(unsigned char masterAddress, unsigned char dstAddress);
// @copydoc
virtual void notify(result_t result);
virtual bool notify(result_t result, SymbolString& slave);
private:
/** the master data @a SymbolString. */
SymbolString m_master;
/** the associated @a Message. */
/** the currently queried @a Message. */
Message* m_message;
/** the remaining secondary @a Message instances. */
deque<Message*> m_messages;
/** the map in which to store the formatted scan result by slave address. */
map<unsigned char, string>* m_scanResults;
@@ -207,8 +209,8 @@ public:
/**
* @brief Constructor.
* @param master the master data @a SymbolString to send.
* @param slave the slave data @a SymbolString received.
* @param master reference to the master data @a SymbolString to send.
* @param slave reference to @a SymbolString for filling in the received slave data.
*/
ActiveBusRequest(SymbolString& master, SymbolString& slave);
@@ -225,7 +227,7 @@ public:
bool wait(int timeout);
// @copydoc
virtual void notify(result_t result);
virtual bool notify(result_t result, SymbolString& slave);
private:
@@ -235,6 +237,9 @@ private:
/** the result of handling the request. */
result_t m_result;
/** reference to @a SymbolString for filling in the received slave data. */
SymbolString& m_slave;
/** a mutex for wait/notify. */
pthread_mutex_t m_mutex;