Commit Graph
43 Commits
Author SHA1 Message Date
Oskar Weigl df2067c544 Merge branch 'pr/kalvdans/243' into devel 2018-12-17 13:54:32 -08:00
Oskar Weigl 921987a09f increase comms stack size (we really need to refactor this) 2018-10-30 18:20:08 -07:00
Christian Häggström cc0f083bf0 Poll analog inputs to drive a configured endpoint. 2018-09-13 14:28:49 +02:00
Oskar Weigl cb84e11348 pwm in: only ch4 is available on odrive v3.2 2018-06-23 20:05:57 -07:00
Oskar Weigl cd74a98b25 fix removed endpoint construction check 2018-06-21 23:22:06 -07:00
Oskar Weigl a9b03dd4df Merge branch 'devel' into powerwheels 2018-06-21 21:41:36 -07:00
Oskar Weigl e52dc0732a fix stdout 2018-06-08 21:21:15 -07: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 84e6f2386b comment out can start for inert merge-in 2018-06-07 00:02:10 -07:00
Oskar Weigl d403bc5ff5 Merge branch 'devel' into sam_can 2018-06-06 23:39:03 -07:00
Oskar Weigl f8306741bc Merge branch 'devel' into sam_user_adc 2018-06-05 23:40:50 -07:00
Oskar Weigl 2a7743ef0b Merge branch 'devel' into fw4 2018-06-05 23:13:58 -07:00
Oskar Weigl c95233a57b make ascii protocol default on CDC interface, change some naming 2018-06-05 21:59:48 -07:00
Samuel Sadok 689fe1512c add PWM channel 1 and 2 initialization, add pulldown, fix off-by-one 2018-05-15 23:58:55 -07:00
Oskar Weigl c13bee09ed Merge remote-tracking branch 'origin/pwm-in' into powerwheels 2018-05-15 16:55:46 -07:00
Samuel Sadok d3105cfcaf expose PWM mappings as endpoint_ref 2018-05-15 16:43:44 -07:00
Oskar Weigl aefd331488 Merge branch 'pwm-in' into powerwheels 2018-05-15 10:48:18 -07:00
Oskar Weigl 3103eda5f9 Merge branch 'devel' into fw4 2018-05-15 10:22:19 -07:00
Samuel Sadok 359eab32f6 implement PWM input 2018-05-15 10:10:55 -07:00
Samuel Sadok 8339311c35 make ADC work 2018-05-14 19:06:09 -07:00
Samuel Sadok 1e47f5c3e8 Merge branch 'devel' into sam_user_adc 2018-05-14 17:40:18 -07:00
Samuel Sadok 15af5fc640 Merge branch 'devel' into sam_winusb 2018-05-14 16:50:45 -07:00
Samuel Sadok 0e32df329f fix compilation when using stdout protocol 2018-05-14 16:25:31 -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 4bf7e987a5 apply ODrive native protocol updates to fibre and switch to fibre 2018-05-13 18:53:44 -07:00
Samuel Sadok 4240ba6074 Merge branch 'sam_user_adc' into project-r 2018-04-27 17:50:48 -07:00
Samuel Sadok b064800116 Add general purpose ADC API
ADC1 is configured to sample channels 0 to 15 continuously
at about 30kHz. Users can now set their GPIO of choice to
analog mode (as long as it's wired to one of the analog
channels) and then read the voltage at any time.

The values can be read like this:

GPIO_set_to_analog(GPIO_3_GPIO_Port, GPIO_3_Pin);
my_voltage = get_adc_voltage(GPIO_3_GPIO_Port, GPIO_3_Pin);
2018-04-27 17:46:56 -07:00
Oskar Weigl 5518d1e12d add hall sample space 2018-04-26 13:46:47 -07:00
Samuel Sadok e19c477875 add test property 2018-04-24 19:39:13 -07:00
Samuel Sadok 1817b978b1 add test property 2018-04-24 19:36:07 -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 e2c14c0082 fix excessive firmware size due to oscilloscope array 2018-04-24 13:49:39 -07:00
Samuel Sadok dc303606b1 fix USB TX lockup issue
When the host reset the connection without reading the response packet first, the TX-empty semaphore would never get released, thereby blocking any further TX communication. This commit just overrides the TX buffer if the semaphore wait times out.
2018-04-23 19:03:55 -07:00
Samuel Sadok 535dbcf481 add system_stats to monitor resource usage 2018-04-23 19:03:55 -07:00
Samuel Sadok 3d13da4e92 implement function return values on protocol
(this time for real)
2018-04-22 00:57:14 -07:00
Samuel Sadok 1f504d1d99 Merge branch 'sam_testing' into sam_oskar_testing 2018-04-21 23:11:36 -07:00
Samuel Sadok e581cc9c90 move enable_dfu_mode() to main.cpp 2018-04-21 22:09:54 -07:00
Samuel Sadok 1380aa5fe5 add CAN interface 2018-04-21 14:22:48 -07:00
Samuel Sadok 429acfd7c9 move enable_dfu_mode() to main.cpp 2018-04-21 14:21:29 -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