Merge pull request #369 from daniel-thompson/fixes/stdout-build-fixes

fixes/stdout build fixes
olikraus · Oct 1, 2016 · f29ac2b · f29ac2b
2 parents e2d1009 + a7209c1
commit f29ac2b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/sys/stdout/helloworld/main.c b/sys/stdout/helloworld/main.c
@@ -18,7 +18,7 @@ int main(void)
     u8g_SetFont(&u8g, u8g_font_10x20);
     w = u8g_GetFontBBXWidth(&u8g);
     h = u8g_GetFontBBXHeight(&u8g);
-    u8g_DrawStr(&u8g, 0, h, 0, "ABCgdef");
+    u8g_DrawStr(&u8g, 0, h, "ABCgdef");
     //u8g_DrawStr(&u8g, 0, 5, 0, "g");
     //u8g_DrawStr(&u8g, 10, 7, 0, "g");
     //u8g_DrawStr(&u8g, 20, 9, 0, "g");

diff --git a/sys/stdout/rotation/Makefile b/sys/stdout/rotation/Makefile
@@ -2,7 +2,7 @@
 CFLAGS = -g -Wall -I../../../csrc/.  -DU8G_16BIT
 #CFLAGS = -g -Wall -I../../../src/. 
 
-SRC = $(shell ls ../../../csrc/*.c) $(shell ls ../../../fntsrc/u8g_font_10x20*.c) $(shell ls ../dev/u8g*.c) main.c
+SRC = $(shell ls ../../../csrc/*.c) $(shell ls ../../../fntsrc/*.c) $(shell ls ../dev/u8g*.c) main.c
 
 OBJ = $(SRC:.c=.o)
 

diff --git a/sys/stdout/rotation/main.c b/sys/stdout/rotation/main.c
@@ -18,8 +18,8 @@ int main(void)
     u8g_SetFont(&u8g, u8g_font_10x20);
     w = u8g_GetFontBBXWidth(&u8g);
     h = u8g_GetFontBBXHeight(&u8g);
-    u8g_DrawStr(&u8g, 0, h, 0, "A");
-    u8g_DrawStr(&u8g, 10, h, 1, "B");
+    u8g_DrawStr(&u8g, 0, h, "A");
+    u8g_DrawStr(&u8g, 10, h, "B");
 
     u8g_DrawFrame(&u8g, 2, 2, 9, 3);
     u8g_DrawFrame(&u8g, 0, 0, 13, 7);