--- smsdaemon/tester.cpp	2008/06/13 06:38:43	69
+++ smsdaemon/tester.cpp	2008/12/07 13:28:52	141
@@ -6,18 +6,18 @@
 #include <string>
 #include <iostream>
 #include <vector>
-#include "SerialPort.h"
+#include "serialport/SerialPort.h"
 
 #include "GsmModem.h"
 #include "Sms.h"
-#include "TogPlugin.h"
-#include "TrainInfo.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)
 {
@@ -27,7 +27,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)
 	{
@@ -42,17 +42,35 @@
 
 int main()
 {
-	string pdu = "06915404950000040A91542233677100008060211202528009AB61F3C8D481622C";
+/*
+	int shift = 6;
+	string start = "Hej med dig";
+	string end = SmsPdu::Decode8to7bit(SmsPdu::Encode7to8bit(start,shift), shift );
 
-	SMS sms = SmsPdu::ParseSmsPdu(pdu);
+	cout << start << endl;
+	cout << end << endl;
+	return 0;
+*/
+	string start = "hej æøåÆØÅ";
+	string mid = str_latin2gsm(start);
+	string final = str_gsm2latin(mid);
+
+	str_dump (start);
+	str_dump(mid);
+	str_dump(final);
 
-	cout << "Sender " << sms.sender << endl;
-	cout << "Time   " << sms.timestamp << endl;
-	cout << "Msg.   " << sms.message << endl;
 
 	return 0;
 
+	DebugGsmModem modem(true);
+	SMS sms;
+	sms.sender="1234";
+	sms.message="status";
+	StatusPlugin status;
+	status.Execute(modem,sms);
 
+	return 0;
+/*
     SerialPort port("/dev/ttyS1" );
     port.Open( SerialPort::BAUD_9600,
 			SerialPort::CHAR_SIZE_8,
@@ -63,7 +81,32 @@
 	GsmModem 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;