Erick / Mbed 2 deprecated ICE_BLE_TEST

Dependencies:   NaturalTinyShell_ice libmDot-12Sept mbed-rtos mbed

Fork of ICE by Erick

Committer:
davidjhoward
Date:
Wed Sep 21 20:32:19 2016 +0000
Revision:
99:55317f374a94
Parent:
88:8a1a2bba8850
Child:
106:c0ddba334e93
logging changes

Who changed what in which revision?

UserRevisionLine numberNew contents of line
jmarkel44 0:65cfa4873284 1 /******************************************************************************
davidjhoward 4:c35db3946fd8 2 *
jmarkel44 0:65cfa4873284 3 * File: ModbusMaster.cpp
jmarkel44 0:65cfa4873284 4 * Desciption: source for the ICE Modbus Master
jmarkel44 0:65cfa4873284 5 *
jmarkel44 0:65cfa4873284 6 *****************************************************************************/
jmarkel44 0:65cfa4873284 7 #include "global.h"
jmarkel44 0:65cfa4873284 8 #include <stdio.h>
davidjhoward 99:55317f374a94 9 #include <sstream>
davidjhoward 99:55317f374a94 10 #include <iostream>
davidjhoward 31:4b1587034318 11 #include "MTSLog.h"
jmarkel44 0:65cfa4873284 12 #include "BLEDataHandler.h"
davidjhoward 4:c35db3946fd8 13 #include "ModbusMaster.h"
davidjhoward 8:abe51ae5ef8b 14 #include "MbedJSONValue.h"
davidjhoward 99:55317f374a94 15 #include "CloudFileSender.h"
jmarkel44 0:65cfa4873284 16
davidjhoward 81:d45bfa16953a 17 DigitalOut dout1(PC_1);
davidjhoward 81:d45bfa16953a 18 DigitalOut dout2(PA_1);
davidjhoward 81:d45bfa16953a 19
jmarkel44 0:65cfa4873284 20 /*****************************************************************************
jmarkel44 0:65cfa4873284 21 * Function: ModbusMaster
jmarkel44 0:65cfa4873284 22 * Description: entry point for the Modbus Master
jmarkel44 0:65cfa4873284 23 *
jmarkel44 0:65cfa4873284 24 * @param (IN) args (user-defined arguments)
jmarkel44 0:65cfa4873284 25 * @return none
jmarkel44 0:65cfa4873284 26 *****************************************************************************/
davidjhoward 42:c703a60993b1 27 char ModbusMasterScratchBuf[1024];
jmarkel44 0:65cfa4873284 28 void ModbusMaster(void const *args)
jmarkel44 0:65cfa4873284 29 {
davidjhoward 31:4b1587034318 30 logInfo("%s ModbusMaster has started...", __func__);
davidjhoward 15:a6ee32969e8e 31 bool status;
davidjhoward 81:d45bfa16953a 32 bool input;
davidjhoward 82:f3e495a98877 33 bool move_up = true;
davidjhoward 8:abe51ae5ef8b 34 MbedJSONValue json_value;
davidjhoward 81:d45bfa16953a 35
davidjhoward 54:ec1b03064bbd 36 modbus_init(MB_BAUD_RATE);
davidjhoward 54:ec1b03064bbd 37 DigitalOut flu_power(PA_11);
davidjhoward 54:ec1b03064bbd 38 flu_power = 0; // provide power to the modbus
jmarkel44 0:65cfa4873284 39
davidjhoward 39:9287c7d59016 40 while( true ) {
davidjhoward 8:abe51ae5ef8b 41
davidjhoward 39:9287c7d59016 42 // configure modbus registers based in all files that start with "input"
davidjhoward 39:9287c7d59016 43 std::vector<mDot::mdot_file> file_list = GLOBAL_mdot->listUserFiles();
davidjhoward 39:9287c7d59016 44 for (std::vector<mDot::mdot_file>::iterator i = file_list.begin(); i != file_list.end(); ++i) {
davidjhoward 8:abe51ae5ef8b 45
davidjhoward 81:d45bfa16953a 46 input = true;
davidjhoward 81:d45bfa16953a 47 if( (strncmp( i->name, "input", (strlen("input")-1)) == 0) ||
davidjhoward 81:d45bfa16953a 48 (strncmp( i->name, "output", (strlen("output")-1)) == 0)) {
davidjhoward 8:abe51ae5ef8b 49
davidjhoward 81:d45bfa16953a 50 if( (strncmp( i->name, "output", (strlen("output")-1)) == 0) ) {
davidjhoward 81:d45bfa16953a 51 input = false;
davidjhoward 81:d45bfa16953a 52 }
davidjhoward 81:d45bfa16953a 53
davidjhoward 81:d45bfa16953a 54 logInfo("(%d)FOUND FILE: %s", __LINE__, i->name);
davidjhoward 42:c703a60993b1 55
davidjhoward 49:0456ee2271be 56 status = GLOBAL_mdot->readUserFile(i->name, ModbusMasterScratchBuf, 1024);
davidjhoward 39:9287c7d59016 57 if( status != true ) {
davidjhoward 45:3b9e1923cb15 58 logInfo("(%d)read file failed, status=%d", __LINE__, status);
davidjhoward 39:9287c7d59016 59 } else {
davidjhoward 45:3b9e1923cb15 60 logInfo("(%d)Read File SUCCESS: %s", __LINE__, ModbusMasterScratchBuf );
davidjhoward 39:9287c7d59016 61 }
davidjhoward 81:d45bfa16953a 62
davidjhoward 42:c703a60993b1 63 parse( json_value, ModbusMasterScratchBuf );
davidjhoward 9:ef0ca2f8a8a6 64
davidjhoward 39:9287c7d59016 65 std::string id = json_value["id"].get<std::string>().c_str();
davidjhoward 39:9287c7d59016 66 ModbusRegisterMap[id].name = json_value["name"].get<std::string>().c_str();
davidjhoward 39:9287c7d59016 67 ModbusRegisterMap[id].units = json_value["units"].get<std::string>().c_str();
davidjhoward 39:9287c7d59016 68 ModbusRegisterMap[id].min = atof(json_value["min"].get<std::string>().c_str());
davidjhoward 39:9287c7d59016 69 ModbusRegisterMap[id].max = atof(json_value["max"].get<std::string>().c_str());
davidjhoward 39:9287c7d59016 70 ModbusRegisterMap[id].node = atoi(json_value["node"].get<std::string>().c_str());
davidjhoward 39:9287c7d59016 71 ModbusRegisterMap[id].reg = atoi(json_value["reg"].get<std::string>().c_str());
davidjhoward 39:9287c7d59016 72 ModbusRegisterMap[id].rtype = atoi(json_value["rtype"].get<std::string>().c_str());
davidjhoward 39:9287c7d59016 73 ModbusRegisterMap[id].type = atoi(json_value["type"].get<std::string>().c_str());
davidjhoward 39:9287c7d59016 74 ModbusRegisterMap[id].size = atoi(json_value["size"].get<std::string>().c_str());
davidjhoward 39:9287c7d59016 75 ModbusRegisterMap[id].order = atoi(json_value["order"].get<std::string>().c_str());
davidjhoward 39:9287c7d59016 76 ModbusRegisterMap[id].fmt = json_value["fmt"].get<std::string>().c_str();
davidjhoward 49:0456ee2271be 77 ModbusRegisterMap[id].rfreq = atoi(json_value["rfreq"].get<std::string>().c_str());
davidjhoward 81:d45bfa16953a 78 ModbusRegisterMap[id].input = input;
davidjhoward 82:f3e495a98877 79 ModbusRegisterMap[id].simulated = false;
davidjhoward 15:a6ee32969e8e 80 }
davidjhoward 4:c35db3946fd8 81 }
davidjhoward 31:4b1587034318 82
davidjhoward 39:9287c7d59016 83 // read modbus registers that have been configured.
davidjhoward 39:9287c7d59016 84 while ( true ) {
davidjhoward 39:9287c7d59016 85
davidjhoward 39:9287c7d59016 86 std::map<std::string, ModbusRegister>::iterator iter;
davidjhoward 39:9287c7d59016 87 for (iter = ModbusRegisterMap.begin(); iter != ModbusRegisterMap.end(); ++iter) {
davidjhoward 82:f3e495a98877 88 if( iter->second.simulated == true ) {
davidjhoward 82:f3e495a98877 89 std::map<std::string, SimulateInput>::iterator iter;
davidjhoward 82:f3e495a98877 90 for (iter = SimulateInputMap.begin(); iter != SimulateInputMap.end(); ++iter) {
davidjhoward 82:f3e495a98877 91 if( (SimulateInputMap[iter->first].min == 0) && (SimulateInputMap[iter->first].max == 0) ) {
davidjhoward 82:f3e495a98877 92 ModbusRegisterMap[iter->first].float_value = SimulateInputMap[iter->first].start_value;
davidjhoward 82:f3e495a98877 93 } else {
davidjhoward 82:f3e495a98877 94 if( ModbusRegisterMap[iter->first].float_value >= SimulateInputMap[iter->first].max ) {
davidjhoward 82:f3e495a98877 95 move_up = false;
davidjhoward 82:f3e495a98877 96 ModbusRegisterMap[iter->first].float_value = ModbusRegisterMap[iter->first].float_value - SimulateInputMap[iter->first].step;
davidjhoward 82:f3e495a98877 97 } else if( ModbusRegisterMap[iter->first].float_value <= SimulateInputMap[iter->first].min ) {
davidjhoward 82:f3e495a98877 98 move_up = true;
davidjhoward 82:f3e495a98877 99 ModbusRegisterMap[iter->first].float_value = ModbusRegisterMap[iter->first].float_value + SimulateInputMap[iter->first].step;
davidjhoward 82:f3e495a98877 100 } else {
davidjhoward 82:f3e495a98877 101 if( move_up == true ) {
davidjhoward 82:f3e495a98877 102 ModbusRegisterMap[iter->first].float_value = ModbusRegisterMap[iter->first].float_value + SimulateInputMap[iter->first].step;
davidjhoward 82:f3e495a98877 103 } else {
davidjhoward 82:f3e495a98877 104 ModbusRegisterMap[iter->first].float_value = ModbusRegisterMap[iter->first].float_value - SimulateInputMap[iter->first].step;
davidjhoward 82:f3e495a98877 105 }
davidjhoward 82:f3e495a98877 106 }
davidjhoward 82:f3e495a98877 107 logInfo("simulating input=%s, value=%2.2f",iter->first.c_str(), ModbusRegisterMap[iter->first].float_value);
davidjhoward 82:f3e495a98877 108 }
davidjhoward 82:f3e495a98877 109 }
davidjhoward 82:f3e495a98877 110 continue;
davidjhoward 82:f3e495a98877 111 }
davidjhoward 81:d45bfa16953a 112 logInfo("Processing node=%d, reg=%d, size=%d, order=%d", iter->second.node, iter->second.reg, iter->second.size, iter->second.order );
davidjhoward 39:9287c7d59016 113 SendModbusCommand(iter->second.node, iter->second.reg, iter->second.size);
davidjhoward 57:5f18ae91c7c7 114 Thread::wait(30);
davidjhoward 39:9287c7d59016 115
davidjhoward 39:9287c7d59016 116 switch( iter->second.type ) {
davidjhoward 39:9287c7d59016 117 case TYPE_32BIT_FLOAT:
davidjhoward 39:9287c7d59016 118 float float_value;
davidjhoward 39:9287c7d59016 119 status = ReadModbus_32bit_float( &float_value, iter->second.order );
davidjhoward 39:9287c7d59016 120 if( status == true ) {
davidjhoward 39:9287c7d59016 121 ModbusRegisterMap[iter->first].float_value = float_value;
davidjhoward 54:ec1b03064bbd 122 logInfo("Modbus Tag:%s value=%2.2f", iter->first.c_str(), float_value );
davidjhoward 99:55317f374a94 123 // std::ostringstream log_event;
davidjhoward 99:55317f374a94 124 // log_event << "tag:"<< iter->first.c_str() << " value:" << float_value;
davidjhoward 99:55317f374a94 125 // printf("%s:%d event=%s\r\n",__func__, __LINE__, log_event.str().c_str());
davidjhoward 99:55317f374a94 126 // std::string queue_event( log_event.str().c_str() );
davidjhoward 99:55317f374a94 127 // CloudFileQueueEvent( queue_event );
davidjhoward 81:d45bfa16953a 128 } else {
davidjhoward 54:ec1b03064bbd 129 logInfo("Modbus Read Failed, tag=%s", iter->first.c_str() );
davidjhoward 39:9287c7d59016 130 }
davidjhoward 39:9287c7d59016 131 break;
davidjhoward 39:9287c7d59016 132 case TYPE_32BIT_INT:
davidjhoward 39:9287c7d59016 133 break;
davidjhoward 39:9287c7d59016 134 case TYPE_32BIT_UINT:
davidjhoward 39:9287c7d59016 135 break;
davidjhoward 39:9287c7d59016 136 case TYPE_16BIT_INT:
davidjhoward 39:9287c7d59016 137 break;
davidjhoward 39:9287c7d59016 138 case TYPE_16BIT_UINT:
davidjhoward 39:9287c7d59016 139 break;
davidjhoward 39:9287c7d59016 140 default:
davidjhoward 39:9287c7d59016 141 break;
davidjhoward 39:9287c7d59016 142 }
davidjhoward 82:f3e495a98877 143
davidjhoward 82:f3e495a98877 144 if( iter->second.input == false ) {
davidjhoward 83:0f76cfbb4eba 145 if( iter->second.node == 0 ) {
davidjhoward 83:0f76cfbb4eba 146 logInfo("processing PIN output=%s, reg=%d, value=%d",iter->first.c_str(), ModbusRegisterMap[iter->first].reg, (bool)ModbusRegisterMap[iter->first].float_value);
davidjhoward 83:0f76cfbb4eba 147 if( ModbusRegisterMap[iter->first].reg == 1 ) {
davidjhoward 83:0f76cfbb4eba 148 dout1 = (bool)ModbusRegisterMap[iter->first].float_value;
davidjhoward 83:0f76cfbb4eba 149 } else {
davidjhoward 83:0f76cfbb4eba 150 dout2 = (bool)ModbusRegisterMap[iter->first].float_value;
davidjhoward 83:0f76cfbb4eba 151 }
jmarkel44 88:8a1a2bba8850 152
davidjhoward 81:d45bfa16953a 153 }
davidjhoward 81:d45bfa16953a 154 }
davidjhoward 39:9287c7d59016 155 }
davidjhoward 39:9287c7d59016 156
davidjhoward 39:9287c7d59016 157 osEvent evt = ModbusMasterMailBox.get(50);
davidjhoward 39:9287c7d59016 158 if (evt.status == osEventMail) {
davidjhoward 39:9287c7d59016 159 Message_t *mail = (Message_t*)evt.value.p;
davidjhoward 39:9287c7d59016 160 logInfo("Mail Received: Action: %d, New Input File: %s", mail->action, mail->controlFile);
davidjhoward 39:9287c7d59016 161 ModbusMasterMailBox.free(mail);
davidjhoward 39:9287c7d59016 162 ModbusRegisterMap.clear();
davidjhoward 39:9287c7d59016 163 break;
davidjhoward 39:9287c7d59016 164 }
davidjhoward 57:5f18ae91c7c7 165 Thread::wait(5000);
davidjhoward 31:4b1587034318 166 }
jmarkel44 0:65cfa4873284 167 }
davidjhoward 4:c35db3946fd8 168 }
davidjhoward 4:c35db3946fd8 169
davidjhoward 4:c35db3946fd8 170
davidjhoward 4:c35db3946fd8 171 volatile char modbus_buffer_char;
davidjhoward 4:c35db3946fd8 172 volatile bool modbus_interrupt_complete = false;
davidjhoward 4:c35db3946fd8 173
davidjhoward 4:c35db3946fd8 174 uint8_t modbus_input_buffer[SIZE_MB_BUFFER];// 1byte address + 1 byte function +1 byte number of regs + 12 bytes of data + 2 bytes for crc response frame from slave
davidjhoward 4:c35db3946fd8 175 volatile uint8_t modbus_input_buffer_counter = 0;
davidjhoward 4:c35db3946fd8 176
davidjhoward 4:c35db3946fd8 177 //Frame crc calucation
davidjhoward 4:c35db3946fd8 178 uint16_t modbus_crc(uint8_t* buf, int len)
davidjhoward 4:c35db3946fd8 179 {
davidjhoward 4:c35db3946fd8 180 uint16_t crc = 0xFFFF;
davidjhoward 4:c35db3946fd8 181
davidjhoward 4:c35db3946fd8 182 for (int pos = 0; pos < len; pos++) {
davidjhoward 4:c35db3946fd8 183 crc ^= (uint16_t)buf[pos]; // XOR byte into least sig. byte of crc
davidjhoward 4:c35db3946fd8 184
davidjhoward 4:c35db3946fd8 185 for (int i = 8; i != 0; i--) {
davidjhoward 4:c35db3946fd8 186 // Loop over each bit
davidjhoward 4:c35db3946fd8 187 if ((crc & 0x0001) != 0) {
davidjhoward 4:c35db3946fd8 188 // If the LSB is set
davidjhoward 4:c35db3946fd8 189 crc >>= 1; // Shift right and XOR 0xA001
davidjhoward 4:c35db3946fd8 190 crc ^= 0xA001;
davidjhoward 4:c35db3946fd8 191 } else // Else LSB is not set
davidjhoward 4:c35db3946fd8 192 crc >>= 1; // Just shift right
davidjhoward 4:c35db3946fd8 193 }
davidjhoward 4:c35db3946fd8 194 }
davidjhoward 4:c35db3946fd8 195 // Note, this number has low and high bytes swapped, so use it accordingly (or swap bytes)
davidjhoward 4:c35db3946fd8 196 return crc;
davidjhoward 4:c35db3946fd8 197 }
davidjhoward 4:c35db3946fd8 198
davidjhoward 4:c35db3946fd8 199 RawSerial modbus(PA_2, PA_3);
davidjhoward 57:5f18ae91c7c7 200 DigitalOut mod_de(PB_0);
davidjhoward 57:5f18ae91c7c7 201 DigitalOut mod_re(PB_1);
davidjhoward 4:c35db3946fd8 202
davidjhoward 4:c35db3946fd8 203 void modbus_init( uint16_t baudRate )
davidjhoward 4:c35db3946fd8 204 {
davidjhoward 4:c35db3946fd8 205 modbus.baud(baudRate);
davidjhoward 4:c35db3946fd8 206 modbus.attach(&modbus_recv, RawSerial::RxIrq);
davidjhoward 4:c35db3946fd8 207 }
davidjhoward 4:c35db3946fd8 208
davidjhoward 4:c35db3946fd8 209 //call back when character goes into RX buffer for RS485 modbus
davidjhoward 4:c35db3946fd8 210 void modbus_recv()
davidjhoward 4:c35db3946fd8 211 {
davidjhoward 4:c35db3946fd8 212
davidjhoward 4:c35db3946fd8 213 if (modbus.readable()) {
davidjhoward 4:c35db3946fd8 214 modbus_buffer_char = modbus.getc();
davidjhoward 4:c35db3946fd8 215 if (modbus_input_buffer_counter == 0 && modbus_buffer_char == 0x00) {
davidjhoward 4:c35db3946fd8 216 modbus_input_buffer_counter = 0;
davidjhoward 4:c35db3946fd8 217 } else {
davidjhoward 4:c35db3946fd8 218 modbus_input_buffer[modbus_input_buffer_counter] = modbus_buffer_char;
davidjhoward 4:c35db3946fd8 219 modbus_input_buffer_counter++;
davidjhoward 4:c35db3946fd8 220 }
davidjhoward 4:c35db3946fd8 221 }
davidjhoward 4:c35db3946fd8 222
davidjhoward 4:c35db3946fd8 223 if (modbus_input_buffer_counter > modbus_input_buffer[2] + 4) {
davidjhoward 4:c35db3946fd8 224 modbus_interrupt_complete = true;
davidjhoward 4:c35db3946fd8 225 modbus_input_buffer_counter = 0;
davidjhoward 4:c35db3946fd8 226 }
davidjhoward 4:c35db3946fd8 227 }
davidjhoward 4:c35db3946fd8 228
davidjhoward 4:c35db3946fd8 229 // Read modbus master frame
davidjhoward 9:ef0ca2f8a8a6 230 void SendModbusCommand(uint8_t slave_address, uint16_t firstReg, uint16_t noRegs)
davidjhoward 4:c35db3946fd8 231 {
davidjhoward 4:c35db3946fd8 232 uint8_t L1V[8] = {slave_address, 0x04, 0x00, 0x02, 0x00, 0x02, 0xD1, 0x16};
davidjhoward 4:c35db3946fd8 233
davidjhoward 4:c35db3946fd8 234 L1V[2] = (firstReg >> 8) & 0xFF;
davidjhoward 4:c35db3946fd8 235 L1V[3] = firstReg & 0xFF;
davidjhoward 4:c35db3946fd8 236 L1V[4] = (noRegs >> 8) & 0xFF;
davidjhoward 4:c35db3946fd8 237 L1V[5] = noRegs & 0xFF;
davidjhoward 4:c35db3946fd8 238 L1V[6] = modbus_crc(L1V,6) & 0xFF;
davidjhoward 4:c35db3946fd8 239 L1V[7] = (modbus_crc(L1V,6)>>8) & 0xFF;
davidjhoward 4:c35db3946fd8 240
davidjhoward 57:5f18ae91c7c7 241 mod_de = 1;
davidjhoward 57:5f18ae91c7c7 242 mod_re = 1;
davidjhoward 57:5f18ae91c7c7 243 Thread::wait(1);
davidjhoward 4:c35db3946fd8 244 for (uint8_t i = 0; i < 8; i++)
davidjhoward 4:c35db3946fd8 245 modbus.putc(L1V[i]);
davidjhoward 4:c35db3946fd8 246
davidjhoward 57:5f18ae91c7c7 247 Thread::wait(2);
davidjhoward 57:5f18ae91c7c7 248 mod_de = 0;
davidjhoward 57:5f18ae91c7c7 249 mod_re = 0;
davidjhoward 4:c35db3946fd8 250
davidjhoward 4:c35db3946fd8 251 }
davidjhoward 4:c35db3946fd8 252
davidjhoward 4:c35db3946fd8 253 bool mbInterruptComplete()
davidjhoward 4:c35db3946fd8 254 {
davidjhoward 4:c35db3946fd8 255 if (modbus_interrupt_complete) {
davidjhoward 4:c35db3946fd8 256 modbus_interrupt_complete = false;
davidjhoward 4:c35db3946fd8 257 return true;
davidjhoward 4:c35db3946fd8 258 } else {
davidjhoward 4:c35db3946fd8 259 return false;
davidjhoward 4:c35db3946fd8 260 }
davidjhoward 4:c35db3946fd8 261 }
davidjhoward 4:c35db3946fd8 262
davidjhoward 15:a6ee32969e8e 263 bool ReadModbus_32bit_float( float *float_value, int order )
davidjhoward 4:c35db3946fd8 264 {
davidjhoward 15:a6ee32969e8e 265 MR_REGISTER_32_BIT_FLOAT value;
davidjhoward 31:4b1587034318 266
davidjhoward 4:c35db3946fd8 267 if (mbInterruptComplete() != true ) {
davidjhoward 4:c35db3946fd8 268 return false;
davidjhoward 4:c35db3946fd8 269 }
davidjhoward 4:c35db3946fd8 270
davidjhoward 15:a6ee32969e8e 271 switch( order ) {
davidjhoward 31:4b1587034318 272 case BigEndian:
davidjhoward 15:a6ee32969e8e 273 value.b.lo_lo = modbus_input_buffer[6];
davidjhoward 15:a6ee32969e8e 274 value.b.lo_hi = modbus_input_buffer[5];
davidjhoward 15:a6ee32969e8e 275 value.b.hi_lo = modbus_input_buffer[4];
davidjhoward 15:a6ee32969e8e 276 value.b.hi_hi = modbus_input_buffer[3];
davidjhoward 15:a6ee32969e8e 277 break;
davidjhoward 15:a6ee32969e8e 278 case BigEndianReverseWord:
davidjhoward 15:a6ee32969e8e 279 value.b.lo_lo = modbus_input_buffer[4];
davidjhoward 15:a6ee32969e8e 280 value.b.lo_hi = modbus_input_buffer[3];
davidjhoward 15:a6ee32969e8e 281 value.b.hi_lo = modbus_input_buffer[6];
davidjhoward 15:a6ee32969e8e 282 value.b.hi_hi = modbus_input_buffer[5];
davidjhoward 15:a6ee32969e8e 283 break;
davidjhoward 15:a6ee32969e8e 284 default:
davidjhoward 15:a6ee32969e8e 285 return false;
davidjhoward 15:a6ee32969e8e 286 }
davidjhoward 15:a6ee32969e8e 287 *float_value = value.f;
davidjhoward 4:c35db3946fd8 288 return true;
davidjhoward 4:c35db3946fd8 289 }