aboutsummaryrefslogtreecommitdiffstats
path: root/demos/modules/gwin/console/main.c
diff options
context:
space:
mode:
authorAndrew Hannam <andrewh@inmarket.com.au>2013-05-24 08:41:48 -0700
committerAndrew Hannam <andrewh@inmarket.com.au>2013-05-24 08:41:48 -0700
commitf0569e2555b3a7f2afe05cc42e4dd0982b179167 (patch)
treee85c90a4f21974b706315d64209021e0b2bde764 /demos/modules/gwin/console/main.c
parent5f2a32714cda6bcfc8829e61895def2f627e1b8f (diff)
parent7fbfde42aabbcd30cffba2fba35158236c0a6c6c (diff)
downloaduGFX-f0569e2555b3a7f2afe05cc42e4dd0982b179167.tar.gz
uGFX-f0569e2555b3a7f2afe05cc42e4dd0982b179167.tar.bz2
uGFX-f0569e2555b3a7f2afe05cc42e4dd0982b179167.zip
Merge pull request #73 from inmarket/master
GOS module for OS independance, GMISC additions
Diffstat (limited to 'demos/modules/gwin/console/main.c')
-rw-r--r--demos/modules/gwin/console/main.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/demos/modules/gwin/console/main.c b/demos/modules/gwin/console/main.c
index 90ebf86f..d968b920 100644
--- a/demos/modules/gwin/console/main.c
+++ b/demos/modules/gwin/console/main.c
@@ -18,10 +18,8 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "ch.h"
-#include "hal.h"
-#include "chprintf.h"
#include "gfx.h"
+#include "chprintf.h"
/* The handles for our three consoles */
GHandle GW1, GW2, GW3;
@@ -33,12 +31,8 @@ int main(void) {
uint8_t i;
font_t font1, font2;
- halInit();
- chSysInit();
-
/* initialize and clear the display */
- gdispInit();
- gdispClear(Black);
+ gfxInit();
font1 = gdispOpenFont("UI2 Double");
font2 = gdispOpenFont("Small");
@@ -81,7 +75,7 @@ int main(void) {
}
while(TRUE) {
- chThdSleepMilliseconds(500);
+ gfxSleepMilliseconds(500);
}
}