Skip to content

Text sms fix #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
krzysztofkrzeslak merged 1 commit into from
Sep 30, 2020
Merged

Text sms fix #6

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions src/LiveObjectsCellular.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,18 @@ void LiveObjectsCellular::connectNetwork()
if(m_Protocol != SMS) while ((m_GPRSAcces.attachGPRS(SECRET_APN.c_str(), SECRET_APN_USER.c_str(), SECRET_APN_PASS.c_str()) != GPRS_READY)) outputDebug(TXT, ".");
outputDebug();
#endif
if(m_Encoding==BINARY) MODEM.send("AT+CMGF=0");
delay(200);
outputDebug(INFO,"You're connected to the network");
}
else
{
if(m_Protocol==MQTT) while ((m_GPRSAcces.attachGPRS(SECRET_APN.c_str(), SECRET_APN_USER.c_str(), SECRET_APN_PASS.c_str()) != GPRS_READY)) outputDebug(TXT, ".");
delay(100);//outputDebug(INFO, "Sending atcmgf");
if(m_Encoding==BINARY) MODEM.send("AT+CMGF=0");
else MODEM.send("AT+CMGF=1");
delay(200);
}
if(m_nPort==8883){
if (!m_bCertLoaded) {
outputDebug(INFO,"Loading DigiCert Root CA certificate");
Expand All @@ -143,9 +153,6 @@ void LiveObjectsCellular::connectNetwork()
}
}
}
if(m_Encoding==BINARY) MODEM.send("AT+CMGF=0");
else MODEM.send("AT+CMGF=1");
delay(200);
}


Expand Down Expand Up @@ -265,6 +272,7 @@ void LiveObjectsCellular::sendData()
if(m_Sms.beginSMS(SECRET_SERVER_MSISDN.c_str())!=1) outputDebug(ERR,"Error occured while sending SMS");
m_Sms.print(m_sPayload);
if(m_Sms.endSMS()!=1) outputDebug(ERR,"Error occured while sending SMS");
outputDebug(INFO, "Nie tutaj");
}
else
{
Expand All @@ -279,7 +287,7 @@ void LiveObjectsCellular::sendData()
msg+=to7bit(m_sPayload);
int msgSize = (msg.length()-2)/2;
msg+='\x1A';
outputDebug(INFO,"MEssage len: ",msgSize);
outputDebug(INFO,"Message len: ",msgSize);
outputDebug(INFO,"Publishing message: ", msg);
MODEM.sendf("AT+CMGS=%d\r", msgSize);
delay(100);
Expand Down