Skip to content

Commit 9329430

Browse files
author
Ari Parkkila
committed
Cellular: Fix Quectel M26 drivers
1 parent 3bcf513 commit 9329430

File tree

4 files changed

+145
-56
lines changed

4 files changed

+145
-56
lines changed

‎features/cellular/framework/targets/QUECTEL/M26/QUECTEL_M26.cpp

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -81,17 +81,6 @@ AT_CellularContext *QUECTEL_M26::create_context_impl(ATHandler &at, const char *
8181
return new QUECTEL_M26_CellularContext(at, this, apn, cp_req, nonip_req);
8282
}
8383

84-
nsapi_error_t QUECTEL_M26::init()
85-
{
86-
_at->lock();
87-
_at->cmd_start("AT");
88-
_at->cmd_stop_read_resp();
89-
_at->cmd_start("AT+CMEE="); // verbose responses
90-
_at->write_int(1);
91-
_at->cmd_stop_read_resp();
92-
return _at->unlock_return_error();
93-
}
94-
9584
nsapi_error_t QUECTEL_M26::shutdown()
9685
{
9786
_at->lock();
@@ -102,3 +91,18 @@ nsapi_error_t QUECTEL_M26::shutdown()
10291

10392
return _at->unlock_return_error();;
10493
}
94+
95+
96+
#if MBED_CONF_QUECTEL_M26_PROVIDE_DEFAULT
97+
#include "UARTSerial.h"
98+
CellularDevice *CellularDevice::get_default_instance()
99+
{
100+
static UARTSerial serial(MBED_CONF_QUECTEL_M26_TX, MBED_CONF_QUECTEL_M26_RX, MBED_CONF_QUECTEL_M26_BAUDRATE);
101+
#if defined (MBED_CONF_QUECTEL_M26_RTS) && defined(MBED_CONF_QUECTEL_M26_CTS)
102+
tr_debug("QUECTEL_M26 flow control: RTS %d CTS %d", MBED_CONF_QUECTEL_M26_RTS, MBED_CONF_QUECTEL_M26_CTS);
103+
serial.set_flow_control(SerialBase::RTSCTS, MBED_CONF_QUECTEL_M26_RTS, MBED_CONF_QUECTEL_M26_CTS);
104+
#endif
105+
static QUECTEL_M26 device(&serial);
106+
return &device;
107+
}
108+
#endif

