aaron/discoverpixy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed compiler warning in tft and screen module.

Browse Source
This commit is contained in:
t-moe
2015-05-10 14:54:07 +02:00
parent f332364a44
commit b6ab7c8e39
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
common/gui/screen.c
View File

@@ -1,8 +1,8 @@
#include "screen.h" #include "screen.h"
static volatile SCREEN_STRUCT* screen_list = NULL; static SCREEN_STRUCT* screen_list = NULL;
static volatile SCREEN_STRUCT* screen_current = NULL; static SCREEN_STRUCT* screen_current = NULL;
static volatile SCREEN_STRUCT* screen_goto = NULL; static volatile SCREEN_STRUCT* screen_goto = NULL;
SCREEN_STRUCT* gui_screen_get_current() { SCREEN_STRUCT* gui_screen_get_current() {
@@ -11,7 +11,7 @@ SCREEN_STRUCT* gui_screen_get_current() {
void gui_screen_update() { void gui_screen_update() {
if(screen_goto!=NULL) { //we received the task to switch the screen if(screen_goto!=NULL) { //we received the task to switch the screen
SCREEN_STRUCT* go = screen_goto; //Backup volatile variable SCREEN_STRUCT* go = (SCREEN_STRUCT*) screen_goto; //Backup volatile variable
screen_goto=NULL; screen_goto=NULL;
if(go->next!=NULL) { //we're going back if(go->next!=NULL) { //we're going back
if(go->next!=screen_current) return; //list corrupted? if(go->next!=screen_current) return; //list corrupted?
@@ -26,7 +26,7 @@ void gui_screen_update() {
} }
} }
go->on_enter(go); go->on_enter(go);
screen_current = go; screen_current =go;
} }
if(screen_current!=NULL) { //A screen has been set if(screen_current!=NULL) { //A screen has been set

1
common/tft/tft.c
View File

@@ -2,6 +2,7 @@
#include "ll_tft.h" #include "ll_tft.h"
#include <string.h> #include <string.h>
#include <stdarg.h> #include <stdarg.h>
#include <stdio.h>
bool tft_init() { bool tft_init() {
return ll_tft_init(); return ll_tft_init();