Rod Coleman / NetServices

Netservices modded to read fragmented HTTP respsonse/payload from special purpose server - 180 bytes only

drv/at/ATIf.cpp@0:8f5825f330b0, 2011-09-08 (annotated)

Committer:
RodColeman
Date:
Thu Sep 08 10:41:36 2011 +0000
Revision:
0:8f5825f330b0
setDataLen hacked to 180bytes

Who changed what in which revision?

UserRevisionLine numberNew contents of line
RodColeman 0:8f5825f330b0 1
RodColeman 0:8f5825f330b0 2 /*
RodColeman 0:8f5825f330b0 3 Copyright (c) 2010 Donatien Garnier (donatiengar [at] gmail [dot] com)
RodColeman 0:8f5825f330b0 4
RodColeman 0:8f5825f330b0 5 Permission is hereby granted, free of charge, to any person obtaining a copy
RodColeman 0:8f5825f330b0 6 of this software and associated documentation files (the "Software"), to deal
RodColeman 0:8f5825f330b0 7 in the Software without restriction, including without limitation the rights
RodColeman 0:8f5825f330b0 8 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
RodColeman 0:8f5825f330b0 9 copies of the Software, and to permit persons to whom the Software is
RodColeman 0:8f5825f330b0 10 furnished to do so, subject to the following conditions:
RodColeman 0:8f5825f330b0 11
RodColeman 0:8f5825f330b0 12 The above copyright notice and this permission notice shall be included in
RodColeman 0:8f5825f330b0 13 all copies or substantial portions of the Software.
RodColeman 0:8f5825f330b0 14
RodColeman 0:8f5825f330b0 15 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
RodColeman 0:8f5825f330b0 16 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
RodColeman 0:8f5825f330b0 17 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
RodColeman 0:8f5825f330b0 18 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
RodColeman 0:8f5825f330b0 19 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
RodColeman 0:8f5825f330b0 20 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
RodColeman 0:8f5825f330b0 21 THE SOFTWARE.
RodColeman 0:8f5825f330b0 22 */
RodColeman 0:8f5825f330b0 23
RodColeman 0:8f5825f330b0 24 #include "ATIf.h"
RodColeman 0:8f5825f330b0 25 #include "mbed.h"
RodColeman 0:8f5825f330b0 26 #include <cstdarg>
RodColeman 0:8f5825f330b0 27
RodColeman 0:8f5825f330b0 28 #define READ_TIMEOUT 100
RodColeman 0:8f5825f330b0 29 #define TMP_BUF_SIZE 128//512
RodColeman 0:8f5825f330b0 30
RodColeman 0:8f5825f330b0 31 #define SERIAL_BUF_LEN 512 //Huge buf needed for PPP (esp. when transferring big data chunks, using TCP)
RodColeman 0:8f5825f330b0 32
RodColeman 0:8f5825f330b0 33 #define BAUDRATE 9600//9600//115200// 19200
RodColeman 0:8f5825f330b0 34
RodColeman 0:8f5825f330b0 35 #include "netCfg.h"
RodColeman 0:8f5825f330b0 36 #if NET_GPRS
RodColeman 0:8f5825f330b0 37
RodColeman 0:8f5825f330b0 38 //#define __DEBUG
RodColeman 0:8f5825f330b0 39 #include "dbg/dbg.h"
RodColeman 0:8f5825f330b0 40
RodColeman 0:8f5825f330b0 41 ATIf::ATIf() : SerialBuf(SERIAL_BUF_LEN), m_isOpen(false)//, m_signalsEnable(false), m_isOpen(false), m_pCurrentSignal(NULL), m_signals()
RodColeman 0:8f5825f330b0 42 {
RodColeman 0:8f5825f330b0 43 DBG("New AT If@%p\n", this);
RodColeman 0:8f5825f330b0 44
RodColeman 0:8f5825f330b0 45 m_readTimeout = READ_TIMEOUT; //default 1s
RodColeman 0:8f5825f330b0 46 //tmpBuf = NULL;
RodColeman 0:8f5825f330b0 47 m_lineMode = false;
RodColeman 0:8f5825f330b0 48 m_tmpBuf = new char[TMP_BUF_SIZE];
RodColeman 0:8f5825f330b0 49 }
RodColeman 0:8f5825f330b0 50
RodColeman 0:8f5825f330b0 51 ATIf::~ATIf()
RodColeman 0:8f5825f330b0 52 {
RodColeman 0:8f5825f330b0 53 if(m_tmpBuf)
RodColeman 0:8f5825f330b0 54 delete[] m_tmpBuf;
RodColeman 0:8f5825f330b0 55 }
RodColeman 0:8f5825f330b0 56
RodColeman 0:8f5825f330b0 57 int ATIf::printf(const char* format, ... )
RodColeman 0:8f5825f330b0 58 {
RodColeman 0:8f5825f330b0 59
RodColeman 0:8f5825f330b0 60 /*if(!m_tmpBuf)
RodColeman 0:8f5825f330b0 61 m_tmpBuf = new char[TMP_BUF_SIZE]; //is it really necessary ??*/
RodColeman 0:8f5825f330b0 62 *m_tmpBuf=0;
RodColeman 0:8f5825f330b0 63
RodColeman 0:8f5825f330b0 64 int len = 0;
RodColeman 0:8f5825f330b0 65
RodColeman 0:8f5825f330b0 66 //
RodColeman 0:8f5825f330b0 67 // flushBuffer();
RodColeman 0:8f5825f330b0 68 //wait(1);
RodColeman 0:8f5825f330b0 69 //
RodColeman 0:8f5825f330b0 70
RodColeman 0:8f5825f330b0 71 va_list argp;
RodColeman 0:8f5825f330b0 72
RodColeman 0:8f5825f330b0 73 va_start(argp, format);
RodColeman 0:8f5825f330b0 74 len += vsprintf(m_tmpBuf, format, argp);
RodColeman 0:8f5825f330b0 75 va_end(argp);
RodColeman 0:8f5825f330b0 76
RodColeman 0:8f5825f330b0 77 //DBG("\r\nOutBuf is : %s, mode is %d.", m_tmpBuf, m_lineMode);
RodColeman 0:8f5825f330b0 78
RodColeman 0:8f5825f330b0 79 int err = write( m_tmpBuf, m_lineMode );
RodColeman 0:8f5825f330b0 80 if (err<0)
RodColeman 0:8f5825f330b0 81 return 0;
RodColeman 0:8f5825f330b0 82
RodColeman 0:8f5825f330b0 83 return len;
RodColeman 0:8f5825f330b0 84
RodColeman 0:8f5825f330b0 85 }
RodColeman 0:8f5825f330b0 86
RodColeman 0:8f5825f330b0 87 int ATIf::scanf(const char* format, ... )
RodColeman 0:8f5825f330b0 88 {
RodColeman 0:8f5825f330b0 89 /*if(!m_tmpBuf)
RodColeman 0:8f5825f330b0 90 m_tmpBuf = new char[TMP_BUF_SIZE];*/
RodColeman 0:8f5825f330b0 91 int err = read( m_tmpBuf, TMP_BUF_SIZE - 1, m_readTimeout, m_lineMode, 1/*Ensure at least one char is read*/ );
RodColeman 0:8f5825f330b0 92 if (err<0)
RodColeman 0:8f5825f330b0 93 return -1;//EOF
RodColeman 0:8f5825f330b0 94
RodColeman 0:8f5825f330b0 95 DBG("Scanf'ing:\r\n%s\r\n",m_tmpBuf);
RodColeman 0:8f5825f330b0 96
RodColeman 0:8f5825f330b0 97 int len = 0;
RodColeman 0:8f5825f330b0 98
RodColeman 0:8f5825f330b0 99 if(strchr(format,'%')) //Ugly, determines wether format string is null or not
RodColeman 0:8f5825f330b0 100 {
RodColeman 0:8f5825f330b0 101 va_list argp;
RodColeman 0:8f5825f330b0 102
RodColeman 0:8f5825f330b0 103 va_start(argp, format);
RodColeman 0:8f5825f330b0 104 len += vsscanf(m_tmpBuf, format, argp);
RodColeman 0:8f5825f330b0 105 va_end(argp);
RodColeman 0:8f5825f330b0 106 }
RodColeman 0:8f5825f330b0 107 else //No varargs, call strncmp
RodColeman 0:8f5825f330b0 108 {
RodColeman 0:8f5825f330b0 109 /* if(strlen(m_tmpBuf) == 0 )
RodColeman 0:8f5825f330b0 110 return -1;*/
RodColeman 0:8f5825f330b0 111 if( !strncmp(m_tmpBuf, format, strlen(format)) )
RodColeman 0:8f5825f330b0 112 {
RodColeman 0:8f5825f330b0 113 return 0;
RodColeman 0:8f5825f330b0 114 }
RodColeman 0:8f5825f330b0 115 else
RodColeman 0:8f5825f330b0 116 {
RodColeman 0:8f5825f330b0 117 return -1;
RodColeman 0:8f5825f330b0 118 }
RodColeman 0:8f5825f330b0 119 }
RodColeman 0:8f5825f330b0 120
RodColeman 0:8f5825f330b0 121 return len;
RodColeman 0:8f5825f330b0 122
RodColeman 0:8f5825f330b0 123 }
RodColeman 0:8f5825f330b0 124
RodColeman 0:8f5825f330b0 125 void ATIf::setTimeout(int timeout) //used by scanf
RodColeman 0:8f5825f330b0 126 {
RodColeman 0:8f5825f330b0 127 m_readTimeout = timeout;
RodColeman 0:8f5825f330b0 128 }
RodColeman 0:8f5825f330b0 129
RodColeman 0:8f5825f330b0 130 void ATIf::setLineMode(bool lineMode) //Switch btw line & raw fns
RodColeman 0:8f5825f330b0 131 {
RodColeman 0:8f5825f330b0 132 m_lineMode = lineMode;
RodColeman 0:8f5825f330b0 133 }
RodColeman 0:8f5825f330b0 134
RodColeman 0:8f5825f330b0 135 #if 0
RodColeman 0:8f5825f330b0 136 void ATIf::setSignals(bool signalsEnable)
RodColeman 0:8f5825f330b0 137 {
RodColeman 0:8f5825f330b0 138 m_signalsEnable=signalsEnable;
RodColeman 0:8f5825f330b0 139 }
RodColeman 0:8f5825f330b0 140 #endif
RodColeman 0:8f5825f330b0 141
RodColeman 0:8f5825f330b0 142 #if 0
RodColeman 0:8f5825f330b0 143 template<class T>
RodColeman 0:8f5825f330b0 144 void ATIf::attachSignal( const char* sigName, T* pItem, bool (T::*pMethod)(ATIf*, bool, bool*) ) //Attach Signal ("Unsollicited response code" in Telit_AT_Reference_Guide.pdf) to an handler fn
RodColeman 0:8f5825f330b0 145 {
RodColeman 0:8f5825f330b0 146 ATSigHandler sig(sigName, (ATSigHandler::CDummy*)pItem, (bool (ATSigHandler::CDummy::*)(ATIf*, bool, bool*))pMethod);
RodColeman 0:8f5825f330b0 147 m_signals.push_back(sig);
RodColeman 0:8f5825f330b0 148 }
RodColeman 0:8f5825f330b0 149 #endif
RodColeman 0:8f5825f330b0 150
RodColeman 0:8f5825f330b0 151 #if 0
RodColeman 0:8f5825f330b0 152 void ATIf::detachSignal( const char* sigName )
RodColeman 0:8f5825f330b0 153 {
RodColeman 0:8f5825f330b0 154 list<ATSigHandler>::iterator it;
RodColeman 0:8f5825f330b0 155
RodColeman 0:8f5825f330b0 156 for ( it = m_signals.begin(); it != m_signals.end(); it++ )
RodColeman 0:8f5825f330b0 157 {
RodColeman 0:8f5825f330b0 158 if( !strcmp((*it).m_name,sigName) )
RodColeman 0:8f5825f330b0 159 {
RodColeman 0:8f5825f330b0 160 m_signals.erase(it);
RodColeman 0:8f5825f330b0 161 break;
RodColeman 0:8f5825f330b0 162 }
RodColeman 0:8f5825f330b0 163 }
RodColeman 0:8f5825f330b0 164 }
RodColeman 0:8f5825f330b0 165 #endif
RodColeman 0:8f5825f330b0 166
RodColeman 0:8f5825f330b0 167 ATErr ATIf::open(Serial* pSerial) //Deactivate echo, etc
RodColeman 0:8f5825f330b0 168 {
RodColeman 0:8f5825f330b0 169 DBG("Opening...\n");
RodColeman 0:8f5825f330b0 170 m_isOpen = true; //Must be set so that the serial port-related fns work
RodColeman 0:8f5825f330b0 171 //Setup options
RodColeman 0:8f5825f330b0 172 // pSerial->baud(BAUDRATE); //FIXME
RodColeman 0:8f5825f330b0 173 SerialBuf::attach(pSerial);
RodColeman 0:8f5825f330b0 174
RodColeman 0:8f5825f330b0 175 setReadMode(false); //Discard chars
RodColeman 0:8f5825f330b0 176 setTimeout(1000);
RodColeman 0:8f5825f330b0 177 setLineMode(true); //Line Mode
RodColeman 0:8f5825f330b0 178
RodColeman 0:8f5825f330b0 179 DBG("Trmt...\n");
RodColeman 0:8f5825f330b0 180 // printf("AT+IPR=%d", BAUDRATE); //FIXME
RodColeman 0:8f5825f330b0 181 printf("ATZ"); //Reset
RodColeman 0:8f5825f330b0 182 wait(.100);
RodColeman 0:8f5825f330b0 183 printf("ATE"); //Deactivate echo
RodColeman 0:8f5825f330b0 184 wait(.500);
RodColeman 0:8f5825f330b0 185 flushBuffer();
RodColeman 0:8f5825f330b0 186
RodColeman 0:8f5825f330b0 187 DBG("ATZ ATE...\n");
RodColeman 0:8f5825f330b0 188
RodColeman 0:8f5825f330b0 189 int len = writeLine("ATV1");
RodColeman 0:8f5825f330b0 190 ATErr err = AT_OK;
RodColeman 0:8f5825f330b0 191 if(len<0)
RodColeman 0:8f5825f330b0 192 err=(ATErr)len;
RodColeman 0:8f5825f330b0 193
RodColeman 0:8f5825f330b0 194 if(!err)
RodColeman 0:8f5825f330b0 195 {
RodColeman 0:8f5825f330b0 196 err = checkOK();
RodColeman 0:8f5825f330b0 197 if (err) //No ACK from module
RodColeman 0:8f5825f330b0 198 {
RodColeman 0:8f5825f330b0 199 DBG("\r\nOpening port, error %d.", err);
RodColeman 0:8f5825f330b0 200 if(err==AT_TIMEOUT)
RodColeman 0:8f5825f330b0 201 err = AT_NOANSWER;
RodColeman 0:8f5825f330b0 202 }
RodColeman 0:8f5825f330b0 203 }
RodColeman 0:8f5825f330b0 204
RodColeman 0:8f5825f330b0 205 if(err)
RodColeman 0:8f5825f330b0 206 {
RodColeman 0:8f5825f330b0 207 SerialBuf::detach();
RodColeman 0:8f5825f330b0 208 m_isOpen = false;
RodColeman 0:8f5825f330b0 209 return err;
RodColeman 0:8f5825f330b0 210 }
RodColeman 0:8f5825f330b0 211
RodColeman 0:8f5825f330b0 212 DBG("\r\nNo error.");
RodColeman 0:8f5825f330b0 213 #if 0//FIXME
RodColeman 0:8f5825f330b0 214 m_signalsEnable = true;
RodColeman 0:8f5825f330b0 215 #endif
RodColeman 0:8f5825f330b0 216 //FIXME:
RodColeman 0:8f5825f330b0 217 // m_pSerial->attach<ATIf>(this, &ATIf::onSerialInterrupt);
RodColeman 0:8f5825f330b0 218
RodColeman 0:8f5825f330b0 219 return AT_OK;
RodColeman 0:8f5825f330b0 220 }
RodColeman 0:8f5825f330b0 221
RodColeman 0:8f5825f330b0 222 #if NET_USB_SERIAL
RodColeman 0:8f5825f330b0 223 ATErr ATIf::open(UsbSerial* pUsbSerial) //Deactivate echo, etc
RodColeman 0:8f5825f330b0 224 {
RodColeman 0:8f5825f330b0 225 DBG("Opening...\n");
RodColeman 0:8f5825f330b0 226 m_isOpen = true; //Must be set so that the serial port-related fns work
RodColeman 0:8f5825f330b0 227 //Setup options
RodColeman 0:8f5825f330b0 228 SerialBuf::attach(pUsbSerial);
RodColeman 0:8f5825f330b0 229
RodColeman 0:8f5825f330b0 230 setReadMode(false); //Discard chars
RodColeman 0:8f5825f330b0 231 setTimeout(1000);
RodColeman 0:8f5825f330b0 232 setLineMode(true); //Line Mode
RodColeman 0:8f5825f330b0 233
RodColeman 0:8f5825f330b0 234 printf("ATZ"); //Reinit
RodColeman 0:8f5825f330b0 235 wait(.500);
RodColeman 0:8f5825f330b0 236 //flushBuffer();
RodColeman 0:8f5825f330b0 237 // printf("ATE0 ^CURC=0"); //Deactivate echo & notif
RodColeman 0:8f5825f330b0 238 printf("ATE0"); //Deactivate echo & notif
RodColeman 0:8f5825f330b0 239 wait(.500);
RodColeman 0:8f5825f330b0 240 flushBuffer();
RodColeman 0:8f5825f330b0 241
RodColeman 0:8f5825f330b0 242 DBG("ATZ ATE...\n");
RodColeman 0:8f5825f330b0 243
RodColeman 0:8f5825f330b0 244 int len = writeLine("ATQ0 V1 S0=0 &C1 &D2 +FCLASS=0");//writeLine("ATQ0 V1 S0=0 &C1 &D2 +FCLASS=0");
RodColeman 0:8f5825f330b0 245 ATErr err = AT_OK;
RodColeman 0:8f5825f330b0 246 if(len<0)
RodColeman 0:8f5825f330b0 247 err=(ATErr)len;
RodColeman 0:8f5825f330b0 248
RodColeman 0:8f5825f330b0 249 if(!err)
RodColeman 0:8f5825f330b0 250 {
RodColeman 0:8f5825f330b0 251 err = checkOK();
RodColeman 0:8f5825f330b0 252 if (err) //No ACK from module
RodColeman 0:8f5825f330b0 253 {
RodColeman 0:8f5825f330b0 254 DBG("Opening port, error %d.\n", err);
RodColeman 0:8f5825f330b0 255 if(err==AT_TIMEOUT)
RodColeman 0:8f5825f330b0 256 err = AT_NOANSWER;
RodColeman 0:8f5825f330b0 257 }
RodColeman 0:8f5825f330b0 258 }
RodColeman 0:8f5825f330b0 259
RodColeman 0:8f5825f330b0 260 if(err)
RodColeman 0:8f5825f330b0 261 {
RodColeman 0:8f5825f330b0 262 SerialBuf::detach();
RodColeman 0:8f5825f330b0 263 m_isOpen = false;
RodColeman 0:8f5825f330b0 264 return err;
RodColeman 0:8f5825f330b0 265 }
RodColeman 0:8f5825f330b0 266
RodColeman 0:8f5825f330b0 267 DBG("No error.\n");
RodColeman 0:8f5825f330b0 268 #if 0//FIXME
RodColeman 0:8f5825f330b0 269 m_signalsEnable = true;
RodColeman 0:8f5825f330b0 270 #endif
RodColeman 0:8f5825f330b0 271 //FIXME:
RodColeman 0:8f5825f330b0 272 // m_pSerial->attach<ATIf>(this, &ATIf::onSerialInterrupt);
RodColeman 0:8f5825f330b0 273
RodColeman 0:8f5825f330b0 274 return AT_OK;
RodColeman 0:8f5825f330b0 275 }
RodColeman 0:8f5825f330b0 276 #endif
RodColeman 0:8f5825f330b0 277
RodColeman 0:8f5825f330b0 278 ATErr ATIf::close() //Release port
RodColeman 0:8f5825f330b0 279 {
RodColeman 0:8f5825f330b0 280 SerialBuf::detach(); //Detach serial buf
RodColeman 0:8f5825f330b0 281 m_isOpen = false;
RodColeman 0:8f5825f330b0 282 //m_signalsEnable = false;
RodColeman 0:8f5825f330b0 283 return AT_OK;
RodColeman 0:8f5825f330b0 284 }
RodColeman 0:8f5825f330b0 285
RodColeman 0:8f5825f330b0 286 ATErr ATIf::flushBuffer()
RodColeman 0:8f5825f330b0 287 {
RodColeman 0:8f5825f330b0 288 if(!m_isOpen)
RodColeman 0:8f5825f330b0 289 return AT_CLOSED;
RodColeman 0:8f5825f330b0 290
RodColeman 0:8f5825f330b0 291 int len=0;
RodColeman 0:8f5825f330b0 292 //char c;
RodColeman 0:8f5825f330b0 293 while(readable())
RodColeman 0:8f5825f330b0 294 {
RodColeman 0:8f5825f330b0 295 //DBG("Readable\n");
RodColeman 0:8f5825f330b0 296 /*c =*/ getc();
RodColeman 0:8f5825f330b0 297 //DBG("\r\n[%c] discarded.", c);
RodColeman 0:8f5825f330b0 298 // wait(0.01);
RodColeman 0:8f5825f330b0 299 len++;
RodColeman 0:8f5825f330b0 300 }
RodColeman 0:8f5825f330b0 301
RodColeman 0:8f5825f330b0 302 DBG("\r\n%d chars discarded.", len);
RodColeman 0:8f5825f330b0 303
RodColeman 0:8f5825f330b0 304 return AT_OK;
RodColeman 0:8f5825f330b0 305 }
RodColeman 0:8f5825f330b0 306
RodColeman 0:8f5825f330b0 307 ATErr ATIf::flushLine(int timeout)
RodColeman 0:8f5825f330b0 308 {
RodColeman 0:8f5825f330b0 309 if(!m_isOpen)
RodColeman 0:8f5825f330b0 310 return AT_CLOSED;
RodColeman 0:8f5825f330b0 311
RodColeman 0:8f5825f330b0 312 Timer timer;
RodColeman 0:8f5825f330b0 313
RodColeman 0:8f5825f330b0 314 timer.start();
RodColeman 0:8f5825f330b0 315
RodColeman 0:8f5825f330b0 316 int len=0;
RodColeman 0:8f5825f330b0 317 char c=0;
RodColeman 0:8f5825f330b0 318 while(true)
RodColeman 0:8f5825f330b0 319 {
RodColeman 0:8f5825f330b0 320 while(!readable())
RodColeman 0:8f5825f330b0 321 { if(timer.read_ms()>timeout)
RodColeman 0:8f5825f330b0 322 {
RodColeman 0:8f5825f330b0 323 // DBG("Timeout!!0");
RodColeman 0:8f5825f330b0 324 return AT_TIMEOUT;
RodColeman 0:8f5825f330b0 325 }
RodColeman 0:8f5825f330b0 326 }
RodColeman 0:8f5825f330b0 327 if(c=='\x0D')
RodColeman 0:8f5825f330b0 328 {
RodColeman 0:8f5825f330b0 329 c = getc();
RodColeman 0:8f5825f330b0 330 len++;
RodColeman 0:8f5825f330b0 331 if(c=='\x0A')
RodColeman 0:8f5825f330b0 332 break;
RodColeman 0:8f5825f330b0 333 }
RodColeman 0:8f5825f330b0 334 else
RodColeman 0:8f5825f330b0 335 {
RodColeman 0:8f5825f330b0 336 c = getc();
RodColeman 0:8f5825f330b0 337 len++;
RodColeman 0:8f5825f330b0 338 }
RodColeman 0:8f5825f330b0 339 }
RodColeman 0:8f5825f330b0 340
RodColeman 0:8f5825f330b0 341 // DBG("\r\n%d chars discarded.", len);
RodColeman 0:8f5825f330b0 342
RodColeman 0:8f5825f330b0 343 return AT_OK;
RodColeman 0:8f5825f330b0 344 }
RodColeman 0:8f5825f330b0 345
RodColeman 0:8f5825f330b0 346 #if 0
RodColeman 0:8f5825f330b0 347 bool ATIf::onRead()
RodColeman 0:8f5825f330b0 348 {
RodColeman 0:8f5825f330b0 349 if(!m_signalsEnable)
RodColeman 0:8f5825f330b0 350 return false;
RodColeman 0:8f5825f330b0 351
RodColeman 0:8f5825f330b0 352 //Save Usermode params
RodColeman 0:8f5825f330b0 353 volatile int u_readTimeout = m_readTimeout;
RodColeman 0:8f5825f330b0 354 volatile bool u_lineMode = m_lineMode;
RodColeman 0:8f5825f330b0 355 // bool u_isOpen = m_isOpen;
RodColeman 0:8f5825f330b0 356 SerialBuf::setReadMode(true);
RodColeman 0:8f5825f330b0 357
RodColeman 0:8f5825f330b0 358 m_readTimeout = 0; //No timeout in an interrupt fn!
RodColeman 0:8f5825f330b0 359
RodColeman 0:8f5825f330b0 360 bool handled;
RodColeman 0:8f5825f330b0 361 if(!!flushLine(0))
RodColeman 0:8f5825f330b0 362 {
RodColeman 0:8f5825f330b0 363 SerialBuf::resetRead();
RodColeman 0:8f5825f330b0 364 //Not a complete line here, wait...
RodColeman 0:8f5825f330b0 365 handled = false;
RodColeman 0:8f5825f330b0 366 }
RodColeman 0:8f5825f330b0 367 else
RodColeman 0:8f5825f330b0 368 {
RodColeman 0:8f5825f330b0 369 SerialBuf::resetRead();
RodColeman 0:8f5825f330b0 370 handled = true;
RodColeman 0:8f5825f330b0 371 if( handleSignal() ) //Was that a signal ?
RodColeman 0:8f5825f330b0 372 {
RodColeman 0:8f5825f330b0 373 //OK, discard data since it has been processed
RodColeman 0:8f5825f330b0 374 SerialBuf::flushRead();
RodColeman 0:8f5825f330b0 375 }
RodColeman 0:8f5825f330b0 376 else
RodColeman 0:8f5825f330b0 377 {
RodColeman 0:8f5825f330b0 378 //Keep data since it has not been processed yet
RodColeman 0:8f5825f330b0 379 //Have to be processed in usermode
RodColeman 0:8f5825f330b0 380 SerialBuf::resetRead();
RodColeman 0:8f5825f330b0 381 // handled = false;
RodColeman 0:8f5825f330b0 382 }
RodColeman 0:8f5825f330b0 383 }
RodColeman 0:8f5825f330b0 384 //Restore Usermode params
RodColeman 0:8f5825f330b0 385 m_readTimeout = u_readTimeout;
RodColeman 0:8f5825f330b0 386 m_lineMode = u_lineMode;
RodColeman 0:8f5825f330b0 387 //m_isOpen = u_isOpen;
RodColeman 0:8f5825f330b0 388 return handled;
RodColeman 0:8f5825f330b0 389 }
RodColeman 0:8f5825f330b0 390 #endif
RodColeman 0:8f5825f330b0 391
RodColeman 0:8f5825f330b0 392 ATErr ATIf::rawOpen(Serial* pSerial, int baudrate) //Simple open function for similar non-conforming protocols
RodColeman 0:8f5825f330b0 393 {
RodColeman 0:8f5825f330b0 394 DBG("\r\nOpening...");
RodColeman 0:8f5825f330b0 395 m_isOpen = true; //Must be set so that the serial port-related fns work
RodColeman 0:8f5825f330b0 396 //Setup options
RodColeman 0:8f5825f330b0 397 pSerial->baud(baudrate);
RodColeman 0:8f5825f330b0 398 SerialBuf::attach(pSerial);
RodColeman 0:8f5825f330b0 399
RodColeman 0:8f5825f330b0 400 return AT_OK;
RodColeman 0:8f5825f330b0 401 }
RodColeman 0:8f5825f330b0 402
RodColeman 0:8f5825f330b0 403 #if 0
RodColeman 0:8f5825f330b0 404 ATErr ATIf::command(const char* cmd, char* result, int resultLen, int timeout) ////WARN/FIXME: result has to be long enough!!!
RodColeman 0:8f5825f330b0 405 {
RodColeman 0:8f5825f330b0 406 if(!m_isOpen)
RodColeman 0:8f5825f330b0 407 return AT_CLOSED;
RodColeman 0:8f5825f330b0 408
RodColeman 0:8f5825f330b0 409 flushBuffer();
RodColeman 0:8f5825f330b0 410
RodColeman 0:8f5825f330b0 411 int err;
RodColeman 0:8f5825f330b0 412 err = writeLine(cmd);
RodColeman 0:8f5825f330b0 413
RodColeman 0:8f5825f330b0 414 if(err<0)
RodColeman 0:8f5825f330b0 415 { m_receiveStatus = AT_READY; return (ATErr)err; }
RodColeman 0:8f5825f330b0 416
RodColeman 0:8f5825f330b0 417 err = readLine(result, resultLen, timeout);
RodColeman 0:8f5825f330b0 418
RodColeman 0:8f5825f330b0 419 if(err<0)
RodColeman 0:8f5825f330b0 420 { m_receiveStatus = AT_READY; return (ATErr)err; }
RodColeman 0:8f5825f330b0 421
RodColeman 0:8f5825f330b0 422 m_receiveStatus = AT_READY;
RodColeman 0:8f5825f330b0 423
RodColeman 0:8f5825f330b0 424 return AT_OK;
RodColeman 0:8f5825f330b0 425
RodColeman 0:8f5825f330b0 426 }
RodColeman 0:8f5825f330b0 427 #endif
RodColeman 0:8f5825f330b0 428
RodColeman 0:8f5825f330b0 429 ATErr ATIf::write(const char* cmd, bool lineMode /*= false*/)
RodColeman 0:8f5825f330b0 430 {
RodColeman 0:8f5825f330b0 431 if(!m_isOpen)
RodColeman 0:8f5825f330b0 432 return AT_CLOSED;
RodColeman 0:8f5825f330b0 433
RodColeman 0:8f5825f330b0 434 int err;
RodColeman 0:8f5825f330b0 435 err = lineMode ? writeLine(cmd) : writeRaw(cmd);
RodColeman 0:8f5825f330b0 436
RodColeman 0:8f5825f330b0 437 if(err<0)
RodColeman 0:8f5825f330b0 438 return (ATErr)err;
RodColeman 0:8f5825f330b0 439
RodColeman 0:8f5825f330b0 440 return AT_OK;
RodColeman 0:8f5825f330b0 441 }
RodColeman 0:8f5825f330b0 442
RodColeman 0:8f5825f330b0 443
RodColeman 0:8f5825f330b0 444 ATErr ATIf::read(char* result, int resultMaxLen, int timeout, bool lineMode /*= false*/, int resultMinLen/* = 0*/)
RodColeman 0:8f5825f330b0 445 {
RodColeman 0:8f5825f330b0 446 if(!m_isOpen)
RodColeman 0:8f5825f330b0 447 return AT_CLOSED;
RodColeman 0:8f5825f330b0 448
RodColeman 0:8f5825f330b0 449 int err;
RodColeman 0:8f5825f330b0 450 err = lineMode ? readLine(result, resultMaxLen, timeout) : readRaw(result, resultMaxLen, timeout, resultMinLen);
RodColeman 0:8f5825f330b0 451
RodColeman 0:8f5825f330b0 452 if(err<0)
RodColeman 0:8f5825f330b0 453 return (ATErr)err;
RodColeman 0:8f5825f330b0 454
RodColeman 0:8f5825f330b0 455 return AT_OK;
RodColeman 0:8f5825f330b0 456 }
RodColeman 0:8f5825f330b0 457
RodColeman 0:8f5825f330b0 458 bool ATIf::isOpen()
RodColeman 0:8f5825f330b0 459 {
RodColeman 0:8f5825f330b0 460 return m_isOpen;
RodColeman 0:8f5825f330b0 461 }
RodColeman 0:8f5825f330b0 462
RodColeman 0:8f5825f330b0 463 ATErr ATIf::checkOK() //Helper fn to quickly check that OK has been returned
RodColeman 0:8f5825f330b0 464 {
RodColeman 0:8f5825f330b0 465 char ret[16] = {0};
RodColeman 0:8f5825f330b0 466 int err = readLine(ret,16,m_readTimeout);
RodColeman 0:8f5825f330b0 467
RodColeman 0:8f5825f330b0 468 if(err<0)
RodColeman 0:8f5825f330b0 469 {
RodColeman 0:8f5825f330b0 470 DBG("\r\nError in check (%s).\r\n", ret);
RodColeman 0:8f5825f330b0 471 flushBuffer(); //Discard anything in buf to avoid misparsing in the following calls
RodColeman 0:8f5825f330b0 472 return (ATErr)err;
RodColeman 0:8f5825f330b0 473 }
RodColeman 0:8f5825f330b0 474
RodColeman 0:8f5825f330b0 475 if(!!strcmp("OK",ret))
RodColeman 0:8f5825f330b0 476 {
RodColeman 0:8f5825f330b0 477 DBG("\r\nNot an OK <%s>.\r\n", ret);
RodColeman 0:8f5825f330b0 478 flushBuffer();
RodColeman 0:8f5825f330b0 479 return AT_ERROR;
RodColeman 0:8f5825f330b0 480 }
RodColeman 0:8f5825f330b0 481
RodColeman 0:8f5825f330b0 482 DBG("\r\nCHECK OK\r\n");
RodColeman 0:8f5825f330b0 483
RodColeman 0:8f5825f330b0 484 return AT_OK;
RodColeman 0:8f5825f330b0 485 }
RodColeman 0:8f5825f330b0 486
RodColeman 0:8f5825f330b0 487 #if 0
RodColeman 0:8f5825f330b0 488 void ATIf::onSerialInterrupt() //Callback from m_pSerial
RodColeman 0:8f5825f330b0 489 {
RodColeman 0:8f5825f330b0 490 return;//FIXME
RodColeman 0:8f5825f330b0 491
RodColeman 0:8f5825f330b0 492 if(m_receiveStatus == AT_READING)
RodColeman 0:8f5825f330b0 493 return;
RodColeman 0:8f5825f330b0 494
RodColeman 0:8f5825f330b0 495 if( m_cbObj && m_cbMeth )
RodColeman 0:8f5825f330b0 496 return (m_cbObj->*m_cbMeth)();
RodColeman 0:8f5825f330b0 497 }
RodColeman 0:8f5825f330b0 498 #endif
RodColeman 0:8f5825f330b0 499
RodColeman 0:8f5825f330b0 500 int ATIf::readLine(char* line, int maxLen, int timeout) //Read a single line from serial port, return length or ATErr(<0)
RodColeman 0:8f5825f330b0 501 {
RodColeman 0:8f5825f330b0 502 #ifdef OLDREADLINE
RodColeman 0:8f5825f330b0 503 if(!m_isOpen)
RodColeman 0:8f5825f330b0 504 return AT_CLOSED;
RodColeman 0:8f5825f330b0 505
RodColeman 0:8f5825f330b0 506 int len = 0;
RodColeman 0:8f5825f330b0 507
RodColeman 0:8f5825f330b0 508 Timer timer;
RodColeman 0:8f5825f330b0 509
RodColeman 0:8f5825f330b0 510 timer.start();
RodColeman 0:8f5825f330b0 511 #ifdef __START_CLRF_MANDAT
RodColeman 0:8f5825f330b0 512 for( int i=0; i<2; i++ )
RodColeman 0:8f5825f330b0 513 {
RodColeman 0:8f5825f330b0 514 while(!readable())
RodColeman 0:8f5825f330b0 515 {
RodColeman 0:8f5825f330b0 516 if(timer.read_ms()>timeout)
RodColeman 0:8f5825f330b0 517 {
RodColeman 0:8f5825f330b0 518 // DBG("Timeout!!0");
RodColeman 0:8f5825f330b0 519 return AT_TIMEOUT;
RodColeman 0:8f5825f330b0 520 }
RodColeman 0:8f5825f330b0 521 wait_ms(10); //Wait 10ms
RodColeman 0:8f5825f330b0 522 }
RodColeman 0:8f5825f330b0 523 *line = getc();
RodColeman 0:8f5825f330b0 524 // DBG("In readLine(), read : %c", *line);
RodColeman 0:8f5825f330b0 525 if( ( (i == 0) && (*line!='\x0D') )
RodColeman 0:8f5825f330b0 526 || ( (i == 1) && (*line!='\x0A') ) )
RodColeman 0:8f5825f330b0 527 return AT_PARSE;
RodColeman 0:8f5825f330b0 528 }
RodColeman 0:8f5825f330b0 529 #else
RodColeman 0:8f5825f330b0 530
RodColeman 0:8f5825f330b0 531 #endif
RodColeman 0:8f5825f330b0 532
RodColeman 0:8f5825f330b0 533 for( ; len < maxLen ; len++ )
RodColeman 0:8f5825f330b0 534 {
RodColeman 0:8f5825f330b0 535 timer.reset();
RodColeman 0:8f5825f330b0 536 while(!readable())
RodColeman 0:8f5825f330b0 537 {
RodColeman 0:8f5825f330b0 538 if(timer.read_ms()>timeout)
RodColeman 0:8f5825f330b0 539 {
RodColeman 0:8f5825f330b0 540 // DBG("Timeout!!1");
RodColeman 0:8f5825f330b0 541 return AT_TIMEOUT;
RodColeman 0:8f5825f330b0 542 }
RodColeman 0:8f5825f330b0 543 wait_ms(10); //Wait 10ms
RodColeman 0:8f5825f330b0 544 }
RodColeman 0:8f5825f330b0 545 *line = getc();
RodColeman 0:8f5825f330b0 546 //DBG("In readLine(), read : %c", *line);
RodColeman 0:8f5825f330b0 547
RodColeman 0:8f5825f330b0 548 if(*line=='\x0D')
RodColeman 0:8f5825f330b0 549 {
RodColeman 0:8f5825f330b0 550 timer.reset();
RodColeman 0:8f5825f330b0 551 while(!readable())
RodColeman 0:8f5825f330b0 552 {
RodColeman 0:8f5825f330b0 553 if(timer.read_ms()>timeout)
RodColeman 0:8f5825f330b0 554 {
RodColeman 0:8f5825f330b0 555 return AT_TIMEOUT;
RodColeman 0:8f5825f330b0 556 }
RodColeman 0:8f5825f330b0 557 wait_ms(10); //Wait 1ms
RodColeman 0:8f5825f330b0 558 }
RodColeman 0:8f5825f330b0 559 *line = getc();
RodColeman 0:8f5825f330b0 560 // DBG("In readLine(), read : %c", *line);
RodColeman 0:8f5825f330b0 561 if(*line=='\x0A')
RodColeman 0:8f5825f330b0 562 {
RodColeman 0:8f5825f330b0 563 if(len==0)
RodColeman 0:8f5825f330b0 564 {
RodColeman 0:8f5825f330b0 565 //Start of line
RodColeman 0:8f5825f330b0 566 len--;
RodColeman 0:8f5825f330b0 567 continue;
RodColeman 0:8f5825f330b0 568 }
RodColeman 0:8f5825f330b0 569 else
RodColeman 0:8f5825f330b0 570 {
RodColeman 0:8f5825f330b0 571 *line=0; //End of line
RodColeman 0:8f5825f330b0 572 break;
RodColeman 0:8f5825f330b0 573 }
RodColeman 0:8f5825f330b0 574 }
RodColeman 0:8f5825f330b0 575 else
RodColeman 0:8f5825f330b0 576 {
RodColeman 0:8f5825f330b0 577 //Should not happen, must have lost some bytes somewhere or non AT protocol
RodColeman 0:8f5825f330b0 578 return AT_PARSE;
RodColeman 0:8f5825f330b0 579 }
RodColeman 0:8f5825f330b0 580 }
RodColeman 0:8f5825f330b0 581 line++;
RodColeman 0:8f5825f330b0 582 }
RodColeman 0:8f5825f330b0 583
RodColeman 0:8f5825f330b0 584 if(len==maxLen)
RodColeman 0:8f5825f330b0 585 return AT_INCOMPLETE; //Buffer full, must call this method again to get end of line
RodColeman 0:8f5825f330b0 586
RodColeman 0:8f5825f330b0 587 return len;
RodColeman 0:8f5825f330b0 588 #else
RodColeman 0:8f5825f330b0 589 if(!m_isOpen)
RodColeman 0:8f5825f330b0 590 return AT_CLOSED;
RodColeman 0:8f5825f330b0 591
RodColeman 0:8f5825f330b0 592 Timer timer;
RodColeman 0:8f5825f330b0 593 timer.start();
RodColeman 0:8f5825f330b0 594
RodColeman 0:8f5825f330b0 595 int len = 0;
RodColeman 0:8f5825f330b0 596 while( len < maxLen )
RodColeman 0:8f5825f330b0 597 {
RodColeman 0:8f5825f330b0 598 timer.reset();
RodColeman 0:8f5825f330b0 599 while(!readable())
RodColeman 0:8f5825f330b0 600 {
RodColeman 0:8f5825f330b0 601 if(timer.read_ms()>timeout)
RodColeman 0:8f5825f330b0 602 {
RodColeman 0:8f5825f330b0 603 return AT_TIMEOUT;
RodColeman 0:8f5825f330b0 604 }
RodColeman 0:8f5825f330b0 605 wait_ms(10); //Wait 10ms
RodColeman 0:8f5825f330b0 606 }
RodColeman 0:8f5825f330b0 607 *line = getc();
RodColeman 0:8f5825f330b0 608
RodColeman 0:8f5825f330b0 609 if( (*line=='\x0D') || (*line=='\x0A') )
RodColeman 0:8f5825f330b0 610 {
RodColeman 0:8f5825f330b0 611
RodColeman 0:8f5825f330b0 612 if(len==0)
RodColeman 0:8f5825f330b0 613 {
RodColeman 0:8f5825f330b0 614 //Start of line
RodColeman 0:8f5825f330b0 615 continue;
RodColeman 0:8f5825f330b0 616 }
RodColeman 0:8f5825f330b0 617 else
RodColeman 0:8f5825f330b0 618 {
RodColeman 0:8f5825f330b0 619 *line=0; //End of line
RodColeman 0:8f5825f330b0 620 break;
RodColeman 0:8f5825f330b0 621 }
RodColeman 0:8f5825f330b0 622 }
RodColeman 0:8f5825f330b0 623 len++;
RodColeman 0:8f5825f330b0 624 line++;
RodColeman 0:8f5825f330b0 625 }
RodColeman 0:8f5825f330b0 626
RodColeman 0:8f5825f330b0 627 if(len==maxLen)
RodColeman 0:8f5825f330b0 628 return AT_INCOMPLETE; //Buffer full, must call this method again to get end of line
RodColeman 0:8f5825f330b0 629
RodColeman 0:8f5825f330b0 630 return len;
RodColeman 0:8f5825f330b0 631 #endif
RodColeman 0:8f5825f330b0 632 }
RodColeman 0:8f5825f330b0 633
RodColeman 0:8f5825f330b0 634 int ATIf::writeLine(const char* line) //Write a single line to serial port
RodColeman 0:8f5825f330b0 635 {
RodColeman 0:8f5825f330b0 636 // char* line = (char*) _line;
RodColeman 0:8f5825f330b0 637 if(!m_isOpen)
RodColeman 0:8f5825f330b0 638 return AT_CLOSED;
RodColeman 0:8f5825f330b0 639
RodColeman 0:8f5825f330b0 640 // DBG("\n\rIn writeline.");
RodColeman 0:8f5825f330b0 641
RodColeman 0:8f5825f330b0 642 int len = 0;
RodColeman 0:8f5825f330b0 643
RodColeman 0:8f5825f330b0 644 while(*line)
RodColeman 0:8f5825f330b0 645 {
RodColeman 0:8f5825f330b0 646 putc(*line);
RodColeman 0:8f5825f330b0 647 line++;
RodColeman 0:8f5825f330b0 648 len++;
RodColeman 0:8f5825f330b0 649 }
RodColeman 0:8f5825f330b0 650
RodColeman 0:8f5825f330b0 651 /* putc('\r');
RodColeman 0:8f5825f330b0 652
RodColeman 0:8f5825f330b0 653 putc('\n');*/
RodColeman 0:8f5825f330b0 654
RodColeman 0:8f5825f330b0 655 putc('\x0D');
RodColeman 0:8f5825f330b0 656 // putc('\x0A');
RodColeman 0:8f5825f330b0 657
RodColeman 0:8f5825f330b0 658 // DBG("\n\rWritten %d + 1", len);
RodColeman 0:8f5825f330b0 659
RodColeman 0:8f5825f330b0 660 return len;
RodColeman 0:8f5825f330b0 661
RodColeman 0:8f5825f330b0 662 }
RodColeman 0:8f5825f330b0 663
RodColeman 0:8f5825f330b0 664
RodColeman 0:8f5825f330b0 665
RodColeman 0:8f5825f330b0 666 int ATIf::readRaw(char* str, int maxLen, int timeout /*= 0*/, int minLen /*= 0*/) //Read from serial port in buf
RodColeman 0:8f5825f330b0 667 {
RodColeman 0:8f5825f330b0 668 if(!m_isOpen)
RodColeman 0:8f5825f330b0 669 return AT_CLOSED;
RodColeman 0:8f5825f330b0 670
RodColeman 0:8f5825f330b0 671 int len = 0;
RodColeman 0:8f5825f330b0 672
RodColeman 0:8f5825f330b0 673 Timer timer;
RodColeman 0:8f5825f330b0 674
RodColeman 0:8f5825f330b0 675 timer.start();
RodColeman 0:8f5825f330b0 676
RodColeman 0:8f5825f330b0 677 for( ; len < maxLen ; len++ )
RodColeman 0:8f5825f330b0 678 {
RodColeman 0:8f5825f330b0 679 while( (len < minLen) && !readable())
RodColeman 0:8f5825f330b0 680 {
RodColeman 0:8f5825f330b0 681 if(timer.read_ms()>timeout)
RodColeman 0:8f5825f330b0 682 {
RodColeman 0:8f5825f330b0 683 return AT_TIMEOUT;
RodColeman 0:8f5825f330b0 684 }
RodColeman 0:8f5825f330b0 685 wait(.01); //Wait 10ms
RodColeman 0:8f5825f330b0 686 }
RodColeman 0:8f5825f330b0 687
RodColeman 0:8f5825f330b0 688 if(!readable()) //Buffer read entirely
RodColeman 0:8f5825f330b0 689 break;
RodColeman 0:8f5825f330b0 690
RodColeman 0:8f5825f330b0 691 *str = getc();
RodColeman 0:8f5825f330b0 692 str++;
RodColeman 0:8f5825f330b0 693 len++;
RodColeman 0:8f5825f330b0 694 }
RodColeman 0:8f5825f330b0 695
RodColeman 0:8f5825f330b0 696 *str = 0; //End char
RodColeman 0:8f5825f330b0 697
RodColeman 0:8f5825f330b0 698 return len;
RodColeman 0:8f5825f330b0 699
RodColeman 0:8f5825f330b0 700 }
RodColeman 0:8f5825f330b0 701
RodColeman 0:8f5825f330b0 702 int ATIf::writeRaw(const char* str) //Write directly to serial port
RodColeman 0:8f5825f330b0 703 {
RodColeman 0:8f5825f330b0 704 if(!m_isOpen)
RodColeman 0:8f5825f330b0 705 return AT_CLOSED;
RodColeman 0:8f5825f330b0 706
RodColeman 0:8f5825f330b0 707 int len = 0;
RodColeman 0:8f5825f330b0 708
RodColeman 0:8f5825f330b0 709 while(*str)
RodColeman 0:8f5825f330b0 710 {
RodColeman 0:8f5825f330b0 711 putc(*str);
RodColeman 0:8f5825f330b0 712 str++;
RodColeman 0:8f5825f330b0 713 len++;
RodColeman 0:8f5825f330b0 714 }
RodColeman 0:8f5825f330b0 715
RodColeman 0:8f5825f330b0 716 return len;
RodColeman 0:8f5825f330b0 717 }
RodColeman 0:8f5825f330b0 718
RodColeman 0:8f5825f330b0 719 #if 0
RodColeman 0:8f5825f330b0 720 bool ATIf::handleSignal()
RodColeman 0:8f5825f330b0 721 {
RodColeman 0:8f5825f330b0 722 bool beg = false;
RodColeman 0:8f5825f330b0 723
RodColeman 0:8f5825f330b0 724 // SerialBuf::setReadMode(true); //Keep chars in buf when read
RodColeman 0:8f5825f330b0 725 // SerialBuf::resetRead();
RodColeman 0:8f5825f330b0 726
RodColeman 0:8f5825f330b0 727 //if( !m_pCurrentSignal ) //If no signal asked for this line
RodColeman 0:8f5825f330b0 728 if(true) //Check anyway, could have been some parsing error before
RodColeman 0:8f5825f330b0 729 {
RodColeman 0:8f5825f330b0 730 //Extract Signal Name
RodColeman 0:8f5825f330b0 731 char sigName[32]; //Should not be longer than that
RodColeman 0:8f5825f330b0 732 setLineMode(true); //Read one line
RodColeman 0:8f5825f330b0 733
RodColeman 0:8f5825f330b0 734 int len = scanf("%[^:]:%*[^\n]", sigName);
RodColeman 0:8f5825f330b0 735 if(len != 1)
RodColeman 0:8f5825f330b0 736 return false; //This is not a signal
RodColeman 0:8f5825f330b0 737 // DBG("\r\nGot signal %s\r\n", sigName);
RodColeman 0:8f5825f330b0 738
RodColeman 0:8f5825f330b0 739 list<ATSigHandler>::iterator it;
RodColeman 0:8f5825f330b0 740
RodColeman 0:8f5825f330b0 741 for ( it = m_signals.begin(); it != m_signals.end(); it++ )
RodColeman 0:8f5825f330b0 742 {
RodColeman 0:8f5825f330b0 743 if( !strcmp((*it).m_name, sigName) )
RodColeman 0:8f5825f330b0 744 {
RodColeman 0:8f5825f330b0 745 // DBG("\r\nFound signal %s\r\n", sigName);
RodColeman 0:8f5825f330b0 746 m_pCurrentSignal = &(*it);
RodColeman 0:8f5825f330b0 747 beg = true;
RodColeman 0:8f5825f330b0 748 break;
RodColeman 0:8f5825f330b0 749 }
RodColeman 0:8f5825f330b0 750 }
RodColeman 0:8f5825f330b0 751
RodColeman 0:8f5825f330b0 752
RodColeman 0:8f5825f330b0 753 }
RodColeman 0:8f5825f330b0 754
RodColeman 0:8f5825f330b0 755 if( !m_pCurrentSignal )
RodColeman 0:8f5825f330b0 756 return false; //This is not a signal or it cannot be handled
RodColeman 0:8f5825f330b0 757
RodColeman 0:8f5825f330b0 758 bool moreData = false;
RodColeman 0:8f5825f330b0 759 //Call signal handling routine
RodColeman 0:8f5825f330b0 760 SerialBuf::resetRead(); //Rollback so that the handling fn can call scanf properly
RodColeman 0:8f5825f330b0 761 bool result = ((m_pCurrentSignal->m_cbObj)->*(m_pCurrentSignal->m_cbMeth))(this, beg, &moreData);
RodColeman 0:8f5825f330b0 762
RodColeman 0:8f5825f330b0 763 if( !moreData ) //Processing completed
RodColeman 0:8f5825f330b0 764 {
RodColeman 0:8f5825f330b0 765 m_pCurrentSignal = NULL;
RodColeman 0:8f5825f330b0 766 }
RodColeman 0:8f5825f330b0 767
RodColeman 0:8f5825f330b0 768 return result;
RodColeman 0:8f5825f330b0 769 }
RodColeman 0:8f5825f330b0 770 #endif
RodColeman 0:8f5825f330b0 771
RodColeman 0:8f5825f330b0 772 #endif