--- smsdaemon/tester.cpp	2008/06/13 06:38:43	69
+++ smsdaemon/tester.cpp	2008/12/08 21:49:49	158
@@ -6,20 +6,21 @@
 #include <string>
 #include <iostream>
 #include <vector>
-#include "SerialPort.h"
+#include "serialport/SerialPort.h"
 
-#include "GsmModem.h"
+#include "DebugTransceiver.h"
+#include "SmsToolTransceiver.h"
 #include "Sms.h"
-#include "TogPlugin.h"
-#include "TrainInfo.h"
-#include "util.h"
-
+#include "plugins/TogPlugin.h"
+#include "plugins/TrainInfo.h"
+#include "Util.h"
+#include "plugins/StatusPlugin.h"
 #include "SmsPdu.h"
 
 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;
 
@@ -27,7 +28,7 @@
 	msg.append(1, ' ');
 	msg.append(len - msg.length(), 'a');
 	
-	vector<PduInfo> pdu = SmsPdu::CreateSmsPdu("4522337617", msg, true);
+	vector<PduInfo> pdu = SmsPdu::CreateSmsPdu("22337617", msg, true);
 
 	for (unsigned int i=0; i<pdu.size(); ++i)
 	{
@@ -35,24 +36,48 @@
 		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);
 	}
 }
 
 
 int main()
 {
-	string pdu = "06915404950000040A91542233677100008060211202528009AB61F3C8D481622C";
+/*
+	int shift = 6;
+	string start = "Hej med dig";
+	string end = SmsPdu::Decode8to7bit(SmsPdu::Encode7to8bit(start,shift), shift );
+
+	cout << start << endl;
+	cout << end << endl;
+	return 0;
+*/
 
-	SMS sms = SmsPdu::ParseSmsPdu(pdu);
+	SmsToolTransceiver trans;
 
-	cout << "Sender " << sms.sender << endl;
-	cout << "Time   " << sms.timestamp << endl;
-	cout << "Msg.   " << sms.message << endl;
+	trans.ReadSms();
 
 	return 0;
+	string start = "hej ������";
+	string mid = str_latin2gsm(start);
+	string final = str_gsm2latin(mid);
+
+	str_dump (start);
+	str_dump(mid);
+	str_dump(final);
 
 
+	return 0;
+
+	DebugTransceiver modem(true);
+	SMS sms;
+	sms.SetSender("1234");
+	sms.SetMessage("status");
+	StatusPlugin status;
+	status.Execute(modem,sms);
+
+	return 0;
+/*
     SerialPort port("/dev/ttyS1" );
     port.Open( SerialPort::BAUD_9600,
 			SerialPort::CHAR_SIZE_8,
@@ -60,10 +85,35 @@
 	        SerialPort::STOP_BITS_1,
 	        SerialPort::FLOW_CONTROL_HARD );
 
-	GsmModem modem(port);
+	ModemTransceiver modem(port);
 	modem.Init();
 
-	test_sms(modem, 161);
+
+	test_sms(modem, 100);
+	return 0;
+
+
+	vector<SMS> res = modem.ReadSms(true);
+
+	for (unsigned int i = 0; i<res.size(); ++i)
+	{
+		SMS& sms = res[i];
+		string cmd = GetSmsCommand(sms);
+		string data = GetSmsData(sms);
+		cout << "------------------------------" << endl;
+		cout << "Index    " << sms.sms_index << endl;
+		cout << "Sender:  " << sms.sender << endl;
+		cout << "Time:    " << sms.timestamp << endl;
+		cout << "Message: >" << sms.message << "<" << endl;
+		cout << "Cmd:     >" << cmd << "<" << endl; 
+		cout << "Data     >" << data << "<" << endl;
+
+		Util::str_dump(sms.message);
+		//modem.SendSms(sms.sender, sms.message, false);
+
+	}
+
+*/
 /*
 	vector<PduInfo> pdu = SmsPdu::CreateSmsPdu("4522337617", "Hej med dig, igen", true);
 	cout << "Len: " << pdu[0].len << endl;
@@ -78,7 +128,7 @@
 	SMS sms;
 	sms.sender = "12345678";
 	sms.message = "Tog list";
-	DebugGsmModem modem;
+	DebugModemTransceiver modem;
 	TogPlugin plugin;
 
 	plugin.Execute(modem, sms);
@@ -118,7 +168,7 @@
 
 	SerialPort port("/dev/ttyS1" );
 	port.Open();
-	GsmModem modem(port);
+	ModemTransceiver modem(port);
 
 	//modem.SendSms("22337617", "Hello, sir!");
 	//