summaryrefslogtreecommitdiff
authorharlekin <harlekin>2004-10-12 21:50:15 (UTC)
committer harlekin <harlekin>2004-10-12 21:50:15 (UTC)
commit52867c8ca21a3bec10eb27c8f698855d8fca320e (patch) (unidiff)
tree4958cca23caa32d85aa78de9c95715b34599f261
parent4eed63767cedb0d96b116c4b9233405ca93e5541 (diff)
downloadopie-52867c8ca21a3bec10eb27c8f698855d8fca320e.zip
opie-52867c8ca21a3bec10eb27c8f698855d8fca320e.tar.gz
opie-52867c8ca21a3bec10eb27c8f698855d8fca320e.tar.bz2
also make 1200 baud connection possible
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/opie-console/btconfigwidget.cpp6
-rw-r--r--noncore/apps/opie-console/iolayerbase.cpp10
-rw-r--r--noncore/apps/opie-console/iolayerbase.h3
-rw-r--r--noncore/apps/opie-console/irdaconfigwidget.cpp6
-rw-r--r--noncore/apps/opie-console/modemconfigwidget.cpp5
-rw-r--r--noncore/apps/opie-console/serialconfigwidget.cpp6
6 files changed, 34 insertions, 2 deletions
diff --git a/noncore/apps/opie-console/btconfigwidget.cpp b/noncore/apps/opie-console/btconfigwidget.cpp
index e1ff18a..7f82e06 100644
--- a/noncore/apps/opie-console/btconfigwidget.cpp
+++ b/noncore/apps/opie-console/btconfigwidget.cpp
@@ -104,8 +104,11 @@ void BTConfigWidget::load( const Profile& prof ) {
104 break; 104 break;
105 case 2400: 105 case 2400:
106 m_base->setSpeed( IOLayerBase::Baud_2400 ); 106 m_base->setSpeed( IOLayerBase::Baud_2400 );
107 break; 107 break;
108 case 1200:
109 m_base->setSpeed( IOLayerBase::Baud_1200 );
110 break;
108 case 9600: 111 case 9600:
109 default: 112 default:
110 m_base->setSpeed(IOLayerBase::Baud_9600 ); 113 m_base->setSpeed(IOLayerBase::Baud_9600 );
111 break; 114 break;
@@ -168,8 +171,11 @@ void BTConfigWidget::save( Profile& prof ) {
168 break; 171 break;
169 case IOLayerBase::Baud_2400: 172 case IOLayerBase::Baud_2400:
170 speed = 2400; 173 speed = 2400;
171 break; 174 break;
175 case IOLayerBase::Baud_1200;
176 speed = 1200;
177 break;
172 default: 178 default:
173 case IOLayerBase::Baud_9600: 179 case IOLayerBase::Baud_9600:
174 speed = 9600; 180 speed = 9600;
175 break; 181 break;
diff --git a/noncore/apps/opie-console/iolayerbase.cpp b/noncore/apps/opie-console/iolayerbase.cpp
index 0f64d6a..95c291f 100644
--- a/noncore/apps/opie-console/iolayerbase.cpp
+++ b/noncore/apps/opie-console/iolayerbase.cpp
@@ -25,9 +25,10 @@ namespace {
25 id_baud_38400, 25 id_baud_38400,
26 id_baud_19200, 26 id_baud_19200,
27 id_baud_9600, 27 id_baud_9600,
28 id_baud_4800, 28 id_baud_4800,
29 id_baud_2400 29 id_baud_2400,
30 id_baud_1200
30 }; 31 };
31 32
32 enum DataIds { 33 enum DataIds {
33 id_data_5, 34 id_data_5,
@@ -89,8 +90,9 @@ IOLayerBase::IOLayerBase( QWidget* par, const char* name )
89 m_speedBox->insertItem(tr("19200 baud"), id_baud_19200 ); 90 m_speedBox->insertItem(tr("19200 baud"), id_baud_19200 );
90 m_speedBox->insertItem(tr("9600 baud"), id_baud_9600 ); 91 m_speedBox->insertItem(tr("9600 baud"), id_baud_9600 );
91 m_speedBox->insertItem(tr("4800 baud"), id_baud_4800 ); 92 m_speedBox->insertItem(tr("4800 baud"), id_baud_4800 );
92 m_speedBox->insertItem(tr("2400 baud"), id_baud_2400 ); 93 m_speedBox->insertItem(tr("2400 baud"), id_baud_2400 );
94 m_speedBox->insertItem(tr("1200 baud"), id_baud_1200);
93}; 95};
94IOLayerBase::~IOLayerBase() { 96IOLayerBase::~IOLayerBase() {
95 97
96} 98}
@@ -141,8 +143,11 @@ void IOLayerBase::setSpeed( Speed sp ) {
141 break; 143 break;
142 case Baud_2400: 144 case Baud_2400:
143 index = id_baud_2400; 145 index = id_baud_2400;
144 break; 146 break;
147 case Baud_1200:
148 index = id_baud_1200;
149 break;
145 default: 150 default:
146 case Baud_9600: 151 case Baud_9600:
147 index = id_baud_9600; 152 index = id_baud_9600;
148 break; 153 break;
@@ -222,8 +227,11 @@ IOLayerBase::Speed IOLayerBase::speed()const{
222 break; 227 break;
223 case id_baud_2400: 228 case id_baud_2400:
224 return Baud_2400; 229 return Baud_2400;
225 break; 230 break;
231 case id_baud_1200:
232 return Baud_1200;
233 break;
226 default: 234 default:
227 case id_baud_9600: 235 case id_baud_9600:
228 return Baud_9600; 236 return Baud_9600;
229 break; 237 break;
diff --git a/noncore/apps/opie-console/iolayerbase.h b/noncore/apps/opie-console/iolayerbase.h
index 214a35c..7d304a1 100644
--- a/noncore/apps/opie-console/iolayerbase.h
+++ b/noncore/apps/opie-console/iolayerbase.h
@@ -22,9 +22,10 @@ public:
22 Baud_38400, 22 Baud_38400,
23 Baud_19200, 23 Baud_19200,
24 Baud_9600, 24 Baud_9600,
25 Baud_4800, 25 Baud_4800,
26 Baud_2400 }; 26 Baud_2400,
27 Baud_1200 };
27 enum Data { Data_Five =5, Data_Six =6, Data_Seven=7, Data_Eight=8 }; 28 enum Data { Data_Five =5, Data_Six =6, Data_Seven=7, Data_Eight=8 };
28 enum Stop { Stop_One =1, Stop_OnePointFive=15, Stop_Two=2 }; 29 enum Stop { Stop_One =1, Stop_OnePointFive=15, Stop_Two=2 };
29 30
30 IOLayerBase( QWidget* base, const char* name = 0l); 31 IOLayerBase( QWidget* base, const char* name = 0l);
diff --git a/noncore/apps/opie-console/irdaconfigwidget.cpp b/noncore/apps/opie-console/irdaconfigwidget.cpp
index 4ee770d..713862d 100644
--- a/noncore/apps/opie-console/irdaconfigwidget.cpp
+++ b/noncore/apps/opie-console/irdaconfigwidget.cpp
@@ -83,8 +83,11 @@ void IrdaConfigWidget::load( const Profile& prof ) {
83 break; 83 break;
84 case 2400: 84 case 2400:
85 m_base->setSpeed( IOLayerBase::Baud_2400 ); 85 m_base->setSpeed( IOLayerBase::Baud_2400 );
86 break; 86 break;
87 case 1200:
88 m_base->setSpeed( IOLayerBase::Baud_1200);
89 break;
87 case 9600: 90 case 9600:
88 default: 91 default:
89 m_base->setSpeed(IOLayerBase::Baud_9600 ); 92 m_base->setSpeed(IOLayerBase::Baud_9600 );
90 break; 93 break;
@@ -147,8 +150,11 @@ void IrdaConfigWidget::save( Profile& prof ) {
147 break; 150 break;
148 case IOLayerBase::Baud_2400: 151 case IOLayerBase::Baud_2400:
149 speed = 2400; 152 speed = 2400;
150 break; 153 break;
154 case IOLayerBase::Baud_1200:
155 speed = 2400;
156 break;
151 default: 157 default:
152 case IOLayerBase::Baud_9600: 158 case IOLayerBase::Baud_9600:
153 speed = 9600; 159 speed = 9600;
154 break; 160 break;
diff --git a/noncore/apps/opie-console/modemconfigwidget.cpp b/noncore/apps/opie-console/modemconfigwidget.cpp
index 90d0b5b..b2f5c68 100644
--- a/noncore/apps/opie-console/modemconfigwidget.cpp
+++ b/noncore/apps/opie-console/modemconfigwidget.cpp
@@ -115,8 +115,10 @@ void ModemConfigWidget::load( const Profile& prof ) {
115 break; 115 break;
116 case 2400: 116 case 2400:
117 m_base->setSpeed( IOLayerBase::Baud_2400 ); 117 m_base->setSpeed( IOLayerBase::Baud_2400 );
118 break; 118 break;
119 case 1200:
120 m_base->setSpeed( IOLayerBase::Baud_1200 );
119 case 9600: 121 case 9600:
120 default: 122 default:
121 m_base->setSpeed( IOLayerBase::Baud_9600 ); 123 m_base->setSpeed( IOLayerBase::Baud_9600 );
122 break; 124 break;
@@ -208,8 +210,11 @@ void ModemConfigWidget::save( Profile& prof ) {
208 break; 210 break;
209 case IOLayerBase::Baud_2400: 211 case IOLayerBase::Baud_2400:
210 speed = 2400; 212 speed = 2400;
211 break; 213 break;
214 case IOLayerBase::Baud_1200:
215 speed = 1200;
216 break;
212 } 217 }
213 218
214 switch( m_base->data() ) { 219 switch( m_base->data() ) {
215 case IOLayerBase::Data_Five: 220 case IOLayerBase::Data_Five:
diff --git a/noncore/apps/opie-console/serialconfigwidget.cpp b/noncore/apps/opie-console/serialconfigwidget.cpp
index 5f3547a..c4c9c99 100644
--- a/noncore/apps/opie-console/serialconfigwidget.cpp
+++ b/noncore/apps/opie-console/serialconfigwidget.cpp
@@ -87,8 +87,11 @@ void SerialConfigWidget::load( const Profile& prof ) {
87 break; 87 break;
88 case 2400: 88 case 2400:
89 m_base->setSpeed( IOLayerBase::Baud_2400 ); 89 m_base->setSpeed( IOLayerBase::Baud_2400 );
90 break; 90 break;
91 case 1200:
92 m_base->setSpeed( IOLayerBase::Baud_1200 );
93 break;
91 case 9600: 94 case 9600:
92 default: 95 default:
93 m_base->setSpeed(IOLayerBase::Baud_9600 ); 96 m_base->setSpeed(IOLayerBase::Baud_9600 );
94 break; 97 break;
@@ -168,8 +171,11 @@ void SerialConfigWidget::save( Profile& prof ) {
168 break; 171 break;
169 case IOLayerBase::Baud_2400: 172 case IOLayerBase::Baud_2400:
170 speed = 2400; 173 speed = 2400;
171 break; 174 break;
175 case IOLayerBase::Baud_1200:
176 speed = 1200;
177 break;
172 default: 178 default:
173 case IOLayerBase::Baud_9600: 179 case IOLayerBase::Baud_9600:
174 speed = 9600; 180 speed = 9600;
175 break; 181 break;