josh
/
Teacup_Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ARM: get sermsg.c/.h in. 

Compiled flawlessly, ran all test flawlessly, and at the end it
turned out mendel.c had an obsolete #include. Very nice.
This commit is contained in:
Markus Hitter 2015-07-18 14:28:11 +02:00
parent 829e4d475b
commit 5dec638919
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile-ARM
View File

@ -97,7 +97,7 @@ TARGET = $(PROGRAM).hex
#SOURCES = $(wildcard *.c) #SOURCES = $(wildcard *.c)
# Until the generic ARM port is completed, we'd have to wrap all sources # Until the generic ARM port is completed, we'd have to wrap all sources
# in #ifdef __AVR__. To avoid this, build only a selection for now: # in #ifdef __AVR__. To avoid this, build only a selection for now:
SOURCES = mendel.c cpu.c serial.c SOURCES = mendel.c cpu.c serial.c sermsg.c
SOURCES += mbed-pinmap.c SOURCES += mbed-pinmap.c
ifeq ($(MCU), lpc1114) ifeq ($(MCU), lpc1114)
SOURCES += mbed-system_LPC11xx.c SOURCES += mbed-system_LPC11xx.c

1
mendel.c
View File

@ -38,7 +38,6 @@
#include "gcode_parse.h" #include "gcode_parse.h"
#include "timer.h" #include "timer.h"
#include "temp.h" #include "temp.h"
#include "sermsg.h"
#include "watchdog.h" #include "watchdog.h"
#include "debug.h" #include "debug.h"
#include "sersendf.h" #include "sersendf.h"