summaryrefslogtreecommitdiff
path: root/digital/asserv/src/asserv/Makefile
diff options
context:
space:
mode:
authorNicolas Schodet2011-12-18 15:19:06 +0100
committerNicolas Schodet2012-03-06 23:16:34 +0100
commit4895e54c666db9720abda0aa8ae901058679aee3 (patch)
tree609c444eb620b1fdf729ed16b784aba1b2b4781b /digital/asserv/src/asserv/Makefile
parent5948ad3b390c3c7a8deac3fea4aa6f6e93f395f7 (diff)
digital/asserv: convert to new control system
Diffstat (limited to 'digital/asserv/src/asserv/Makefile')
-rw-r--r--digital/asserv/src/asserv/Makefile18
1 files changed, 8 insertions, 10 deletions
diff --git a/digital/asserv/src/asserv/Makefile b/digital/asserv/src/asserv/Makefile
index 4a61d08b..d19d9909 100644
--- a/digital/asserv/src/asserv/Makefile
+++ b/digital/asserv/src/asserv/Makefile
@@ -1,15 +1,13 @@
BASE = ../../../avr
PROGS = asserv
-AVR_PROGS = test_counter
-HOST_PROGS = test_motor_model
-asserv_SOURCES = main.c timer.avr.c counter_ext.avr.c pwm.avr.c pwm_mp.avr.c \
- pwm_ocr.avr.c pos.c speed.c postrack.c traj.c aux.c \
- twi_proto.c eeprom.avr.c state.c \
- simu.host.c motor_model.host.c models.host.c
-test_counter_SOURCES = test_counter.c timer.avr.c
-test_motor_model_SOURCES = test_motor_model.c motor_model.host.c models.host.c
-MODULES = proto uart utils math/fixed twi spi
-test_motor_model_MODULES =
+asserv_SOURCES = main.c timer.avr.c \
+ postrack.c traj.c aux.c cs.c \
+ twi_proto.c eeprom.avr.c seq.c \
+ simu.host.c models.host.c
+MODULES = proto uart utils math/fixed twi spi \
+ motor/encoder motor/encoder/ext motor/output motor/output/pwm_mp \
+ motor/control_system motor/speed_control motor/pos_control \
+ motor/blocking_detection motor/motor_model
CONFIGFILE = avrconfig.h
# atmega8, atmega8535, atmega128...
AVR_MCU = atmega128