aboutsummaryrefslogtreecommitdiffstats
path: root/libmaple
Commit message (Collapse)AuthorAgeFilesLines
* Reverting commits between `git merge-head master refactor` and master.Marti Bolivar2011-05-095-114/+145
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a combination of 11 revert commits, and allows for a clean merge of the work done in the refactor branch. The combined commit messages follow. Revert "Committing basic ring_buffer test." This reverts commit 987fa5f433e0cd41b1621dad8b4e331cf82d49f3. Revert "qa-slave-shield.cpp and test-session.cpp fixes for Mini and RET6 Edition." This reverts commit cdd367bdd264c9e19180032c119850fbba2115ba. Revert "Brought examples/ up to date; PIN_MAP bugfix for D24." This reverts commit b4c2d4514c6d52cac8a649c5d5c24b68a3c0a416. Revert "Separated GPIO config to a separate FSMC routine." This reverts commit 744848ad0fc33eed66acc44e41c3c9d646c5b100. Revert "Slightly faster RAM writes (6.5MHz)." This reverts commit 8ba0b6bb065acb4aff26bc9c838de5f37515caf1. Revert "FSMC working but slow (~6 MHz)." This reverts commit 0dc9490cf4f4f10a23b08fef1728773f10c1b76a. Revert "Maple Mini ERROR_LED_PIN fix." This reverts commit 07d437706840901db1e09ff0ab88229c67c1fa8a. Revert "Fixing USBSerial::read(void*, uint32) return value (thanks, Crenn!)" This reverts commit 3ba7196712a5bfe4fe1166b6c34d49c3d7254568. Revert "Trivial gpio_init() bugfix" This reverts commit f6ce003bb935f26eeefa54acf7c2ae6afaabd871. Revert "Trivial changes to test-session.cpp" This reverts commit a32a37b121ac7e62660d2a83fe67c857fe705122. Revert ".gitignore: Ignore cscope* files" This reverts commit d8c72c17bd6d7416a0846e69f4f5ae5cb229d58e.
* qa-slave-shield.cpp and test-session.cpp fixes for Mini and RET6 Edition.Marti Bolivar2011-03-082-61/+49
| | | | | | | | | | | | | There's a bit of a hack on the RET6 NR_DAC_PINS: due to the fact that PA5 is hooked up to the built-in LED and DAC channel 2, I set NR_DAC_PINS to 0 for the STM32F103RE (in libmaple.h), so that init() doesn't dac_init() and mess with the LED. Not too worried about it since this is just a beta board, but we'll need to fix this in the design for the real version. Also, BUT should be moved, since it steals Timer 8's channel 4 CC connection.
* Separated GPIO config to a separate FSMC routine.Marti Bolivar2011-03-082-8/+13
|
* Slightly faster RAM writes (6.5MHz).Marti Bolivar2011-03-071-1/+1
|
* FSMC working but slow (~6 MHz).Marti Bolivar2011-03-071-74/+46
|
* Maple Mini ERROR_LED_PIN fix.Marti Bolivar2011-03-071-1/+1
|
* Trivial gpio_init() bugfixMarti Bolivar2011-03-011-2/+6
|
* Trivial DAC-related updates.Marti Bolivar2011-02-181-1/+1
|
* Basic DAC functionality (high-density devices only).Marti Bolivar2011-02-183-10/+10
|
* Generalizing adc_init() to allow user to select sample timeMarti Bolivar2011-02-172-8/+44
|
* Merge branch 'nzmichaelh-master' into master.Marti Bolivar2011-02-1622-102/+815
|\ | | | | | | | | | | | | | | | | This provides DMA, IWDG, PWR, and BKP support, and fixes several bugs. Conflicts: libmaple/adc.h libmaple/libmaple.h libmaple/ring_buffer.h
| * undoing USART[45] -> UART[45] mistakeMarti Bolivar2011-02-156-23/+24
| |
| * nvic bugfix; removed unnecessary volatile usageMarti Bolivar2011-01-312-7/+7
| |
| * [WIP] Code review picked up some bugs/issues.Marti Bolivar2011-01-267-74/+131
| |
| * Documentation improvements, DMA IRQ table volatile bugfix.Marti Bolivar2011-01-032-1/+11
| |
| * nzmichaelh-master branch is ready for code review.Marti Bolivar2010-12-303-8/+8
| |
| * Changed nzmichaelh's initial DMA interface to be more flexible.Marti Bolivar2010-12-306-59/+153
| | | | | | | | | | Some bugfixes in the external interrupt code were found along the way. Defines for nonexistent registers removed from nvic interface.
| * nzmichaelh's pull request mods compile and upload.Marti Bolivar2010-12-2811-19/+256
| | | | | | | | renamed SysTick_Handler back to SysTickHandler since all of our linker magic/lanchon-stm32 depends on that name. added backup register support in order to test independent watchdog support; it seems to work. next major test target is DMA support.
| * Wait until the transmit buffer is empty before send to save timeMichael Hope2010-10-201-3/+3
| |
| * Added DMA1 and DMA2 to the RCCMichael Hope2010-10-202-0/+4
| |
| * Added basic DMA supportMichael Hope2010-10-202-0/+175
| |
| * Added independent watchdog supportMichael Hope2010-10-142-0/+107
| |
| * Reduced the use of volatiles to speed up rb_insert() and rb_remove().Michael Hope2010-10-101-15/+15
| | | | | | | | Added support for non-power-of-two ring buffers.
| * Changed the ring_buffer indexes to uint16 to cut memory usage and increase ↵Michael Hope2010-10-101-5/+5
| | | | | | | | capacity. Sorted struct members by size to improve the packing.
| * Mark head and tail as volatile as a ring buffer works accross ↵Michael Hope2010-10-101-3/+17
| | | | | | | | threads/interrupts. Add comments.
| * Make rcc.h C++ safeMichael Hope2010-10-101-0/+7
| |
| * Change the systick handler to the CMSIS compliant SysTick_HandlerMichael Hope2010-10-101-1/+1
| |
| * Make systick.h C++ safe. Expose the sys tick count via systick.h and remove ↵Michael Hope2010-10-102-6/+8
| | | | | | | | other externs.
| * Merge remote branch 'upstream/master'Michael Hope2010-09-2933-1103/+1056
| |\
| * | Fixed up the build due to a missing header file.Michael Hope2010-09-291-4/+4
| | |
* | | Merge branch 'debug-serialusb'Marti Bolivar2011-02-127-179/+180
|\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: libmaple/usb/usb.c notes/coding_standard.txt
| * | | readme and coding standard updatesMarti Bolivar2010-12-211-38/+46
| | | |
| * | | Merge branch 'master' into debug-serialusb.Marti Bolivar2010-12-213-224/+373
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Chose debug-serialusb version in cases of conflict. Conflicts: libmaple/usb/usb_callbacks.c
| * | | | added a usbBlockingSendByte(char ch)AJM2010-12-142-5/+11
| | | | | | | | | | | | | | | | | | | | this new function will only return AFTER the usb interrupt has been serviced and the byte is sent. Bytes should NOT fall on the floor ever with this function. (but they still do? pyserials problem?)
| * | | | changed the serialusb to be simplest possible designAJM2010-12-143-51/+20
| | | | | | | | | | | | | | | | | | | | no longer use a ring buffer. No longer double buffer a local rx buffer and the packet memory. Instead, we read out of packet memory and block it for all reads. This is going to be slower. but it tests OK (unlike the old one...).
| * | | | enlarged rx buffer and nak when less than 64 bytes is left in packet bufAJM2010-12-135-20/+22
| | | | |
| * | | | candidate bugfix for serialusb receive bugAJM2010-12-134-26/+43
| | | | | | | | | | | | | | | | | | | | changed USB driver to nak whenever it cant fill an entire endpoint (64B) worth of new data. The old scheme was to set receive valid as long as as the endpoint buffer wasnt full, the new scheme is to nak until it is completely empty.
* | | | | Made Native prototype B definitions in libmaple.h and boards.h; addedMarti Bolivar2011-02-101-2/+2
| | | | | | | | | | | | | | | | | | | | notes/native-pin-definitions.txt (copied from ST datasheet).
* | | | | Fixing usb.c countTx race; thanks, geoffreymbrown!Marti Bolivar2011-02-091-1/+1
| | | | |
* | | | | Ported examples/test-session.cpp to work on MiniMarti Bolivar2011-01-301-0/+2
| | | | |
* | | | | Ported libmaple to the new mini prototypeMarti Bolivar2011-01-272-13/+12
| |/ / / |/| | |
* | | | Finalized 0.0.9 documentation.Marti Bolivar2010-12-152-74/+37
| | | |
* | | | Merge branch 'master' into newdocMarti Bolivar2010-12-143-102/+218
|\| | |
| * | | Servo library tested and debugged.Marti Bolivar2010-12-082-75/+143
| | | | | | | | | | | | | | | | | | | | Some additional HardwareTimer methods introduced to make this convenient; ancillary libmaple/timers.h changes resulted.
| * | | maple mini prototype seems to be workingMarti Bolivar2010-11-301-8/+18
| | | |
* | | | Finished converting the Arduino docsMarti Bolivar2010-11-291-234/+234
| | | |
* | | | arduino language reference nearing completion, properly CC-BY-SA 3.0 attributedMarti Bolivar2010-11-172-36/+186
|/ / /
* | | maple mini runs blinky now.Marti Bolivar2010-10-225-13/+32
| | | | | | | | | | | | still need usb descriptors to improve, and also nothing else is tested.
* | | weird broken table for maple miniMarti Bolivar2010-10-201-20/+55
| | |
* | | Merge branch 'master' of github.com:leaflabs/libmapleMarti Bolivar2010-10-142-31/+27
|\ \ \