Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
F
fwatch
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
8
Issues
8
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
image/svg+xml
Discourse
Discourse
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Projects
fwatch
Commits
d4ec3f8b
Commit
d4ec3f8b
authored
Oct 05, 2014
by
Theodor-Adrian Stana
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed date setting from GPS
parent
7558fc34
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
5 deletions
+9
-5
set_time_fr_gps.c
sw/freertos/src/apps/settings/set_time_fr_gps.c
+7
-3
gpsbkgnd_task.c
sw/freertos/src/gpsbkgnd_task.c
+2
-2
No files found.
sw/freertos/src/apps/settings/set_time_fr_gps.c
View file @
d4ec3f8b
...
...
@@ -29,9 +29,13 @@
#include "settings.h"
#include <usbdbg.h>
#include <stdio.h>
void
set_time_fr_gps_main
(
void
*
params
)
{
/* Avoid compiler warning */
(
void
)
params
;
struct
tm
time
;
struct
gps_utc
gpstime
;
char
b
[
32
];
...
...
@@ -44,20 +48,20 @@ void set_time_fr_gps_main(void *params)
usbdbg_puts
(
b
);
sprintf
(
b
,
"OFS: %d-%d-%d %d:%d:%d
\r\n
"
,
setting_gmt_ofs
.
tm_year
,
setting_gmt_ofs
.
tm_mon
,
setting_gmt_ofs
.
tm_
w
day
,
setting_gmt_ofs
.
tm_year
,
setting_gmt_ofs
.
tm_mon
,
setting_gmt_ofs
.
tm_
m
day
,
setting_gmt_ofs
.
tm_hour
,
setting_gmt_ofs
.
tm_min
,
setting_gmt_ofs
.
tm_sec
);
usbdbg_puts
(
b
);
time
.
tm_year
=
gpstime
.
yr
;
time
.
tm_mon
=
gpstime
.
mon
;
time
.
tm_
w
day
=
gpstime
.
day
;
time
.
tm_
m
day
=
gpstime
.
day
;
time
.
tm_hour
=
gpstime
.
hr
+
setting_gmt_ofs
.
tm_hour
;
time
.
tm_min
=
gpstime
.
min
+
setting_gmt_ofs
.
tm_min
;
time
.
tm_sec
=
gpstime
.
sec
;
time
.
tm_isdst
=
0
;
sprintf
(
b
,
"AFT: %d-%d-%d %d:%d:%d
\r\n
"
,
time
.
tm_year
,
time
.
tm_mon
,
time
.
tm_
w
day
,
time
.
tm_year
,
time
.
tm_mon
,
time
.
tm_
m
day
,
time
.
tm_hour
,
time
.
tm_min
,
time
.
tm_sec
);
usbdbg_puts
(
b
);
...
...
sw/freertos/src/gpsbkgnd_task.c
View file @
d4ec3f8b
...
...
@@ -80,12 +80,12 @@ static void gpsbkgnd_task(void *params)
// usbdbg_puts(b);
if
(
firstfix
||
((
time
.
tm_hour
==
12
)
&&
(
time
.
tm_min
==
0
0
)))
{
((
time
.
tm_hour
==
12
)
&&
(
time
.
tm_min
==
0
)))
{
gps_get_utc
(
&
gpstime
);
time
.
tm_year
=
gpstime
.
yr
;
time
.
tm_mon
=
gpstime
.
mon
;
time
.
tm_
w
day
=
gpstime
.
day
;
time
.
tm_
m
day
=
gpstime
.
day
;
time
.
tm_hour
=
gpstime
.
hr
+
setting_gmt_ofs
.
tm_hour
;
time
.
tm_min
=
gpstime
.
min
+
setting_gmt_ofs
.
tm_min
;
time
.
tm_sec
=
gpstime
.
sec
;
...
...
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