‎features/cellular/framework/targets/QUECTEL/M26/QUECTEL_M26.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ class QUECTEL_M26 : public AT_CellularDevice {
3838
protected: // AT_CellularDevice
3939
virtual nsapi_error_t get_sim_state(SimState &state);
4040
virtual AT_CellularContext *create_context_impl(ATHandler &at, const char *apn, bool cp_req = false, bool nonip_req = false);
41-
virtual nsapi_error_t init();
4241
virtual nsapi_error_t shutdown();
4342

4443
public: // NetworkInterface

‎features/cellular/framework/targets/QUECTEL/M26/QUECTEL_M26_CellularStack.cpp

Lines changed: 122 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,37 @@
1515
* limitations under the License.
1616
*/
1717

18+
#include "rtos/Kernel.h"
1819
#include "QUECTEL/M26/QUECTEL_M26_CellularStack.h"
1920
#include "CellularLog.h"
2021

22+
#define SOCKET_SEND_READY_TIMEOUT (30*1000)
23+
#define SOCKET_READ_TIMEOUT 1000
24+
2125
using namespace mbed;
2226

2327
QUECTEL_M26_CellularStack::QUECTEL_M26_CellularStack(ATHandler &atHandler, int cid, nsapi_ip_stack_t stack_type) : AT_CellularStack(atHandler, cid, stack_type)
2428
{
25-
_at.set_urc_handler("+QIRDI:", mbed::Callback<void()>(this, &QUECTEL_M26_CellularStack::urc_qiurc));
29+
_at.set_urc_handler("+QIRDI:", Callback<void()>(this, &QUECTEL_M26_CellularStack::urc_qiurc));
30+
31+
_at.set_urc_handler("0, CLOSED", Callback<void()>(this, &QUECTEL_M26_CellularStack::socket_closed_0));
32+
_at.set_urc_handler("1, CLOSED", Callback<void()>(this, &QUECTEL_M26_CellularStack::socket_closed_1));
33+
_at.set_urc_handler("2, CLOSED", Callback<void()>(this, &QUECTEL_M26_CellularStack::socket_closed_2));
34+
_at.set_urc_handler("3, CLOSED", Callback<void()>(this, &QUECTEL_M26_CellularStack::socket_closed_3));
35+
_at.set_urc_handler("4, CLOSED", Callback<void()>(this, &QUECTEL_M26_CellularStack::socket_closed_4));
36+
_at.set_urc_handler("5, CLOSED", Callback<void()>(this, &QUECTEL_M26_CellularStack::socket_closed_5));
2637
}
2738

2839
QUECTEL_M26_CellularStack::~QUECTEL_M26_CellularStack()
2940
{
41+
_at.set_urc_handler("5, CLOSED", NULL);
42+
_at.set_urc_handler("4, CLOSED", NULL);
43+
_at.set_urc_handler("3, CLOSED", NULL);
44+
_at.set_urc_handler("2, CLOSED", NULL);
45+
_at.set_urc_handler("1, CLOSED", NULL);
46+
_at.set_urc_handler("0, CLOSED", NULL);
47+
48+
_at.set_urc_handler("+QIRDI:", NULL);
3049
}
3150

3251
nsapi_error_t QUECTEL_M26_CellularStack::socket_listen(nsapi_socket_t handle, int backlog)
@@ -44,6 +63,45 @@ nsapi_error_t QUECTEL_M26_CellularStack::socket_bind(nsapi_socket_t handle, cons
4463
return NSAPI_ERROR_UNSUPPORTED;
4564
}
4665

66+
void QUECTEL_M26_CellularStack::socket_closed(int sock_id)
67+
{
68+
CellularSocket *sock = find_socket(sock_id);
69+
if (sock) {
70+
tr_info("Socket closed %d", sock_id);
71+
sock->closed = true;
72+
}
73+
}
74+
75+
void QUECTEL_M26_CellularStack::socket_closed_0()
76+
{
77+
socket_closed(0);
78+
}
79+
80+
void QUECTEL_M26_CellularStack::socket_closed_1()
81+
{
82+
socket_closed(1);
83+
}
84+
85+
void QUECTEL_M26_CellularStack::socket_closed_2()
86+
{
87+
socket_closed(2);
88+
}
89+
90+
void QUECTEL_M26_CellularStack::socket_closed_3()
91+
{
92+
socket_closed(3);
93+
}
94+
95+
void QUECTEL_M26_CellularStack::socket_closed_4()
96+
{
97+
socket_closed(4);
98+
}
99+
100+
void QUECTEL_M26_CellularStack::socket_closed_5()
101+
{
102+
socket_closed(5);
103+
}
104+
47105
void QUECTEL_M26_CellularStack::urc_qiurc()
48106
{
49107
int sock_id = 0;
@@ -348,7 +406,6 @@ nsapi_error_t QUECTEL_M26_CellularStack::create_socket_impl(CellularSocket *sock
348406
socket->created = ((ret_val == NSAPI_ERROR_OK) && (modem_connect_id == request_connect_id));
349407
return ret_val;
350408
} else {
351-
tr_warn("QUECTEL_M26_CellularStack:%s:%u: Do not support TCP Listner/UDP Service Mode [%d,%d]", __FUNCTION__, __LINE__, socket->created, ret_val);
352409
ret_val = NSAPI_ERROR_OK;
353410
}
354411

@@ -360,16 +417,16 @@ nsapi_error_t QUECTEL_M26_CellularStack::create_socket_impl(CellularSocket *sock
360417
nsapi_size_or_error_t QUECTEL_M26_CellularStack::socket_sendto_impl(CellularSocket *socket, const SocketAddress &address,
361418
const void *data, nsapi_size_t size)
362419
{
363-
int sent_len = (size > M26_SENT_BYTE_MAX) ? M26_SENT_BYTE_MAX : size;
420+
int sent_len = size;
421+
int sent_acked = 0;
364422
int sent_nacked = 0;
365423
int sent_len_before = 0;
366424
int sent_len_after = 0;
367-
int sent_acked;
368425
nsapi_error_t error;
369426

370427
tr_debug("QUECTEL_M26_CellularStack:%s:%u:[%d-%d]", __FUNCTION__, __LINE__, sent_len, size);
371428

372-
if (sent_len == 0) {
429+
if (sent_len == 0 || size > M26_SENT_BYTE_MAX) {
373430
tr_error("QUECTEL_M26_CellularStack:%s:%u:[NSAPI_ERROR_PARAMETER]", __FUNCTION__, __LINE__);
374431
return NSAPI_ERROR_PARAMETER;
375432
}
@@ -385,23 +442,28 @@ nsapi_size_or_error_t QUECTEL_M26_CellularStack::socket_sendto_impl(CellularSock
385442
}
386443

387444
if (socket->proto == NSAPI_TCP) {
388-
_at.cmd_start("AT+QISACK=");
389-
_at.write_int(socket->id);
390-
_at.cmd_stop();
391-
_at.resp_start("+QISACK:");
392-
sent_len_before = _at.read_int();
393-
sent_acked = _at.read_int();
394-
sent_nacked = _at.read_int();
395-
_at.resp_stop();
445+
bool ready_to_send = false;
446+
uint64_t start_time = rtos::Kernel::get_ms_count();
447+
while (!ready_to_send && start_time < rtos::Kernel::get_ms_count() + SOCKET_SEND_READY_TIMEOUT) {
448+
_at.cmd_start("AT+QISACK=");
449+
_at.write_int(socket->id);
450+
_at.cmd_stop();
451+
_at.resp_start("+QISACK:");
452+
sent_len_before = _at.read_int();
453+
sent_acked = _at.read_int();
454+
sent_nacked = _at.read_int();
455+
_at.resp_stop();
396456

397-
if (_at.get_last_error() != NSAPI_ERROR_OK) {
398-
tr_error("QUECTEL_M26_CellularStack:%s:%u:[NSAPI_ERROR_DEVICE_ERROR]", __FUNCTION__, __LINE__);
399-
return NSAPI_ERROR_DEVICE_ERROR;
400-
}
457+
if (_at.get_last_error() != NSAPI_ERROR_OK) {
458+
tr_error("QUECTEL_M26_CellularStack:%s:%u:[NSAPI_ERROR_DEVICE_ERROR]", __FUNCTION__, __LINE__);
459+
return NSAPI_ERROR_DEVICE_ERROR;
460+
}
401461

402-
if (sent_nacked != 0) {
403-
tr_debug("QUECTEL_M26_CellularStack:%s:%u:[NSAPI_ERROR_WOULD_BLOCK]", __FUNCTION__, __LINE__);
404-
return NSAPI_ERROR_WOULD_BLOCK;
462+
if (sent_nacked == 0) {
463+
ready_to_send = true;
464+
} else {
465+
tr_debug("QUECTEL_M26_CellularStack:%s:%u:[NSAPI_ERROR_WOULD_BLOCK]", __FUNCTION__, __LINE__);
466+
}
405467
}
406468
}
407469

@@ -455,35 +517,53 @@ nsapi_size_or_error_t QUECTEL_M26_CellularStack::socket_sendto_impl(CellularSock
455517
nsapi_size_or_error_t QUECTEL_M26_CellularStack::socket_recvfrom_impl(CellularSocket *socket, SocketAddress *address,
456518
void *buffer, nsapi_size_t size)
457519
{
458-
nsapi_size_or_error_t recv_len = (size > M26_RECV_BYTE_MAX) ? M26_RECV_BYTE_MAX : size;
459-
int recv_len_after = 0;
460520
int port;
461521
char type[8];
462522
char ip_address[NSAPI_IP_SIZE + 1];
463523

464524
tr_debug("QUECTEL_M26_CellularStack:%s:%u:[%d]", __FUNCTION__, __LINE__, size);
465-
_at.cmd_start("AT+QIRD=");
466-
_at.write_int(0); /* at+qifgcnt 0-1 */
467-
_at.write_int(1); /* 1-Client, 2-Server */
468-
_at.write_int(socket->id);
469-
_at.write_int(recv_len);
470-
_at.cmd_stop();
471525

472-
_at.resp_start("+QIRD:");
473-
if (_at.info_resp()) {
474-
_at.set_delimiter(':');
475-
_at.read_string(ip_address, sizeof(ip_address));
476-
_at.set_default_delimiter();
477-
port = _at.read_int();
478-
_at.read_string(type, sizeof(type));
479-
recv_len_after = _at.read_int();
480-
if (recv_len_after > 0) {
481-
_at.read_bytes((uint8_t *)buffer, recv_len_after);
526+
uint64_t start_time = rtos::Kernel::get_ms_count();
527+
nsapi_size_t len = 0;
528+
for (; len < size;) {
529+
int read_len = (size - len > M26_RECV_BYTE_MAX) ? M26_RECV_BYTE_MAX : size - len;
530+
_at.cmd_start("AT+QIRD=");
531+
_at.write_int(0); /* at+qifgcnt 0-1 */
532+
_at.write_int(1); /* 1-Client, 2-Server */
533+
_at.write_int(socket->id);
534+
_at.write_int(read_len);
535+
_at.cmd_stop();
536+
537+
nsapi_size_t recv_len = 0;
538+
_at.resp_start("+QIRD:");
539+
if (_at.info_resp()) {
540+
_at.set_delimiter(':');
541+
_at.read_string(ip_address, sizeof(ip_address));
542+
_at.set_default_delimiter();
543+
port = _at.read_int();
544+
_at.read_string(type, sizeof(type));
545+
recv_len = _at.read_int();
546+
_at.read_bytes((uint8_t *)buffer + len, recv_len);
547+
len += recv_len;
548+
}
549+
_at.resp_stop();
550+
551+
if (_at.get_last_error() != NSAPI_ERROR_OK) {
552+
tr_warn("QUECTEL_M26_CellularStack:%s:%u:[ERROR NSAPI_ERROR_OK]", __FUNCTION__, __LINE__);
553+
return NSAPI_ERROR_DEVICE_ERROR;
554+
}
555+
556+
if (rtos::Kernel::get_ms_count() > start_time + SOCKET_READ_TIMEOUT) {
557+
tr_warn("QUECTEL_M26_CellularStack:%s:%u:[ERROR NSAPI_ERROR_TIMEOUT]", __FUNCTION__, __LINE__);
558+
return NSAPI_ERROR_TIMEOUT;
559+
}
560+
561+
if (recv_len == 0 || recv_len < read_len) {
562+
break;
482563
}
483564
}
484-
_at.resp_stop();
485565

486-
if (!recv_len_after || (_at.get_last_error() != NSAPI_ERROR_OK)) {
566+
if (len == 0) {
487567
tr_debug("QUECTEL_M26_CellularStack:%s:%u:[ERROR NSAPI_ERROR_WOULD_BLOCK]", __FUNCTION__, __LINE__);
488568
return NSAPI_ERROR_WOULD_BLOCK;
489569
}
@@ -493,6 +573,6 @@ nsapi_size_or_error_t QUECTEL_M26_CellularStack::socket_recvfrom_impl(CellularSo
493573
address->set_port(port);
494574
}
495575

496-
tr_debug("QUECTEL_M26_CellularStack:%s:%u:[%d]", __FUNCTION__, __LINE__, recv_len_after);
497-
return recv_len_after;
576+
tr_debug("QUECTEL_M26_CellularStack:%s:%u:[%d]", __FUNCTION__, __LINE__, len);
577+
return len;
498578
}

‎features/cellular/framework/targets/QUECTEL/M26/QUECTEL_M26_CellularStack.h

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ namespace mbed {
2525
#define M26_SOCKET_MAX 6
2626
#define M26_CREATE_SOCKET_TIMEOUT 75000 //75 seconds
2727
#define M26_SENT_BYTE_MAX 1460
28-
#define M26_RECV_BYTE_MAX 1000
28+
#define M26_RECV_BYTE_MAX 1024
2929

3030
class QUECTEL_M26_CellularStack : public AT_CellularStack {
3131
public:
@@ -62,9 +62,15 @@ class QUECTEL_M26_CellularStack : public AT_CellularStack {
6262
void *buffer, nsapi_size_t size);
6363

6464
private:
65-
// URC handlers
6665
// URC handlers
6766
void urc_qiurc();
67+
void socket_closed(int sock_id);
68+
void socket_closed_0();
69+
void socket_closed_1();
70+
void socket_closed_2();
71+
void socket_closed_3();
72+
void socket_closed_4();
73+
void socket_closed_5();
6874

6975
void handle_open_socket_response(int &modem_connect_id, int &err);
7076
};

0 commit comments

Comments
 (0)