aboutsummaryrefslogtreecommitdiffstats
path: root/wirish
Commit message (Collapse)AuthorAgeFilesLines
* Board-specific values; corresponding QA test generalizations.Marti Bolivar2011-03-3015-38/+158
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* Removed Maple-specific information from digitalWrite() doxygen comment.Marti Bolivar2011-03-301-3/+2
|
* NitpicksMarti Bolivar2011-03-301-1/+1
|
* Final stm32_pin_info design candidate; ADC3 support on Native.Marti Bolivar2011-03-2514-276/+304
| | | | | | | | | | | | | | | | | | | | Added an adc_dev to struct stm32_pin_info. This was necessary to add support for the channels on the Native which are only connected to ADC3, but it does add a bunch of NULLs to the PIN_MAPs. I don't think any other peripherals need representation on a per-pin basis. Each peripheral library will be responsible for keeping track of related GPIO ports and bits, and we can throw #defines in to boards/*.h for other things (e.g. BOARD_SPI1_MISO_PIN). Fleshed out the ADC refactor and brought it more in keeping with the new design as it evolves. A couple of other tweaks. Notably: waitForButtonPress() now takes a default argument meaning "wait forever". Removed Maple-specific documentation from core functions in io.h; this information will need to go into the individual board docs files.
* Adding /wirish/boards/ for easier porting; shrank PIN_MAPs.Marti Bolivar2011-03-2417-378/+783
| | | | | | | | | | | | | | | | | /wirish/boards/ contains xxx.h and xxx.cpp (for xxx=maple, maple_native, maple_mini, maple_RET6). The headers contain the board-specific #defines that used to live in boards.h (except BOARD_INIT, which was removed). The CPP files contain the PIN_MAP definitions that used to live in boards.cpp, and a proper boardInit() function to replace the old BOARD_INIT macro. This will make it easier to add new boards in the future. struct PinMapping was renamed struct stm32_pin_info, and was moved into a new wirish_types.h. Its external interrupt field was moved into struct gpio_dev, which saves memory by storing an afio_exti_port per port, rather than one per pin. Also rearranged the stm32_pin_info fields to improve packing. Maple's PIN_MAP is now down to below 500 bytes.
* Initial timer refactor.Marti Bolivar2011-03-2410-507/+338
| | | | | | | | | | | | | | | 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.
* Native PIN_MAP typoMarti Bolivar2011-03-211-1/+1
|
* Merge branch 'i2c-wip' into refactorPerry Hung2011-03-211-11/+2
|\ | | | | | | | | | | | | Conflicts: examples/test-fsmc.cpp libmaple/rules.mk wirish/boards.h
| * Reenable other peripherals.Perry Hung2011-03-151-12/+12
| |
| * Add rudimentary error handling for nack conditionPerry Hung2011-03-141-12/+12
| |
| * Fix merge error and compile error.Perry Hung2011-03-111-11/+2
| |
| * Merge refactor into i2c-wip:Perry Hung2011-03-092-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squashed commit of the following: commit 4d6662dadfda7f2fd55107535165dc98a0638a3c Merge: 174d9ab 7ddc844 Author: Marti Bolivar <mbolivar@leaflabs.com> Date: Fri Mar 4 23:18:29 2011 -0500 Merge remote branch 'origin/refactor' into refactor commit 174d9ab73cc3387a3812e6f3d3e97519bf5b2150 Author: Marti Bolivar <mbolivar@leaflabs.com> Date: Fri Mar 4 23:16:53 2011 -0500 USBSerial docs fix. commit f217acb73d94f0a88bf33a42684e6e988dcb3685 Author: Marti Bolivar <mbolivar@leaflabs.com> Date: Fri Mar 4 20:25:26 2011 -0500 Brought examples/ up to date; PIN_MAP bugfix for D24. commit c4ba3ba05fc39ef260cd80d91759966952df74ae Author: Marti Bolivar <mbolivar@leaflabs.com> Date: Fri Mar 4 19:16:42 2011 -0500 Cosmetic/documentation changes to adc.c commit e7747b4eb831621951deef6d31629f55cb5c3500 Author: Marti Bolivar <mbolivar@leaflabs.com> Date: Fri Mar 4 19:16:07 2011 -0500 Cosmetic changes to wirish/main.cxx commit e2f9d4116e59d8487c936989384228ea084a3501 Author: Marti Bolivar <mbolivar@leaflabs.com> Date: Fri Mar 4 19:15:24 2011 -0500 Untabifying docs/source/conf.py commit 7ddc84481b4eebe337065a0219e3d8dc000791e5 Author: Perry Hung <iperry@gmail.com> Date: Wed Mar 2 00:30:19 2011 -0500 cscope: Find .S instead of .s files commit 62cb09ed6357eae58b0234fbc074c44e9c0aa5e5 Author: Marti Bolivar <mbolivar@leaflabs.com> Date: Wed Mar 2 00:07:10 2011 -0500 Fixing typo in main.cpp.example.
* | Revert "RCC refactor, bugfixes"Perry Hung2011-03-212-2/+2
| | | | | | | | This reverts commit e4807a5010f59ab863ad2c96dc14caf65bf1ae60.
* | FSMC refactor; SRAM test codeMarti Bolivar2011-03-174-1/+91
| |
* | Maple RET6 edition supportMarti Bolivar2011-03-163-1/+105
| |
* | RCC refactor, bugfixesMarti Bolivar2011-03-122-2/+2
| |
* | shiftOut(), docs fixesMarti Bolivar2011-03-111-0/+16
| |
* | Oops.Marti Bolivar2011-03-111-1/+1
| |
* | [WIP] GPIO refactor: seems ok, ready for reviewMarti Bolivar2011-03-1119-525/+494
| |
* | Brought examples/ up to date; PIN_MAP bugfix for D24.Marti Bolivar2011-03-041-1/+1
| |
* | Cosmetic changes to wirish/main.cxxMarti Bolivar2011-03-041-5/+4
|/
* Cleaned out libmaple.h; this had wide-ranging implications.Marti Bolivar2011-02-275-12/+20
| | | | | | | | | | | | | | | | | | | 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.
* Refactor ADC: Pass device pointer instead of register mapPerry Hung2011-02-272-2/+2
|
* Refactor DACPerry Hung2011-02-271-4/+0
| | | | | DAC header and source slightly cleaned up. Test on Maple Native prototype. Add flags parameter to allow selective enabling of channels.
* libmaple: Refactor ADC routinesPerry Hung2011-02-273-159/+157
| | | | | | ADC routines rewritten, support for ADC2, 3, added. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* Trivial wirish_digital.c sanity check + bugfix.Marti Bolivar2011-02-251-0/+5
|
* Rewrote Print class.Marti Bolivar2011-02-242-145/+187
| | | | | | | | | | | | | | | | | | | | | | | | | | | The old Print class couldn't print uint64 values, and featured hand-hacked functionality better handled by snprintf(). Redid it using snprintf(), using "[u]int[8,16,32,64]" types for more clarity, and eliminated some private methods in favor of auxiliary functions in Print.cpp. Breaking compatibility with original implementation in three ways: - Print::print(double) is now accurate to 6 digits, rather than 2; this is consistent with the default behavior of the %f format specifier, and if you're using floating point, it's slow enough that you probably want the increased accuracy. - The only bases you can print a number to are 2, 8, 10, and 16. 8, 10, and 16 already have format specifiers, and 2 is an important special case; others complicate matters unnecessarily. - Printing numbers in bases other than 10 treats them as unsigned quantities (i.e., won't print '-' characters). This is more consistent with C++'s behavior for hexadecimal and octal literals (e.g., 0xFFFFFFFF has type uint32). Updated HardwareSerial and USBSerial class documentation to reflect the new behavior.
* Generalizing adc_init() to allow user to select sample timeMarti Bolivar2011-02-171-2/+4
|
* Merge branch 'nzmichaelh-master' into master.Marti Bolivar2011-02-162-7/+6
|\ | | | | | | | | | | | | | | | | This provides DMA, IWDG, PWR, and BKP support, and fixes several bugs. Conflicts: libmaple/adc.h libmaple/libmaple.h libmaple/ring_buffer.h
| * nvic bugfix; removed unnecessary volatile usageMarti Bolivar2011-01-311-1/+1
| |
| * Make systick.h C++ safe. Expose the sys tick count via systick.h and remove ↵Michael Hope2010-10-101-2/+0
| | | | | | | | other externs.
| * Merge remote branch 'upstream/master'Michael Hope2010-09-2927-712/+809
| |\
| * | Fixed up the build due to a missing header file.Michael Hope2010-09-291-4/+5
| | |
* | | Merge branch 'debug-serialusb'Marti Bolivar2011-02-121-2/+12
|\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: libmaple/usb/usb.c notes/coding_standard.txt
| * \ \ Merge branch 'master' into debug-serialusb.Marti Bolivar2010-12-2112-70/+224
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Chose debug-serialusb version in cases of conflict. Conflicts: libmaple/usb/usb_callbacks.c
| * | | | fixed broken build from usb_serial.cppAJM2010-12-131-2/+2
| | | | | | | | | | | | | | | | | | | | oops
| * | | | made SerialUSB.read blockingAJM2010-12-131-2/+12
| | | | | | | | | | | | | | | | | | | | it should have been blocking before but wasnt. see bug #49
* | | | | Made Native prototype B definitions in libmaple.h and boards.h; addedMarti Bolivar2011-02-101-116/+214
| | | | | | | | | | | | | | | | | | | | notes/native-pin-definitions.txt (copied from ST datasheet).
* | | | | Ported libmaple to the new mini prototypeMarti Bolivar2011-01-271-62/+62
| |/ / / |/| | |
* | | | Finalized 0.0.9 documentation.Marti Bolivar2010-12-156-43/+62
| | | |
* | | | Merge branch 'master' into newdocMarti Bolivar2010-12-1413-187/+431
|\| | |
| * | | Servo library tested and debugged.Marti Bolivar2010-12-0810-177/+289
| | | | | | | | | | | | | | | | | | | | Some additional HardwareTimer methods introduced to make this convenient; ancillary libmaple/timers.h changes resulted.
| * | | added interrupts()/noInterrupts()Marti Bolivar2010-12-021-0/+27
| | | |
| * | | maple mini prototype seems to be workingMarti Bolivar2010-11-304-8/+115
| | | |
* | | | Finished converting the Arduino docsMarti Bolivar2010-11-292-4/+11
| | | |
* | | | arduino language reference nearing completion, properly CC-BY-SA 3.0 attributedMarti Bolivar2010-11-178-24/+154
|/ / /
* | | fixed highByte() implementation for when sizeof(argument) > 2Marti Bolivar2010-11-161-2/+2
| | |
* | | removed arduino/gpl dependency in bits.h; added binary notation for bytes ↵Marti Bolivar2010-11-102-50/+603
| | | | | | | | | | | | (e.g. B10110011)
* | | maple mini runs blinky now.Marti Bolivar2010-10-228-88/+522
| | | | | | | | | | | | still need usb descriptors to improve, and also nothing else is tested.
* | | Merge branch 'master' of github.com:leaflabs/libmapleMarti Bolivar2010-10-143-43/+61
|\ \ \