Commit Graph

870 Commits

Author SHA1 Message Date
Roger Clark b5eadb8409 Merge pull request #312 from victorpv/SPI-Callbacks
Added Spi callbacks from @victorpv
2017-07-16 08:54:18 +10:00
Roger Clark 0f3c6e5854 Merge pull request #278 from syfre/master
Enhancements and fixes to use ADC in continuous mode triggered by an internal timer
2017-07-16 08:45:38 +10:00
Roger Clark bb8f6ca6d5 Merge branch 'merge_stevstrong' 2017-07-16 08:36:20 +10:00
Roger Clark 8bf5f62d6f Merge branch 'work' of https://github.com/stevstrong/Arduino_STM32 into merge_stevstrong 2017-07-16 08:34:20 +10:00
Roger Clark 0393be3400 Added setClock() to Wire and Hardware - only 100000Hz and 400000Hz are supported 2017-07-15 18:31:02 +10:00
victorpv 910072c7db Changes tabs for spaces. 2017-07-10 12:08:59 -05:00
victorpv b892004cc2 Add files via upload 2017-07-10 12:00:29 -05:00
victorpv d49df93f38 Merge pull request #12 from rogerclarkmelbourne/master
Merge pull request #308 from victorpv/master
2017-07-10 11:02:57 -05:00
Roger Clark 5a442ac407 Merge pull request #308 from victorpv/master
Added USBSerial implementation of readBytes.
2017-07-10 16:46:11 +10:00
victorpv fd95b99914 Added readBytes function to usbSerial
Add Arduino USB implementation of Arduino Stream class readBytes, which reads bytes in blocks with a timeout.
Increases the speed from 300KB/s to 500KB/s over the Stream class readBytes function.
2017-07-08 10:52:50 -05:00
victorpv 1c07e25bd7 Update usb_serial.h 2017-07-08 10:49:14 -05:00
victorpv 8683035cb7 Update usb_serial.h 2017-07-08 10:46:49 -05:00
victorpv 27de00652d Merge pull request #11 from rogerclarkmelbourne/master
Sync to Roger.
2017-07-07 18:02:03 -05:00
stevstrong 7cdf3acf8e Merge remote-tracking branch 'refs/remotes/rogerclarkmelbourne/master' 2017-07-07 17:34:02 +02:00
Roger Clark 8b2699bdba Merge branch 'master' of https://github.com/rogerclarkmelbourne/Arduino_STM32 2017-07-06 10:57:55 +10:00
Roger Clark 54dd788f2b Fix warning caused by commit #f7a576f2e0efcee958bdfd737d9af7a2f6c76051 2017-07-06 10:57:20 +10:00
stevstrong e5a6709b9c Merge remote-tracking branch 'refs/remotes/origin/work' 2017-07-06 00:41:21 +02:00
Roger Clark 385dfbf29c Merge pull request #270 from SukkoPera/Fix-ifSerial
Added "if serial" and deprecated isConnected()
2017-07-06 08:36:20 +10:00
stevstrong 6f2effadac update SdioF4.cpp - fix for CL4 cards 2017-07-06 00:29:45 +02:00
stevstrong 6fcecec2b0 remove compiler warning about passing NULL to non-pointer argument 2017-07-04 20:20:14 +02:00
stevstrong d34c58d8ff Merge remote-tracking branch 'refs/remotes/origin/master' into work 2017-07-04 20:13:16 +02:00
stevstrong 04d50f7567 Merge pull request #1 from stevstrong/leaflabs_usb_warning
Leaflabs usb warning
2017-07-04 20:11:38 +02:00
stevstrong 8f46bf3c9e remove leaflasb USB CDC ACM warning 2017-07-04 20:09:11 +02:00
stevstrong d1d84b58de Merge remote-tracking branch 'refs/remotes/origin/master' into leaflabs_usb_warning 2017-07-04 20:08:00 +02:00
stevstrong 7b53254e29 fix maximum data size for netduino2plus 2017-07-04 20:04:58 +02:00
stevstrong dc22c7e7dd Merge branch 'master' into master 2017-07-04 19:46:19 +02:00
stevstrong 597f77ac1d replace all backslaches by slashes in include paths 2017-07-04 19:28:50 +02:00
stevstrong 9b30346bfa default activated SPI class - needed by external libs 2017-07-04 19:13:20 +02:00
stevstrong 4467592149 adapt flash and RAM maximum sizes for Arduino 2017-07-04 19:11:48 +02:00
Testato 85f8b8237a Update boards.txt
- Exluded CCM Ram
2017-07-04 10:05:01 +02:00
Roger Clark 1189a3569c Merge pull request #276 from lacklustrlabs/Adafruit_SSD1306_STM32_swap
Add swap() function to ssd1306_128x64_i2c_STM32 as example would not build…
2017-07-04 08:39:56 +10:00
Roger Clark 8096bb6d0a Merge pull request #238 from Testato/patch-3
Updated size definitions in F4 boards.txt
2017-07-04 08:38:40 +10:00
stevstrong 66df08b6bb update .gitignore 2017-07-03 20:59:56 +02:00
stevstrong 8d93d4beaa Merge remote-tracking branch 'refs/remotes/origin/Black_F4_variant' 2017-07-03 20:54:22 +02:00
stevstrong 832f102090 bring up in sync with master 2017-07-03 20:50:53 +02:00
stevstrong 753d92977d remove duplicated generic variant 2017-07-03 20:47:25 +02:00
stevstrong bb8bbbaec7 Merge remote-tracking branch 'refs/remotes/origin/master' into Black_F4_variant
# Conflicts:
#	STM32F4/cores/maple/libmaple/HardwareSerial.cpp
#	STM32F4/cores/maple/libmaple/adc.h
#	STM32F4/cores/maple/libmaple/dmaF4.c
#	STM32F4/cores/maple/libmaple/dmaF4.h
#	STM32F4/cores/maple/libmaple/fsmc.c
#	STM32F4/cores/maple/libmaple/gpio.c
#	STM32F4/cores/maple/libmaple/rcc.c
#	STM32F4/cores/maple/libmaple/spi_f4.c
#	STM32F4/cores/maple/wirish_time.h
#	STM32F4/cores/maple/wirish_types.h
#	STM32F4/libraries/SPI/src/SPI.cpp
#	STM32F4/libraries/SPI/src/SPI.h
#	STM32F4/platform.txt
#	STM32F4/system/libmaple/Arduino.h
#	STM32F4/variants/generic_f407v/generic_f407v.h
#	STM32F4/variants/generic_f407v/ld/common.inc
#	STM32F4/variants/generic_f407v/ld/jtag.ld
#	STM32F4/variants/generic_f407v/pin_map.c
#	STM32F4/variants/generic_f407v/wirish/start.S
2017-07-03 20:42:10 +02:00
stevstrong 1c1c90ebe3 Merge remote-tracking branch 'refs/remotes/rogerclarkmelbourne/master'
# Conflicts:
#	STM32F1/libraries/SPI/src/SPI.cpp
#	STM32F4/cores/maple/libmaple/HardwareSerial.cpp
#	STM32F4/cores/maple/libmaple/adc.h
#	STM32F4/cores/maple/libmaple/dmaF4.c
#	STM32F4/cores/maple/libmaple/dmaF4.h
#	STM32F4/cores/maple/libmaple/gpio.c
#	STM32F4/cores/maple/libmaple/gpio.h
#	STM32F4/cores/maple/libmaple/rcc.c
#	STM32F4/cores/maple/wirish_digital.cpp
#	STM32F4/cores/maple/wirish_time.h
#	STM32F4/libraries/SPI/src/SPI.cpp
#	STM32F4/platform.txt
#	STM32F4/system/libmaple/Arduino.h
#	STM32F4/variants/generic_f407v/generic_f407v.h
#	STM32F4/variants/generic_f407v/ld/common.inc
#	STM32F4/variants/generic_f407v/ld/jtag.ld
#	STM32F4/variants/generic_f407v/pin_map.c
#	STM32F4/variants/generic_f407v/variant.h
#	STM32F4/variants/generic_f407v/wirish/start.S
2017-07-03 20:09:45 +02:00
Roger Clark 04a811f9bd Merge pull request #237 from Testato/patch-2
Update F3 boards.txt for Flash and RAM size
2017-07-03 16:59:53 +10:00
Roger Clark 20168b1359 Merge pull request #280 from stevstrong/generic_f4
STM32F4 development updated by @stevstrong
2017-07-03 16:36:07 +10:00
Roger Clark d4103b8cd1 Merge pull request #294 from tomtor/fix-doc
Fix documentation for usart_putc()
2017-07-03 15:36:23 +10:00
Roger Clark 6891e40546 Merge pull request #288 from MicroBahner/pinmodeTimer
Added Pinmode timer fix by @MicroBahner
2017-07-03 15:35:30 +10:00
Roger Clark bd8ef73bef Merge pull request #302 from bmarquismarkail/rcmclone
Adding i2C repeated start condition from @bmarquismarkail
2017-07-03 15:31:45 +10:00
Roger Clark e4f598683c Merge pull request #262 from victorpv/timer_dma
Timer dma from @victorpv
2017-07-03 15:30:14 +10:00
Roger Clark 2dbf8b72c3 Merge pull request #261 from victorpv/FreeRTOS900
Added Free rtos900 from @victorpv
2017-07-03 15:29:23 +10:00
stevstrong f744048583 include backslashes replaced by slashes 2017-07-02 15:02:55 +02:00
U-MarquisSeven\Brandon 54044592fb changing comment 2017-06-26 18:59:33 -05:00
U-MarquisSeven\Brandon 80339e6073 checking out work from master 2017-06-26 18:57:49 -05:00
Roger Clark f7a576f2e0 Fixed issue with PB10 being set to OUTPUT for use as a USB Disconnect control on boards which do not have the additional USB disconnect hardware e.g. the Blue Pill. Note. Some variants seem to have the disconnect control on another pin, so I did not change those in case they were actually used 2017-06-25 13:08:30 +10:00
Roger Clark 747634a31a Update README.md 2017-06-24 17:23:54 +10:00