summaryrefslogtreecommitdiff
path: root/noncore
authorharlekin <harlekin>2004-10-12 21:50:15 (UTC)
committer harlekin <harlekin>2004-10-12 21:50:15 (UTC)
commit52867c8ca21a3bec10eb27c8f698855d8fca320e (patch) (side-by-side diff)
tree4958cca23caa32d85aa78de9c95715b34599f261 /noncore
parent4eed63767cedb0d96b116c4b9233405ca93e5541 (diff)
downloadopie-52867c8ca21a3bec10eb27c8f698855d8fca320e.zip
opie-52867c8ca21a3bec10eb27c8f698855d8fca320e.tar.gz
opie-52867c8ca21a3bec10eb27c8f698855d8fca320e.tar.bz2
also make 1200 baud connection possible
Diffstat (limited to 'noncore') (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
@@ -96,24 +96,27 @@ void BTConfigWidget::load( const Profile& prof ) {
case 38400:
m_base->setSpeed(IOLayerBase::Baud_38400 );
break;
case 19200:
m_base->setSpeed( IOLayerBase::Baud_19200 );
break;
case 4800:
m_base->setSpeed( IOLayerBase::Baud_4800 );
break;
case 2400:
m_base->setSpeed( IOLayerBase::Baud_2400 );
break;
+ case 1200:
+ m_base->setSpeed( IOLayerBase::Baud_1200 );
+ break;
case 9600:
default:
m_base->setSpeed(IOLayerBase::Baud_9600 );
break;
}
if ( prof.readEntry("Device").isEmpty() ) return;
setCurrent( prof.readEntry("Device"), m_deviceCmb );
}
/*
* save speed,
@@ -160,24 +163,27 @@ void BTConfigWidget::save( Profile& prof ) {
case IOLayerBase::Baud_38400:
speed = 38400;
break;
case IOLayerBase::Baud_19200:
speed = 19200;
break;
case IOLayerBase::Baud_4800:
speed = 4800;
break;
case IOLayerBase::Baud_2400:
speed = 2400;
break;
+ case IOLayerBase::Baud_1200;
+ speed = 1200;
+ break;
default:
case IOLayerBase::Baud_9600:
speed = 9600;
break;
}
prof.writeEntry("Flow", flow);
prof.writeEntry("Parity", parity);
prof.writeEntry("Speed", speed);
prof.writeEntry("Mac", m_mac->text() );
}
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
@@ -17,25 +17,26 @@ namespace {
id_flow_hw,
id_flow_sw,
id_flow_none,
};
enum SpeedIds {
id_baud_115200,
id_baud_57600,
id_baud_38400,
id_baud_19200,
id_baud_9600,
id_baud_4800,
- id_baud_2400
+ id_baud_2400,
+ id_baud_1200
};
enum DataIds {
id_data_5,
id_data_6,
id_data_7,
id_data_8
};
enum StopIds {
id_stop_1,
id_stop_1_5,
@@ -81,24 +82,25 @@ IOLayerBase::IOLayerBase( QWidget* par, const char* name )
m_lroot->add( m_groupData );
m_lroot->add( m_groupStop );
m_lroot->addStretch(2);
// profiles
m_speedBox->insertItem(tr("115200 baud"), id_baud_115200 );
m_speedBox->insertItem(tr("57600 baud"), id_baud_57600 );
m_speedBox->insertItem(tr("38400 baud"), id_baud_38400 );
m_speedBox->insertItem(tr("19200 baud"), id_baud_19200 );
m_speedBox->insertItem(tr("9600 baud"), id_baud_9600 );
m_speedBox->insertItem(tr("4800 baud"), id_baud_4800 );
m_speedBox->insertItem(tr("2400 baud"), id_baud_2400 );
+ m_speedBox->insertItem(tr("1200 baud"), id_baud_1200 );
};
IOLayerBase::~IOLayerBase() {
}
void IOLayerBase::setFlow( Flow flo ) {
switch ( flo ) {
case Software:
m_flowSw->setChecked( true );
break;
case Hardware:
m_flowHw->setChecked( true );
break;
@@ -133,24 +135,27 @@ void IOLayerBase::setSpeed( Speed sp ) {
case Baud_38400:
index = id_baud_38400;
break;
case Baud_19200:
index = id_baud_19200;
break;
case Baud_4800:
index = id_baud_4800;
break;
case Baud_2400:
index = id_baud_2400;
break;
+ case Baud_1200:
+ index = id_baud_1200;
+ break;
default:
case Baud_9600:
index = id_baud_9600;
break;
}
m_speedBox->setCurrentItem(index );
}
void IOLayerBase::setData( Data data ) {
switch( data ) {
case Data_Five:
m_data5->setChecked( true );
@@ -214,24 +219,27 @@ IOLayerBase::Speed IOLayerBase::speed()const{
case id_baud_38400:
return Baud_38400;
break;
case id_baud_19200:
return Baud_19200;
break;
case id_baud_4800:
return Baud_4800;
break;
case id_baud_2400:
return Baud_2400;
break;
+ case id_baud_1200:
+ return Baud_1200;
+ break;
default:
case id_baud_9600:
return Baud_9600;
break;
}
}
IOLayerBase::Data IOLayerBase::data()const {
if ( m_data5->isChecked() ) {
return Data_Five;
} else if ( m_data6->isChecked() ) {
return Data_Six;
} else if ( m_data7->isChecked() ) {
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
@@ -14,25 +14,26 @@ class IOLayerBase : public QWidget {
Q_OBJECT
public:
enum Flow { Hardware, Software, None };
enum Parity{ Odd =2 , Even =1, NonePar =0 };
enum Speed{ Baud_115200,
Baud_57600,
Baud_38400,
Baud_19200,
Baud_9600,
Baud_4800,
- Baud_2400 };
+ Baud_2400,
+ Baud_1200 };
enum Data { Data_Five =5, Data_Six =6, Data_Seven=7, Data_Eight=8 };
enum Stop { Stop_One =1, Stop_OnePointFive=15, Stop_Two=2 };
IOLayerBase( QWidget* base, const char* name = 0l);
~IOLayerBase();
void setFlow( Flow flo );
void setParity( Parity par );
void setSpeed( Speed speed );
void setData( Data data );
void setStop( Stop stop );
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
@@ -75,24 +75,27 @@ void IrdaConfigWidget::load( const Profile& prof ) {
case 38400:
m_base->setSpeed(IOLayerBase::Baud_38400 );
break;
case 19200:
m_base->setSpeed( IOLayerBase::Baud_19200 );
break;
case 4800:
m_base->setSpeed( IOLayerBase::Baud_4800 );
break;
case 2400:
m_base->setSpeed( IOLayerBase::Baud_2400 );
break;
+ case 1200:
+ m_base->setSpeed( IOLayerBase::Baud_1200 );
+ break;
case 9600:
default:
m_base->setSpeed(IOLayerBase::Baud_9600 );
break;
}
if ( prof.readEntry("Device").isEmpty() ) return;
setCurrent( prof.readEntry("Device"), m_deviceCmb );
}
/*
* save speed,
@@ -139,22 +142,25 @@ void IrdaConfigWidget::save( Profile& prof ) {
case IOLayerBase::Baud_38400:
speed = 38400;
break;
case IOLayerBase::Baud_19200:
speed = 19200;
break;
case IOLayerBase::Baud_4800:
speed = 4800;
break;
case IOLayerBase::Baud_2400:
speed = 2400;
break;
+ case IOLayerBase::Baud_1200:
+ speed = 2400;
+ break;
default:
case IOLayerBase::Baud_9600:
speed = 9600;
break;
}
prof.writeEntry("Flow", flow);
prof.writeEntry("Parity", parity);
prof.writeEntry("Speed", speed);
}
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
@@ -107,24 +107,26 @@ void ModemConfigWidget::load( const Profile& prof ) {
case 38400:
m_base->setSpeed( IOLayerBase::Baud_38400 );
break;
case 19200:
m_base->setSpeed( IOLayerBase::Baud_19200 );
break;
case 4800:
m_base->setSpeed( IOLayerBase::Baud_4800 );
break;
case 2400:
m_base->setSpeed( IOLayerBase::Baud_2400 );
break;
+ case 1200:
+ m_base->setSpeed( IOLayerBase::Baud_1200 );
case 9600:
default:
m_base->setSpeed( IOLayerBase::Baud_9600 );
break;
}
if ( dbits == 5) {
m_base->setData( IOLayerBase::Data_Five );
} else if (rad_flow == 6) {
m_base->setData( IOLayerBase::Data_Six );
} else if (rad_flow == 7) {
@@ -200,24 +202,27 @@ void ModemConfigWidget::save( Profile& prof ) {
case IOLayerBase::Baud_19200:
speed = 19200;
break;
case IOLayerBase::Baud_9600:
speed = 9600;
break;
case IOLayerBase::Baud_4800:
speed = 4800;
break;
case IOLayerBase::Baud_2400:
speed = 2400;
break;
+ case IOLayerBase::Baud_1200:
+ speed = 1200;
+ break;
}
switch( m_base->data() ) {
case IOLayerBase::Data_Five:
data = 5;
break;
case IOLayerBase::Data_Six:
data = 6;
break;
case IOLayerBase::Data_Seven:
data = 7;
break;
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
@@ -79,24 +79,27 @@ void SerialConfigWidget::load( const Profile& prof ) {
case 38400:
m_base->setSpeed(IOLayerBase::Baud_38400 );
break;
case 19200:
m_base->setSpeed( IOLayerBase::Baud_19200 );
break;
case 4800:
m_base->setSpeed( IOLayerBase::Baud_4800 );
break;
case 2400:
m_base->setSpeed( IOLayerBase::Baud_2400 );
break;
+ case 1200:
+ m_base->setSpeed( IOLayerBase::Baud_1200 );
+ break;
case 9600:
default:
m_base->setSpeed(IOLayerBase::Baud_9600 );
break;
}
if ( dbits == 5) {
m_base->setData( IOLayerBase::Data_Five );
} else if (rad_flow == 6) {
m_base->setData( IOLayerBase::Data_Six );
} else if (rad_flow == 7) {
m_base->setData( IOLayerBase::Data_Seven );
@@ -160,24 +163,27 @@ void SerialConfigWidget::save( Profile& prof ) {
case IOLayerBase::Baud_38400:
speed = 38400;
break;
case IOLayerBase::Baud_19200:
speed = 19200;
break;
case IOLayerBase::Baud_4800:
speed = 4800;
break;
case IOLayerBase::Baud_2400:
speed = 2400;
break;
+ case IOLayerBase::Baud_1200:
+ speed = 1200;
+ break;
default:
case IOLayerBase::Baud_9600:
speed = 9600;
break;
}
switch( m_base->data() ) {
case IOLayerBase::Data_Five:
data = 5;
break;
case IOLayerBase::Data_Six:
data = 6;