Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
5863ef99
Commit
5863ef99
authored
Mar 19, 2019
by
Matej Frančeškin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Microhard - removed air and ground unit IPs as they won't be needed.
parent
afe560b4
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
48 deletions
+8
-48
MicrohardManager.cc
src/Microhard/MicrohardManager.cc
+6
-13
MicrohardManager.h
src/Microhard/MicrohardManager.h
+1
-9
MicrohardSettings.qml
src/Microhard/MicrohardSettings.qml
+1
-26
No files found.
src/Microhard/MicrohardManager.cc
View file @
5863ef99
...
...
@@ -15,13 +15,12 @@
#include <QSettings>
#define LONG_TIMEOUT 5000
#define SHORT_TIMEOUT 2500
#define LONG_TIMEOUT 5000
static
const
char
*
kMICROHARD_GROUP
=
"Microhard"
;
static
const
char
*
kLOCAL_IP
=
"LocalIP"
;
static
const
char
*
kREMOTE_IP
=
"RemoteIP"
;
static
const
char
*
kGROUND_IP
=
"GroundIP"
;
static
const
char
*
kAIR_IP
=
"AirIP"
;
static
const
char
*
kNET_MASK
=
"NetMask"
;
static
const
char
*
kCFG_PASSWORD
=
"ConfigPassword"
;
static
const
char
*
kENC_KEY
=
"EncryptionKey"
;
...
...
@@ -38,8 +37,6 @@ MicrohardManager::MicrohardManager(QGCApplication* app, QGCToolbox* toolbox)
settings
.
beginGroup
(
kMICROHARD_GROUP
);
_localIPAddr
=
settings
.
value
(
kLOCAL_IP
,
QString
(
"192.168.168.1"
)).
toString
();
_remoteIPAddr
=
settings
.
value
(
kREMOTE_IP
,
QString
(
"192.168.168.2"
)).
toString
();
_groundIPAddr
=
settings
.
value
(
kGROUND_IP
,
QString
(
"192.168.168.101"
)).
toString
();
_airIPAddr
=
settings
.
value
(
kAIR_IP
,
QString
(
"192.168.168.213"
)).
toString
();
_netMask
=
settings
.
value
(
kNET_MASK
,
QString
(
"255.255.255.0"
)).
toString
();
_configPassword
=
settings
.
value
(
kCFG_PASSWORD
,
QString
(
"admin"
)).
toString
();
_encryptionKey
=
settings
.
value
(
kENC_KEY
,
QString
(
"1234567890"
)).
toString
();
...
...
@@ -117,10 +114,10 @@ MicrohardManager::setToolbox(QGCToolbox* toolbox)
//-----------------------------------------------------------------------------
bool
MicrohardManager
::
setIPSettings
(
QString
localIP_
,
QString
remoteIP_
,
QString
groundIP_
,
QString
airIP_
,
QString
netMask_
,
QString
cfgPassword_
,
QString
encryptionKey_
)
MicrohardManager
::
setIPSettings
(
QString
localIP_
,
QString
remoteIP_
,
QString
netMask_
,
QString
cfgPassword_
,
QString
encryptionKey_
)
{
if
(
_localIPAddr
!=
localIP_
||
_remoteIPAddr
!=
remoteIP_
||
_netMask
!=
netMask_
||
_configPassword
!=
cfgPassword_
||
_encryptionKey
!=
encryptionKey_
||
_groundIPAddr
!=
groundIP_
||
_airIPAddr
!=
airIP_
)
_configPassword
!=
cfgPassword_
||
_encryptionKey
!=
encryptionKey_
)
{
if
(
_mhSettingsLoc
&&
_encryptionKey
!=
encryptionKey_
)
{
_mhSettingsLoc
->
setEncryptionKey
(
encryptionKey_
);
...
...
@@ -128,8 +125,6 @@ MicrohardManager::setIPSettings(QString localIP_, QString remoteIP_, QString gro
_localIPAddr
=
localIP_
;
_remoteIPAddr
=
remoteIP_
;
_groundIPAddr
=
groundIP_
;
_airIPAddr
=
airIP_
;
_netMask
=
netMask_
;
_configPassword
=
cfgPassword_
;
_encryptionKey
=
encryptionKey_
;
...
...
@@ -138,8 +133,6 @@ MicrohardManager::setIPSettings(QString localIP_, QString remoteIP_, QString gro
settings
.
beginGroup
(
kMICROHARD_GROUP
);
settings
.
setValue
(
kLOCAL_IP
,
localIP_
);
settings
.
setValue
(
kREMOTE_IP
,
remoteIP_
);
settings
.
setValue
(
kGROUND_IP
,
groundIP_
);
settings
.
setValue
(
kAIR_IP
,
airIP_
);
settings
.
setValue
(
kNET_MASK
,
netMask_
);
settings
.
setValue
(
kCFG_PASSWORD
,
cfgPassword_
);
settings
.
setValue
(
kENC_KEY
,
encryptionKey_
);
...
...
@@ -169,7 +162,7 @@ MicrohardManager::_setEnabled()
connect
(
_mhSettingsRem
,
&
MicrohardSettings
::
connected
,
this
,
&
MicrohardManager
::
_connectedRem
);
connect
(
_mhSettingsRem
,
&
MicrohardSettings
::
rssiUpdated
,
this
,
&
MicrohardManager
::
_rssiUpdatedRem
);
}
_workTimer
.
start
(
1000
);
_workTimer
.
start
(
SHORT_TIMEOUT
);
}
else
{
//-- Stop everything
_close
();
...
...
@@ -268,5 +261,5 @@ MicrohardManager::_checkMicrohard()
_mhSettingsRem
->
getStatus
();
}
}
_workTimer
.
start
(
_isConnected
?
1000
:
LONG_TIMEOUT
);
_workTimer
.
start
(
_isConnected
?
SHORT_TIMEOUT
:
LONG_TIMEOUT
);
}
src/Microhard/MicrohardManager.h
View file @
5863ef99
...
...
@@ -32,13 +32,11 @@ public:
Q_PROPERTY
(
int
downlinkRSSI
READ
downlinkRSSI
NOTIFY
linkChanged
)
Q_PROPERTY
(
QString
localIPAddr
READ
localIPAddr
NOTIFY
localIPAddrChanged
)
Q_PROPERTY
(
QString
remoteIPAddr
READ
remoteIPAddr
NOTIFY
remoteIPAddrChanged
)
Q_PROPERTY
(
QString
groundIPAddr
READ
groundIPAddr
NOTIFY
groundIPAddrChanged
)
Q_PROPERTY
(
QString
airIPAddr
READ
airIPAddr
NOTIFY
airIPAddrChanged
)
Q_PROPERTY
(
QString
netMask
READ
netMask
NOTIFY
netMaskChanged
)
Q_PROPERTY
(
QString
configPassword
READ
configPassword
NOTIFY
configPasswordChanged
)
Q_PROPERTY
(
QString
encryptionKey
READ
encryptionKey
NOTIFY
encryptionKeyChanged
)
Q_INVOKABLE
bool
setIPSettings
(
QString
localIP
,
QString
remoteIP
,
QString
groundIP
,
QString
airIP
,
QString
netMask
,
QString
cfgPassword
,
QString
encyrptionKey
);
Q_INVOKABLE
bool
setIPSettings
(
QString
localIP
,
QString
remoteIP
,
QString
netMask
,
QString
cfgPassword
,
QString
encyrptionKey
);
explicit
MicrohardManager
(
QGCApplication
*
app
,
QGCToolbox
*
toolbox
);
~
MicrohardManager
()
override
;
...
...
@@ -51,8 +49,6 @@ public:
int
downlinkRSSI
()
{
return
_uplinkRSSI
;
}
QString
localIPAddr
()
{
return
_localIPAddr
;
}
QString
remoteIPAddr
()
{
return
_remoteIPAddr
;
}
QString
airIPAddr
()
{
return
_airIPAddr
;
}
QString
groundIPAddr
()
{
return
_groundIPAddr
;
}
QString
netMask
()
{
return
_netMask
;
}
QString
configPassword
()
{
return
_configPassword
;
}
QString
encryptionKey
()
{
return
_encryptionKey
;
}
...
...
@@ -63,8 +59,6 @@ signals:
void
connectedChanged
();
void
localIPAddrChanged
();
void
remoteIPAddrChanged
();
void
airIPAddrChanged
();
void
groundIPAddrChanged
();
void
netMaskChanged
();
void
configPasswordChanged
();
void
encryptionKeyChanged
();
...
...
@@ -98,8 +92,6 @@ private:
int
_uplinkRSSI
=
0
;
QString
_localIPAddr
;
QString
_remoteIPAddr
;
QString
_groundIPAddr
;
QString
_airIPAddr
;
QString
_netMask
;
QString
_configPassword
;
QString
_encryptionKey
;
...
...
src/Microhard/MicrohardSettings.qml
View file @
5863ef99
...
...
@@ -205,27 +205,6 @@ QGCView {
inputMethodHints
:
Qt
.
ImhFormattedNumbersOnly
Layout.minimumWidth
:
_valueWidth
}
QGCLabel
{
text
:
qsTr
(
"
Ground Unit IP Address:
"
)
Layout.minimumWidth
:
_labelWidth
}
QGCTextField
{
id
:
groundIP
text
:
QGroundControl
.
microhardManager
.
groundIPAddr
enabled
:
true
inputMethodHints
:
Qt
.
ImhFormattedNumbersOnly
Layout.minimumWidth
:
_valueWidth
}
QGCLabel
{
text
:
qsTr
(
"
Air Unit IP Address:
"
)
}
QGCTextField
{
id
:
airIP
text
:
QGroundControl
.
microhardManager
.
airIPAddr
enabled
:
true
inputMethodHints
:
Qt
.
ImhFormattedNumbersOnly
Layout.minimumWidth
:
_valueWidth
}
QGCLabel
{
text
:
qsTr
(
"
Network Mask:
"
)
}
...
...
@@ -270,16 +249,12 @@ QGCView {
function
testEnabled
()
{
if
(
localIP
.
text
===
QGroundControl
.
microhardManager
.
localIPAddr
&&
remoteIP
.
text
===
QGroundControl
.
microhardManager
.
remoteIPAddr
&&
groundIP
.
text
===
QGroundControl
.
microhardManager
.
groundIPAddr
&&
airIP
.
text
===
QGroundControl
.
microhardManager
.
airIPAddr
&&
netMask
.
text
===
QGroundControl
.
microhardManager
.
netMask
&&
configPassword
.
text
===
QGroundControl
.
microhardManager
.
configPassword
&&
encryptionKey
.
text
===
QGroundControl
.
microhardManager
.
encryptionKey
)
return
false
if
(
!
validateIPaddress
(
localIP
.
text
))
return
false
if
(
!
validateIPaddress
(
remoteIP
.
text
))
return
false
if
(
!
validateIPaddress
(
groundIP
.
text
))
return
false
if
(
!
validateIPaddress
(
airIP
.
text
))
return
false
if
(
!
validateIPaddress
(
netMask
.
text
))
return
false
return
true
}
...
...
@@ -287,7 +262,7 @@ QGCView {
text
:
qsTr
(
"
Apply
"
)
anchors.horizontalCenter
:
parent
.
horizontalCenter
onClicked
:
{
QGroundControl
.
microhardManager
.
setIPSettings
(
localIP
.
text
,
remoteIP
.
text
,
groundIP
.
text
,
airIP
.
text
,
netMask
.
text
,
configPassword
.
text
,
encryptionKey
.
text
)
QGroundControl
.
microhardManager
.
setIPSettings
(
localIP
.
text
,
remoteIP
.
text
,
netMask
.
text
,
configPassword
.
text
,
encryptionKey
.
text
)
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment