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
da2dd42b
Commit
da2dd42b
authored
Oct 08, 2014
by
Theodor-Adrian Stana
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Made all apps return on BUT_TL as well
Also removed second (for now) redundant GPS coordinate app screen
parent
38e0cf16
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
50 additions
and
44 deletions
+50
-44
clock.c
sw/freertos/src/apps/clock.c
+2
-1
compass.c
sw/freertos/src/apps/compass.c
+2
-1
game.c
sw/freertos/src/apps/game.c
+2
-1
gpscoord.c
sw/freertos/src/apps/gpscoord.c
+10
-9
reset.c
sw/freertos/src/apps/reset.c
+32
-31
usb_mass_storage.c
sw/freertos/src/apps/usb_mass_storage.c
+2
-1
No files found.
sw/freertos/src/apps/clock.c
View file @
da2dd42b
...
@@ -108,7 +108,8 @@ void clock_main(void* params) {
...
@@ -108,7 +108,8 @@ void clock_main(void* params) {
if
(
xQueueReceive
(
appQueue
,
&
evt
,
portMAX_DELAY
))
{
if
(
xQueueReceive
(
appQueue
,
&
evt
,
portMAX_DELAY
))
{
switch
(
evt
.
type
)
{
switch
(
evt
.
type
)
{
case
BUTTON_PRESSED
:
case
BUTTON_PRESSED
:
if
(
evt
.
data
.
button
==
BUT_TR
)
if
(
evt
.
data
.
button
==
BUT_TR
||
evt
.
data
.
button
==
BUT_TL
)
return
;
// go back to the main menu
return
;
// go back to the main menu
// no break; fall through
// no break; fall through
...
...
sw/freertos/src/apps/compass.c
View file @
da2dd42b
...
@@ -135,7 +135,8 @@ void compass_main(void *params)
...
@@ -135,7 +135,8 @@ void compass_main(void *params)
if
(
xQueueReceive
(
appQueue
,
&
evt
,
50
/
portTICK_RATE_MS
))
{
if
(
xQueueReceive
(
appQueue
,
&
evt
,
50
/
portTICK_RATE_MS
))
{
switch
(
evt
.
type
)
{
switch
(
evt
.
type
)
{
case
BUTTON_PRESSED
:
case
BUTTON_PRESSED
:
if
(
evt
.
data
.
button
==
BUT_TR
)
if
(
evt
.
data
.
button
==
BUT_TR
||
evt
.
data
.
button
==
BUT_TL
)
return
;
return
;
/*if(evt.data.button == BUT_BR) {
/*if(evt.data.button == BUT_BR) {
...
...
sw/freertos/src/apps/game.c
View file @
da2dd42b
...
@@ -129,7 +129,8 @@ void game_main(void *params)
...
@@ -129,7 +129,8 @@ void game_main(void *params)
if
(
xQueueReceive
(
appQueue
,
&
evt
,
30
/
portTICK_RATE_MS
))
{
if
(
xQueueReceive
(
appQueue
,
&
evt
,
30
/
portTICK_RATE_MS
))
{
switch
(
evt
.
type
)
{
switch
(
evt
.
type
)
{
case
BUTTON_PRESSED
:
case
BUTTON_PRESSED
:
if
(
evt
.
data
.
button
==
BUT_TR
)
{
if
(
evt
.
data
.
button
==
BUT_TR
||
evt
.
data
.
button
==
BUT_TL
)
{
vibra_disable
();
vibra_disable
();
buzzer_disable
();
buzzer_disable
();
return
;
return
;
...
...
sw/freertos/src/apps/gpscoord.c
View file @
da2dd42b
...
@@ -157,16 +157,17 @@ void gpscoord_main(void *params)
...
@@ -157,16 +157,17 @@ void gpscoord_main(void *params)
if
(
xQueueReceive
(
appQueue
,
&
evt
,
portMAX_DELAY
))
{
if
(
xQueueReceive
(
appQueue
,
&
evt
,
portMAX_DELAY
))
{
switch
(
evt
.
type
)
{
switch
(
evt
.
type
)
{
case
BUTTON_PRESSED
:
case
BUTTON_PRESSED
:
if
(
evt
.
data
.
button
==
BUT_TR
)
if
(
evt
.
data
.
button
==
BUT_TR
||
evt
.
data
.
button
==
BUT_TL
)
return
;
return
;
else
if
(
evt
.
data
.
button
==
BUT_BR
)
{
//
else if (evt.data.button == BUT_BR) {
/*
//
/*
* Toggle between coordinate and
//
* Toggle between coordinate and
* elevation screens
//
* elevation screens
*/
//
*/
gpsscreen
+=
1
;
//
gpsscreen += 1;
gpsscreen
%=
2
;
//
gpsscreen %= 2;
}
//
}
/* fall through */
/* fall through */
case
GPS_TICK
:
case
GPS_TICK
:
...
...
sw/freertos/src/apps/reset.c
View file @
da2dd42b
...
@@ -33,49 +33,50 @@
...
@@ -33,49 +33,50 @@
static
void
reset_redraw
(
struct
ui_widget
*
w
)
static
void
reset_redraw
(
struct
ui_widget
*
w
)
{
{
gfx_text
(
&
w
->
dc
,
&
font_helv22b
,
10
,
50
,
"Bottom right"
,
0
);
gfx_text
(
&
w
->
dc
,
&
font_helv22b
,
10
,
50
,
"Bottom right"
,
0
);
gfx_text
(
&
w
->
dc
,
&
font_helv22b
,
20
,
70
,
"to reset"
,
0
);
gfx_text
(
&
w
->
dc
,
&
font_helv22b
,
20
,
70
,
"to reset"
,
0
);
}
}
static
struct
ui_widget
reset_screen
=
{
static
struct
ui_widget
reset_screen
=
{
reset_redraw
,
reset_redraw
,
NULL
,
NULL
,
{
0
,
0
,
127
,
127
},
{
0
,
0
,
127
,
127
},
0
,
0
,
WF_ACTIVE
|
WF_VISIBLE
WF_ACTIVE
|
WF_VISIBLE
};
};
void
reset_main
(
void
*
params
)
void
reset_main
(
void
*
params
)
{
{
(
void
)
params
;
// suppress warnings
(
void
)
params
;
// suppress warnings
struct
event
evt
;
struct
event
evt
;
/* Init UI */
/* Init UI */
ui_clear
();
ui_clear
();
ui_init_widget
(
&
reset_screen
);
ui_init_widget
(
&
reset_screen
);
ui_add_widget
(
&
reset_screen
);
ui_add_widget
(
&
reset_screen
);
ui_init_widget
(
&
status_bar
);
ui_init_widget
(
&
status_bar
);
ui_add_widget
(
&
status_bar
);
ui_add_widget
(
&
status_bar
);
ui_update
(
NULL
);
ui_update
(
NULL
);
while
(
1
)
{
while
(
1
)
{
if
(
xQueueReceive
(
appQueue
,
&
evt
,
portMAX_DELAY
))
{
if
(
xQueueReceive
(
appQueue
,
&
evt
,
portMAX_DELAY
))
{
switch
(
evt
.
type
)
{
switch
(
evt
.
type
)
{
case
BUTTON_PRESSED
:
case
BUTTON_PRESSED
:
if
(
evt
.
data
.
button
==
BUT_TR
)
if
(
evt
.
data
.
button
==
BUT_TR
||
return
;
evt
.
data
.
button
==
BUT_TL
)
/* Reset on bottom right and bottom left buttons
return
;
* pressed */
/* Reset on bottom right and bottom left buttons
if
(
evt
.
data
.
button
==
BUT_BR
)
* pressed */
SCB
->
AIRCR
=
0x05FA0004
;
if
(
evt
.
data
.
button
==
BUT_BR
)
break
;
SCB
->
AIRCR
=
0x05FA0004
;
}
break
;
}
}
}
}
}
}
}
application
reset
=
{
application
reset
=
{
.
name
=
"Reset"
,
.
name
=
"Reset"
,
.
main
=
reset_main
.
main
=
reset_main
};
};
sw/freertos/src/apps/usb_mass_storage.c
View file @
da2dd42b
...
@@ -93,7 +93,8 @@ void usb_ms_main(void* params) {
...
@@ -93,7 +93,8 @@ void usb_ms_main(void* params) {
if
(
xQueueReceive
(
appQueue
,
&
evt
,
0
))
{
if
(
xQueueReceive
(
appQueue
,
&
evt
,
0
))
{
switch
(
evt
.
type
)
{
switch
(
evt
.
type
)
{
case
BUTTON_PRESSED
:
case
BUTTON_PRESSED
:
if
(
evt
.
data
.
button
==
BUT_TR
)
{
if
(
evt
.
data
.
button
==
BUT_TR
||
evt
.
data
.
button
==
BUT_TL
)
{
if
(
mutexours
)
{
if
(
mutexours
)
{
mutexours
=
0
;
mutexours
=
0
;
USBD_Stop
();
USBD_Stop
();
...
...
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