Fiddle around to get tests suite passing...going a little crazy.

openxc · May 31, 2013 · 09777b9 · 09777b9
1 parent 3f45bb9
commit 09777b9
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-CC = gcc
+CC = g++
 INCLUDES = -I. -Iatcommander
 CFLAGS = $(INCLUDES) -c -w -Wall -Werror -g -ggdb
 LDFLAGS =

diff --git a/arduino/baudsetter.ino b/arduino/baudsetter.ino
@@ -3,6 +3,8 @@
 #include "WProgram.h"
 #include <stdarg.h>
 
+extern const AtCommanderPlatform AT_PLATFORM_RN42;
+
 bool configured = false;
 AtCommanderConfig config;
 

diff --git a/atcommander/atcommander.c b/atcommander/atcommander.c
@@ -14,7 +14,7 @@
         config->log_function("\r\n"); \
     }
 
-const AtCommanderPlatform AT_PLATFORM_RN42 = {
+AtCommanderPlatform AT_PLATFORM_RN42 = {
     DEFAULT_RESPONSE_DELAY_MS,
     rn42_baud_rate_mapper,
     { "$$$", "CMD\r\n" },
@@ -24,7 +24,7 @@ const AtCommanderPlatform AT_PLATFORM_RN42 = {
     { "R,1\r", NULL },
 };
 
-const AtCommanderPlatform AT_PLATFORM_XBEE = {
+AtCommanderPlatform AT_PLATFORM_XBEE = {
     3000,
     xbee_baud_rate_mapper,
     { "+++", "OK" },

diff --git a/atcommander/atcommander.h b/atcommander/atcommander.h
@@ -21,7 +21,7 @@ typedef struct {
 } AtCommand;
 
 typedef struct {
-    const int response_delay_ms;
+    int response_delay_ms;
     int (*baud_rate_mapper)(int baud);
     AtCommand enter_command_mode_command;
     AtCommand exit_command_mode_command;

diff --git a/tests/tests.c b/tests/tests.c
@@ -5,6 +5,9 @@
 #include <stdlib.h>
 #include <stdarg.h>
 
+extern const AtCommanderPlatform AT_PLATFORM_RN42;
+extern const AtCommanderPlatform AT_PLATFORM_XBEE;
+
 AtCommanderConfig config;
 
 void debug(const char* format, ...) {