aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAJM <poslathian@poslathian.(none)>2010-05-20 23:47:29 -0400
committerAJM <poslathian@poslathian.(none)>2010-05-20 23:47:29 -0400
commit7ee6a800d97e2dfeb5cbc4041df431941648b512 (patch)
treed06999398bfe1855cb1ae3c8398e06ca0d05901f
parentceffba70ebdeb53bea139d343f2d6cb88888515c (diff)
removed another depricated reference to old usb shit
removed HardwareUsb usb in example main, as that class hasnt been defined yet also modded the makefile to actually compile main.cpp
-rw-r--r--Makefile4
-rw-r--r--main.cpp.example2
2 files changed, 1 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index cd03356..379013c 100644
--- a/Makefile
+++ b/Makefile
@@ -58,9 +58,6 @@ LFLAGS = -Tstm32conf/$(LINKER) -L stm32conf/lanchon-stm32 \
CPFLAGS = -v -Obinary
ODFLAGS = -S
-# main source file
-MAIN=main.cpp
-
CSRC = libmaple/systick.c \
libmaple/timers.c \
libmaple/adc.c \
@@ -96,6 +93,7 @@ CPPSRC = wirish/wirish_math.cpp \
wirish/comm/HardwareSerial.cpp \
wirish/comm/HardwareSPI.cpp \
wirish/cxxabi-compat.cpp \
+ main.cpp
# i really have no idea what i'm doing
meep += $(CSRC)
diff --git a/main.cpp.example b/main.cpp.example
index 5c285f6..67380ae 100644
--- a/main.cpp.example
+++ b/main.cpp.example
@@ -34,8 +34,6 @@
#define LED_PIN 13
#define PWM_PIN 2
-HardwareUsb Usb;
-
void setup()
{
/* Set up the LED to blink */