From 4151cc12a6c37cbec4bb6883204703eec2fb8648 Mon Sep 17 00:00:00 2001 From: harlekin Date: Fri, 25 Oct 2002 18:48:25 +0000 Subject: added data bits and stop bits --- (limited to 'noncore/apps/opie-console') diff --git a/noncore/apps/opie-console/iolayerbase.cpp b/noncore/apps/opie-console/iolayerbase.cpp index 47f9e76..ba7c86e 100644 --- a/noncore/apps/opie-console/iolayerbase.cpp +++ b/noncore/apps/opie-console/iolayerbase.cpp @@ -4,6 +4,7 @@ #include #include #include +#include #include "iolayerbase.h" @@ -28,6 +29,19 @@ namespace { id_baud_9600 }; + enum DataIds { + id_data_5, + id_data_6, + id_data_7, + id_data_8 + }; + + enum StopIds { + id_stop_1, + id_stop_1_5, + id_stop_2 + }; + } @@ -37,35 +51,35 @@ IOLayerBase::IOLayerBase( QWidget* par, const char* name ) m_speedLabel = new QLabel(tr("Speed"), this ); m_speedBox = new QComboBox(this ); - m_groupFlow = new QButtonGroup(tr("Flow control"),this ); + m_groupFlow = new QHButtonGroup(tr("Flow control"),this ); m_flowHw = new QRadioButton(tr("Hardware"), m_groupFlow ); m_flowSw = new QRadioButton(tr("Software"), m_groupFlow ); m_flowNone = new QRadioButton( tr("None"), m_groupFlow ); - m_groupParity = new QButtonGroup(tr("Parity"), this ); + m_groupParity = new QHButtonGroup(tr("Parity"), this ); m_parityNone = new QRadioButton(tr("None"), m_groupParity ); m_parityOdd = new QRadioButton(tr("Odd"), m_groupParity ); m_parityEven = new QRadioButton(tr("Even"), m_groupParity ); + m_groupData = new QHButtonGroup(tr("Data Bits"), this); + m_data5 = new QRadioButton(tr("5"), m_groupData ); + m_data6 = new QRadioButton(tr("6"), m_groupData ); + m_data7 = new QRadioButton(tr("7"), m_groupData ); + m_data8 = new QRadioButton(tr("8"), m_groupData ); + + m_groupStop = new QHButtonGroup(tr("Stop Bits"), this ); + m_stop1 = new QRadioButton(tr("1"), m_groupStop ); + m_stop15 = new QRadioButton(tr("1.5"), m_groupStop ); + m_stop2 = new QRadioButton(tr("2"), m_groupStop ); + + m_lroot = new QVBoxLayout( this ); m_lroot->add(m_speedLabel ); m_lroot->add(m_speedBox ); - m_lroot->setStretchFactor(m_speedLabel, 1); - m_lroot->setStretchFactor(m_speedBox, 1 ); - - m_hbox = new QHBoxLayout(m_groupFlow, 2 ); - m_hbox->add(m_flowHw ); - m_hbox->add(m_flowSw ); - m_hbox->add(m_flowNone ); m_lroot->add(m_groupFlow ); - m_lroot->setStretchFactor(m_groupFlow, 2 ); - - m_hboxPar = new QHBoxLayout( m_groupParity, 2 ); - m_hboxPar->add(m_parityOdd ); - m_hboxPar->add(m_parityEven ); - m_hboxPar->add(m_parityNone ); m_lroot->add(m_groupParity ); - m_lroot->setStretchFactor(m_groupParity, 2 ); + m_lroot->add( m_groupData ); + m_lroot->add( m_groupStop ); m_lroot->addStretch(2); // profiles @@ -128,6 +142,41 @@ void IOLayerBase::setSpeed( Speed sp ) { } m_speedBox->setCurrentItem(index ); } + +void IOLayerBase::setData( Data data ) { + switch( data ) { + case Data_Five: + m_data5->setChecked( true ); + break; + case Data_Six: + m_data6->setChecked( true ); + break; + case Data_Seven: + m_data7->setChecked( true ); + break; + default: + m_data8->setChecked( true ); + break; + } +} + + +void IOLayerBase::setStop( Stop stop ) { + switch( stop ) { + case Stop_Two: + m_stop2->setChecked( true ); + break; + case Stop_OnePointFive: + m_stop15->setChecked( true ); + break; + default: + m_stop1->setChecked( true ); + break; + } +} + + + IOLayerBase::Flow IOLayerBase::flow()const { if (m_flowHw->isChecked() ) { return Hardware; @@ -167,3 +216,24 @@ IOLayerBase::Speed IOLayerBase::speed()const{ 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() ) { + return Data_Seven; + } else { + return Data_Eight; + } +} +IOLayerBase::Stop IOLayerBase::stop()const { + if ( m_stop2->isChecked() ) { + return Stop_Two; + } else if ( m_stop15->isChecked() ) { + return Stop_OnePointFive; + } else { + return Stop_One; + } +} + diff --git a/noncore/apps/opie-console/iolayerbase.h b/noncore/apps/opie-console/iolayerbase.h index 74de46a..e1b96df 100644 --- a/noncore/apps/opie-console/iolayerbase.h +++ b/noncore/apps/opie-console/iolayerbase.h @@ -22,25 +22,34 @@ public: Baud_38400, Baud_19200, Baud_9600 }; + 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 ); Flow flow()const; Parity parity()const; Speed speed()const; + Data data()const; + Stop stop()const; private: QVBoxLayout* m_lroot; QLabel* m_speedLabel; QComboBox* m_speedBox; - QButtonGroup* m_groupFlow; + QButtonGroup* m_groupFlow, *m_groupData, *m_groupStop ; QRadioButton *m_flowHw, *m_flowSw, *m_flowNone; QButtonGroup* m_groupParity; QRadioButton *m_parityOdd, *m_parityEven, *m_parityNone; + QRadioButton *m_data5, *m_data6, *m_data7, *m_data8; + QRadioButton *m_stop1, *m_stop15, *m_stop2; QHBoxLayout* m_hbox; QHBoxLayout* m_hboxPar; }; diff --git a/noncore/apps/opie-console/modemconfigwidget.cpp b/noncore/apps/opie-console/modemconfigwidget.cpp index ec83b9f..ce44dab 100644 --- a/noncore/apps/opie-console/modemconfigwidget.cpp +++ b/noncore/apps/opie-console/modemconfigwidget.cpp @@ -34,8 +34,9 @@ ModemConfigWidget::ModemConfigWidget( const QString& name, QWidget* parent, QLabel* telLabel = new QLabel( this ); telLabel->setText( tr( "Enter telefon number here:" ) ); - m_telNumber = new QLineEdit( this ); + // m_telNumber = new QLineEdit( this ); QHBox *buttonBox = new QHBox( this ); + m_telNumber = new QLineEdit( buttonBox ); QPushButton *atButton = new QPushButton( buttonBox ); atButton->setText( tr( "AT commands" ) ); // disabled for now @@ -46,15 +47,14 @@ ModemConfigWidget::ModemConfigWidget( const QString& name, QWidget* parent, dialButton->setText( tr( "Enter number" ) ); connect( dialButton, SIGNAL( clicked() ), this, SLOT( slotDial() ) ); - m_base = new IOLayerBase( this, "base" ); m_lay->addWidget( m_device ); m_lay->addWidget( m_deviceCmb ); m_lay->addWidget( telLabel ); - m_lay->addWidget( m_telNumber ); m_lay->addWidget( buttonBox ); m_lay->addWidget( m_base ); + m_lay->addStretch( 0 ); m_deviceCmb->insertItem( "/dev/ttyS0" ); m_deviceCmb->insertItem( "/dev/ttyS1" ); @@ -71,6 +71,8 @@ void ModemConfigWidget::load( const Profile& prof ) { int rad_flow = prof.readNumEntry( "Flow" ); int rad_parity = prof.readNumEntry( "Parity" ); int speed = prof.readNumEntry( "Speed" ); + int dbits = prof.readNumEntry("DataBits"); + int sbits = prof.readNumEntry("StopBits"); QString number = prof.readEntry( "Number" ); if ( !number.isEmpty() ) { @@ -113,6 +115,27 @@ void ModemConfigWidget::load( const Profile& prof ) { 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 ); + } else { + m_base->setData( IOLayerBase::Data_Eight ); + } + + if ( sbits == 2) { + m_base->setStop( IOLayerBase::Stop_Two ); + } else if ( sbits == 15 ) { + m_base->setStop( IOLayerBase::Stop_OnePointFive ); + } else { + m_base->setStop( IOLayerBase::Stop_One ); + } + + + if ( prof.readEntry( "Device" ).isEmpty() ) { return; } @@ -127,8 +150,8 @@ void ModemConfigWidget::load( const Profile& prof ) { * parity */ void ModemConfigWidget::save( Profile& prof ) { - int flow, parity, speed; - flow = parity = speed = 0; + int flow, parity, speed, data, stop; + flow = parity = speed = data = stop = 0; prof.writeEntry( "Device", m_deviceCmb->currentText() ); @@ -174,9 +197,38 @@ void ModemConfigWidget::save( Profile& prof ) { 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; + case IOLayerBase::Data_Eight: + data = 8; + break; + } + + switch( m_base->stop() ) { + case IOLayerBase::Stop_One: + stop = 1; + break; + case IOLayerBase::Stop_OnePointFive: + stop = 15; + break; + case IOLayerBase::Stop_Two: + stop = 2; + break; + } + prof.writeEntry( "Flow", flow ); prof.writeEntry( "Parity", parity ); prof.writeEntry( "Speed", speed ); + prof.writeEntry("DataBits", data); + prof.writeEntry("StopBits", stop); prof.writeEntry( "Number", m_telNumber->text() ); diff --git a/noncore/apps/opie-console/serialconfigwidget.cpp b/noncore/apps/opie-console/serialconfigwidget.cpp index 5c6d975..3edf723 100644 --- a/noncore/apps/opie-console/serialconfigwidget.cpp +++ b/noncore/apps/opie-console/serialconfigwidget.cpp @@ -50,6 +50,8 @@ void SerialConfigWidget::load( const Profile& prof ) { int rad_flow = prof.readNumEntry("Flow"); int rad_parity = prof.readNumEntry("Parity"); int speed = prof.readNumEntry("Speed"); + int dbits = prof.readNumEntry("DataBits"); + int sbits = prof.readNumEntry("StopBits"); if (rad_flow == 1) { m_base->setFlow( IOLayerBase::Hardware ); @@ -86,6 +88,24 @@ void SerialConfigWidget::load( const Profile& prof ) { 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 ); + } else { + m_base->setData( IOLayerBase::Data_Eight ); + } + + if ( sbits == 2) { + m_base->setStop( IOLayerBase::Stop_Two ); + } else if ( sbits == 15 ) { + m_base->setStop( IOLayerBase::Stop_OnePointFive ); + } else { + m_base->setStop( IOLayerBase::Stop_One ); + } + if ( prof.readEntry("Device").isEmpty() ) return; setCurrent( prof.readEntry("Device"), m_deviceCmb ); @@ -96,8 +116,8 @@ void SerialConfigWidget::load( const Profile& prof ) { * parity */ void SerialConfigWidget::save( Profile& prof ) { - int flow, parity, speed ; - flow = parity = speed = 0; + int flow, parity, speed, data, stop; + flow = parity = speed = data = stop = 0; prof.writeEntry("Device", m_deviceCmb->currentText() ); switch( m_base->flow() ) { @@ -143,7 +163,36 @@ void SerialConfigWidget::save( Profile& prof ) { 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; + case IOLayerBase::Data_Eight: + data = 8; + break; + } + + switch( m_base->stop() ) { + case IOLayerBase::Stop_One: + stop = 1; + break; + case IOLayerBase::Stop_OnePointFive: + stop = 15; + break; + case IOLayerBase::Stop_Two: + stop = 2; + break; + } + prof.writeEntry("Flow", flow); prof.writeEntry("Parity", parity); prof.writeEntry("Speed", speed); + prof.writeEntry("DataBits", data); + prof.writeEntry("StopBits", stop); } -- cgit v0.9.0.2