| -rw-r--r-- | noncore/apps/opie-console/dialer.cpp | 73 | ||||
| -rw-r--r-- | noncore/apps/opie-console/dialer.h | 3 | ||||
| -rw-r--r-- | noncore/apps/opie-console/io_modem.cpp | 2 |
3 files changed, 64 insertions, 14 deletions
diff --git a/noncore/apps/opie-console/dialer.cpp b/noncore/apps/opie-console/dialer.cpp index 89a0e8d..10c16ef 100644 --- a/noncore/apps/opie-console/dialer.cpp +++ b/noncore/apps/opie-console/dialer.cpp @@ -3,15 +3,18 @@ #include <qlayout.h> #include <qprogressbar.h> #include <qlabel.h> #include <qpushbutton.h> #include <qapp.h> #include <qtimer.h> +#include <qmessagebox.h> #include <unistd.h> #include <string.h> +#include <fcntl.h> +#include <errno.h> // State machine: | When an error occurs, we don't have to // | reset everything. // (init) <------+ | But if the user wants to reset, // | | | we stop dialing immediately. // v | | @@ -41,20 +44,26 @@ // from modemconfigwidget //int rad_flow = prof.readNumEntry("Flow"); //int rad_parity = prof.readNumEntry("Parity"); //int speed = prof.readNumEntry("Speed"); //QString number = prof.readEntry("Number"); -Dialer::Dialer(const Profile& profile, QWidget *parent, const char *name) -: QDialog(parent, name, true), m_profile(profile) +Dialer::Dialer(const Profile& profile, int fd, QWidget *parent, const char *name) +: QDialog(parent, name, true), m_fd(fd), m_profile(profile) { QVBoxLayout *vbox; QLabel *desc; + //m_profile.writeEntry("InitString", "ATZ"); + //m_profile.writeEntry("DialPrefix1", "ATDT"); + //m_profile.writeEntry("Termination", "\n"); + usercancel = 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); status->setFrameStyle(QFrame::Panel | QFrame::Sunken); cancel = new QPushButton(QObject::tr("Cancel"), this); @@ -89,22 +98,23 @@ void Dialer::reset() { switchState(state_cancel); } void Dialer::slotAutostart() { - state = state_preinit; + //state = state_preinit; dial(m_profile.readEntry("Number")); } void Dialer::dial(const QString& number) { while(state != state_online) { if(!usercancel) { + state = state_preinit; trydial(number); } else break; } if(usercancel) @@ -115,46 +125,61 @@ void Dialer::dial(const QString& number) void Dialer::trydial(const QString& number) { if(state != state_cancel) { switchState(state_preinit); - // ... - QString response = receive(); + 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) { switchState(state_options); send("ATM0L0"); QString response3 = receive(); + if(!response3.contains("\nOK\r")) + reset(); } if(state != state_cancel) { switchState(state_dialtone); send("ATX1"); QString response4 = receive(); + if(!response4.contains("\nOK\r")) + reset(); } if(state != state_cancel) { switchState(state_dialing); - 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("\nOK\r")) + { + QMessageBox::warning(this, + QObject::tr("Failure"), + QObject::tr("Dialing the number failed.")); + slotCancel(); + } } if(state != state_cancel) { switchState(state_online); } @@ -163,28 +188,52 @@ void Dialer::trydial(const QString& number) void Dialer::send(const QString& msg) { QString m = msg; int bytes; QString termination; - termination = m_profile.readEntry("Termination"); +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"; - bytes = write(0, m.local8Bit(), strlen(m.local8Bit())); + bytes = ::write(m_fd, m.local8Bit(), strlen(m.local8Bit())); if(bytes < 0) { reset(); } } QString Dialer::receive() { - for(int i = 0; i < 200000;i++) - qApp->processEvents(); + char buffer[1024]; + int ret; + + while(1) + { + ret = ::read(m_fd, buffer, sizeof(buffer)); + + if(ret > 0) + { + for(int i = 0; i < ret; i++) + buffer[i] = buffer[i] & 0x7F; + buffer[ret] = 0; + qWarning("Receiving: '%s'", buffer); + return QString(buffer); + } + else if(ret < 0) + { + if(errno != EAGAIN) reset(); + } + } + + //for(int i = 0; i < 200000;i++) + // qApp->processEvents(); 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 09cc5ca..4011880 100644 --- a/noncore/apps/opie-console/dialer.h +++ b/noncore/apps/opie-console/dialer.h @@ -9,13 +9,13 @@ class QLabel; class QProgressBar; class Dialer : public QDialog { Q_OBJECT public: - Dialer(const Profile& profile, QWidget *parent = NULL, const char *name = NULL); + Dialer(const Profile& profile, int fd, QWidget *parent = NULL, const char *name = NULL); ~Dialer(); public slots: void slotCancel(); void slotAutostart(); @@ -42,10 +42,11 @@ class Dialer : public QDialog QLabel *status; QProgressBar *progress; QPushButton *cancel; int state; int usercancel; const Profile& m_profile; + int m_fd; }; #endif diff --git a/noncore/apps/opie-console/io_modem.cpp b/noncore/apps/opie-console/io_modem.cpp index 41f553b..c04aad1 100644 --- a/noncore/apps/opie-console/io_modem.cpp +++ b/noncore/apps/opie-console/io_modem.cpp @@ -21,13 +21,13 @@ void IOModem::close() { } bool IOModem::open() { bool ret = IOSerial::open(); if(!ret) return false; - Dialer d(m_profile); + Dialer d(m_profile, rawIO()); int result = d.exec(); if(result == QDialog::Accepted) { return true; } |