diff --git a/Configuration/ZT.cfg b/Configuration/ZT.cfg index fca2464..b6ef9c0 100644 --- a/Configuration/ZT.cfg +++ b/Configuration/ZT.cfg @@ -76,10 +76,10 @@ ENGLOG=3 #STATION=ANGRIGNON #STATION=HENRI_BOURASSA #STATION=COTE_VERTU -STATION=BERRI_UQAM +#STATION=BERRI_UQAM #STATION=LONGUEIL #STATION=SAINT_MICHEL -#STATION=SNOWDON_L5 +STATION=SNOWDON_L5 #STATION=MONTMORENCY #STATION=MONTMORENCY_10_12 #STATION=MONTMORENCY_10_22 diff --git a/Configuration/ZTSettings.ztc b/Configuration/ZTSettings.ztc index 33db5e2..d29a83a 100644 Binary files a/Configuration/ZTSettings.ztc and b/Configuration/ZTSettings.ztc differ diff --git a/sources/GuiElements/ModbusSettingsPage.cpp b/sources/GuiElements/ModbusSettingsPage.cpp index ed2c7dd..f538431 100644 --- a/sources/GuiElements/ModbusSettingsPage.cpp +++ b/sources/GuiElements/ModbusSettingsPage.cpp @@ -36,8 +36,10 @@ #include #include #include +#include //#include #include "ZTLog.h" +#include @@ -133,6 +135,14 @@ CModbusSettingsPage::CModbusSettingsPage(QGraphicsWidget *Parent) Proxy->setPos(100,100); connect(mUseModbusChkBox,SIGNAL(stateChanged(int)),this,SLOT(CheckBoxStatedChanged(int))); + + + IpSettingsPosx = 100, IpSettingsPosy = 250; + mMACAddress = new QGraphicsTextItem("Adresse MAC: xx:xx:xx:xx",this); + mMACAddress->setFont(font); + mMACAddress->setPos(IpSettingsPosx,IpSettingsPosy); + + IpSettingsPosx = 100; IpSettingsPosy += 50; font.setPointSize(14); @@ -222,6 +232,12 @@ int CModbusSettingsPage::SetActualSettings(bool UseModbus, QHostAddress CCHostAd mIPChunk1->setValue(add & 0x000000FF); mApplyButton->hide(); + + QNetworkInterface IfInfo = QNetworkInterface::interfaceFromName("eth0"); + QString MacAddress = IfInfo.hardwareAddress(); + + mMACAddress->setPlainText(MacAddress.prepend("Adresse MAC: " )); + return RET_OK; } diff --git a/sources/GuiElements/ModbusSettingsPage.h b/sources/GuiElements/ModbusSettingsPage.h index d4a1b88..45e354c 100644 --- a/sources/GuiElements/ModbusSettingsPage.h +++ b/sources/GuiElements/ModbusSettingsPage.h @@ -66,7 +66,7 @@ private: QSpinBox *mIPChunk1, *mIPChunk2, *mIPChunk3, *mIPChunk4; QString mCurIP; QCheckBox *mUseModbusChkBox; - QGraphicsTextItem *mModbusCCConnectionState, *mModbusCCLinkState; + QGraphicsTextItem *mMACAddress, *mModbusCCConnectionState, *mModbusCCLinkState; QGraphicsPixmapItem *mCCConnectionLED, *mCCModbusLinkLED; void ShowApplyButton();