aboutsummaryrefslogtreecommitdiffstats
path: root/libmaple/libmaple.h
Commit message (Collapse)AuthorAgeFilesLines
* Move public headers to include directories; related cleanups.Marti Bolivar2012-04-111-50/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move libmaple/*.h to (new) libmaple/include/libmaple/. The new accepted way to include a libmaple header foo.h is with: #include <libmaple/foo.h> This is more polite in terms of the include namespace. It also allows us to e.g. implement the Arduino SPI library at all (which has header SPI.h; providing it was previously impossible on case-insensitive filesystems due to libmaple's spi.h). Similarly for Wirish. The old include style (#include "header.h") is now deprecated. libmaple/*.h: - Change include guard #defines from _FOO_H_ to _LIBMAPLE_FOO_H_. - Add license headers where they're missing - Add conditional extern "C" { ... } blocks where they're missing (they aren't always necessary, but we might was well do it against the future, while we're at it.). - Change includes from #include "foo.h" to #include <libmaple/foo.h>. - Move includes after extern "C". - Remove extra trailing newlines Note that this doesn't include the headers under libmaple/usb/ or libmaple/usb/usb_lib. These will get fixed later. libmaple/*.c: - Change includes from #include "foo.h" to #include <libmaple/foo.h>. Makefile: - Add I$(LIBMAPLE_PATH)/include/libmaple to GLOBAL_FLAGS. This allows for users (including Wirish) to migrate their code, but should go away ASAP, since it slows down compilation. Wirish: - Move wirish/**/*.h to (new) wirish/include/wirish/. This ignores the USB headers, which, as usual, are getting handled after everything else. - Similarly generify wirish/boards/ structure. For each supported board "foo", move wirish/boards/foo.h and wirish/boards/foo.cpp to wirish/boards/foo/include/board/board.h and wirish/boards/foo/board.cpp, respectively. Also remove the #ifdef hacks around the .cpp files. - wirish/rules.mk: put wirish/boards/foo/include in the include path (and add wirish/boards/foo/board.cpp to the list of sources to be compiled). This allows saying: #include <board/board.h> instead of the hack currently in place. We can allow the user to override this setting later to make adding custom board definitions easier. - Disable -Werror in libmaple/rules.mk, as the current USB warnings don't let the olimex_stm32_h103 board compile. We can re-enable -Werror once we've moved the board-specific bits out of libmaple proper. libraries, examples: - Update includes accordingly. - Miscellaneous cosmetic fixups. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* Move STM32 config from libmaple.h into stm32.h.Marti Bolivar2011-07-181-39/+0
|
* Keep it 80-column clean.Marti Bolivar2011-06-071-14/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | Go through overlong source code lines and convert as many of them as appropriate to be 80-column clean. This mostly affects license headers. Overlong lines are determined by running following from the libmaple base directory: $ ack-grep --nocolor --nogroup --cpp --cc --ignore-dir=usb -- '.{80}' Note that this excludes libmaple's usb subdirectory, which is still full of ST code that doesn't follow the libmaple source code guidelines. Contents of ~/.ackrc (these won't matter, but are included for completeness): --ignore-dir=docs --ignore-dir=build --type-set ld=.ld --type-set rst=.rst --type-set txt=.txt --type-set mk=.mk
* Merge branch 'i2c-wip' into refactorPerry Hung2011-03-211-0/+2
|\ | | | | | | | | | | | | Conflicts: examples/test-fsmc.cpp libmaple/rules.mk wirish/boards.h
| * Fix merge error and compile error.Perry Hung2011-03-111-0/+2
| |
* | Maple RET6 edition supportMarti Bolivar2011-03-161-1/+6
| |
* | [WIP] GPIO refactor: seems ok, ready for reviewMarti Bolivar2011-03-111-1/+1
|/
* Cleaned out libmaple.h; this had wide-ranging implications.Marti Bolivar2011-02-271-140/+23
| | | | | | | | | | | | | | | | | | | Many of the #defines in libmaple.h were board-specific, not MCU-specific. Most of these were only used by code under libmaple/usb/. These were moved into usb_config.h, and are clearly marked as being terrible hacks. I'm going to treat the USB stack as a black box that we'll deal with later. Further, instead of having a variety of #defines like "How many USARTS do I have?", we decide that based on the density of the chip. This is determined by testing for STM32_MEDIUM_DENSITY or STM32_HIGH_DENSITY defines. libmaple currently doesn't support low-density chips, so that suffices. The Makefile will set these automatically based on the MCU. Other offending #defines are ERROR_LED_PORT and ERROR_LED_PIN; these were made optional, but they're set in the Makefile as a hack to keep things working.
* libmaple: Refactor ADC routinesPerry Hung2011-02-271-0/+5
| | | | | | ADC routines rewritten, support for ADC2, 3, added. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* Trivial DAC-related updates.Marti Bolivar2011-02-181-1/+1
|
* Merge branch 'nzmichaelh-master' into master.Marti Bolivar2011-02-161-0/+5
|\ | | | | | | | | | | | | | | | | 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-151-1/+2
| |
| * nzmichaelh's pull request mods compile and upload.Marti Bolivar2010-12-281-0/+4
| | | | | | | | 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.
* | 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).
* | Ported libmaple to the new mini prototypeMarti Bolivar2011-01-271-12/+10
| |
* | maple mini runs blinky now.Marti Bolivar2010-10-221-0/+6
| | | | | | | | still need usb descriptors to improve, and also nothing else is tested.
* | weird broken table for maple miniMarti Bolivar2010-10-201-20/+55
| |
* | somebody broke assertionsMarti Bolivar2010-10-071-1/+7
|/
* whitespace cleanupsMarti Bolivar2010-09-271-2/+2
|
* bugfix MAPLE_RELOAD_VAL, whitespace fixesMarti Bolivar2010-09-131-7/+3
|
* debug verbosity levelsbnewbold2010-09-051-1/+5
|
* added 'unused' attribs and reset default targetbnewbold2010-09-021-3/+4
|
* Various fixes, working with Maplebnewbold2010-09-011-0/+103
|\
| * Portability fixesbnewbold2010-08-311-20/+13
| | | | | | | | Still not working but fixed a lot of merge errors
| * Merge maple-native changes into portablebnewbold2010-08-311-0/+110
|/| | | | | | | This compiles for both maple and maple_native but is untested.
| * Further wirish portability progressbnewbold2010-08-311-3/+46
| | | | | | | | Sort of ugly changes. Compiles but untested.
| * Partial progress on wirish portabilitybnewbold2010-08-311-3/+6
| | | | | | | | | | This version throws "defined but unused" warnings which could probably be squashed with #pragma
| * MCU-specific, not BOARD-specificbnewbold2010-08-311-9/+49
| |
| * inital portability workbnewbold2010-08-251-0/+18
|/
* Licensing: Relicensed libmaple under the MIT License.Perry Hung2010-03-311-12/+17
| | | | | | Relicensed the bulk of libmaple under the more permissive MIT License, from GPLv3. Files that were largely or entirely derived from the Arduino, STM, or Lanchon retain their original licenses.
* Major hierarchy reorganization; see README.bnewbold2010-03-311-0/+33
copy-to-ide and Makefile updated to conform; .gitignore added; LICENSE added