-rw-r--r-- | noncore/settings/netsystemtime/main.cpp | 12 | ||||
-rw-r--r-- | noncore/settings/netsystemtime/netsystemtime.pro | 10 | ||||
-rw-r--r-- | noncore/settings/netsystemtime/ntp.cpp | 146 | ||||
-rw-r--r-- | noncore/settings/netsystemtime/ntp.h | 37 | ||||
-rw-r--r-- | noncore/settings/netsystemtime/ntpbase.ui | 322 | ||||
-rw-r--r-- | noncore/settings/netsystemtime/opie-netsystemtime.control | 8 |
6 files changed, 535 insertions, 0 deletions
diff --git a/noncore/settings/netsystemtime/main.cpp b/noncore/settings/netsystemtime/main.cpp new file mode 100644 index 0000000..2b23751 --- a/dev/null +++ b/noncore/settings/netsystemtime/main.cpp @@ -0,0 +1,12 @@ +#include "ntp.h" +#include <qpe/qpeapplication.h> + +int main( int argc, char ** argv ) +{ + QPEApplication a( argc, argv ); + + Ntp mw; + a.showMainWidget( &mw ); + + return a.exec(); +} diff --git a/noncore/settings/netsystemtime/netsystemtime.pro b/noncore/settings/netsystemtime/netsystemtime.pro new file mode 100644 index 0000000..b98e45d --- a/dev/null +++ b/noncore/settings/netsystemtime/netsystemtime.pro @@ -0,0 +1,10 @@ +TEMPLATE = app +CONFIG = qt warn_on debug +#CONFIG = qt warn_on release +HEADERS = ntp.h +SOURCES = main.cpp ntp.cpp +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += $(OPIEDIR)/include +LIBS += -lqpe -lopie +INTERFACES = ntpbase.ui +TARGET = ../../bin/netsystemtime diff --git a/noncore/settings/netsystemtime/ntp.cpp b/noncore/settings/netsystemtime/ntp.cpp new file mode 100644 index 0000000..c2b64f0 --- a/dev/null +++ b/noncore/settings/netsystemtime/ntp.cpp @@ -0,0 +1,146 @@ +#include "ntp.h" +#include <qpushbutton.h> +#include <qregexp.h> +#include <qtable.h> +#include <qlabel.h> +#include <qlineedit.h> +#include <qmultilineedit.h> +#include <opie/oprocess.h> +#include <qpe/config.h> +#include <qpe/global.h> +#include <qpe/timeconversion.h> +#include <qpe/tzselect.h> +#include <qpe/timestring.h> +#include <qpe/qpedialog.h> +#include <sys/time.h> +#include <time.h> +#include <stdlib.h> + + +Ntp::Ntp( QWidget* parent, const char* name, WFlags fl ) + : NtpBase( parent, name, fl ) +{ + Config cfg("ntp",Config::User); + cfg.setGroup("settings"); + _maxOffset = cfg.readNumEntry("maxOffset",5); + _minLookupDiff = cfg.readNumEntry("minLookupDiff",10); + LineEditNtpServer->setText( cfg.readEntry("ntpServer") ); + ntpProcess = new OProcess( ); + connect ( ntpProcess, SIGNAL(receivedStdout(OProcess*,char*,int)), + this, SLOT(getNtpOutput(OProcess*,char*,int))); + connect ( ntpProcess, SIGNAL(processExited(OProcess*)), + this, SLOT(ntpFinished(OProcess*))); + connect(runNtp, SIGNAL(clicked()), this, SLOT(slotRunNtp())); + _nextCorrection = new QTimer( this ); + connect( _nextCorrection, SIGNAL(timeout()), SLOT(correctClock()) ); + slotRunNtp(); + readLookups(); +} + +Ntp::~Ntp() +{ + Config cfg("ntp",Config::User); + cfg.setGroup("settings"); + cfg.writeEntry("ntpServer", LineEditNtpServer->text()); +} + + +void Ntp::slotRunNtp() +{ + TextLabelStartTime->setText(QDateTime::currentDateTime().toString()); + ntpProcess->clearArguments(); + *ntpProcess << "ntpdate" << LineEditNtpServer->text(); + bool ret = ntpProcess->start(OProcess::NotifyOnExit,OProcess::AllOutput); + if ( !ret ) { + qDebug("Error while executing ntp"); + outPut->append("\nError while executing\n\n"); + } +} + +void Ntp::getNtpOutput(OProcess *proc, char *buffer, int buflen) +{ + QString lineStr, lineStrOld; + lineStr = buffer; + lineStr=lineStr.left(buflen); + if (lineStr!=lineStrOld) + { + outPut->append(lineStr); + _ntpOutput += lineStr; + } + lineStrOld = lineStr; +} + +void Ntp::ntpFinished(OProcess*) +{ + Config cfg("ntp",Config::User); + cfg.setGroup("lookups"); + int lastLookup = cfg.readNumEntry("time",0); + int lookupCount = cfg.readNumEntry("count",-1); + int time = TimeConversion::toUTC( QDateTime::currentDateTime() ); + cfg.writeEntry("time", time); + + float timeShift = getTimeShift(); + if (timeShift = 0.0) return; + int secsSinceLast = time - lastLookup; + TextLabelNewTime->setText(QDateTime::currentDateTime().toString()); + if ( lastLookup > 0 && secsSinceLast > 60*_minLookupDiff) + { + lookupCount++; + cfg.writeEntry("count",lookupCount); + cfg.setGroup("lookup_"+QString::number(lookupCount)); + _shiftPerSec = timeShift / secsSinceLast; + float nextCorr = _maxOffset / _shiftPerSec; + qDebug("secs since last lookup %i", secsSinceLast);qDebug("timeshift since last lookup %f", timeShift);qDebug("timeshift since per sec %f", _shiftPerSec);qDebug("in %f secs the time will be shifted by %i", nextCorr,_maxOffset); + cfg.writeEntry("secsSinceLast",secsSinceLast); + cfg.writeEntry("timeShift",QString::number(timeShift)); + } +} + +void Ntp::correctClock() +{ + qDebug("current time: %s",QDateTime::currentDateTime().toString().latin1()); + Config cfg("ntp",Config::User); + cfg.setGroup("correction"); + int lastTime = cfg.readNumEntry("time",0); + int now = TimeConversion::toUTC( QDateTime::currentDateTime() ); + int corr = int((now - lastTime) * _shiftPerSec); + outPut->append( "time will be shifted by "+QString::number(corr)+ "secs"); + struct timeval myTv; + myTv.tv_sec = TimeConversion::toUTC( QDateTime::currentDateTime().addSecs(corr) ); + myTv.tv_usec = 0; + + if ( myTv.tv_sec != -1 ) + ::settimeofday( &myTv, 0 ); + Global::writeHWClock(); + cfg.writeEntry("time",now); + qDebug("current time: %s",QDateTime::currentDateTime().toString().latin1()); +} + +float Ntp::getTimeShift() +{ + QString _offset = "offset"; + QString _sec = "sec"; + QRegExp _reOffset = QRegExp(_offset); + QRegExp _reEndOffset = QRegExp(_sec); + int posOffset = _reOffset.match( _ntpOutput ); + int posEndOffset = _reEndOffset.match( _ntpOutput, posOffset ); + posOffset += _offset.length() + 1; + QString diff = _ntpOutput.mid(posOffset, posEndOffset-posOffset-1); + qDebug("%s", _ntpOutput.latin1()); + qDebug("diff = >%s<",diff.latin1()); + TextLabelTimeShift->setText(diff); + return diff.toFloat(); +} + +void Ntp::readLookups() +{ + Config cfg("ntp",Config::User); + cfg.setGroup("lookups"); + int lookupCount = cfg.readNumEntry("count",-1); + for (int i=0; i < lookupCount; i++) + { + cfg.setGroup("lookup_"+QString::number(i)); + TableLookups->setText( 1,i,cfg.readEntry("secsSinceLast",0)); + TableLookups->setText( 2,i,cfg.readEntry("timeShift",0)); + } +} diff --git a/noncore/settings/netsystemtime/ntp.h b/noncore/settings/netsystemtime/ntp.h new file mode 100644 index 0000000..4dc04b1 --- a/dev/null +++ b/noncore/settings/netsystemtime/ntp.h @@ -0,0 +1,37 @@ +#ifndef NTP_H +#define NTP_H +#include "ntpbase.h" +#include <qdatetime.h> +#include <qtimer.h> + +class OProcess; +class QString; + + +class Ntp : public NtpBase +{ + Q_OBJECT + +public: + Ntp( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + ~Ntp(); + + OProcess *ntpProcess; + +private: + QString _ntpOutput; + int _maxOffset; + float _shiftPerSec; + QTimer *_nextCorrection; + int _minLookupDiff; + + float getTimeShift(); + void readLookups(); +private slots: + void slotRunNtp(); + void getNtpOutput(OProcess *proc, char *buffer, int buflen); + void ntpFinished(OProcess*); + void correctClock(); +}; + +#endif diff --git a/noncore/settings/netsystemtime/ntpbase.ui b/noncore/settings/netsystemtime/ntpbase.ui new file mode 100644 index 0000000..eb09e4a --- a/dev/null +++ b/noncore/settings/netsystemtime/ntpbase.ui @@ -0,0 +1,322 @@ +<!DOCTYPE UI><UI> +<class>NtpBase</class> +<widget> + <class>QWidget</class> + <property stdset="1"> + <name>name</name> + <cstring>NtpBase</cstring> + </property> + <property stdset="1"> + <name>geometry</name> + <rect> + <x>0</x> + <y>0</y> + <width>296</width> + <height>337</height> + </rect> + </property> + <property stdset="1"> + <name>caption</name> + <string>Network Time</string> + </property> + <property> + <name>layoutMargin</name> + </property> + <property> + <name>layoutSpacing</name> + </property> + <grid> + <property stdset="1"> + <name>margin</name> + <number>2</number> + </property> + <property stdset="1"> + <name>spacing</name> + <number>1</number> + </property> + <widget row="0" column="0" > + <class>QTabWidget</class> + <property stdset="1"> + <name>name</name> + <cstring>TabWidgetMain</cstring> + </property> + <property> + <name>layoutMargin</name> + </property> + <property> + <name>layoutSpacing</name> + </property> + <widget> + <class>QWidget</class> + <property stdset="1"> + <name>name</name> + <cstring>tabNtp</cstring> + </property> + <attribute> + <name>title</name> + <string>NTP</string> + </attribute> + <grid> + <property stdset="1"> + <name>margin</name> + <number>3</number> + </property> + <property stdset="1"> + <name>spacing</name> + <number>3</number> + </property> + <widget row="1" column="0" > + <class>QPushButton</class> + <property stdset="1"> + <name>name</name> + <cstring>runNtp</cstring> + </property> + <property stdset="1"> + <name>text</name> + <string>get time from network</string> + </property> + </widget> + <widget row="0" column="0" > + <class>QFrame</class> + <property stdset="1"> + <name>name</name> + <cstring>FrameNtp</cstring> + </property> + <property stdset="1"> + <name>frameShape</name> + <enum>StyledPanel</enum> + </property> + <property stdset="1"> + <name>frameShadow</name> + <enum>Raised</enum> + </property> + <property> + <name>layoutMargin</name> + </property> + <grid> + <property stdset="1"> + <name>margin</name> + <number>11</number> + </property> + <property stdset="1"> + <name>spacing</name> + <number>6</number> + </property> + <widget row="0" column="0" > + <class>QLayoutWidget</class> + <property stdset="1"> + <name>name</name> + <cstring>Layout4</cstring> + </property> + <vbox> + <property stdset="1"> + <name>margin</name> + <number>0</number> + </property> + <property stdset="1"> + <name>spacing</name> + <number>6</number> + </property> + <widget> + <class>QLabel</class> + <property stdset="1"> + <name>name</name> + <cstring>TextLabel1</cstring> + </property> + <property stdset="1"> + <name>autoMask</name> + <bool>false</bool> + </property> + <property stdset="1"> + <name>text</name> + <string>Start Time:</string> + </property> + </widget> + <widget> + <class>QLabel</class> + <property stdset="1"> + <name>name</name> + <cstring>TextLabelStartTime</cstring> + </property> + <property stdset="1"> + <name>text</name> + <string></string> + </property> + </widget> + <widget> + <class>QLabel</class> + <property stdset="1"> + <name>name</name> + <cstring>TextLabel3</cstring> + </property> + <property stdset="1"> + <name>text</name> + <string>Time Shift:</string> + </property> + </widget> + <widget> + <class>QLabel</class> + <property stdset="1"> + <name>name</name> + <cstring>TextLabelTimeShift</cstring> + </property> + <property stdset="1"> + <name>text</name> + <string></string> + </property> + </widget> + <widget> + <class>QLabel</class> + <property stdset="1"> + <name>name</name> + <cstring>TextLabel5</cstring> + </property> + <property stdset="1"> + <name>text</name> + <string>New Time:</string> + </property> + </widget> + <widget> + <class>QLabel</class> + <property stdset="1"> + <name>name</name> + <cstring>TextLabelNewTime</cstring> + </property> + <property stdset="1"> + <name>text</name> + <string></string> + </property> + </widget> + <spacer> + <property> + <name>name</name> + <cstring>Spacer1</cstring> + </property> + <property stdset="1"> + <name>orientation</name> + <enum>Vertical</enum> + </property> + <property stdset="1"> + <name>sizeType</name> + <enum>Expanding</enum> + </property> + <property> + <name>sizeHint</name> + <size> + <width>20</width> + <height>20</height> + </size> + </property> + </spacer> + </vbox> + </widget> + <widget row="1" column="0" > + <class>QLayoutWidget</class> + <property stdset="1"> + <name>name</name> + <cstring>Layout6</cstring> + </property> + <hbox> + <property stdset="1"> + <name>margin</name> + <number>0</number> + </property> + <property stdset="1"> + <name>spacing</name> + <number>6</number> + </property> + <widget> + <class>QLabel</class> + <property stdset="1"> + <name>name</name> + <cstring>TextLabel7</cstring> + </property> + <property stdset="1"> + <name>text</name> + <string>NTP Server:</string> + </property> + </widget> + <widget> + <class>QLineEdit</class> + <property stdset="1"> + <name>name</name> + <cstring>LineEditNtpServer</cstring> + </property> + </widget> + </hbox> + </widget> + </grid> + </widget> + </grid> + </widget> + <widget> + <class>QWidget</class> + <property stdset="1"> + <name>name</name> + <cstring>tab</cstring> + </property> + <attribute> + <name>title</name> + <string>Auto Correction</string> + </attribute> + <widget> + <class>QTable</class> + <property stdset="1"> + <name>name</name> + <cstring>TableLookups</cstring> + </property> + <property stdset="1"> + <name>geometry</name> + <rect> + <x>10</x> + <y>10</y> + <width>270</width> + <height>220</height> + </rect> + </property> + <property stdset="1"> + <name>numRows</name> + <number>2</number> + </property> + <property stdset="1"> + <name>numCols</name> + <number>2</number> + </property> + </widget> + </widget> + <widget> + <class>QWidget</class> + <property stdset="1"> + <name>name</name> + <cstring>TabDebug</cstring> + </property> + <attribute> + <name>title</name> + <string>Debug</string> + </attribute> + <grid> + <property stdset="1"> + <name>margin</name> + <number>3</number> + </property> + <property stdset="1"> + <name>spacing</name> + <number>6</number> + </property> + <widget row="0" column="0" > + <class>QMultiLineEdit</class> + <property stdset="1"> + <name>name</name> + <cstring>outPut</cstring> + </property> + <property stdset="1"> + <name>wordWrap</name> + <enum>WidgetWidth</enum> + </property> + </widget> + </grid> + </widget> + </widget> + </grid> +</widget> +</UI> diff --git a/noncore/settings/netsystemtime/opie-netsystemtime.control b/noncore/settings/netsystemtime/opie-netsystemtime.control new file mode 100644 index 0000000..e6f5e2d --- a/dev/null +++ b/noncore/settings/netsystemtime/opie-netsystemtime.control @@ -0,0 +1,8 @@ +Files: bin/netsystemtime apps/Settings/ntpdatetime.desktop +Priority: optional +Section: opie/settings +Maintainer: Patrick S. Vogt <tille@handhelds.org> +Architecture: arm +Version: $QPE_VERSION-$SUB_VERSION +Depends: opie-base ($QPE_VERSION) +Description: ntp ( Network Time Protocol) gui |