Please review!

- change modem default commands because we don't interpret ~ and friends
  (minicom does AFAIK)
- disable unused AT settings for now
- when cancelling dialing, and we didn't yet get a single byte from the modem,
  don't hangup

5 files changed, 47 insertions, 44 deletions

diff --git a/noncore/apps/opie-console/atconfigdialog.cpp b/noncore/apps/opie-console/atconfigdialog.cpp
index 87a08f6..5c02692 100644
--- a/noncore/apps/opie-console/atconfigdialog.cpp
+++ b/noncore/apps/opie-console/atconfigdialog.cpp
@@ -9,6 +9,7 @@
 #include <qscrollview.h>
 
 #include "atconfigdialog.h"
+#include "io_modem.h"
 
 
 ATConfigDialog::ATConfigDialog(  QWidget* parent, const char* name, bool modal, WFlags fl )
@@ -170,6 +171,21 @@ void ATConfigDialog::readConfig( const Profile& config ) {
     bpsDetectBox->setCurrentItem( config.readBoolEntry("BPSDetect", MODEM_DEFAULT_BPS_DETECT ) );
     dcdLinesBox->setCurrentItem( config.readBoolEntry("DCDLines", MODEM_DEFAULT_DCD_LINES ) );
     multiLineUntagBox->setCurrentItem( config.readBoolEntry("MultiLineUntag", MODEM_DEFAULT_MULTI_LINE_UNTAG ) );
+
+        // Not implemented yet
+        resetStringLine->setEnabled(false);
+        dialSuf1Line->setEnabled(false);
+        dialPref2Line->setEnabled(false);
+        dialSuf2Line->setEnabled(false);
+        dialPref3Line->setEnabled(false);
+        dialSuf3Line->setEnabled(false);
+        dialTimeSpin->setEnabled(false);
+        delayRedialSpin->setEnabled(false);
+        numberTriesSpin->setEnabled(false);
+        dtrDropTimeSpin->setEnabled(false);
+        bpsDetectBox->setEnabled(false);
+        dcdLinesBox->setEnabled(false);
+        multiLineUntagBox->setEnabled(false);
 }
 
 void ATConfigDialog::writeConfig( Profile& config ) {
diff --git a/noncore/apps/opie-console/atconfigdialog.h b/noncore/apps/opie-console/atconfigdialog.h
index 4dd033b..8cb044e 100644
--- a/noncore/apps/opie-console/atconfigdialog.h
+++ b/noncore/apps/opie-console/atconfigdialog.h
@@ -5,25 +5,6 @@
 #include <qdialog.h>
 #include "profile.h"
 
-#define MODEM_DEFAULT_INIT_STRING  "~^M~ATZ^M~"
-#define MODEM_DEFAULT_RESET_STRING "~^M~ATZ^M~"
-#define MODEM_DEFAULT_DIAL_PREFIX1 "ATDT"
-#define MODEM_DEFAULT_DIAL_SUFFIX1 "^M"
-#define MODEM_DEFAULT_DIAL_PREFIX2 "ATDP"
-#define MODEM_DEFAULT_DIAL_SUFFIX2 "^M"
-#define MODEM_DEFAULT_DIAL_PREFIX3 "ATX1DT"
-#define MODEM_DEFAULT_DIAL_SUFFIX3 ";X4D^M"
-#define MODEM_DEFAULT_CONNECT_STRING "CONNECT"
-#define MODEM_DEFAULT_HANGUP_STRING "~~+++~~ATH^M"
-#define MODEM_DEFAULT_CANCEL_STRING "^M"
-#define MODEM_DEFAULT_DIAL_TIME     45
-#define MODEM_DEFAULT_DELAY_REDIAL  2
-#define MODEM_DEFAULT_NUMBER_TRIES  10
-#define MODEM_DEFAULT_DTR_DROP_TIME 1
-#define MODEM_DEFAULT_BPS_DETECT    0   // bool
-#define MODEM_DEFAULT_DCD_LINES     1   //bool
-#define MODEM_DEFAULT_MULTI_LINE_UNTAG 0 // bool
-
 class QLineEdit;
 class QSpinBox;
 class QComboBox;
diff --git a/noncore/apps/opie-console/dialer.cpp b/noncore/apps/opie-console/dialer.cpp
index 51d4093..d37e406 100644
--- a/noncore/apps/opie-console/dialer.cpp
+++ b/noncore/apps/opie-console/dialer.cpp
@@ -58,6 +58,7 @@ Dialer::Dialer(const Profile& profile, int fd, QWidget *parent, const char *name
         //m_profile.writeEntry("Termination", "\n");
 
         usercancel = 0;
+        cleanshutdown = 0;
 
         fcntl(m_fd, F_SETFL, O_NONBLOCK);
 
@@ -133,19 +134,19 @@ void Dialer::dial(const QString& number)
 
 void Dialer::trydial(const QString& number)
 {
-        //if(state != state_cancel)
-        //{
-                if(state != state_cancel) switchState(state_preinit);
-                send("+++ATH");
+        if(state != state_cancel) switchState(state_preinit);
+        if(cleanshutdown)
+        {
+                send(m_profile.readEntry("HangupString"));
+                //send("+++ATH");
                 send("");
-                //QString response = receive();
-        //}
+        }
 
         if(state != state_cancel)
         {
                 switchState(state_init);
-                send("ATZ");
-                //send(m_profile.readEntry("InitString"));
+                //send("ATZ");
+                send(m_profile.readEntry("InitString"));
                 QString response2 = receive();
                 if(!response2.contains("\nOK\r"))
                         reset();
@@ -175,10 +176,10 @@ void Dialer::trydial(const QString& number)
         {
                 switchState(state_dialing);
 
-                send(QString("ATDT %1").arg(number));
-                //send(QString("%1 %2").arg(m_profile.readEntry("DialPrefix1")).arg(number));
+                //send(QString("ATDT %1").arg(number));
+                send(QString("%1 %2").arg(m_profile.readEntry("DialPrefix1")).arg(number));
                 QString response5 = receive();
-                if(!response5.contains("\nCONNECT"))
+                if(!response5.contains("\n" + m_profile.readEntry("DefaultConnect")))
                 {
                         if(response5.contains("BUSY"))
                                 switchState(state_dialing);
@@ -204,7 +205,7 @@ void Dialer::send(const QString& msg)
         int bytes;
         QString termination;
 
-qWarning("Sending: '%s'", m.latin1());
+        //qWarning("Sending: '%s'", m.latin1());
 
         termination = "\r";
         //termination = m_profile.readEntry("Termination");
@@ -235,13 +236,14 @@ QString Dialer::receive()
                         for(int i = 0; i < ret; i++)
                                 buffer[i] = buffer[i] & 0x7F;
                         buffer[ret] = 0;
-qWarning("Got: '%s'", buffer);
+                        //qWarning("Got: '%s'", buffer);
                         buf.append(QString(buffer));
                         if(buf.contains("OK") || buf.contains("ERROR") || buf.contains("CONNECT") || (buf.contains("BUSY")))
-{
-qWarning("Receiving: '%s'", buf.latin1());
+                        {
+                                //qWarning("Receiving: '%s'", buf.latin1());
+                                cleanshutdown = 1;
                                 return buf;
-}
+                        }
                 }
                 else if(ret < 0)
                 {
@@ -249,8 +251,11 @@ qWarning("Receiving: '%s'", buf.latin1());
                         else if(!(counter++ % 100)) qApp->processEvents();
                 }
                 else if(!(counter++ % 100)) qApp->processEvents();
+
+                if(usercancel) return QString::null;
         }
 
+        cleanshutdown = 1;
         return QString::null;
 }
 
diff --git a/noncore/apps/opie-console/dialer.h b/noncore/apps/opie-console/dialer.h
index 84444b9..28303f3 100644
--- a/noncore/apps/opie-console/dialer.h
+++ b/noncore/apps/opie-console/dialer.h
@@ -47,6 +47,7 @@ class Dialer : public QDialog
                 int usercancel;
                 const Profile& m_profile;
                 int m_fd;
+                int cleanshutdown;
 };
 
 #endif
diff --git a/noncore/apps/opie-console/io_modem.h b/noncore/apps/opie-console/io_modem.h
index 8453b95..1328706 100644
--- a/noncore/apps/opie-console/io_modem.h
+++ b/noncore/apps/opie-console/io_modem.h
@@ -13,17 +13,17 @@
 #define MODEM_DEFAULT_SBITS        1
 #define MODEM_DEFAULT_FLOW         0
 
-#define MODEM_DEFAULT_INIT_STRING  "~^M~ATZ^M~"
-#define MODEM_DEFAULT_RESET_STRING "~^M~ATZ^M~"
+#define MODEM_DEFAULT_INIT_STRING  "ATZ"
+#define MODEM_DEFAULT_RESET_STRING "ATZ~"
 #define MODEM_DEFAULT_DIAL_PREFIX1 "ATDT"
-#define MODEM_DEFAULT_DIAL_SUFFIX1 "^M"
-#define MODEM_DEFAULT_DIAL_PREFIX2 "ATDP"
-#define MODEM_DEFAULT_DIAL_SUFFIX2 "^M"
-#define MODEM_DEFAULT_DIAL_PREFIX3 "ATX1DT"
-#define MODEM_DEFAULT_DIAL_SUFFIX3 ";X4D^M"
+#define MODEM_DEFAULT_DIAL_SUFFIX1 ""
+#define MODEM_DEFAULT_DIAL_PREFIX2 ""
+#define MODEM_DEFAULT_DIAL_SUFFIX2 ""
+#define MODEM_DEFAULT_DIAL_PREFIX3 ""
+#define MODEM_DEFAULT_DIAL_SUFFIX3 ""
 #define MODEM_DEFAULT_CONNECT_STRING "CONNECT"
-#define MODEM_DEFAULT_HANGUP_STRING "~~+++~~ATH^M"
-#define MODEM_DEFAULT_CANCEL_STRING "^M"
+#define MODEM_DEFAULT_HANGUP_STRING "+++ATH"
+#define MODEM_DEFAULT_CANCEL_STRING ""
 #define MODEM_DEFAULT_DIAL_TIME     45
 #define MODEM_DEFAULT_DELAY_REDIAL  2
 #define MODEM_DEFAULT_NUMBER_TRIES  10