Changes to support Vodafone K4606
Dependencies: Socket USBHostWANDongle lwip-sys lwip
Fork of VodafoneUSBModem by
VodafoneUSBModem.cpp@59:593fb493172f, 2012-10-24 (annotated)
- Committer:
- donatien
- Date:
- Wed Oct 24 14:13:49 2012 +0000
- Revision:
- 59:593fb493172f
- Parent:
- 41:8bec5a8ea878
- Child:
- 61:0bcb8c5216d4
- Disabling/Re-enabling of unsollicited response codes between commands to avoid having unsollicited result codes mixed up with commands responses; - Suppressed 100ms guard time in ATCommandsInterface; - Fixed race condition in ATCommandsInterface
Who changed what in which revision?
User | Revision | Line number | New contents of line |
---|---|---|---|
donatien | 22:06fb2a93a1f6 | 1 | /* VodafoneUSBModem.cpp */ |
donatien | 22:06fb2a93a1f6 | 2 | /* Copyright (C) 2012 mbed.org, MIT License |
donatien | 22:06fb2a93a1f6 | 3 | * |
donatien | 22:06fb2a93a1f6 | 4 | * Permission is hereby granted, free of charge, to any person obtaining a copy of this software |
donatien | 22:06fb2a93a1f6 | 5 | * and associated documentation files (the "Software"), to deal in the Software without restriction, |
donatien | 22:06fb2a93a1f6 | 6 | * including without limitation the rights to use, copy, modify, merge, publish, distribute, |
donatien | 22:06fb2a93a1f6 | 7 | * sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is |
donatien | 22:06fb2a93a1f6 | 8 | * furnished to do so, subject to the following conditions: |
donatien | 22:06fb2a93a1f6 | 9 | * |
donatien | 22:06fb2a93a1f6 | 10 | * The above copyright notice and this permission notice shall be included in all copies or |
donatien | 22:06fb2a93a1f6 | 11 | * substantial portions of the Software. |
donatien | 22:06fb2a93a1f6 | 12 | * |
donatien | 22:06fb2a93a1f6 | 13 | * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING |
donatien | 22:06fb2a93a1f6 | 14 | * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND |
donatien | 22:06fb2a93a1f6 | 15 | * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, |
donatien | 22:06fb2a93a1f6 | 16 | * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, |
donatien | 22:06fb2a93a1f6 | 17 | * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. |
donatien | 22:06fb2a93a1f6 | 18 | */ |
donatien | 8:04b6a042595f | 19 | |
donatien | 37:c1fd83bd31b4 | 20 | #define __DEBUG__ 3 |
donatien | 8:04b6a042595f | 21 | #ifndef __MODULE__ |
donatien | 22:06fb2a93a1f6 | 22 | #define __MODULE__ "VodafoneUSBModem.cpp" |
donatien | 8:04b6a042595f | 23 | #endif |
donatien | 8:04b6a042595f | 24 | |
donatien | 8:04b6a042595f | 25 | #include "core/fwk.h" |
donatien | 8:04b6a042595f | 26 | |
donatien | 22:06fb2a93a1f6 | 27 | #include "VodafoneUSBModem.h" |
donatien | 8:04b6a042595f | 28 | |
ashleymills | 41:8bec5a8ea878 | 29 | VodafoneUSBModem::VodafoneUSBModem(PinName powerGatingPin /*= NC*/, bool powerGatingOnWhenPinHigh /* = true*/) : |
ashleymills | 41:8bec5a8ea878 | 30 | m_dongle(), // Construct WANDongle: USB interface with two serial channels to the modem (USBSerialStream objects) |
ashleymills | 41:8bec5a8ea878 | 31 | m_atStream(m_dongle.getSerial(1)), // AT commands are sent down one serial channel. |
ashleymills | 41:8bec5a8ea878 | 32 | m_pppStream(m_dongle.getSerial(0)), // PPP connections are managed via another serial channel. |
ashleymills | 41:8bec5a8ea878 | 33 | m_at(&m_atStream), // Construct ATCommandsInterface with the AT serial channel |
ashleymills | 41:8bec5a8ea878 | 34 | m_sms(&m_at), // Construct SMSInterface with the ATCommandsInterface |
ashleymills | 41:8bec5a8ea878 | 35 | m_ussd(&m_at), // Construct USSDInterface with the ATCommandsInterface |
ashleymills | 41:8bec5a8ea878 | 36 | m_linkMonitor(&m_at), // Construct LinkMonitor with the ATCommandsInterface |
ashleymills | 41:8bec5a8ea878 | 37 | m_ppp(&m_pppStream), // Construct PPPIPInterface with the PPP serial channel |
ashleymills | 41:8bec5a8ea878 | 38 | m_dongleConnected(false), // Dongle is initially not ready for anything |
ashleymills | 41:8bec5a8ea878 | 39 | m_ipInit(false), // PPIPInterface connection is initially down |
ashleymills | 41:8bec5a8ea878 | 40 | m_smsInit(false), // SMSInterface starts un-initialised |
ashleymills | 41:8bec5a8ea878 | 41 | m_ussdInit(false), // USSDInterface starts un-initialised |
ashleymills | 41:8bec5a8ea878 | 42 | m_linkMonitorInit(false), // LinkMonitor subsystem starts un-initialised |
ashleymills | 41:8bec5a8ea878 | 43 | m_atOpen(false), // ATCommandsInterface starts in a closed state |
ashleymills | 41:8bec5a8ea878 | 44 | m_powerGatingPin(powerGatingPin), // set power gating pin |
ashleymills | 41:8bec5a8ea878 | 45 | m_powerGatingOnWhenPinHigh(powerGatingOnWhenPinHigh) // set state semantics for power gating pin |
donatien | 8:04b6a042595f | 46 | { |
donatien | 26:d37501dc6c61 | 47 | if( m_powerGatingPin != NC ) |
donatien | 26:d37501dc6c61 | 48 | { |
donatien | 26:d37501dc6c61 | 49 | power(false); //Dongle will have to be powered on manually |
donatien | 26:d37501dc6c61 | 50 | } |
donatien | 8:04b6a042595f | 51 | } |
donatien | 8:04b6a042595f | 52 | |
donatien | 8:04b6a042595f | 53 | class CREGProcessor : public IATCommandsProcessor |
donatien | 8:04b6a042595f | 54 | { |
donatien | 8:04b6a042595f | 55 | public: |
donatien | 8:04b6a042595f | 56 | CREGProcessor() : status(STATUS_REGISTERING) |
donatien | 8:04b6a042595f | 57 | { |
donatien | 8:04b6a042595f | 58 | |
donatien | 8:04b6a042595f | 59 | } |
donatien | 8:04b6a042595f | 60 | enum REGISTERING_STATUS { STATUS_REGISTERING, STATUS_OK, STATUS_FAILED }; |
donatien | 8:04b6a042595f | 61 | REGISTERING_STATUS getStatus() |
donatien | 8:04b6a042595f | 62 | { |
donatien | 8:04b6a042595f | 63 | return status; |
donatien | 8:04b6a042595f | 64 | } |
donatien | 8:04b6a042595f | 65 | private: |
donatien | 8:04b6a042595f | 66 | virtual int onNewATResponseLine(ATCommandsInterface* pInst, const char* line) |
donatien | 8:04b6a042595f | 67 | { |
donatien | 8:04b6a042595f | 68 | int r; |
donatien | 8:04b6a042595f | 69 | if( sscanf(line, "+CREG: %*d,%d", &r) == 1 ) |
donatien | 8:04b6a042595f | 70 | { |
donatien | 8:04b6a042595f | 71 | switch(r) |
donatien | 8:04b6a042595f | 72 | { |
donatien | 8:04b6a042595f | 73 | case 1: |
donatien | 8:04b6a042595f | 74 | case 5: |
donatien | 8:04b6a042595f | 75 | status = STATUS_OK; |
donatien | 8:04b6a042595f | 76 | break; |
donatien | 8:04b6a042595f | 77 | case 0: |
donatien | 8:04b6a042595f | 78 | case 2: |
donatien | 8:04b6a042595f | 79 | status = STATUS_REGISTERING; |
donatien | 8:04b6a042595f | 80 | break; |
donatien | 8:04b6a042595f | 81 | case 3: |
donatien | 8:04b6a042595f | 82 | default: |
donatien | 8:04b6a042595f | 83 | status = STATUS_FAILED; |
donatien | 8:04b6a042595f | 84 | break; |
donatien | 8:04b6a042595f | 85 | } |
donatien | 8:04b6a042595f | 86 | } |
donatien | 8:04b6a042595f | 87 | return OK; |
donatien | 8:04b6a042595f | 88 | } |
donatien | 8:04b6a042595f | 89 | virtual int onNewEntryPrompt(ATCommandsInterface* pInst) |
donatien | 8:04b6a042595f | 90 | { |
donatien | 8:04b6a042595f | 91 | return OK; |
donatien | 8:04b6a042595f | 92 | } |
donatien | 8:04b6a042595f | 93 | volatile REGISTERING_STATUS status; |
donatien | 8:04b6a042595f | 94 | }; |
donatien | 8:04b6a042595f | 95 | |
donatien | 12:66dc2c8eba2d | 96 | #if 0 |
donatien | 8:04b6a042595f | 97 | class COPSProcessor : public IATCommandsProcessor |
donatien | 8:04b6a042595f | 98 | { |
donatien | 8:04b6a042595f | 99 | public: |
donatien | 8:04b6a042595f | 100 | COPSProcessor() : valid(false) |
donatien | 8:04b6a042595f | 101 | { |
donatien | 8:04b6a042595f | 102 | network[0] = '\0'; |
donatien | 8:04b6a042595f | 103 | apn[0] = '\0'; |
donatien | 8:04b6a042595f | 104 | bearer[0] = '\0'; |
donatien | 8:04b6a042595f | 105 | } |
donatien | 8:04b6a042595f | 106 | char* getNetwork() |
donatien | 8:04b6a042595f | 107 | { |
donatien | 8:04b6a042595f | 108 | return network; |
donatien | 8:04b6a042595f | 109 | } |
donatien | 8:04b6a042595f | 110 | char* getAPN() |
donatien | 8:04b6a042595f | 111 | { |
donatien | 8:04b6a042595f | 112 | return apn; |
donatien | 8:04b6a042595f | 113 | } |
donatien | 8:04b6a042595f | 114 | char* getBearer() |
donatien | 8:04b6a042595f | 115 | { |
donatien | 8:04b6a042595f | 116 | return bearer; |
donatien | 8:04b6a042595f | 117 | } |
donatien | 8:04b6a042595f | 118 | bool isValid() |
donatien | 8:04b6a042595f | 119 | { |
donatien | 8:04b6a042595f | 120 | return valid; |
donatien | 8:04b6a042595f | 121 | } |
donatien | 8:04b6a042595f | 122 | private: |
donatien | 8:04b6a042595f | 123 | virtual int onNewATResponseLine(ATCommandsInterface* pInst, const char* line) |
donatien | 8:04b6a042595f | 124 | { |
donatien | 8:04b6a042595f | 125 | int networkId; |
donatien | 8:04b6a042595f | 126 | int bearerId; |
donatien | 8:04b6a042595f | 127 | int s = sscanf(line, "+COPS: %*d,%*d,\"%d\",%d", &networkId, &bearerId); |
donatien | 8:04b6a042595f | 128 | if( s == 2 ) |
donatien | 8:04b6a042595f | 129 | { |
donatien | 8:04b6a042595f | 130 | switch(networkId) |
donatien | 8:04b6a042595f | 131 | { |
donatien | 8:04b6a042595f | 132 | case 23415: |
donatien | 8:04b6a042595f | 133 | strcpy(network, "Vodafone UK"); |
donatien | 8:04b6a042595f | 134 | strcpy(apn, "pp.vodafone.co.uk"); |
donatien | 8:04b6a042595f | 135 | valid = true; |
donatien | 8:04b6a042595f | 136 | break; |
donatien | 8:04b6a042595f | 137 | case 20810: |
donatien | 8:04b6a042595f | 138 | strcpy(network, "SFR FR"); |
donatien | 8:04b6a042595f | 139 | strcpy(apn, "websfr"); |
donatien | 8:04b6a042595f | 140 | valid = true; |
donatien | 8:04b6a042595f | 141 | break; |
donatien | 8:04b6a042595f | 142 | default: |
donatien | 8:04b6a042595f | 143 | break; |
donatien | 8:04b6a042595f | 144 | } |
donatien | 8:04b6a042595f | 145 | } |
donatien | 8:04b6a042595f | 146 | else |
donatien | 8:04b6a042595f | 147 | { |
donatien | 8:04b6a042595f | 148 | return OK; |
donatien | 8:04b6a042595f | 149 | } |
donatien | 8:04b6a042595f | 150 | switch(bearerId) |
donatien | 8:04b6a042595f | 151 | { |
donatien | 8:04b6a042595f | 152 | case 0: strcpy(bearer, "GSM"); break; |
donatien | 8:04b6a042595f | 153 | case 1: strcpy(bearer, "GSM Compact"); break; |
donatien | 8:04b6a042595f | 154 | case 2: strcpy(bearer, "UTRAN"); break; |
donatien | 8:04b6a042595f | 155 | case 3: strcpy(bearer, "GSM w/EGPRS"); break; |
donatien | 8:04b6a042595f | 156 | case 4: strcpy(bearer, "UTRAN w/HSDPA"); break; |
donatien | 8:04b6a042595f | 157 | case 5: strcpy(bearer, "UTRAN w/HSUPA"); break; |
donatien | 8:04b6a042595f | 158 | case 6: strcpy(bearer, "UTRAN w/HSDPA and HSUPA"); break; |
donatien | 8:04b6a042595f | 159 | case 7: strcpy(bearer, "E-UTRAN"); break; |
donatien | 8:04b6a042595f | 160 | |
donatien | 8:04b6a042595f | 161 | default: |
donatien | 8:04b6a042595f | 162 | break; |
donatien | 8:04b6a042595f | 163 | } |
donatien | 8:04b6a042595f | 164 | return OK; |
donatien | 8:04b6a042595f | 165 | } |
donatien | 8:04b6a042595f | 166 | virtual int onNewEntryPrompt(ATCommandsInterface* pInst) |
donatien | 8:04b6a042595f | 167 | { |
donatien | 8:04b6a042595f | 168 | return OK; |
donatien | 8:04b6a042595f | 169 | } |
donatien | 8:04b6a042595f | 170 | char network[24]; |
donatien | 8:04b6a042595f | 171 | char bearer[24]; |
donatien | 8:04b6a042595f | 172 | char apn[24]; |
donatien | 8:04b6a042595f | 173 | volatile bool valid; |
donatien | 8:04b6a042595f | 174 | }; |
donatien | 12:66dc2c8eba2d | 175 | #endif |
donatien | 8:04b6a042595f | 176 | |
donatien | 22:06fb2a93a1f6 | 177 | int VodafoneUSBModem::connect(const char* apn, const char* user, const char* password) |
donatien | 8:04b6a042595f | 178 | { |
donatien | 8:04b6a042595f | 179 | if( !m_ipInit ) |
donatien | 8:04b6a042595f | 180 | { |
donatien | 8:04b6a042595f | 181 | m_ipInit = true; |
donatien | 8:04b6a042595f | 182 | m_ppp.init(); |
donatien | 8:04b6a042595f | 183 | } |
donatien | 8:04b6a042595f | 184 | m_ppp.setup(user, password); |
donatien | 8:04b6a042595f | 185 | |
donatien | 8:04b6a042595f | 186 | int ret = init(); |
donatien | 8:04b6a042595f | 187 | if(ret) |
donatien | 8:04b6a042595f | 188 | { |
donatien | 8:04b6a042595f | 189 | return ret; |
donatien | 8:04b6a042595f | 190 | } |
donatien | 8:04b6a042595f | 191 | |
donatien | 9:3f077dde13c9 | 192 | #if USE_ONE_PORT |
donatien | 8:04b6a042595f | 193 | m_smsInit = false; //SMS status reset |
donatien | 8:04b6a042595f | 194 | m_ussdInit = false; //USSD status reset |
donatien | 12:66dc2c8eba2d | 195 | m_linkMonitorInit = false; //Link monitor status reset |
donatien | 9:3f077dde13c9 | 196 | #endif |
donatien | 8:04b6a042595f | 197 | |
donatien | 8:04b6a042595f | 198 | ATCommandsInterface::ATResult result; |
donatien | 8:04b6a042595f | 199 | |
donatien | 9:3f077dde13c9 | 200 | #if 0 |
donatien | 8:04b6a042595f | 201 | //Get network info & select corresponding APN |
donatien | 8:04b6a042595f | 202 | COPSProcessor copsProcessor; |
donatien | 8:04b6a042595f | 203 | DBG("Get network info & select APN from DB"); |
donatien | 8:04b6a042595f | 204 | ret = m_at.execute("AT+COPS=,2;+COPS?", &copsProcessor, &result); //Configure to get operator's info in numeric code & get operator's id |
donatien | 8:04b6a042595f | 205 | DBG("Result of command: Err code=%d", ret); |
donatien | 8:04b6a042595f | 206 | DBG("ATResult: AT return=%d (code %d)", result.result, result.code); |
donatien | 8:04b6a042595f | 207 | |
donatien | 8:04b6a042595f | 208 | if(!copsProcessor.isValid()) |
donatien | 8:04b6a042595f | 209 | { |
donatien | 8:04b6a042595f | 210 | WARN("Connected to an unknown network, try to connect with default parameters"); |
donatien | 8:04b6a042595f | 211 | DBG("Connected with %s", copsProcessor.getBearer()); |
donatien | 8:04b6a042595f | 212 | } |
donatien | 8:04b6a042595f | 213 | else |
donatien | 8:04b6a042595f | 214 | { |
donatien | 8:04b6a042595f | 215 | DBG("Connected to %s with %s", copsProcessor.getNetwork(), copsProcessor.getBearer()); |
donatien | 8:04b6a042595f | 216 | char cmd[48]; |
donatien | 8:04b6a042595f | 217 | sprintf(cmd, "AT+CGDCONT=1,\"IP\",\"%s\"", copsProcessor.getAPN()); |
donatien | 8:04b6a042595f | 218 | ret = m_at.executeSimple(cmd, &result); |
donatien | 8:04b6a042595f | 219 | DBG("Result of command: Err code=%d", ret); |
donatien | 8:04b6a042595f | 220 | DBG("ATResult: AT return=%d (code %d)", result.result, result.code); |
donatien | 8:04b6a042595f | 221 | DBG("APN set to %s", copsProcessor.getAPN()); |
donatien | 8:04b6a042595f | 222 | } |
donatien | 8:04b6a042595f | 223 | #else |
donatien | 8:04b6a042595f | 224 | if(apn != NULL) |
donatien | 8:04b6a042595f | 225 | { |
donatien | 8:04b6a042595f | 226 | char cmd[48]; |
donatien | 8:04b6a042595f | 227 | sprintf(cmd, "AT+CGDCONT=1,\"IP\",\"%s\"", apn); |
donatien | 8:04b6a042595f | 228 | ret = m_at.executeSimple(cmd, &result); |
donatien | 8:04b6a042595f | 229 | DBG("Result of command: Err code=%d", ret); |
donatien | 8:04b6a042595f | 230 | DBG("ATResult: AT return=%d (code %d)", result.result, result.code); |
donatien | 8:04b6a042595f | 231 | DBG("APN set to %s", apn); |
donatien | 8:04b6a042595f | 232 | } |
donatien | 8:04b6a042595f | 233 | #endif |
donatien | 8:04b6a042595f | 234 | |
donatien | 8:04b6a042595f | 235 | |
donatien | 8:04b6a042595f | 236 | //Connect |
donatien | 8:04b6a042595f | 237 | DBG("Connecting"); |
donatien | 9:3f077dde13c9 | 238 | #if 0 |
donatien | 8:04b6a042595f | 239 | ret = m_at.executeSimple("ATDT *99#", &result); |
donatien | 8:04b6a042595f | 240 | DBG("Result of command: Err code=%d", ret); |
donatien | 8:04b6a042595f | 241 | DBG("ATResult: AT return=%d (code %d)", result.result, result.code); |
donatien | 9:3f077dde13c9 | 242 | #endif |
donatien | 9:3f077dde13c9 | 243 | #if USE_ONE_PORT |
donatien | 8:04b6a042595f | 244 | m_at.close(); // Closing AT parser |
donatien | 8:04b6a042595f | 245 | m_atOpen = false; //Will need to be reinitialized afterwards |
donatien | 9:3f077dde13c9 | 246 | #endif |
donatien | 8:04b6a042595f | 247 | |
donatien | 9:3f077dde13c9 | 248 | #if 0 |
donatien | 8:04b6a042595f | 249 | DBG("AT Parser closed"); |
donatien | 8:04b6a042595f | 250 | if( (ret!=NET_MOREINFO) || (result.result != ATCommandsInterface::ATResult::AT_CONNECT)) |
donatien | 8:04b6a042595f | 251 | { |
donatien | 8:04b6a042595f | 252 | ERR("Could not connect"); |
donatien | 8:04b6a042595f | 253 | return ret; //Could not connect |
donatien | 8:04b6a042595f | 254 | } |
donatien | 9:3f077dde13c9 | 255 | #endif |
donatien | 8:04b6a042595f | 256 | DBG("Connecting PPP"); |
donatien | 8:04b6a042595f | 257 | |
donatien | 12:66dc2c8eba2d | 258 | ret = m_ppp.connect(); |
donatien | 8:04b6a042595f | 259 | DBG("Result of connect: Err code=%d", ret); |
donatien | 8:04b6a042595f | 260 | return ret; |
donatien | 8:04b6a042595f | 261 | } |
donatien | 8:04b6a042595f | 262 | |
donatien | 8:04b6a042595f | 263 | |
donatien | 22:06fb2a93a1f6 | 264 | int VodafoneUSBModem::disconnect() |
donatien | 8:04b6a042595f | 265 | { |
donatien | 8:04b6a042595f | 266 | DBG("Disconnecting from PPP"); |
donatien | 8:04b6a042595f | 267 | int ret = m_ppp.disconnect(); |
donatien | 8:04b6a042595f | 268 | if(ret) |
donatien | 8:04b6a042595f | 269 | { |
donatien | 8:04b6a042595f | 270 | ERR("Disconnect returned %d, still trying to disconnect", ret); |
donatien | 8:04b6a042595f | 271 | } |
donatien | 8:04b6a042595f | 272 | |
donatien | 8:04b6a042595f | 273 | //Ugly but leave dongle time to recover |
donatien | 8:04b6a042595f | 274 | Thread::wait(500); |
donatien | 8:04b6a042595f | 275 | |
donatien | 9:3f077dde13c9 | 276 | #if USE_ONE_PORT |
donatien | 8:04b6a042595f | 277 | ATCommandsInterface::ATResult result; |
donatien | 8:04b6a042595f | 278 | DBG("Starting AT thread"); |
donatien | 8:04b6a042595f | 279 | ret = m_at.open(); |
donatien | 8:04b6a042595f | 280 | if(ret) |
donatien | 8:04b6a042595f | 281 | { |
donatien | 8:04b6a042595f | 282 | return ret; |
donatien | 8:04b6a042595f | 283 | } |
donatien | 9:3f077dde13c9 | 284 | #endif |
donatien | 8:04b6a042595f | 285 | |
donatien | 8:04b6a042595f | 286 | DBG("Trying to hangup"); |
donatien | 8:04b6a042595f | 287 | |
donatien | 9:3f077dde13c9 | 288 | #if 0 //Does not appear to work |
donatien | 8:04b6a042595f | 289 | int tries = 10; |
donatien | 8:04b6a042595f | 290 | do |
donatien | 8:04b6a042595f | 291 | { |
donatien | 8:04b6a042595f | 292 | ret = m_at.executeSimple("+++", &result, 1000); |
donatien | 8:04b6a042595f | 293 | DBG("Result of command: Err code=%d\n", ret); |
donatien | 8:04b6a042595f | 294 | DBG("ATResult: AT return=%d (code %d)\n", result.result, result.code); |
donatien | 8:04b6a042595f | 295 | } while(tries-- && ret); |
donatien | 8:04b6a042595f | 296 | if(!ret) |
donatien | 8:04b6a042595f | 297 | { |
donatien | 8:04b6a042595f | 298 | ret = m_at.executeSimple("ATH", &result); |
donatien | 8:04b6a042595f | 299 | DBG("Result of command: Err code=%d\n", ret); |
donatien | 8:04b6a042595f | 300 | DBG("ATResult: AT return=%d (code %d)\n", result.result, result.code); |
donatien | 8:04b6a042595f | 301 | } |
donatien | 9:3f077dde13c9 | 302 | #endif |
donatien | 8:04b6a042595f | 303 | |
donatien | 9:3f077dde13c9 | 304 | #if USE_ONE_PORT |
donatien | 8:04b6a042595f | 305 | //Reinit AT parser |
donatien | 8:04b6a042595f | 306 | ret = m_at.init(); |
donatien | 8:04b6a042595f | 307 | DBG("Result of command: Err code=%d\n", ret); |
donatien | 8:04b6a042595f | 308 | if(ret) |
donatien | 8:04b6a042595f | 309 | { |
donatien | 8:04b6a042595f | 310 | m_at.close(); // Closing AT parser |
donatien | 8:04b6a042595f | 311 | DBG("AT Parser closed, could not complete disconnection"); |
donatien | 8:04b6a042595f | 312 | return NET_TIMEOUT; |
donatien | 8:04b6a042595f | 313 | } |
donatien | 8:04b6a042595f | 314 | |
donatien | 9:3f077dde13c9 | 315 | #if 0 |
donatien | 8:04b6a042595f | 316 | m_at.close(); // Closing AT parser |
donatien | 8:04b6a042595f | 317 | DBG("AT Parser closed"); |
donatien | 9:3f077dde13c9 | 318 | #endif |
donatien | 9:3f077dde13c9 | 319 | #endif |
donatien | 8:04b6a042595f | 320 | return OK; |
donatien | 8:04b6a042595f | 321 | } |
donatien | 8:04b6a042595f | 322 | |
donatien | 22:06fb2a93a1f6 | 323 | int VodafoneUSBModem::sendSM(const char* number, const char* message) |
donatien | 8:04b6a042595f | 324 | { |
donatien | 8:04b6a042595f | 325 | int ret = init(); |
donatien | 8:04b6a042595f | 326 | if(ret) |
donatien | 8:04b6a042595f | 327 | { |
donatien | 8:04b6a042595f | 328 | return ret; |
donatien | 8:04b6a042595f | 329 | } |
donatien | 8:04b6a042595f | 330 | |
donatien | 8:04b6a042595f | 331 | if(!m_smsInit) |
donatien | 8:04b6a042595f | 332 | { |
donatien | 8:04b6a042595f | 333 | ret = m_sms.init(); |
donatien | 8:04b6a042595f | 334 | if(ret) |
donatien | 8:04b6a042595f | 335 | { |
donatien | 8:04b6a042595f | 336 | return ret; |
donatien | 8:04b6a042595f | 337 | } |
donatien | 8:04b6a042595f | 338 | m_smsInit = true; |
donatien | 8:04b6a042595f | 339 | } |
donatien | 8:04b6a042595f | 340 | |
donatien | 8:04b6a042595f | 341 | ret = m_sms.send(number, message); |
donatien | 8:04b6a042595f | 342 | if(ret) |
donatien | 8:04b6a042595f | 343 | { |
donatien | 8:04b6a042595f | 344 | return ret; |
donatien | 8:04b6a042595f | 345 | } |
donatien | 8:04b6a042595f | 346 | |
donatien | 8:04b6a042595f | 347 | return OK; |
donatien | 8:04b6a042595f | 348 | } |
donatien | 8:04b6a042595f | 349 | |
donatien | 22:06fb2a93a1f6 | 350 | int VodafoneUSBModem::getSM(char* number, char* message, size_t maxLength) |
donatien | 8:04b6a042595f | 351 | { |
donatien | 8:04b6a042595f | 352 | int ret = init(); |
donatien | 8:04b6a042595f | 353 | if(ret) |
donatien | 8:04b6a042595f | 354 | { |
donatien | 8:04b6a042595f | 355 | return ret; |
donatien | 8:04b6a042595f | 356 | } |
donatien | 8:04b6a042595f | 357 | |
donatien | 8:04b6a042595f | 358 | if(!m_smsInit) |
donatien | 8:04b6a042595f | 359 | { |
donatien | 8:04b6a042595f | 360 | ret = m_sms.init(); |
donatien | 8:04b6a042595f | 361 | if(ret) |
donatien | 8:04b6a042595f | 362 | { |
donatien | 8:04b6a042595f | 363 | return ret; |
donatien | 8:04b6a042595f | 364 | } |
donatien | 8:04b6a042595f | 365 | m_smsInit = true; |
donatien | 8:04b6a042595f | 366 | } |
donatien | 8:04b6a042595f | 367 | |
donatien | 8:04b6a042595f | 368 | ret = m_sms.get(number, message, maxLength); |
donatien | 8:04b6a042595f | 369 | if(ret) |
donatien | 8:04b6a042595f | 370 | { |
donatien | 8:04b6a042595f | 371 | return ret; |
donatien | 8:04b6a042595f | 372 | } |
donatien | 8:04b6a042595f | 373 | |
donatien | 8:04b6a042595f | 374 | return OK; |
donatien | 8:04b6a042595f | 375 | } |
donatien | 8:04b6a042595f | 376 | |
donatien | 22:06fb2a93a1f6 | 377 | int VodafoneUSBModem::getSMCount(size_t* pCount) |
donatien | 8:04b6a042595f | 378 | { |
donatien | 8:04b6a042595f | 379 | int ret = init(); |
donatien | 8:04b6a042595f | 380 | if(ret) |
donatien | 8:04b6a042595f | 381 | { |
donatien | 8:04b6a042595f | 382 | return ret; |
donatien | 8:04b6a042595f | 383 | } |
donatien | 8:04b6a042595f | 384 | |
donatien | 8:04b6a042595f | 385 | if(!m_smsInit) |
donatien | 8:04b6a042595f | 386 | { |
donatien | 8:04b6a042595f | 387 | ret = m_sms.init(); |
donatien | 8:04b6a042595f | 388 | if(ret) |
donatien | 8:04b6a042595f | 389 | { |
donatien | 8:04b6a042595f | 390 | return ret; |
donatien | 8:04b6a042595f | 391 | } |
donatien | 8:04b6a042595f | 392 | m_smsInit = true; |
donatien | 8:04b6a042595f | 393 | } |
donatien | 8:04b6a042595f | 394 | |
donatien | 8:04b6a042595f | 395 | ret = m_sms.getCount(pCount); |
donatien | 8:04b6a042595f | 396 | if(ret) |
donatien | 8:04b6a042595f | 397 | { |
donatien | 8:04b6a042595f | 398 | return ret; |
donatien | 8:04b6a042595f | 399 | } |
donatien | 8:04b6a042595f | 400 | |
donatien | 8:04b6a042595f | 401 | return OK; |
donatien | 8:04b6a042595f | 402 | } |
donatien | 8:04b6a042595f | 403 | |
donatien | 22:06fb2a93a1f6 | 404 | int VodafoneUSBModem::sendUSSD(const char* command, char* result, size_t maxLength) |
donatien | 8:04b6a042595f | 405 | { |
donatien | 8:04b6a042595f | 406 | int ret = init(); |
donatien | 8:04b6a042595f | 407 | if(ret) |
donatien | 8:04b6a042595f | 408 | { |
donatien | 8:04b6a042595f | 409 | return ret; |
donatien | 8:04b6a042595f | 410 | } |
donatien | 8:04b6a042595f | 411 | |
donatien | 8:04b6a042595f | 412 | if(!m_ussdInit) |
donatien | 8:04b6a042595f | 413 | { |
donatien | 8:04b6a042595f | 414 | ret = m_ussd.init(); |
donatien | 8:04b6a042595f | 415 | if(ret) |
donatien | 8:04b6a042595f | 416 | { |
donatien | 8:04b6a042595f | 417 | return ret; |
donatien | 8:04b6a042595f | 418 | } |
donatien | 8:04b6a042595f | 419 | m_ussdInit = true; |
donatien | 8:04b6a042595f | 420 | } |
donatien | 8:04b6a042595f | 421 | |
donatien | 8:04b6a042595f | 422 | ret = m_ussd.send(command, result, maxLength); |
donatien | 8:04b6a042595f | 423 | if(ret) |
donatien | 8:04b6a042595f | 424 | { |
donatien | 8:04b6a042595f | 425 | return ret; |
donatien | 8:04b6a042595f | 426 | } |
donatien | 8:04b6a042595f | 427 | |
donatien | 8:04b6a042595f | 428 | return OK; |
donatien | 8:04b6a042595f | 429 | } |
donatien | 8:04b6a042595f | 430 | |
donatien | 22:06fb2a93a1f6 | 431 | int VodafoneUSBModem::getLinkState(int* pRssi, LinkMonitor::REGISTRATION_STATE* pRegistrationState, LinkMonitor::BEARER* pBearer) |
donatien | 12:66dc2c8eba2d | 432 | { |
donatien | 12:66dc2c8eba2d | 433 | int ret = init(); |
donatien | 12:66dc2c8eba2d | 434 | if(ret) |
donatien | 12:66dc2c8eba2d | 435 | { |
donatien | 12:66dc2c8eba2d | 436 | return ret; |
donatien | 12:66dc2c8eba2d | 437 | } |
donatien | 12:66dc2c8eba2d | 438 | |
donatien | 12:66dc2c8eba2d | 439 | if(!m_linkMonitorInit) |
donatien | 12:66dc2c8eba2d | 440 | { |
donatien | 12:66dc2c8eba2d | 441 | ret = m_linkMonitor.init(); |
donatien | 12:66dc2c8eba2d | 442 | if(ret) |
donatien | 12:66dc2c8eba2d | 443 | { |
donatien | 12:66dc2c8eba2d | 444 | return ret; |
donatien | 12:66dc2c8eba2d | 445 | } |
donatien | 12:66dc2c8eba2d | 446 | m_linkMonitorInit = true; |
donatien | 12:66dc2c8eba2d | 447 | } |
donatien | 12:66dc2c8eba2d | 448 | |
donatien | 12:66dc2c8eba2d | 449 | ret = m_linkMonitor.getState(pRssi, pRegistrationState, pBearer); |
donatien | 12:66dc2c8eba2d | 450 | if(ret) |
donatien | 12:66dc2c8eba2d | 451 | { |
donatien | 12:66dc2c8eba2d | 452 | return ret; |
donatien | 12:66dc2c8eba2d | 453 | } |
donatien | 12:66dc2c8eba2d | 454 | |
donatien | 12:66dc2c8eba2d | 455 | return OK; |
donatien | 12:66dc2c8eba2d | 456 | } |
donatien | 12:66dc2c8eba2d | 457 | |
donatien | 12:66dc2c8eba2d | 458 | |
donatien | 22:06fb2a93a1f6 | 459 | ATCommandsInterface* VodafoneUSBModem::getATCommandsInterface() |
donatien | 8:04b6a042595f | 460 | { |
donatien | 8:04b6a042595f | 461 | return &m_at; |
donatien | 8:04b6a042595f | 462 | } |
donatien | 8:04b6a042595f | 463 | |
donatien | 26:d37501dc6c61 | 464 | int VodafoneUSBModem::power(bool enable) |
donatien | 26:d37501dc6c61 | 465 | { |
donatien | 26:d37501dc6c61 | 466 | if( m_powerGatingPin == NC ) |
donatien | 26:d37501dc6c61 | 467 | { |
donatien | 26:d37501dc6c61 | 468 | return NET_INVALID; //A pin name has not been provided in the constructor |
donatien | 26:d37501dc6c61 | 469 | } |
donatien | 27:37d3ac289e86 | 470 | |
donatien | 27:37d3ac289e86 | 471 | if(!enable) //Will force components to re-init |
donatien | 26:d37501dc6c61 | 472 | { |
donatien | 27:37d3ac289e86 | 473 | cleanup(); |
donatien | 26:d37501dc6c61 | 474 | } |
donatien | 26:d37501dc6c61 | 475 | |
donatien | 26:d37501dc6c61 | 476 | DigitalOut powerGatingOut(m_powerGatingPin); |
donatien | 33:f505faeda8e7 | 477 | powerGatingOut = m_powerGatingOnWhenPinHigh?enable:!enable; |
donatien | 27:37d3ac289e86 | 478 | |
donatien | 26:d37501dc6c61 | 479 | return OK; |
donatien | 26:d37501dc6c61 | 480 | } |
donatien | 26:d37501dc6c61 | 481 | |
donatien | 26:d37501dc6c61 | 482 | bool VodafoneUSBModem::power() |
donatien | 26:d37501dc6c61 | 483 | { |
donatien | 26:d37501dc6c61 | 484 | if( m_powerGatingPin == NC ) |
donatien | 26:d37501dc6c61 | 485 | { |
donatien | 26:d37501dc6c61 | 486 | return true; //Assume power is always on |
donatien | 26:d37501dc6c61 | 487 | } |
donatien | 26:d37501dc6c61 | 488 | |
donatien | 26:d37501dc6c61 | 489 | DigitalOut powerGatingOut(m_powerGatingPin); |
donatien | 33:f505faeda8e7 | 490 | return m_powerGatingOnWhenPinHigh?powerGatingOut:!powerGatingOut; |
donatien | 26:d37501dc6c61 | 491 | } |
donatien | 26:d37501dc6c61 | 492 | |
donatien | 22:06fb2a93a1f6 | 493 | int VodafoneUSBModem::init() |
donatien | 8:04b6a042595f | 494 | { |
donatien | 8:04b6a042595f | 495 | if( !m_dongleConnected ) |
donatien | 8:04b6a042595f | 496 | { |
donatien | 26:d37501dc6c61 | 497 | if(!power()) |
donatien | 26:d37501dc6c61 | 498 | { |
donatien | 26:d37501dc6c61 | 499 | //Obviously cannot initialize the dongle if it is disconnected... |
donatien | 26:d37501dc6c61 | 500 | ERR("Power is off"); |
donatien | 26:d37501dc6c61 | 501 | return NET_INVALID; |
donatien | 26:d37501dc6c61 | 502 | } |
donatien | 8:04b6a042595f | 503 | m_dongleConnected = true; |
donatien | 8:04b6a042595f | 504 | while( !m_dongle.connected() ) |
donatien | 8:04b6a042595f | 505 | { |
donatien | 8:04b6a042595f | 506 | m_dongle.tryConnect(); |
donatien | 8:04b6a042595f | 507 | Thread::wait(10); |
donatien | 8:04b6a042595f | 508 | } |
donatien | 8:04b6a042595f | 509 | } |
donatien | 8:04b6a042595f | 510 | |
donatien | 8:04b6a042595f | 511 | if(m_atOpen) |
donatien | 8:04b6a042595f | 512 | { |
donatien | 8:04b6a042595f | 513 | return OK; |
donatien | 8:04b6a042595f | 514 | } |
donatien | 59:593fb493172f | 515 | |
donatien | 8:04b6a042595f | 516 | DBG("Starting AT thread if needed"); |
donatien | 8:04b6a042595f | 517 | int ret = m_at.open(); |
donatien | 8:04b6a042595f | 518 | if(ret) |
donatien | 8:04b6a042595f | 519 | { |
donatien | 8:04b6a042595f | 520 | return ret; |
donatien | 8:04b6a042595f | 521 | } |
donatien | 59:593fb493172f | 522 | |
donatien | 8:04b6a042595f | 523 | DBG("Sending initialisation commands"); |
donatien | 8:04b6a042595f | 524 | ret = m_at.init(); |
donatien | 8:04b6a042595f | 525 | if(ret) |
donatien | 8:04b6a042595f | 526 | { |
donatien | 8:04b6a042595f | 527 | return ret; |
donatien | 8:04b6a042595f | 528 | } |
donatien | 8:04b6a042595f | 529 | |
donatien | 23:21046ba01b7b | 530 | if(m_dongle.getDongleType() == WAN_DONGLE_TYPE_VODAFONEK3770) |
donatien | 8:04b6a042595f | 531 | { |
donatien | 18:1789a11d1892 | 532 | INFO("Using a Vodafone K3770 Dongle"); |
donatien | 18:1789a11d1892 | 533 | #if USE_ONE_PORT |
donatien | 18:1789a11d1892 | 534 | DBG("Configuring unsolicited result codes support properly"); |
donatien | 18:1789a11d1892 | 535 | //Configuring port to enable 3GPP-compliant unsollicited response codes but disable Huawei-specific unsollicited response codes |
donatien | 18:1789a11d1892 | 536 | ret = m_at.executeSimple("AT^CURC=0;^PORTSEL=1", NULL); //Huawei-specific, not 3GPP-compliant |
donatien | 18:1789a11d1892 | 537 | if(ret != OK) |
donatien | 18:1789a11d1892 | 538 | { |
donatien | 18:1789a11d1892 | 539 | return NET_PROTOCOL; |
donatien | 18:1789a11d1892 | 540 | } |
donatien | 18:1789a11d1892 | 541 | #else |
donatien | 18:1789a11d1892 | 542 | //Configuring port to disable Huawei-specific unsollicited response codes |
donatien | 18:1789a11d1892 | 543 | ret = m_at.executeSimple("AT^CURC=0", NULL); //Huawei-specific, not 3GPP-compliant |
donatien | 18:1789a11d1892 | 544 | if(ret != OK) |
donatien | 18:1789a11d1892 | 545 | { |
donatien | 18:1789a11d1892 | 546 | return NET_PROTOCOL; |
donatien | 18:1789a11d1892 | 547 | } |
donatien | 18:1789a11d1892 | 548 | #endif |
donatien | 8:04b6a042595f | 549 | } |
donatien | 18:1789a11d1892 | 550 | else if(m_dongle.getDongleType() == WAN_DONGLE_TYPE_VODAFONEK3772Z) |
donatien | 12:66dc2c8eba2d | 551 | { |
donatien | 18:1789a11d1892 | 552 | INFO("Using a Vodafone K3772-Z Dongle"); |
donatien | 18:1789a11d1892 | 553 | //FIXME this returns %USBMODEM: [0] MODEM DRIVER<CR><LF><CR><LF><CR><LF>OK<CR><LF> which is not a compliant response |
donatien | 18:1789a11d1892 | 554 | /* |
donatien | 18:1789a11d1892 | 555 | //Configuring modem to directly boot into modem mode |
donatien | 18:1789a11d1892 | 556 | ret = m_at.executeSimple("AT%USBMODEM=0", NULL); //Icera-specific, not 3GPP-compliant |
donatien | 18:1789a11d1892 | 557 | if(ret != OK) |
donatien | 18:1789a11d1892 | 558 | { |
donatien | 18:1789a11d1892 | 559 | return NET_PROTOCOL; |
donatien | 18:1789a11d1892 | 560 | } |
donatien | 18:1789a11d1892 | 561 | */ |
donatien | 18:1789a11d1892 | 562 | } |
donatien | 18:1789a11d1892 | 563 | else |
donatien | 18:1789a11d1892 | 564 | { |
donatien | 18:1789a11d1892 | 565 | WARN("Using an Unknown Dongle"); |
donatien | 18:1789a11d1892 | 566 | } |
donatien | 8:04b6a042595f | 567 | |
donatien | 8:04b6a042595f | 568 | ATCommandsInterface::ATResult result; |
donatien | 8:04b6a042595f | 569 | |
donatien | 8:04b6a042595f | 570 | //Wait for network registration |
donatien | 8:04b6a042595f | 571 | CREGProcessor cregProcessor; |
donatien | 8:04b6a042595f | 572 | do |
donatien | 8:04b6a042595f | 573 | { |
donatien | 8:04b6a042595f | 574 | DBG("Waiting for network registration"); |
donatien | 8:04b6a042595f | 575 | ret = m_at.execute("AT+CREG?", &cregProcessor, &result); |
donatien | 8:04b6a042595f | 576 | DBG("Result of command: Err code=%d\n", ret); |
donatien | 8:04b6a042595f | 577 | DBG("ATResult: AT return=%d (code %d)\n", result.result, result.code); |
donatien | 8:04b6a042595f | 578 | if(cregProcessor.getStatus() == CREGProcessor::STATUS_REGISTERING) |
donatien | 8:04b6a042595f | 579 | { |
donatien | 8:04b6a042595f | 580 | Thread::wait(3000); |
donatien | 8:04b6a042595f | 581 | } |
donatien | 8:04b6a042595f | 582 | } while(cregProcessor.getStatus() == CREGProcessor::STATUS_REGISTERING); |
donatien | 8:04b6a042595f | 583 | if(cregProcessor.getStatus() == CREGProcessor::STATUS_FAILED) |
donatien | 8:04b6a042595f | 584 | { |
donatien | 8:04b6a042595f | 585 | ERR("Registration denied"); |
donatien | 8:04b6a042595f | 586 | return NET_AUTH; |
donatien | 8:04b6a042595f | 587 | } |
donatien | 8:04b6a042595f | 588 | |
donatien | 8:04b6a042595f | 589 | m_atOpen = true; |
donatien | 8:04b6a042595f | 590 | |
donatien | 8:04b6a042595f | 591 | return OK; |
donatien | 8:04b6a042595f | 592 | } |
donatien | 8:04b6a042595f | 593 | |
donatien | 27:37d3ac289e86 | 594 | int VodafoneUSBModem::cleanup() |
donatien | 27:37d3ac289e86 | 595 | { |
donatien | 27:37d3ac289e86 | 596 | if(m_ppp.isConnected()) |
donatien | 27:37d3ac289e86 | 597 | { |
donatien | 27:37d3ac289e86 | 598 | WARN("Data connection is still open"); //Try to encourage good behaviour from the user |
donatien | 27:37d3ac289e86 | 599 | m_ppp.disconnect(); |
donatien | 27:37d3ac289e86 | 600 | } |
donatien | 27:37d3ac289e86 | 601 | |
donatien | 27:37d3ac289e86 | 602 | m_smsInit = false; |
donatien | 27:37d3ac289e86 | 603 | m_ussdInit = false; |
donatien | 27:37d3ac289e86 | 604 | m_linkMonitorInit = false; |
donatien | 27:37d3ac289e86 | 605 | //We don't reset m_ipInit as PPPIPInterface::init() only needs to be called once |
donatien | 27:37d3ac289e86 | 606 | |
donatien | 27:37d3ac289e86 | 607 | if(m_atOpen) |
donatien | 27:37d3ac289e86 | 608 | { |
donatien | 27:37d3ac289e86 | 609 | m_at.close(); |
donatien | 27:37d3ac289e86 | 610 | m_atOpen = false; |
donatien | 27:37d3ac289e86 | 611 | } |
donatien | 27:37d3ac289e86 | 612 | |
donatien | 27:37d3ac289e86 | 613 | m_dongle.disconnect(); |
donatien | 27:37d3ac289e86 | 614 | m_dongleConnected = false; |
donatien | 27:37d3ac289e86 | 615 | |
donatien | 27:37d3ac289e86 | 616 | return OK; |
donatien | 27:37d3ac289e86 | 617 | } |
donatien | 8:04b6a042595f | 618 |