Revision 610
no explosions! removed hack from ConstantCharging.c and ran a test w/ the medium inductor, no freq hack, and saved it in data
Makefile | ||
---|---|---|
14 | 14 |
TARGET = main |
15 | 15 |
|
16 | 16 |
# Uncomment this to use the wireless library |
17 |
USE_WIRELESS = 1
|
|
17 |
# USE_WIRELESS = 0
|
|
18 | 18 |
|
19 | 19 |
# com1 = serial port. Use lpt1 to connect to parallel port. |
20 |
AVRDUDE_PORT = com2 #/dev/ttyUSB1
|
|
20 |
AVRDUDE_PORT = com4 #/dev/ttyUSB1
|
|
21 | 21 |
# |
22 | 22 |
# |
23 | 23 |
################################### |
... | ... | |
114 | 114 |
CDEFS += -DF_CPU=$(F_CPU)UL |
115 | 115 |
CDEFS += -DFFP |
116 | 116 |
# for wireless library |
117 |
ifdef USE_WIRELESS |
|
118 |
CDEFS += -DROBOT |
|
119 |
endif |
|
117 |
#ifdef USE_WIRELESS
|
|
118 |
# CDEFS += -DROBOT
|
|
119 |
#endif
|
|
120 | 120 |
|
121 | 121 |
# Place -I, -L options here |
122 |
CINCS = -I$(COLONYROOT)/code/lib/include/libdragonfly
|
|
123 |
CINCS += -L$(COLONYROOT)/code/lib/bin
|
|
124 |
ifdef USE_WIRELESS |
|
125 |
CINCS += -I$(COLONYROOT)/code/lib/include/libwireless |
|
126 |
endif |
|
122 |
CINCS = -I../../../libdragonfly/
|
|
123 |
CINCS += -L../../../libdragonfly/
|
|
124 |
#ifdef USE_WIRELESS
|
|
125 |
# CINCS += -I$(COLONYROOT)/code/lib/include/libwireless
|
|
126 |
#endif
|
|
127 | 127 |
|
128 | 128 |
#---------------- Compiler Options ---------------- |
129 | 129 |
# -g*: generate debugging information |
Also available in: Unified diff