Working copy of Leaflabs libmaple https://git.suspectdevices.com/suspect-devices/libmaple/atom?h=master 2012-04-11T20:56:50+00:00 2012-04-11T20:56:50+00:00 Marti Bolivar mbolivar@leaflabs.com 2011-11-15T21:05:12+00:00 urn:sha1:4b826727d0aa14356ec3a7bdf52e24282555b322 The wirish/comm/ directory is stupid. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com> 2012-04-11T20:56:50+00:00 Marti Bolivar mbolivar@leaflabs.com 2011-11-15T17:45:43+00:00 urn:sha1:954f9e5065b39fe4c683f4d216b54326d876f51b 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> 2011-09-08T03:34:23+00:00 Marti Bolivar mbolivar@leaflabs.com 2011-09-07T20:08:34+00:00 urn:sha1:aad2377ae3404899ae3816396b5ca95efdfbaf55 stm32.h has been updated to prefix its definitions. Update the rest of libmaple to take this into account. 2011-08-16T10:13:48+00:00 Marti Bolivar mbolivar@leaflabs.com 2011-08-16T08:18:37+00:00 urn:sha1:8a3aa2a29ba3f60c1ee7fcdec073f8fce0e79149 2011-08-16T10:13:48+00:00 Marti Bolivar mbolivar@leaflabs.com 2011-08-16T08:12:47+00:00 urn:sha1:96c474d94baf8a0d56fa8c5b5de23dfd58bb8186 2011-06-07T18:44:39+00:00 Marti Bolivar mbolivar@leaflabs.com 2011-06-07T18:44:39+00:00 urn:sha1:450e1c6e17329525639670855043bb169740702d 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 2011-04-11T19:56:38+00:00 Marti Bolivar mbolivar@leaflabs.com 2011-04-11T19:52:48+00:00 urn:sha1:f604bb7b27abea7e6cab2ef9c5f6d9dde9c69957 USART refactor commit f6f9a1122706ed336c52c984d76219dee0594487 only worked for USART1. 2011-04-07T17:18:36+00:00 Marti Bolivar mbolivar@leaflabs.com 2011-04-06T17:57:30+00:00 urn:sha1:f6f9a1122706ed336c52c984d76219dee0594487 2011-03-30T11:19:13+00:00 Marti Bolivar mbolivar@leaflabs.com 2011-03-30T04:55:51+00:00 urn:sha1:6cf31789965b87efe9c51c9b1acc91c7cc9cb463 Various board-specific #defines and arrays of pins added. For the changelog (some of this information predates this commit): * wirish/boards.h now declares the following arrays of pin numbers: * boardPWMPins - PWM-capable pins * boardADCPins - ADC-capable pins * boardUsedPins - pins already in use, e.g. BOARD_BUTTON_PIN It also declares a bool boardUsesPin(uint8 pin) function for convenient testing of whether a pin is in use. * wirish/boards/*.h now define: * BOARD_USART1_TX_PIN * BOARD_USART1_RX_PIN * BOARD_USART2_TX_PIN * BOARD_USART2_RX_PIN * BOARD_USART3_TX_PIN * BOARD_USART3_RX_PIN * BOARD_NR_GPIO_PINS (renamed from NR_GPIO_PINS) * BOARD_NR_USARTS (renamed from NR_USARTS) * BOARD_NR_PWM_PINS * BOARD_NR_ADC_PINS * BOARD_NR_USED_PINS * wirish/boards/maple_native.h now defines: * BOARD_UART4_TX_PIN * BOARD_UART4_RX_PIN * BOARD_UART5_TX_PIN * BOARD_UART5_RX_PIN (Unfortunately, wirish/boards/maple_RET6.h cannot, since at least one of the UART4/UART5 pins are used already; this will require layout changes for a wide-release Maple form factor RET6 board). * wirish/boards/*.cpp all include the corresponding array definitions. They all live in flash by default, thanks to the new __FLASH__ macro in wirish/wirish_types.h, which is a synonym for the existing __attr_flash #define in libmaple/libmaple_types.h. The documentation was updated to include this information. It also gained various FIXME/TODO comments related to its generalization across boards. The quality assurance-related examples (examples/qa-slave-shield.cpp and examples/test-session.cpp) now make heavy use of board-specific values to ensure portability. 2011-03-24T11:25:14+00:00 Marti Bolivar mbolivar@leaflabs.com 2011-03-22T20:59:29+00:00 urn:sha1:296b1188bfb8cf28466b95f1dd0fde309b1f9399 Basic PWM works. Had some problems in testing that might be due to USART bugs. HardwareTimer has been removed from the build for now; I will re-implement it in terms of the new libmaple API, but consider it deprecated. Let's come up with something better. Servo is implemented in terms of HardwareTimer, so it also has been temporarily removed from the build. pwmWrite() likely got a little bit less inefficient due to indirection, but the PIN_MAPs shrank by a pointer per PinMapping.