CHENGQI YANG
Murata RF modules are designed to simplify wireless development and certification by minimizing the amount of RF expertise you need to wirelessly enable a wide range of applications.
Revision 7:a71d7c24afc0, committed 2015-02-08
- Comitter:
- yangcq88517
- Date:
- Sun Feb 08 01:22:29 2015 +0000
- Parent:
- 6:2efbb7a3ca36
- Child:
- 8:5856c23794b1
- Commit message:
- bug fix
Changed in this revision
--- a/MuRata.cpp Thu Feb 05 22:08:33 2015 +0000
+++ b/MuRata.cpp Sun Feb 08 01:22:29 2015 +0000
@@ -84,7 +84,7 @@
HTTPResponseIndication * MuRata::Get_HTTPResponseIndication()
{
- while (FrameReceive())
+ while (FrameReceive())
if (_payload.GetResponseFlag() == Request_Indication
&& _frame.GetCommandID() == CMD_ID_SNIC
&& _payload.GetSubCommandID() == SNIC_HTTP_RSP_IND)
@@ -95,6 +95,7 @@
void MuRata::Send()
{
+ _frame.SetACKRequired(false);
_payload.SetResponseFlag(Request_Indication);
serial->putc(UARTFrame::SOM);
@@ -265,7 +266,7 @@
_payload.SetContent(0x00);
}
_payload.SetContent(config->GetChannel());
- _payload.SetContent((char)config->GetSecurityMode());
+ _payload.SetContent(config->GetSecurityMode());
int keyLength = strlen(config->GetSecurityKey());
_payload.SetContent(keyLength);
@@ -292,7 +293,7 @@
_payload.SetContent(AP->GetSSID(), 0, strlen(AP->GetSSID()));
_payload.SetContent(0x00);
- _payload.SetContent((char)AP->GetSecurityMode());
+ _payload.SetContent(AP->GetSecurityMode());
int keyLength = strlen(AP->GetSecurityKey());
_payload.SetContent(keyLength);
@@ -338,7 +339,7 @@
_payload.Rewind();
_payload.SetSubCommandID(WIFI_GET_STATUS_REQ);
_payload.SetFrameID(_payload.GetFrameID() + 1);
- _payload.SetContent((char)WiFiInterface);
+ _payload.SetContent(WiFiInterface);
_frame.SetCommandID(CMD_ID_WIFI);
_frame.SetPayload(&_payload);
@@ -381,7 +382,7 @@
_payload.Rewind();
_payload.SetSubCommandID(WIFI_WPS_REQ);
_payload.SetFrameID(_payload.GetFrameID() + 1);
- _payload.SetContent((char)mode);
+ _payload.SetContent(mode);
if (mode == Pin) {
if (Pin == NULL)
@@ -424,8 +425,8 @@
_payload.Rewind();
_payload.SetSubCommandID(WIFI_SCAN_REQ);
_payload.SetFrameID(_payload.GetFrameID() + 1);
- _payload.SetContent((char)scan);
- _payload.SetContent((char)bss);
+ _payload.SetContent(scan);
+ _payload.SetContent(bss);
for (int i = 0; i < 8; i++)
_payload.SetContent(0x00);
@@ -488,7 +489,7 @@
_payload.SetSubCommandID(SNIC_SEND_FROM_SOCKET_REQ);
_payload.SetFrameID(_payload.GetFrameID() + 1);
_payload.SetContent(SocketID);
- _payload.SetContent((char)option);
+ _payload.SetContent(option);
_payload.SetContent(length >> 8);
_payload.SetContent(length);
_payload.SetContent(payload, offset, length);
@@ -529,7 +530,7 @@
_payload.Rewind();
_payload.SetSubCommandID(SNIC_GET_DHCP_INFO_REQ);
_payload.SetFrameID(_payload.GetFrameID() + 1);
- _payload.SetContent((char)wifiInterface);
+ _payload.SetContent(wifiInterface);
_frame.SetCommandID(CMD_ID_SNIC);
_frame.SetPayload(&_payload);
@@ -550,7 +551,7 @@
_payload.Rewind();
_payload.SetSubCommandID(SNIC_RESOLVE_NAME_REQ);
_payload.SetFrameID(_payload.GetFrameID() + 1);
- _payload.SetContent((char)STA);
+ _payload.SetContent(STA);
_payload.SetContent(hostLength);
_payload.SetContent(host, 0, hostLength);
@@ -574,8 +575,8 @@
_payload.Rewind();
_payload.SetSubCommandID(SNIC_IP_CONFIG_REQ);
_payload.SetFrameID(_payload.GetFrameID() + 1);
- _payload.SetContent((char)config->GetInterface());
- _payload.SetContent((char)config->GetDHCPMode());
+ _payload.SetContent(config->GetInterface());
+ _payload.SetContent(config->GetDHCPMode());
if (config->GetDHCPMode() != dynamic_IP) {
_payload.SetContent(config->GetLocalIP()->GetValue(), 0, 4);
@@ -607,10 +608,10 @@
_payload.SetFrameID(_payload.GetFrameID() + 1);
_payload.SetContent(SocketID);
_payload.SetContent(remoteIP->GetValue(), 0, 4);
- _payload.SetContent((char)(remotePort >> 8));
- _payload.SetContent((char)remotePort);
- _payload.SetContent((char)(receiveBufferSize >> 8));
- _payload.SetContent((char)receiveBufferSize);
+ _payload.SetContent((remotePort >> 8));
+ _payload.SetContent(remotePort);
+ _payload.SetContent((receiveBufferSize >> 8));
+ _payload.SetContent(receiveBufferSize);
_payload.SetContent(timeout);
_frame.SetCommandID(CMD_ID_SNIC);
@@ -640,7 +641,7 @@
_payload.Rewind();
_payload.SetSubCommandID(subID);
_payload.SetFrameID(_payload.GetFrameID() + 1);
- _payload.SetContent((char)(bind ? 0x01 : 0x00));
+ _payload.SetContent(bind ? 0x01 : 0x00);
if (bind) {
if (localIP != NULL)
@@ -652,8 +653,8 @@
_payload.SetContent(0x00);
}
- _payload.SetContent((char)(localPort >> 8));
- _payload.SetContent((char)localPort);
+ _payload.SetContent(localPort >> 8);
+ _payload.SetContent(localPort);
}
_frame.SetCommandID(CMD_ID_SNIC);
@@ -674,8 +675,8 @@
_payload.SetSubCommandID(SNIC_UDP_START_RECV_REQ);
_payload.SetFrameID(_payload.GetFrameID() + 1);
_payload.SetContent(SocketID);
- _payload.SetContent((char)(receiveBufferSize >> 8));
- _payload.SetContent((char)receiveBufferSize);
+ _payload.SetContent(receiveBufferSize >> 8);
+ _payload.SetContent(receiveBufferSize);
_frame.SetCommandID(CMD_ID_SNIC);
_frame.SetPayload(&_payload);
@@ -695,10 +696,10 @@
_payload.SetSubCommandID(SNIC_UDP_SIMPLE_SEND_REQ);
_payload.SetFrameID(_payload.GetFrameID() + 1);
_payload.SetContent(remoteIP->GetValue(), 0 ,4);
- _payload.SetContent((char)(remotePort >> 8));
- _payload.SetContent((char)remotePort);
- _payload.SetContent((char)(length >> 8));
- _payload.SetContent((char)length);
+ _payload.SetContent(remotePort >> 8);
+ _payload.SetContent(remotePort);
+ _payload.SetContent(length >> 8);
+ _payload.SetContent(length);
_payload.SetContent(payload, offset, length);
_frame.SetCommandID(CMD_ID_SNIC);
@@ -719,12 +720,12 @@
_payload.SetSubCommandID(SNIC_UDP_SEND_FROM_SOCKET_REQ);
_payload.SetFrameID(_payload.GetFrameID() + 1);
_payload.SetContent(remoteIP->GetValue(),0, 4);
- _payload.SetContent((char)(remotePort >> 8));
- _payload.SetContent((char)remotePort);
+ _payload.SetContent(remotePort >> 8);
+ _payload.SetContent(remotePort);
_payload.SetContent(SocketID);
- _payload.SetContent((char)(connectServer ? 0x01 : 0x00));
- _payload.SetContent((char)(length >> 8));
- _payload.SetContent((char)length);
+ _payload.SetContent(connectServer ? 0x01 : 0x00);
+ _payload.SetContent(length >> 8);
+ _payload.SetContent(length);
_payload.SetContent(payload, offset, length);
_frame.SetCommandID(CMD_ID_SNIC);
@@ -748,7 +749,7 @@
_payload.SetFrameID(_payload.GetFrameID() + 1);
_payload.SetContent(content->GetRemotePort() >> 8);
_payload.SetContent(content->GetRemotePort());
- _payload.SetContent((char)content->GetMethod());
+ _payload.SetContent(content->GetMethod());
_payload.SetContent(content->GetTimeout());
_payload.SetContent(content->GetRemoteHost(), 0, strlen(content->GetRemoteHost()));
@@ -799,13 +800,13 @@
_payload.SetFrameID(_payload.GetFrameID() + 1);
int length = content->GetContentLength();
- char msb = (char)(length >> 8);
+ char msb = length;
if (chunked)
msb |= 0x80;
else msb &= 0x7F;
_payload.SetContent(msb);
- _payload.SetContent((char)length);
+ _payload.SetContent(length);
if (length > 0)
_payload.SetContent(content->GetBody(), 0, length);
--- a/Payload.cpp Thu Feb 05 22:08:33 2015 +0000
+++ b/Payload.cpp Sun Feb 08 01:22:29 2015 +0000
@@ -41,7 +41,7 @@
void Payload::SetSubCommandID(const SubCommandID id)
{
- SetSubCommandID((char)id);
+ SetSubCommandID((int)id);
}
void Payload::SetSubCommandID(const int value)
--- a/UARTFrame.cpp Thu Feb 05 22:08:33 2015 +0000
+++ b/UARTFrame.cpp Sun Feb 08 01:22:29 2015 +0000
@@ -56,7 +56,7 @@
void UARTFrame::SetCommandID(const CommandID id)
{
- commandid = id;
+ SetCommandID ((int)id);
}
void UARTFrame::SetCommandID(const int value)