jackcartersmith/blackmagic
1
0
Fork 0
Code Issues Pull Requests Releases Activity
1,011 Commits 3 Branches 18 Tags
Commit Graph

1011 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Ciesielski
db35fbb7ba Merge branch 'master' of git://github.com/libopencm3/libopencm3 into upstream-merge 2012-11-13 13:13:40 -08:00
Piotr Esden-Tempski
4691568ca4 [examples] Added CAN example for obldc strip. 2012-11-11 21:02:15 -08:00
Piotr Esden-Tempski
7006d3c457 [examples] Added systick example for obldc strip. 2012-11-11 20:37:18 -08:00
Piotr Esden-Tempski
d1e789b5b7 [examples] Added obldc strip led example. 2012-11-11 20:36:56 -08:00
Piotr Esden-Tempski
1544800a23 Made all Lisa/M 2.0 examples luftboot ready. 2012-11-08 15:35:17 -08:00
Piotr Esden-Tempski
898691e5ef Updated and backported improvements form the Lisa/M 2.0 CAN example. 2012-11-08 15:21:40 -08:00
Piotr Esden-Tempski
5d4d84026a Added updated and improved CAN example for Lisa/M 2.0. 2012-11-08 15:18:26 -08:00
Piotr Esden-Tempski
020ec859df Fixed cut and paste typo for CAN banks. 2012-11-08 14:29:11 -08:00
Piotr Esden-Tempski
f714ee42c0 Merging pull request #60 Miscellaneous DMA fixes for F4 
Merge remote-tracking branch 'bgamari/master'
 2012-11-08 12:04:28 -08:00
Ben Gamari
095e6cdb5d stm32f4/dma: Fix cut-and-paste error 2012-11-08 12:20:36 -05:00
Ben Gamari
f3557b8d60 stm32f4/dma: Fix DMA_ISR_OFFSET definition 2012-11-08 12:13:16 -05:00
Ben Gamari
2fe567e25d stm32f4: Add dma.o 2012-11-08 12:12:59 -05:00
Piotr Esden-Tempski
d87e751f71 Added directories with autogenerated files to the ignore list. 2012-11-07 16:42:11 -08:00
Piotr Esden-Tempski
971a295d43 Adjusted path to nvic.h. 2012-11-07 16:28:29 -08:00
Karl Palsson
d417666095 Eliminate redundant gpio code from f2/f4/l1 
Implemented as per exti2
 2012-11-07 21:58:16 +00:00
Karl Palsson
db5d19b4d4 Update documentation to reflect reality 2012-11-07 21:54:18 +00:00
Karl Palsson
bffaa72f7e Remove debug code. 2012-11-07 21:54:18 +00:00
Karl Palsson
ce8f47e7df Enable nvic and exti support for L1 
And include an example that uses it.
 2012-11-07 21:54:18 +00:00
Karl Palsson
b860504fed Add L1 to nvic, now that it's all generated 2012-11-07 21:50:27 +00:00
Karl Palsson
25acaa5878 Add usart support for L1. 
Only tested with basic tx blocking, ie, the same example code as on
F2/F4, but the description of the block is almost identical.
 2012-11-07 21:50:27 +00:00
Karl Palsson
2e5cfa39a5 Ignore generated files 2012-11-07 21:50:27 +00:00
Karl Palsson
4941286454 STM32L1 support, rebased onto upstream generalizations branch. 
Working example again.
 2012-11-07 21:50:27 +00:00
Karl Palsson
e4f84278f2 Add most of the rcc functions. 
(Add the forgotten gpio.c file from before)
 2012-11-07 21:50:27 +00:00
Karl Palsson
9aed64a19d Finish RCC definitions => Working example! 2012-11-07 21:50:27 +00:00
Karl Palsson
8318384cf1 More progress towards L1 support. 
Believe gpio is complete, but untested without finishing at least the
RCC defines.

RCC defines are a work in progress
 2012-11-07 21:50:27 +00:00
Karl Palsson
2011941b55 Vectors and Memory Map for STM32L1 series 2012-11-07 21:50:27 +00:00
Karl Palsson
f1f1aa84f3 Use make flags to help control where the library is installed 
Where the library is installed has quite an affect on what -L and -I
flags are used.  If you install into the toolchain, you don't want
to use them at all, but if you install out of tree (/opt/mycm3 for
example) you need to specify the -L and -I flags.

Update the documentation and the example makefiles to support this
 2012-11-07 21:50:27 +00:00
Jeff Ciesielski
1768df7eda Merge pull request #2 from ndreys/staging 
Fix for USB string descriptors/USB iSerialNumber helper functions
 2012-11-07 11:49:10 -08:00
Andrey Smirnov
720e85f850 Further re-factor USB string handling code 
This commit refactors USB string code, making it, hopefully, less
buggy and more easier to understand. It also removes "magic" bit
manipulation and "magic" numbers;
 2012-11-07 11:30:44 -08:00
