| -rw-r--r-- | noncore/apps/opie-console/test/console.pro | 4 | ||||
| -rw-r--r-- | noncore/apps/opie-console/test/senderui.cpp | 16 | ||||
| -rw-r--r-- | noncore/apps/opie-console/test/senderui.h | 10 |
3 files changed, 21 insertions, 9 deletions
diff --git a/noncore/apps/opie-console/test/console.pro b/noncore/apps/opie-console/test/console.pro index b10b651..f5761e2 100644 --- a/noncore/apps/opie-console/test/console.pro +++ b/noncore/apps/opie-console/test/console.pro @@ -3,10 +3,10 @@ TEMPLATE = app CONFIG = qt debug #DESTDIR = $(OPIEDIR)/bin HEADERS = ../io_layer.h ../io_serial.h ../sz_transfer.h ../file_layer.h\ - senderui.h ../profile.h + senderui.h ../profile.h ../filetransfer.h SOURCES = ../io_layer.cpp ../io_serial.cpp \ ../profile.cpp ../sz_transfer.cpp ../file_layer.cpp\ - main.cpp senderui.cpp + main.cpp senderui.cpp ../filetransfer.cpp INTERFACES = sender.ui INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include diff --git a/noncore/apps/opie-console/test/senderui.cpp b/noncore/apps/opie-console/test/senderui.cpp index 24d3eb2..3d7c534 100644 --- a/noncore/apps/opie-console/test/senderui.cpp +++ b/noncore/apps/opie-console/test/senderui.cpp @@ -1,12 +1,16 @@ #include <stdlib.h> #include <stdio.h> +#include <fcntl.h> +#include <sys/termios.h> #include <qmultilineedit.h> +#include <qsocketnotifier.h> #include "../profile.h" #include "../io_serial.h" -#include "../sz_transfer.h" +#include "../filetransfer.h" +#include <opie/oprocess.h> #include "senderui.h" @@ -15,7 +19,7 @@ SenderUI::SenderUI() /* we do that manually */ Profile prof; - QString str = "/dev/ttyS1"; + QString str = "/dev/ttyS0"; prof.writeEntry("Device",str ); prof.writeEntry("Baud", 115200 ); @@ -30,15 +34,14 @@ SenderUI::SenderUI() qWarning("could not open"); - } SenderUI::~SenderUI() { } void SenderUI::slotSendFile() { - sz = new SzTransfer(SzTransfer::SZ, ser); - sz->sendFile("/home/jake/test"); + sz = new FileTransfer(FileTransfer::SZ, ser); + sz->sendFile("/home/ich/bootopie-v06-13.jffs2"); connect (sz, SIGNAL(sent()), this, SLOT(fileTransComplete())); @@ -60,3 +63,6 @@ void SenderUI::fileTransComplete() { qWarning("file transfer compete"); } +void SenderUI::send() { + +} diff --git a/noncore/apps/opie-console/test/senderui.h b/noncore/apps/opie-console/test/senderui.h index f6230cc..5e613cd 100644 --- a/noncore/apps/opie-console/test/senderui.h +++ b/noncore/apps/opie-console/test/senderui.h @@ -6,7 +6,9 @@ #include "sender.h" class IOSerial; -class SzTransfer; +class FileTransfer; +class QSocketNotifier; +class OProcess; class SenderUI : public Sender { Q_OBJECT public: @@ -14,13 +16,17 @@ public: ~SenderUI(); public slots: + void send(); void slotSendFile(); void slotSend(); void got(const QByteArray& ); void fileTransComplete(); private: IOSerial* ser; - SzTransfer* sz; + FileTransfer* sz; + int m_fd; + QSocketNotifier* m_sock; + OProcess* m_proc; }; |