Oskar Weigl 6ff4445770 Merge branch 'devel' into sam_fibre ...

Conflicts:
	Firmware/Tupfile.lua
	Firmware/fibre/cpp/include/fibre/protocol.hpp
	Firmware/fibre/python/fibre/discovery.py
	Firmware/fibre/python/fibre/usbbulk_transport.py
	tools/odrive/dfu.py
	tools/odrive/shell.py
	tools/odrive/utils.py
	tools/odrivetool

2018-06-08 19:30:21 -07:00

..

axis.cpp

clean state machine level error writing

2018-05-10 14:42:35 -07:00

axis.hpp

make ADC work

2018-05-14 19:06:09 -07:00

board_config_v3.h

make ADC work

2018-04-27 18:21:39 -07:00

controller.cpp

Make subcomponent errors to always set relevant axis error; use do_checks and set_error

2018-05-10 06:56:13 -07:00

controller.hpp

[UNTESTED] start implementing sensorless test

2018-05-21 15:57:06 -07:00

encoder.cpp

Merge branch 'devel' into fw4

2018-05-15 10:22:19 -07:00

encoder.hpp

restore default config values

2018-05-10 14:48:48 -07:00

example.json

[TEMP] refactoring: compile works, motors initialize as usual

2018-03-02 22:03:24 -08:00

low_level.cpp

Merge branch 'devel' into sam_user_adc

2018-05-14 17:40:18 -07:00

low_level.h

Merge branch 'sam_user_adc' into project-r

2018-04-27 17:50:48 -07:00

main.cpp

fix usage of GPIO_5 for ODrive v3.2

2018-06-06 00:18:25 -07:00

motor.cpp

implement snap of requested current range

2018-05-14 00:03:50 -07:00

motor.hpp

implement snap of requested current range

2018-05-14 00:03:50 -07:00

nvm_config.hpp

apply ODrive native protocol updates to fibre and switch to fibre

2018-05-13 18:53:44 -07:00

nvm.c

change how default configs are done for now

2018-02-23 23:36:46 -08:00

nvm.h

Add low level non-volatile memory implementation

2018-02-22 18:05:03 -08:00

odrive_main.h

Merge branch 'devel' into sam_fibre

2018-06-08 19:30:21 -07:00

sensorless_estimator.cpp

push estimator updates into control loop prefix

2018-05-10 07:33:54 -07:00

sensorless_estimator.hpp

push estimator updates into control loop prefix

2018-05-10 07:33:54 -07:00

utils.c

Merge branch 'devel' into sam_can

2018-06-06 23:39:03 -07:00

utils.h

Merge branch 'devel' into sam_can

2018-06-06 23:39:03 -07:00