class BaseLoop: adapted for Command::calcResult

src/baseloop.cpp

@@ -57,7 +57,7 @@ void BaseLoop::start()
 std::string BaseLoop::decodeMessage(const std::string& data)
 {
 	std::ostringstream result;
-	std::string value;
+	std::string cycdata;
 	int index;
 	BusCommand* busCommand;
 	
@@ -90,17 +90,22 @@ std::string BaseLoop::decodeMessage(const std::string& data)
 		if (index >= 0) {
 
 			std::string type = m_commands->getType(index);
-			std::string cmd(A.getParam<const char*>("p_address"));
+			std::string ebusCommand(A.getParam<const char*>("p_address"));
-			cmd += m_commands->getEbusCommand(index);
+			ebusCommand += m_commands->getEbusCommand(index);
-			std::transform(cmd.begin(), cmd.end(), cmd.begin(), tolower);
+			std::transform(ebusCommand.begin(), ebusCommand.end(), ebusCommand.begin(), tolower);
 			
-			L.log(bas, trace, " type: %s msg: %s", type.c_str(), cmd.c_str());
+			L.log(bas, event, " type: %s msg: %s", type.c_str(), ebusCommand.c_str());
-			// send BusCommand
+			// send busCommand
-			m_ebusloop->addBusCommand(new BusCommand(type, cmd));
+			m_ebusloop->addBusCommand(new BusCommand(type, ebusCommand));
 			busCommand = m_ebusloop->getBusCommand();
+
+			// decode data
+			Command* command = new Command(index, (*m_commands)[index], busCommand->getResult().c_str());
 			
-			// decode BusCommand
+			// return result
-			result << busCommand->getResult().c_str();
+			result << command->calcResult(cmd);
+			
+			delete command;
 			delete busCommand;
 
 		} else {
@@ -118,10 +123,16 @@ std::string BaseLoop::decodeMessage(const std::string& data)
 		index = m_commands->findCommand(data);
 		
 		if (index >= 0) {
-			value = m_cycdata->getData(index);
+			// get cycdata
-			if (value != "") {
+			cycdata = m_cycdata->getData(index);
-				// decode CYC Data
+			if (cycdata != "") {
-				result << value.c_str();
+				// decode data
+				Command* command = new Command(index, (*m_commands)[index], cycdata.c_str());
+
+				// return result
+				result << command->calcResult(cmd);
+				
+				delete command;
 			} else {
 				result << "no data stored";
 			}

src/ebusloop.cpp

@@ -78,15 +78,16 @@ void* EBusLoop::run()
 
 			// send bus command
 			if (busResult == 1 && busCommandActive == true) {
-				L.log(bus, trace, " getBus success");
+				L.log(bus, event, " getBus success");
 				m_bus->sendCommand();
 				BusCommand* busCommand = m_bus->recvCommand();
+				L.log(bus, trace, " %s", busCommand->getResult().c_str());
 				m_recvBuffer.add(busCommand);
 				busCommandActive = false;
 			}
 
 			if (busResult == 0)
-				L.log(bus, trace, " getBus failure");
+				L.log(bus, event, " getBus failure");
 
 			if (busResult == -1)
 				L.log(bus, event, " getBus error");