aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'revert-pull-54'Marti Bolivar2014-01-105-460/+3
|\
| * Revert "- tx and rx callbacks for each module"Marti Bolivar2014-01-104-306/+1
| | | | | | | | | | | | | | | | This reverts commit da01c80f24dc9c43ff951ea9fd283abb4628ceb7. Reverting pull request #54, which breaks examples/i2c-mcp4725-dac.cpp. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
| * Revert "I2C slave support cleanups."Marti Bolivar2014-01-103-46/+9
| | | | | | | | | | | | | | | | This reverts commit 39cd07a640ee87b7937738d36f17019b2865bfae. Reverting pull request #54, which breaks examples/i2c-mcp4725-dac.cpp. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
| * Revert "Added I2C slave echo example in examples folder. Using another ↵Marti Bolivar2014-01-104-121/+6
|/ | | | | | | | | | maple, write a byte and then read." This reverts commit 594724951553a882758c11497a4f03828b4f43e6. Reverting pull request #54, which breaks examples/i2c-mcp4725-dac.cpp. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* Merge branch 'master' of github.com:leaflabs/libmapleMarti Bolivar2014-01-105-3/+460
|\
| * Merge pull request #54 from ginge/masterMarti Bolivar2013-07-265-3/+460
| |\ | | | | | | Added i2c slave support
| | * Added I2C slave echo example in examples folder. Using another maple, write ↵Barry Carter2012-09-054-6/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a byte and then read. Slight tidy up. Reformatted CREDITS file to be in correct order. Added a note about buffer overrun Signed-off-by:- Barry Carter <barry.carter@gmail.com>
| | * I2C slave support cleanups.Barry Carter2012-09-043-9/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added fix for corner case where badly behaving master doesn't NACK and we don't get the callbacks fires. Removed my own name from several places and added attribution to the correct place. Updated include comments to reference the fact it now supports I2C slave Signed-off-by:- Barry Carter <barry.carter@gmail.com>
| | * - tx and rx callbacks for each moduleBarry Carter2012-09-034-1/+306
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Callbacks can be called after each read/write cycle or per byte - Each I2C module can have different callbacks - General call support also working - Supports master and slave at same time. Also works with multimaster Usage: i2c_msg msg; char buffer[255]; main() { i2c_slave_enable(I2C1, I2C_FAST_MODE | I2C_SLAVE_DUAL_ADDRESS | I2C_SLAVE_GENERAL_CALL | I2C_SLAVE_USE_RX_BUFFER); // init slave mode. Enables master too i2c_slave_attach_recv_handler(I2C1, pmsg, funcrx); // attach receive handler i2c_slave_attach_transmit_handler(I2C1, pmsg, functx); // attach transmit handler i2c_slave_set_own_address(I2C1, 0x10); // set addresss 1 i2c_slave_set_own_address2(I2C1, 0x20); // set addresss 2 } void funcrx(i2c_msg *msg) { printf("length is %d.\n", msg->length); char return_data = msg0>data[0]; } void functx(i2c_msg *dev) { msg->data[0] = 0x01; msg->data[1] = 0x02; msg->data[2] = 0x03; msg->data[3] = 0x04; msg->data[4] = 0x05; msg->length = 5; } All code derived from datasheets and libmaple. Signed-off-by:- Barry Carter <barry.carter@gmail.com>
* | | build-rules.mk: allow user to override dfu-util path.Marti Bolivar2013-07-191-1/+1
|/ / | | | | | | Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* | build-rules.mk: Add CROSS_COMPILE env var supportDaniel Nyström2013-06-041-9/+11
| | | | | | | | | | | | | | | | | | Since toolchains other then older Code Sourcery (Mentor Graphics) might not use the arm-none-eabi triplet, make it possible to use any triplet by just setting the CROSS_COMPILE environment variable accordingly. Signed-off-by: Daniel Nyström <daniel@nystrom.st>
* | wirish/syscalls.c: Replace obsolete caddr_t with void *Daniel Nyström2013-06-041-6/+7
| | | | | | | | | | | | | | | | | | caddr_t is obsolete in POSIX and thus unavailable in most modern toolchains. caddr_t usage should be replaced by void *. stddef.h includes the size_t typedef which was missing. Signed-off-by: Daniel Nyström <daniel@nystrom.st>
* | libmaple/timer.c: Sync enable_irq() declaration with it's definitionDaniel Nyström2013-06-041-1/+1
| | | | | | | | Signed-off-by: Daniel Nyström <daniel@nystrom.st>
* | Use linker symbol __text_start__ to setup base of nvic vector table.Magnus Lundin2013-05-031-5/+7
| | | | | | | | | | Signed-off-by: Magnus Lundin <lundin@mlu.mine.nu> Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* | wirish/syscalls.c: add weak exit function.Magnus Lundin2013-05-021-0/+5
| | | | | | | | | | | | For toolchains which require an exit function. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* | libmaple/usb/stm32f1/usb.c: cosmetics.Marti Bolivar2013-04-301-99/+99
| | | | | | | | | | | | Whitespace and comments. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* | libmaple/usb/stm32f1/usb.c: fix build error.Marti Bolivar2013-04-291-1/+1
| | | | | | | | Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* | Merge remote-tracking branch 'wesen/bug/usb-resume'Marti Bolivar2013-04-262-7/+14
|\ \
| * | Preserve previous usb state when suspending / restore on resumeManuel Odendahl2013-04-262-7/+14
| | | | | | | | | | | | Signed-off-by: Manuel Odendahl <wesen@ruinwesen.com>
* | | usb_cdcacm: Reset transmitting flag in usbReset().Marti Bolivar2013-04-151-0/+1
| | | | | | | | | | | | | | | | | | Thanks to Manuel Odenahl for the fix. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* | | usb_cdcacm: Make USB lib globals weak symbols.Marti Bolivar2013-01-181-3/+6
| | | | | | | | | | | | | | | | | | This allows users to override them. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* | | Merge branch 'bug/usb-full-ep'Marti Bolivar2013-01-183-32/+50
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This resolves issues related to sending full (64B) packets via USB 2.0. In this case, some hosts continue to expect more data. Add infrastructure for sending 0-byte packets to signal end of transmission, and use it in SerialUSB. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
| * | | usb_cdcacm.c: Fixups for usb_cdcacm_tx().Marti Bolivar2013-01-171-11/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Check if we're transmitting (instead of how many bytes are left untransmitted) before bailing, in case we're transmitting a zero-length packet. - Set transmitting=1 before setting the endpoint valid to avoid races with the USB interrupt. - Eliminate some duplicated code. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
| * | | Check if the last packet sent was the full endpoint size, in this case flush ↵Manuel Odendahl2013-01-171-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | the host buffers by sending a 0 byte packet Signed-off-by: Manuel Odendahl <wesen@ruinwesen.com>
| * | | Handle sending 0 byte packets.Manuel Odendahl2013-01-172-6/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a flag to see if we are currently waiting on an interrupt to acknowledge the sending of the current IN packet. Added a method usb_cdcacm_is_transmitting() to check for that flag. Signed-off-by: Manuel Odendahl <wesen@ruinwesen.com>
| * | | Move endpoint definitions to include files (they are now needed outside in ↵Manuel Odendahl2013-01-172-21/+21
| |/ / | | | | | | | | | | | | | | | usb_serial.cpp) Signed-off-by: Manuel Odendahl <wesen@ruinwesen.com>
* | | Merge branch 'dbl-buf-usb'Marti Bolivar2013-01-172-26/+217
|\ \ \ | | | | | | | | | | | | | | | | | | | | For bulk double buffer support. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
| * | | usb_reg_map.c: Fix incorrect function name call.Marti Bolivar2013-01-171-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
| * | | usb_reg_map.h: Fix incorrect register bit definitions.Marti Bolivar2013-01-171-5/+5
| | | | | | | | | | | | | | | | Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
| * | | Rename misleading ptr functionManuel Odendahl2013-01-171-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Manuel Odendahl <wesen@ruinwesen.com>
| * | | Refactor setting a USB EP rx countManuel Odendahl2013-01-171-18/+7
| | | | | | | | | | | | | | | | Signed-off-by: Manuel Odendahl <wesen@ruinwesen.com>
| * | | Rename USB_EP_EP_KIND to USB_EP_EP_KIND_DBL_BUFManuel Odendahl2013-01-171-5/+5
| | | | | | | | | | | | | | | | Signed-off-by: Manuel Odendahl <wesen@ruinwesen.com>
| * | | Add double buffering routinesManuel Odendahl2013-01-172-24/+226
| |/ / | | | | | | | | | Signed-off-by: Manuel Odendahl <wesen@ruinwesen.com>
* | | Merge remote-tracking branch 'wesen/bug/bkp'Marti Bolivar2013-01-171-2/+2
|\ \ \ | | | | | | | | | | | | Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
| * | | Fix BKP write enableManuel Odendahl2013-01-171-2/+2
| |/ / | | | | | | | | | Signed-off-by: Manuel Odendahl <wesen@ruinwesen.com>
* / / Set DCNTR before starting DMA transfer.Manuel Odendahl2013-01-172-0/+11
|/ / | | | | | | | | | | | | I am not sure why this would work for most DMA transfers but I ran into trouble when doing SDIO DMA. Signed-off-by: Manuel Odendahl <wesen@ruinwesen.com>
* | Add fix to support Summon/Linaro GCC ARM embedded toolchain.Dmitry Prokhorov2013-01-051-0/+4
| | | | | | | | Signed-off-by: Dmitry Prokhorov <dipspb@gmail.com>
* | examples/blinky.cpp: Use toggleLED() instead of digitalWrite().Marti Bolivar2013-01-011-8/+1
| | | | | | | | | | | | Keep things simple. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* | Merge remote-tracking branch 'wesen/bug/high-density-irqs'Marti Bolivar2012-11-083-1/+6
|\ \ | | | | | | | | | Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
| * | stm32f1/rules.mk: update include path for assembler filesManuel Odendahl2012-11-073-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stm32f1/performance: load stm32.h in order to have STM32_HIGH_DENSITY when necessary STM32_HIGH_DENSITY was not defined in isrs.S and vector_table.S for a high density STM32. This was because stm32.h where the flag is now defined (in contrast to being defined on the command line in an earlier version of libmaple) was not included. This led to crashes when using one of the high density peripherals. Updated the ASFLAGS to have the correct include path in rules.mk. Include stm32.h in the assembler files. Signed-off-by: Manuel Odendahl <wesen@ruinwesen.com>
* | | usb_cdcacm.c: reenable the endpoint if an empty bulk transfer was received.Manuel Odendahl2012-11-081-0/+7
|/ / | | | | | | | | | | It is possible to receive empty bulk transfers. This would lead to the endpoint never being reenabled as this was handled by the read routine. This caused the USB to hang. Signed-off-by: Manuel Odendahl <wesen@ruinwesen.com>
* | Add some missing LeafLabs copyright notices.Marti Bolivar2012-09-047-0/+7
| | | | | | | | | | | | | | Sigh; Emacs's elide-head feature makes it easy to forget to update these. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* | exti.c: Use exti_num enumerators instead of magic values.Marti Bolivar2012-09-031-16/+16
| | | | | | | | Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* | Merge branch 'callback_interrupt_handlers'Marti Bolivar2012-09-037-34/+263
|\ \ | |/ |/|
| * EXTI examples: whitespace fixups.Marti Bolivar2012-09-032-22/+22
| | | | | | | | Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
| * ext_interrupts.cpp: Doxygen fixups.Marti Bolivar2012-09-031-26/+2
| | | | | | | | | | | | Keep the Doxygen in the header as per Wirish conventions. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
| * Whitespace fixups to EXTI files.Marti Bolivar2012-09-032-5/+4
| | | | | | | | Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
| * "Changed tabs to spaces. Changed some braces placement to match existing ↵Aditya Gaddam2012-09-032-48/+44
| | | | | | | | | | | | examples Signed-off-by: Aditya Gaddam <adityagaddam@gmail.com>"
| * "Added two examples for using attachInterrupt. One shows the use of a global ↵Aditya Gaddam2012-09-032-0/+141
| | | | | | | | | | | | function. While the second shows the use of a static class method as the event handler. Both work on Maple REVC Signed-off-by: Aditya Gaddam <adityagaddam@gmail.com>"
| * "Callback versions of functions now take voidArgumentFuncPtr. We can ↵Aditya Gaddam2012-09-024-6/+6
| | | | | | | | | | | | probably use voidFuncPtr instead, but this way people can see that the function expects something different. Existing functions haven't changed in signature. Signed-off-by: Aditya Gaddam <adityagaddam@gmail.com>"
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-11 17:51:38 +0000