<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[Freeswitch-trunk][16045] </title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<div id="header">FreeSWITCH Subversion</div>
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://fisheye.freeswitch.org/changelog/FreeSWITCH?cs=16045">16045</a></dd>
<dt>Author</dt> <dd>gmaruzz</dd>
<dt>Date</dt> <dd>2009-12-23 11:51:10 -0600 (Wed, 23 Dec 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>gsmopen: beginning use gsmlib for serial</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchbranchesgmaruzzmod_gsmopengsmopen_protocolcpp">freeswitch/branches/gmaruzz/mod_gsmopen/gsmopen_protocol.cpp</a></li>
<li><a href="#freeswitchbranchesgmaruzzmod_gsmopentestcc">freeswitch/branches/gmaruzz/mod_gsmopen/test.cc</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchbranchesgmaruzzmod_gsmopengsmopen_protocolcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/branches/gmaruzz/mod_gsmopen/gsmopen_protocol.cpp (16044 => 16045)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/branches/gmaruzz/mod_gsmopen/gsmopen_protocol.cpp 2009-12-23 17:49:36 UTC (rev 16044)
+++ freeswitch/branches/gmaruzz/mod_gsmopen/gsmopen_protocol.cpp 2009-12-23 17:51:10 UTC (rev 16045)
</span><span class="lines">@@ -1,7 +1,15 @@
</span><span class="cx"> #include "gsmopen.h"
</span><span class="cx"> //#include <iostream.h>
</span><span class="cx"> #include <gsmlib/gsm_sms.h>
</span><ins>+#ifdef WIN32
+#include <gsmlib/gsm_win32_serial.h>
+#else
+#include <gsmlib/gsm_unix_serial.h>
+#endif
+#include <gsmlib/gsm_me_ta.h>
+#include <iostream>
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> using namespace std;
</span><span class="cx"> using namespace gsmlib;
</span><span class="cx">
</span><span class="lines">@@ -27,6 +35,8 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><ins>+#undef GSMLIBGIO
+#ifndef GSMLIBGIO
</ins><span class="cx"> int gsmopen_serial_init(private_t * tech_pvt, speed_t controldevice_speed)
</span><span class="cx"> {
</span><span class="cx"> int fd;
</span><span class="lines">@@ -108,7 +118,41 @@
</span><span class="cx"> }
</span><span class="cx"> return (fd);
</span><span class="cx"> }
</span><ins>+#else //GSMLIBGIO
+int gsmopen_serial_init(private_t * tech_pvt, speed_t controldevice_speed)
+{
+ int i;
+ string ciapa;
</ins><span class="cx">
</span><ins>+#ifdef WIN32
+ Ref<Port> port = new Win32SerialPort((string)tech_pvt->controldevice_name, 38400);
+#else
+ //Ref<Port> port = new UnixSerialPort((string)argv[1], B38400);
+ Ref<Port> port = new UnixSerialPort((string)tech_pvt->controldevice_name, B115200);
+#endif
+ MeTa m(port);
+
+ //cout << "Creating GsmAt object" << endl;
+ Ref<GsmAt> gsmat = new GsmAt(m);
+
+ //cout << "Using GsmAt object" << endl;
+ //cout << gsmat->chat("AT", "OK", false, false) << endl;
+ //cout << gsmat->chat("D3472665618;") << endl;
+ gsmat->putLine("ATI9", true);
+ for(i=0; i<4; i++){
+ ciapa = gsmat->getLine();
+ //cout << "PRESO: |||" << ciapa << "|||" << endl;
+ ERRORA("PRESO %d |||%s|||\n", GSMOPEN_P_LOG, i, ciapa.c_str());
+ //usleep(5000);
+ }
+
+
+ return (-1);
+}
+
+#endif //GSMLIBGIO
+
+
</ins><span class="cx"> int gsmopen_serial_read(private_t * tech_pvt)
</span><span class="cx"> {
</span><span class="cx"> if (tech_pvt->controldevprotocol == PROTOCOL_AT)
</span></span></pre></div>
<a id="freeswitchbranchesgmaruzzmod_gsmopentestcc"></a>
<div class="modfile"><h4>Modified: freeswitch/branches/gmaruzz/mod_gsmopen/test.cc (16044 => 16045)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/branches/gmaruzz/mod_gsmopen/test.cc 2009-12-23 17:49:36 UTC (rev 16044)
+++ freeswitch/branches/gmaruzz/mod_gsmopen/test.cc 2009-12-23 17:51:10 UTC (rev 16045)
</span><span class="lines">@@ -38,6 +38,13 @@
</span><span class="cx">
</span><span class="cx"> int main(int argc, char *argv[])
</span><span class="cx"> {
</span><ins>+ string ciapa;
+ int i;
+
+ if(argc<2){
+ cout << (string)"You gave no \"device\" argument!" << endl;
+ return -1;
+ }
</ins><span class="cx"> try
</span><span class="cx"> {
</span><span class="cx"> cout << (string)"Opening device " + argv[1] << endl;
</span><span class="lines">@@ -48,9 +55,24 @@
</span><span class="cx"> Ref<Port> port = new UnixSerialPort((string)argv[1], B115200);
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> cout << "Creating MeTa object" << endl;
</span><span class="cx"> MeTa m(port);
</span><span class="cx">
</span><ins>+ cout << "Creating GsmAt object" << endl;
+ Ref<GsmAt> gsmat = new GsmAt(m);
+
+ cout << "Using GsmAt object" << endl;
+ //cout << gsmat->chat("AT", "OK", false, false) << endl;
+ //cout << gsmat->chat("D3472665618;") << endl;
+ gsmat->putLine("ATI9", true);
+ for(i=0; i<9; i++){
+ ciapa = gsmat->getLine();
+ cout << "PRESO: |||" << ciapa << "|||" << endl;
+ //usleep(5000);
+ }
+
+#ifdef NOTDEF
</ins><span class="cx"> cout << "Getting ME info" << endl;
</span><span class="cx"> MEInfo mei = m.getMEInfo();
</span><span class="cx">
</span><span class="lines">@@ -169,12 +191,15 @@
</span><span class="cx"> cout << "Signal strength: " << m.getSignalStrength() << endl << endl;
</span><span class="cx">
</span><span class="cx"> cout << "Bit error rate: " << m.getBitErrorRate() << endl << endl;
</span><ins>+#endif //NOTDEF
</ins><span class="cx"> }
</span><span class="cx"> catch (GsmException &ge)
</span><span class="cx"> {
</span><span class="cx"> cerr << "GsmException '" << ge.what() << "'" << endl;
</span><span class="cx"> return 1;
</span><span class="cx"> }
</span><ins>+
+
</ins><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>