Erick
/
ICE_BLE_TEST
Important changes to repositories hosted on mbed.com
Mbed hosted mercurial repositories are deprecated and are due to be permanently deleted in July 2026.
To keep a copy of this software download the repository Zip archive or clone locally using Mercurial.
It is also possible to export all your personal repositories from the account settings page.
Dependencies: NaturalTinyShell_ice libmDot-12Sept mbed-rtos mbed
Diff: src/ModbusMaster/ModbusMaster.cpp
- Revision:
- 147:105bcf234f81
- Parent:
- 123:ce602c91a9c3
- Child:
- 148:ee3cbaafe355
--- a/src/ModbusMaster/ModbusMaster.cpp Tue Sep 27 22:33:22 2016 +0000
+++ b/src/ModbusMaster/ModbusMaster.cpp Wed Sep 28 12:34:34 2016 +0000
@@ -101,36 +101,40 @@
ModbusRegisterMap[iter->first].float_value = ModbusRegisterMap[iter->first].float_value - SimulateInputMap[iter->first].step;
}
}
- logInfo("simulating input=%s, value=%2.2f",iter->first.c_str(), ModbusRegisterMap[iter->first].float_value);
+ logInfo("simulating input=%s, value=%2.2f",iter->first.c_str(), ModbusRegisterMap[iter->first].float_value);
}
}
continue;
}
- logInfo("Processing node=%d, reg=%d, size=%d, order=%d", iter->second.node, iter->second.reg, iter->second.size, iter->second.order );
- SendModbusCommand(iter->second.node, iter->second.reg, iter->second.size);
- Thread::wait(30);
+
+ if( iter->second.node != 0 ) {
+
+ logInfo("Processing Input: node=%d, reg=%d, size=%d, order=%d", iter->second.node, iter->second.reg, iter->second.size, iter->second.order );
+ SendModbusCommand(iter->second.node, iter->second.reg, iter->second.size);
+ Thread::wait(30);
- switch( iter->second.type ) {
- case TYPE_32BIT_FLOAT:
- float float_value;
- status = ReadModbus_32bit_float( &float_value, iter->second.order );
- if( status == true ) {
- ModbusRegisterMap[iter->first].float_value = float_value;
- logInfo("Modbus Tag:%s value=%2.2f", iter->first.c_str(), float_value );
- } else {
- logInfo("Modbus Read Failed, tag=%s", iter->first.c_str() );
- }
- break;
- case TYPE_32BIT_INT:
- break;
- case TYPE_32BIT_UINT:
- break;
- case TYPE_16BIT_INT:
- break;
- case TYPE_16BIT_UINT:
- break;
- default:
- break;
+ switch( iter->second.type ) {
+ case TYPE_32BIT_FLOAT:
+ float float_value;
+ status = ReadModbus_32bit_float( &float_value, iter->second.order );
+ if( status == true ) {
+ ModbusRegisterMap[iter->first].float_value = float_value;
+ logInfo("Modbus Tag:%s value=%2.2f", iter->first.c_str(), float_value );
+ } else {
+ logInfo("Modbus Read Failed, tag=%s", iter->first.c_str() );
+ }
+ break;
+ case TYPE_32BIT_INT:
+ break;
+ case TYPE_32BIT_UINT:
+ break;
+ case TYPE_16BIT_INT:
+ break;
+ case TYPE_16BIT_UINT:
+ break;
+ default:
+ break;
+ }
}
if( iter->second.input == false ) {