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
5dab94a8
Commit
5dab94a8
authored
Oct 05, 2014
by
Theodor-Adrian Stana
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'thedi-sunday' into proposed_master
parents
9e39b8c3
d4ec3f8b
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
22 additions
and
10 deletions
+22
-10
menu_struct.c
sw/freertos/src/apps/menu_struct.c
+13
-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/menu_struct.c
View file @
5dab94a8
...
@@ -38,20 +38,28 @@ int get_menu_size(const menu_list *menu) {
...
@@ -38,20 +38,28 @@ int get_menu_size(const menu_list *menu) {
return
len
;
return
len
;
}
}
menu_list
settings_menu
=
{
menu_list
gps_
settings_menu
=
{
"
S
ettings"
,
"
GPS s
ettings"
,
{
{
{
APP
,
&
clock_icon
,
{
.
app
=
&
set_time
}
},
{
APP
,
&
date_icon
,
{
.
app
=
&
set_date
}
},
{
SETTING
,
NULL
,
{
.
setting
=
&
setting_gps_on
}
},
{
SETTING
,
NULL
,
{
.
setting
=
&
setting_gps_on
}
},
{
SETTING
,
NULL
,
{
.
setting
=
&
setting_coord_style
}
},
{
SETTING
,
NULL
,
{
.
setting
=
&
setting_coord_style
}
},
{
SETTING
,
NULL
,
{
.
setting
=
&
setting_gps_sets_time
}
},
{
SETTING
,
NULL
,
{
.
setting
=
&
setting_gps_sets_time
}
},
{
APP
,
&
gps_receiving
,
{
.
app
=
&
set_gmt_ofs
}
},
{
APP
,
&
clock_icon
,
{
.
app
=
&
set_gmt_ofs
}
},
{
APP
,
&
clock_icon
,
{
.
app
=
&
set_time_fr_gps
}
},
{
APP
,
&
clock_icon
,
{
.
app
=
&
set_time_fr_gps
}
},
{
END
,
NULL
,
{
NULL
}
}
{
END
,
NULL
,
{
NULL
}
}
}
}
};
};
menu_list
settings_menu
=
{
"Settings"
,
{
{
APP
,
&
clock_icon
,
{
.
app
=
&
set_time
}
},
{
APP
,
&
date_icon
,
{
.
app
=
&
set_date
}
},
{
SUBMENU
,
&
gps_receiving
,
{
.
submenu
=
&
gps_settings_menu
}
},
{
END
,
NULL
,
{
NULL
}
}
}
};
menu_list
main_menu
=
{
menu_list
main_menu
=
{
"Main menu"
,
"Main menu"
,
{
{
...
...
sw/freertos/src/apps/settings/set_time_fr_gps.c
View file @
5dab94a8
...
@@ -29,9 +29,13 @@
...
@@ -29,9 +29,13 @@
#include "settings.h"
#include "settings.h"
#include <usbdbg.h>
#include <usbdbg.h>
#include <stdio.h>
void
set_time_fr_gps_main
(
void
*
params
)
void
set_time_fr_gps_main
(
void
*
params
)
{
{
/* Avoid compiler warning */
(
void
)
params
;
struct
tm
time
;
struct
tm
time
;
struct
gps_utc
gpstime
;
struct
gps_utc
gpstime
;
char
b
[
32
];
char
b
[
32
];
...
@@ -44,20 +48,20 @@ void set_time_fr_gps_main(void *params)
...
@@ -44,20 +48,20 @@ void set_time_fr_gps_main(void *params)
usbdbg_puts
(
b
);
usbdbg_puts
(
b
);
sprintf
(
b
,
"OFS: %d-%d-%d %d:%d:%d
\r\n
"
,
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
);
setting_gmt_ofs
.
tm_hour
,
setting_gmt_ofs
.
tm_min
,
setting_gmt_ofs
.
tm_sec
);
usbdbg_puts
(
b
);
usbdbg_puts
(
b
);
time
.
tm_year
=
gpstime
.
yr
;
time
.
tm_year
=
gpstime
.
yr
;
time
.
tm_mon
=
gpstime
.
mon
;
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_hour
=
gpstime
.
hr
+
setting_gmt_ofs
.
tm_hour
;
time
.
tm_min
=
gpstime
.
min
+
setting_gmt_ofs
.
tm_min
;
time
.
tm_min
=
gpstime
.
min
+
setting_gmt_ofs
.
tm_min
;
time
.
tm_sec
=
gpstime
.
sec
;
time
.
tm_sec
=
gpstime
.
sec
;
time
.
tm_isdst
=
0
;
time
.
tm_isdst
=
0
;
sprintf
(
b
,
"AFT: %d-%d-%d %d:%d:%d
\r\n
"
,
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
);
time
.
tm_hour
,
time
.
tm_min
,
time
.
tm_sec
);
usbdbg_puts
(
b
);
usbdbg_puts
(
b
);
...
...
sw/freertos/src/gpsbkgnd_task.c
View file @
5dab94a8
...
@@ -80,12 +80,12 @@ static void gpsbkgnd_task(void *params)
...
@@ -80,12 +80,12 @@ static void gpsbkgnd_task(void *params)
// usbdbg_puts(b);
// usbdbg_puts(b);
if
(
firstfix
||
if
(
firstfix
||
((
time
.
tm_hour
==
12
)
&&
(
time
.
tm_min
==
0
0
)))
{
((
time
.
tm_hour
==
12
)
&&
(
time
.
tm_min
==
0
)))
{
gps_get_utc
(
&
gpstime
);
gps_get_utc
(
&
gpstime
);
time
.
tm_year
=
gpstime
.
yr
;
time
.
tm_year
=
gpstime
.
yr
;
time
.
tm_mon
=
gpstime
.
mon
;
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_hour
=
gpstime
.
hr
+
setting_gmt_ofs
.
tm_hour
;
time
.
tm_min
=
gpstime
.
min
+
setting_gmt_ofs
.
tm_min
;
time
.
tm_min
=
gpstime
.
min
+
setting_gmt_ofs
.
tm_min
;
time
.
tm_sec
=
gpstime
.
sec
;
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