summaryrefslogtreecommitdiff
authorjosef <josef>2002-10-20 09:48:21 (UTC)
committer josef <josef>2002-10-20 09:48:21 (UTC)
commit940ba90ed4375f79b6a4934d290abf83980b77ad (patch) (side-by-side diff)
treec455e88ce9fe99ef79048e3f228b7f4551652537
parente2694c5aedb3697a373e363cebe72cddb3114a8f (diff)
downloadopie-940ba90ed4375f79b6a4934d290abf83980b77ad.zip
opie-940ba90ed4375f79b6a4934d290abf83980b77ad.tar.gz
opie-940ba90ed4375f79b6a4934d290abf83980b77ad.tar.bz2
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
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/apps/opie-console/atconfigdialog.cpp16
-rw-r--r--noncore/apps/opie-console/atconfigdialog.h19
-rw-r--r--noncore/apps/opie-console/dialer.cpp31
-rw-r--r--noncore/apps/opie-console/dialer.h1
-rw-r--r--noncore/apps/opie-console/io_modem.h18
5 files changed, 44 insertions, 41 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
@@ -6,12 +6,13 @@
#include <qtabwidget.h>
#include <qlabel.h>
#include <qcombobox.h>
#include <qscrollview.h>
#include "atconfigdialog.h"
+#include "io_modem.h"
ATConfigDialog::ATConfigDialog( QWidget* parent, const char* name, bool modal, WFlags fl )
: QDialog( parent, name, modal, fl ) {
@@ -167,12 +168,27 @@ void ATConfigDialog::readConfig( const Profile& config ) {
delayRedialSpin->setValue( config.readNumEntry("DelayRedial", MODEM_DEFAULT_DELAY_REDIAL ) );
numberTriesSpin->setValue( config.readNumEntry("NumberTries", MODEM_DEFAULT_NUMBER_TRIES ) );
dtrDropTimeSpin->setValue( config.readNumEntry("DTRDRopTime", MODEM_DEFAULT_DTR_DROP_TIME ) );
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 ) {
config.writeEntry( "InitString", initStringLine->text() );
config.writeEntry( "ResetString", resetStringLine->text() );
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
@@ -2,31 +2,12 @@
#ifndef ATCONFIGDIALOG_H
#define ATCONFIGDIALOG_H
#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;
class ATConfigDialog : public QDialog {
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
@@ -55,12 +55,13 @@ Dialer::Dialer(const Profile& profile, int fd, QWidget *parent, const char *name
//m_profile.writeEntry("InitString", "ATZ");
//m_profile.writeEntry("DialPrefix1", "ATDT");
//m_profile.writeEntry("Termination", "\n");
usercancel = 0;
+ cleanshutdown = 0;
fcntl(m_fd, F_SETFL, O_NONBLOCK);
desc = new QLabel(QObject::tr("Dialing number: %1").arg(m_profile.readEntry("Number")), this);
progress = new QProgressBar(this);
status = new QLabel("", this);
@@ -130,25 +131,25 @@ void Dialer::dial(const QString& number)
reject();
}
}
void Dialer::trydial(const QString& number)
{
- //if(state != state_cancel)
- //{
if(state != state_cancel) switchState(state_preinit);
- send("+++ATH");
+ 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();
}
if(state != state_cancel)
@@ -172,16 +173,16 @@ void Dialer::trydial(const QString& number)
}
if(state != state_cancel)
{
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);
else
{
QMessageBox::warning(this,
@@ -201,13 +202,13 @@ void Dialer::trydial(const QString& number)
void Dialer::send(const QString& msg)
{
QString m = msg;
int bytes;
QString termination;
-qWarning("Sending: '%s'", m.latin1());
+ //qWarning("Sending: '%s'", m.latin1());
termination = "\r";
//termination = m_profile.readEntry("Termination");
if(termination == "\n") m = m + "\n";
else if(termination == "\r") m = m + "\r";
else m = m + "\r\n";
@@ -232,28 +233,32 @@ QString Dialer::receive()
if(ret > 0)
{
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)
{
if(errno != EAGAIN) reset();
else if(!(counter++ % 100)) qApp->processEvents();
}
else if(!(counter++ % 100)) qApp->processEvents();
+
+ if(usercancel) return QString::null;
}
+ cleanshutdown = 1;
return QString::null;
}
void Dialer::switchState(int newstate)
{
int oldstate = state;
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
@@ -44,10 +44,11 @@ class Dialer : public QDialog
QProgressBar *progress;
QPushButton *cancel;
int state;
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
@@ -10,23 +10,23 @@
#define MODEM_DEFAULT_BAUD 9600
#define MODEM_DEFAULT_PARITY 0
#define MODEM_DEFAULT_DBITS 8
#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
#define MODEM_DEFAULT_DTR_DROP_TIME 1
#define MODEM_DEFAULT_BPS_DETECT 0 // bool
#define MODEM_DEFAULT_DCD_LINES 1 //bool