summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/opietooth/applet/bluezapplet.cpp22
1 files changed, 17 insertions, 5 deletions
diff --git a/noncore/net/opietooth/applet/bluezapplet.cpp b/noncore/net/opietooth/applet/bluezapplet.cpp
index f1618ae..39c15ab 100644
--- a/noncore/net/opietooth/applet/bluezapplet.cpp
+++ b/noncore/net/opietooth/applet/bluezapplet.cpp
@@ -35,6 +35,8 @@
35#include <qpe/resource.h> 35#include <qpe/resource.h>
36#include <qpe/config.h> 36#include <qpe/config.h>
37 37
38#include <opie/odevice.h>
39
38#include <qpoint.h> 40#include <qpoint.h>
39#include <qpainter.h> 41#include <qpainter.h>
40#include <qlayout.h> 42#include <qlayout.h>
@@ -46,6 +48,8 @@
46 48
47#include <device.h> 49#include <device.h>
48 50
51using namespace Opie;
52
49namespace OpieTooth { 53namespace OpieTooth {
50 54
51 BluezApplet::BluezApplet( QWidget *parent, const char *name ) : QWidget( parent, name ) { 55 BluezApplet::BluezApplet( QWidget *parent, const char *name ) : QWidget( parent, name ) {
@@ -81,10 +85,18 @@ namespace OpieTooth {
81 85
82 int BluezApplet::setBluezStatus(int c) { 86 int BluezApplet::setBluezStatus(int c) {
83 87
84 if (c == 1) { 88 if ( c == 1 ) {
85 btDevice = new Device("/dev/ttySB0", "bcsp", "230400" ); 89 switch ( ODevice::inst()->model() ) {
90 case Model_iPAQ_H39xx:
91 btDevice = new Device( "/dev/tts/1", "bcsp", "921600" );
92 break;
93
94 default:
95 btDevice = new Device( "/dev/ttySB0", "bcsp", "230400" );
96 break;
97 }
86 } else { 98 } else {
87 if (btDevice) { 99 if ( btDevice ) {
88 delete btDevice; 100 delete btDevice;
89 btDevice = 0; 101 btDevice = 0;
90 } 102 }
@@ -117,8 +129,8 @@ namespace OpieTooth {
117 menu->insertItem( tr("Launch manager"), 2 ); 129 menu->insertItem( tr("Launch manager"), 2 );
118 130
119 menu->insertSeparator(6); 131 menu->insertSeparator(6);
120 menu->insertItem( tr("Signal strength"), signal, 5); 132 //menu->insertItem( tr("Signal strength"), signal, 5);
121 menu->insertSeparator(8); 133 //menu->insertSeparator(8);
122 134
123 if (bluezDiscoveryActive) { 135 if (bluezDiscoveryActive) {
124 menu->insertItem( tr("Disable discovery"), 3 ); 136 menu->insertItem( tr("Disable discovery"), 3 );