Andrey Smirnov
c5c4db0196 Extend control hook framework 
This commits adds a new error code that can be return from a
registered control callback: USBD_REQ_NEXT_CALLBACK. This return code
signifies that the callback is done processing the data successfully,
but user would like to have all matching callbacks down the callback
chain to be executed too.

This change allows for example to intercept standard requests like
GET_DESCRIPTOR, do some small action upon receiving of one, but still
have the standard callback executed and do it's job. This way user
doesn't have to re-implement standard GET_DESCRIPTOR functionality if
they want to intercept that request to do some small thing.
 2012-11-07 10:33:51 -08:00
Andrey Smirnov
12e1786863 Add a desig_get_unique_id_as_string 
This commit adds desig_get_unique_id_as_string which is useful if one
wants to use device ID as USB serial number(iSerialNumber), for example.
 2012-11-06 16:48:40 -08:00
Andrey Smirnov
7a5da60e26 Change USB strings handling code 
This commit add an extra field to the _usbd_device, that allows to
keep track of the number of USB strings  which allows simplify
boundaries checking code in usb_standard_get_descriptor.

This commit also changes the index base for strings in
usb_standard_get_descriptor which allows to get rid of necessity to
have a dummy one-character string in a strings array.
 2012-11-06 16:46:55 -08:00
Andrey Smirnov
74405de4a5 Enable OTG clock during initialization 
Add a call to enable USB clock, otherwise the dive will not enumerate.
 2012-11-06 11:03:12 -08:00
Jeff Ciesielski
e5cf92b9ae stm32/f1/rcc: expose method for selecting MCO source 2012-11-02 10:52:25 -07:00
Jeff Ciesielski
6c41c808c3 stm32/f1/can: Add clearing of can timing bits on init 
This corrects a bug introduced with the addition of allowing loopback
and silent parameters in the init function.
 2012-11-01 18:02:11 -07:00
Jeff Ciesielski
fa1d5f8e43 stm32/f1/can: clean up can_available_mailbox ->fewer 'if' statements 2012-10-31 17:03:26 -07:00
Jeff Ciesielski
7e9b79aa55 stm32/can: add 'shift' defines for can timing bits 
Useful whe you want to return min/max values of timing parameters
 2012-10-31 17:01:56 -07:00
Piotr Esden-Tempski
507a1742dc Merge pull request #57 F2/F4 timer merging action 
Merge remote-tracking branch 'tdaede/f4-timer'
 2012-10-31 13:47:54 -07:00
Piotr Esden-Tempski
76c7357c00 Fixed header clean target find call for Darwin BSD find too. 2012-10-31 13:45:58 -07:00
Piotr Esden-Tempski
8091f10576 Merge pull request #56 Allow make to build libs/examples in parallel. 
Merge remote-tracking branch 'karlp/pr_parallel_makes'
 2012-10-31 13:43:44 -07:00
Piotr Esden-Tempski
08129a5644 Fixed stm32f4-discovery/usb_cdcacm example for deduplication patches. 2012-10-31 13:41:24 -07:00
Piotr Esden-Tempski
def9b9f381 Added new f4 adc module to the library makefile. 2012-10-31 13:39:24 -07:00
Piotr Esden-Tempski
f5df25d6de Merge pull request #55 STM32F4: New adc module 
Merge remote-tracking branch 'ksarkies/adc-f4'
 2012-10-31 13:38:51 -07:00
Piotr Esden-Tempski
60aa32e2b9 Merge pull request #53 CAN fixes 
Merge remote-tracking branch 'tdaede/master'
 2012-10-31 13:37:19 -07:00
Ken Sarkies
68e6818761 STM32F4 New: headers and source code for DMA 
This has been tested with some dac, timer and (as yet uncommitted) adc examples.
 2012-10-31 13:36:07 -07:00
Ken Sarkies
5a6b1a1934 STM32F1 Addition to DMA to add interrupt flag read and clear. 
Additional macros and defines added to header for the purpose.
Also disable of increment modes (seem to have been omitted originally).
 2012-10-31 13:35:59 -07:00
Piotr Esden-Tempski
6b2ca89f48 Merge pull request #22 fixing usb and f4 alignment issues 
Merge remote-tracking branch 'jdk/master'

Conflicts:
	lib/stm32/f1/Makefile
	lib/stm32/f4/Makefile
 2012-10-31 13:34:18 -07:00
Thomas Daede
016c74af25 F2 timers are the same as F4 timers, so make the same changes to them 2012-10-31 15:34:10 -05:00
Piotr Esden-Tempski
fd3ee124f8 Fixed find call for Darwin BSD find. 2012-10-31 13:29:38 -07:00
Thomas Daede
9468933735 Add back timer_set_option for STM32F4, and document. 2012-10-31 00:42:58 -05:00