--- smsdaemon/tester.cpp 2008/12/07 13:28:52 141 +++ smsdaemon/tester.cpp 2008/12/07 20:58:41 149 @@ -8,7 +8,7 @@ #include #include "serialport/SerialPort.h" -#include "GsmModem.h" +#include "DebugTransceiver.h" #include "Sms.h" #include "plugins/TogPlugin.h" #include "plugins/TrainInfo.h" @@ -19,7 +19,7 @@ using namespace std; using namespace Util; -void test_sms(GsmModem& modem, int len) +void test_sms(ISmsTransceiver& modem, int len) { cout << "----- test_sms( " << len << " ) ------- " << endl; @@ -35,7 +35,7 @@ cout << "Len: " << pdu[i].len << endl; cout << "Pdu: " << pdu[i].pdu << endl; - modem.SendSmsPdu(pdu[i].pdu, pdu[i].len); +// modem.SendSmsPdu(pdu[i].pdu, pdu[i].len); } } @@ -51,7 +51,7 @@ cout << end << endl; return 0; */ - string start = "hej æøåÆØÅ"; + string start = "hej ������"; string mid = str_latin2gsm(start); string final = str_gsm2latin(mid); @@ -62,10 +62,10 @@ return 0; - DebugGsmModem modem(true); + DebugTransceiver modem(true); SMS sms; - sms.sender="1234"; - sms.message="status"; + sms.SetSender("1234"); + sms.SetMessage("status"); StatusPlugin status; status.Execute(modem,sms); @@ -78,7 +78,7 @@ SerialPort::STOP_BITS_1, SerialPort::FLOW_CONTROL_HARD ); - GsmModem modem(port); + ModemTransceiver modem(port); modem.Init(); @@ -121,7 +121,7 @@ SMS sms; sms.sender = "12345678"; sms.message = "Tog list"; - DebugGsmModem modem; + DebugModemTransceiver modem; TogPlugin plugin; plugin.Execute(modem, sms); @@ -161,7 +161,7 @@ SerialPort port("/dev/ttyS1" ); port.Open(); - GsmModem modem(port); + ModemTransceiver modem(port); //modem.SendSms("22337617", "Hello, sir!"); //