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
1daf1e79
Commit
1daf1e79
authored
Aug 23, 2019
by
Willian Galvani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add checkbox for saving CSVs
parent
eaf48fe3
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
34 additions
and
4 deletions
+34
-4
App.SettingsGroup.json
src/Settings/App.SettingsGroup.json
+7
-0
AppSettings.cc
src/Settings/AppSettings.cc
+1
-0
AppSettings.h
src/Settings/AppSettings.h
+1
-0
Vehicle.cc
src/Vehicle/Vehicle.cc
+17
-4
GeneralSettings.qml
src/ui/preferences/GeneralSettings.qml
+8
-0
No files found.
src/Settings/App.SettingsGroup.json
View file @
1daf1e79
...
...
@@ -263,5 +263,12 @@
"longDescription"
:
"Use Link Pairing."
,
"type"
:
"bool"
,
"defaultValue"
:
false
},
{
"name"
:
"saveCsvTelemetry"
,
"shortDescription"
:
"Save CSV Telementry Logs"
,
"longDescription"
:
"If this option is enabled, all Facts will be written to a CSV file with a 1 Hertz frequency."
,
"type"
:
"bool"
,
"defaultValue"
:
false
}
]
src/Settings/AppSettings.cc
View file @
1daf1e79
...
...
@@ -97,6 +97,7 @@ DECLARE_SETTINGSFACT(AppSettings, enableMicrohard)
DECLARE_SETTINGSFACT
(
AppSettings
,
language
)
DECLARE_SETTINGSFACT
(
AppSettings
,
disableAllPersistence
)
DECLARE_SETTINGSFACT
(
AppSettings
,
usePairing
)
DECLARE_SETTINGSFACT
(
AppSettings
,
saveCsvTelemetry
)
DECLARE_SETTINGSFACT_NO_FUNC
(
AppSettings
,
indoorPalette
)
{
...
...
src/Settings/AppSettings.h
View file @
1daf1e79
...
...
@@ -52,6 +52,7 @@ public:
DEFINE_SETTINGFACT
(
language
)
DEFINE_SETTINGFACT
(
disableAllPersistence
)
DEFINE_SETTINGFACT
(
usePairing
)
DEFINE_SETTINGFACT
(
saveCsvTelemetry
)
// Although this is a global setting it only affects ArduPilot vehicle since PX4 automatically starts the stream from the vehicle side
DEFINE_SETTINGFACT
(
apmStartMavlinkStreams
)
...
...
src/Vehicle/Vehicle.cc
View file @
1daf1e79
...
...
@@ -303,7 +303,10 @@ Vehicle::Vehicle(LinkInterface* link,
connect
(
&
_adsbTimer
,
&
QTimer
::
timeout
,
this
,
&
Vehicle
::
_adsbTimerTimeout
);
_adsbTimer
.
setSingleShot
(
false
);
_adsbTimer
.
start
(
1000
);
_initializeCsv
();
// Start csv logger
connect
(
&
_csvLogTimer
,
&
QTimer
::
timeout
,
this
,
&
Vehicle
::
_writeCsvLine
);
_csvLogTimer
.
start
(
1000
);
}
// Disconnected Vehicle for offline editing
...
...
@@ -4010,6 +4013,9 @@ void Vehicle::_pidTuningAdjustRates(bool setRatesForTuning)
void
Vehicle
::
_initializeCsv
()
{
if
(
!
_toolbox
->
settingsManager
()
->
appSettings
()
->
saveCsvTelemetry
()
->
rawValue
().
toBool
()){
return
;
}
QString
now
=
QDateTime
::
currentDateTime
().
toString
(
"yyyy-MM-dd hh-mm-ss"
);
QString
fileName
=
QString
(
"%1 vehicle%2.csv"
).
arg
(
now
).
arg
(
_id
);
QDir
saveDir
(
_toolbox
->
settingsManager
()
->
appSettings
()
->
telemetrySavePath
());
...
...
@@ -4030,13 +4036,20 @@ void Vehicle::_initializeCsv()
}
qCDebug
(
VehicleLog
)
<<
"Facts logged to csv:"
<<
allFactNames
;
stream
<<
"Timestamp,"
<<
allFactNames
.
join
(
","
)
<<
"
\n
"
;
connect
(
&
_csvLogTimer
,
&
QTimer
::
timeout
,
this
,
&
Vehicle
::
_writeCsvLine
);
_csvLogTimer
.
start
(
1000
);
}
void
Vehicle
::
_writeCsvLine
()
{
// Only save the logs after the the vehicle gets armed, unless "Save logs even if vehicle was not armed" is checked
if
(
!
_csvLogFile
.
isOpen
()
&&
(
_armed
||
_toolbox
->
settingsManager
()
->
appSettings
()
->
telemetrySaveNotArmed
()
->
rawValue
().
toBool
())){
_initializeCsv
();
}
if
(
!
_csvLogFile
.
isOpen
()){
return
;
}
QStringList
allFactValues
;
QTextStream
stream
(
&
_csvLogFile
);
...
...
src/ui/preferences/GeneralSettings.qml
View file @
1daf1e79
...
...
@@ -420,6 +420,14 @@ Rectangle {
enabled
:
promptSaveLog
.
checked
&&
!
disableDataPersistence
.
checked
property
Fact
_telemetrySaveNotArmed
:
QGroundControl
.
settingsManager
.
appSettings
.
telemetrySaveNotArmed
}
FactCheckBox
{
id
:
promptSaveCsv
text
:
qsTr
(
"
Save CSV log of telemetry data
"
)
fact
:
_saveCsvTelemetry
visible
:
_saveCsvTelemetry
.
visible
enabled
:
!
disableDataPersistence
.
checked
property
Fact
_saveCsvTelemetry
:
QGroundControl
.
settingsManager
.
appSettings
.
saveCsvTelemetry
}
}
}
...
...
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