Commit Graph
72 Commits
Author SHA1 Message Date
Paul Guenette 687cf5b877 Merge branch 'Endstops' into develop 2019-05-25 13:53:38 +02:00
Paul Guenette 9315c4e1c7 Write and test CAN getSignal function 2019-05-19 21:18:18 +02:00
Paul Guenette d8b335fcb9 Merge branch 'feature/doctest' into feature/CAN 2019-05-19 19:27:20 +02:00
Paul Guenette 0598c2c995 Setup doctest 2019-05-16 00:03:37 +02:00
Paul Guenette 1e5b82ca8b Merge branch 'devel' into Endstops 2019-04-23 21:48:43 +02:00
Paul Guenette 5fee14a378 Merge branch 'devel' into feature/CAN 2019-03-23 09:33:42 +01:00
Oskar Weigl b8bcdb8fe3 reorder some stuff 2019-03-19 14:13:51 -07:00
Oskar Weigl 0e971fb73c Merge pull request #318 from Wetmelon/backend_fixes
Backend fixes
2019-03-19 14:12:35 -07:00
Oskar Weigl 901311b582 add ODrive v3.6 2019-03-18 17:57:44 -07:00
Paul Guenette b049e6f0eb Add a config flag for debug builds. Build with -O2 by default 2019-03-17 20:25:38 +01:00
Unknown a2ebb7085c Merge branch 'devel' into Endstops 2018-10-06 13:33:21 -04:00
Unknown 82c21c6a03 Merge branch 'devel' into feature/CAN 2018-10-06 13:32:44 -04:00
Unknown 2431fd98c6 Start with CAN_SIMPLE protocol 2018-10-04 18:50:45 -04:00
Oskar Weigl 6c89460d88 Merge pull request #254 from madcowswe/fix-sincos
Fix rounding issue in arm_cos_f32
2018-09-30 19:13:53 -07:00
Oskar Weigl ece2921316 add and rename our own copy of arm_sin_f32 and arm_cos_f32 2018-09-27 21:18:38 -07:00
Unknown dc693ebd9c Merge branch 'devel' into Endstops 2018-09-27 20:42:30 -04:00
Oskar Weigl b3c7ca61e3 Merge branch 'devel' into traptraj 2018-09-27 13:00:16 -07:00
Oskar Weigl 7776d39cd0 add Wdouble-promotion warning 2018-09-26 22:07:47 -07:00
Unknown 9b0bc6f840 Make Endstops objects instead of structs in Axis 2018-09-08 18:25:51 -04:00
Unknown 03bf297bd8 Add TrapTraj to Axis and Controller. Add move_to_pos funciton 2018-09-01 23:39:31 -04:00
Unknown 3aeaedfe52 Add semicolon to class end, add file to tupfile.lua 2018-08-06 20:15:17 -04:00
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
Oskar Weigl d403bc5ff5 Merge branch 'devel' into sam_can 2018-06-06 23:39:03 -07:00
Oskar Weigl 2a7743ef0b Merge branch 'devel' into fw4 2018-06-05 23:13:58 -07:00
Samuel Sadok caacde7544 Replace ASCII protocol compile time setting with runtime setting
When enabled, the USB CDC interface of the ODrive will
run the ASCII protocol instead of the native protocol.
In that case the native protocol can still be used on
endpoints 0x03, 0x83.
Truly concurrent use is not tested and thus not recommended.
2018-05-14 15:50:01 -07:00
Samuel Sadok c714f0ee49 fix function calls with arguments 2018-05-13 23:51:21 -07:00
Samuel Sadok 4bf7e987a5 apply ODrive native protocol updates to fibre and switch to fibre 2018-05-13 18:53:44 -07:00
Samuel Sadok 62dd4a9a6a Merge branch 'sam_i2c' into project-r 2018-04-24 18:26:54 -07:00
Samuel Sadok c0ac611e4b implement protocol over I2C 2018-04-24 18:07:51 -07:00
Samuel Sadok 2fde5b4d85 improve cross platform compatibility
- python odrive module can be used from python2 again
 - the automatic firmware version.h generation is now based on python instead of bash (which didn't work well on Windows)
2018-04-24 15:35:10 -07:00
Samuel Sadok 1f504d1d99 Merge branch 'sam_testing' into sam_oskar_testing 2018-04-21 23:11:36 -07:00
Samuel Sadok 96d2bc81f2 Merge branch 'sam_refactoring' into sam_testing 2018-04-21 22:22:42 -07:00
Samuel Sadok 1380aa5fe5 add CAN interface 2018-04-21 14:22:48 -07:00
Samuel Sadok 1d7bf6b467 Merge branch 'devel' of github.com:madcowswe/ODrive into sam_refactoring 2018-04-21 00:07:31 -07:00
Samuel Sadok 741a51442f split communication into multiple files 2018-04-20 23:44:55 -07:00
Samuel Sadok abdb037d75 move communication related files 2018-04-20 21:33:39 -07:00
Oskar Weigl e4b199e5c6 some nan checks require overriding fast math 2018-04-14 23:43:21 -07:00
Samuel Sadok eff744e143 Merge branch 'sam_v3.5_post_refactoring' into sam_testing 2018-04-09 18:24:26 -07:00
Samuel Sadok d9b7996c8a Merge branch 'sam_refactoring' into sam_testing 2018-04-09 18:23:25 -07:00
Samuel Sadok ab27552c0e add v3.5 support to build system 2018-04-09 18:20:13 -07:00
Oskar Weigl fed26a8d00 Merge branch 'devel' into sam_versions 2018-04-09 15:03:26 -07:00
Samuel Sadok 8972e4a8b1 reenable ASCII protocol (formerly "legacy" protocol) 2018-04-07 21:20:26 -07:00
Samuel Sadok e264e1c326 rename legacy protocol to ASCII protocol 2018-04-07 13:25:19 -07:00
Samuel Sadok b229fb16d3 Merge branch 'devel' into sam_refactoring 2018-04-06 15:04:51 -07:00
Samuel Sadok e460e59c27 Merge branch 'sam_rtos_debugging' into sam_testing 2018-04-05 22:38:15 -07:00
Samuel Sadok 8618549753 Merge branch 'sam_refactoring' into sam_testing 2018-04-05 22:24:52 -07:00
Samuel Sadok 2d681f8b99 Merge branch 'sam_python_fixes' into sam_testing 2018-04-03 17:27:19 -07:00
Samuel Sadok b8b483c9d6 Firmware hardening
- check return code of enqueue_modulation_timings
 - wrap all hardware access to safety critical hardware timer registers in safety_critical_ sections. These functions like the armed-ness of each PWM output to a corresponding armed state that can only be set at start or by the user
 - ensure NaN in any variables doesn't cause unpredictable behavior on the safety critical PWM outputs
2018-03-30 22:32:07 -07:00
Samuel Sadok 13aacbfed2 bake Git-derived version into firmware 2018-03-28 01:12:02 -07:00
Samuel Sadok 95ba621403 Merge branch 'devel' of github.com:madcowswe/ODrive into sam_refactoring 2018-03-17 22:38:16 -07:00