From fc148def63a58a1970700afeadf541daea445f33 Mon Sep 17 00:00:00 2001 From: Kevin Kellar Date: Tue, 29 Aug 2017 10:40:15 -0700 Subject: [PATCH] serial-test now properly compiles --- joy/joy.ino | 2 +- sdl-test/{ => simple}/compile.sh | 0 sdl-test/{ => simple}/sdl-example.c | 0 serial/serial-test.c | 4 ++-- 4 files changed, 3 insertions(+), 3 deletions(-) rename sdl-test/{ => simple}/compile.sh (100%) rename sdl-test/{ => simple}/sdl-example.c (100%) diff --git a/joy/joy.ino b/joy/joy.ino index ddf3801..a4d6934 100644 --- a/joy/joy.ino +++ b/joy/joy.ino @@ -1,5 +1,5 @@ -// #define JOY_SEND_DEBUG_ASCII +#define JOY_SEND_DEBUG_ASCII #include "jt-constants.h" diff --git a/sdl-test/compile.sh b/sdl-test/simple/compile.sh similarity index 100% rename from sdl-test/compile.sh rename to sdl-test/simple/compile.sh diff --git a/sdl-test/sdl-example.c b/sdl-test/simple/sdl-example.c similarity index 100% rename from sdl-test/sdl-example.c rename to sdl-test/simple/sdl-example.c diff --git a/serial/serial-test.c b/serial/serial-test.c index a79cbec..2780bca 100644 --- a/serial/serial-test.c +++ b/serial/serial-test.c @@ -118,7 +118,7 @@ void* serial_write() fclose(output); } -#elif SERIAL_TEST_ESCAPING +#elif defined SERIAL_TEST_ESCAPING void* serial_write() { @@ -182,7 +182,7 @@ void* serial_write() #else -int main() +void* serial_write() { printf("Squares Serial Test\n"); #warning "Squares Serial Test"