/[projects]/smsdaemon/ModemTransceiver.cpp
ViewVC logotype

Diff of /smsdaemon/ModemTransceiver.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 58 by torben, Wed Jun 11 16:14:28 2008 UTC revision 63 by torben, Thu Jun 12 12:43:29 2008 UTC
# Line 4  Line 4 
4  #include <iostream>  #include <iostream>
5    
6  #include <string>  #include <string>
 #include <cstring>  
7  #include <stdexcept>  #include <stdexcept>
8    
9  #include <sys/time.h>  #include <sys/time.h>
# Line 18  Line 17 
17  #include "util.h"  #include "util.h"
18  #include "common.h"  #include "common.h"
19    
20    #include "SmsPdu.h"
21    
22  using namespace std;  using namespace std;
23    
# Line 89  string GsmModem::Command(string command, Line 89  string GsmModem::Command(string command,
89    
90  vector<SMS> GsmModem::ReadSms(bool readAll)  vector<SMS> GsmModem::ReadSms(bool readAll)
91  {  {
92    
93            Command( "AT+CMGF=1" ); //Set SMS format to text
94    
95          const string search = "+CMGL: ";          const string search = "+CMGL: ";
96          std::string cmd = "AT+CMGL";          std::string cmd = "AT+CMGL";
97          if (readAll)          if (readAll)
# Line 120  vector<SMS> GsmModem::ReadSms(bool readA Line 123  vector<SMS> GsmModem::ReadSms(bool readA
123          return retval;          return retval;
124  }  }
125    
126  void GsmModem::SendSms(string to, string message)  
127    void GsmModem::SendSmsPdu(std::string pdu, int len) //pdu inclussive leading "00"
128  {  {
129          Common::instance()->logMessage( string("SMS send to ") + to);          Common::instance()->logMessage( string("SMS pdu send") );
130    
131          Command("AT+CMGF=1");///Allways telling the format makes the application more stable          Command("AT+CMGF=0");
132          Util::Sleep(2);          Util::Sleep(2);
133    
134          string line1 = "AT+CMGS=";          string line1 = "AT+CMGS=";
135          line1.append(to);          line1.append( Util::str_formatint(len) );
136          line1.append("\r");          line1.append("\r");
137    
138    
139          Command(line1,"> ");          Command(line1,"> ");
140    
141          if (message.length() > 160)          pdu.append("\032"); // \032 == Ctrl+Z
142          {          Command( pdu );
143                  message = message.substr(0,160);          Util::Sleep( 50 );
144                  Common::instance()->logMessage( "Trunkating message! ");          Common::instance()->smsCounter.outgoing++;
145          }  }
146    
147          message.append("\032"); // \032 == Ctrl+Z  void GsmModem::SendSms(string to, string message, bool allowMultipart)
148    {
149            Common::instance()->logMessage( string("SMS send to ") + to);
150    
151          Command( message ); //In textmode limit to 160 bytes          if (to.at(0) == '+')
152                    to.erase(0,0);
153    
154            vector<PduInfo> pdu_vec = SmsPdu::CreateSmsPdu(to, message, allowMultipart);
155    
156            for (unsigned i=0; i<pdu_vec.size(); ++i)
157            {
158                    PduInfo& pdu = pdu_vec[i];
159    
160                    SendSmsPdu(pdu.pdu, pdu.len);
161            }
162    
         Util::Sleep(50); //Give the modem some time to send the sms and be ready again  
         Common::instance()->smsCounter.outgoing++;  
163  }  }
164    
165  void GsmModem::DeleteSms(std::string smsIndex)  void GsmModem::DeleteSms(std::string smsIndex)
# Line 180  void GsmModem::Init() Line 194  void GsmModem::Init()
194    
195          Command( "ATE0" ); //Disable echo          Command( "ATE0" ); //Disable echo
196    
         Command( "AT+CMGF=1" ); //Set SMS format to text  
   
197          Command ("AT^SM20=0,0" ); //No SM20 compability          Command ("AT^SM20=0,0" ); //No SM20 compability
198    
199          //Set RealTimeClock ??          //Set RealTimeClock ??
200                    
201          //Enter pin code ??          //Enter pin code ??
202  }  }
203    
204    
Legend:
Removed from v.58  
changed lines
  Added in v.63
  ViewVC Help
Powered by ViewVC 1.1.20