Merge remote-tracking branch 'refs/remotes/rogerclarkmelbourne/master'
This commit is contained in:
commit
8f847cc786
|
@ -60,6 +60,7 @@ size_t Print::write(const void *buffer, uint32 size) {
|
||||||
uint8 *ch = (uint8*)buffer;
|
uint8 *ch = (uint8*)buffer;
|
||||||
while (size--) {
|
while (size--) {
|
||||||
write(*ch++);
|
write(*ch++);
|
||||||
|
n++;
|
||||||
}
|
}
|
||||||
return n;
|
return n;
|
||||||
}
|
}
|
||||||
|
|
|
@ -46,7 +46,7 @@ byte state = 0;
|
||||||
unsigned int colour = red << 11;
|
unsigned int colour = red << 11;
|
||||||
|
|
||||||
void setup(void) {
|
void setup(void) {
|
||||||
tft.init();
|
tft.begin();
|
||||||
tft.setRotation(1);
|
tft.setRotation(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -84,7 +84,7 @@ recipe.cpp.o.pattern="{compiler.path}{compiler.cpp.cmd}" {compiler.cpp.flags} -m
|
||||||
recipe.S.o.pattern="{compiler.path}{compiler.c.cmd}" {compiler.S.flags} -mcpu={build.mcu} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} {compiler.S.extra_flags} {build.extra_flags} {build.cpu_flags} {build.hs_flag} {build.common_flags} {compiler.libs.c.flags} {includes} "{source_file}" -o "{object_file}"
|
recipe.S.o.pattern="{compiler.path}{compiler.c.cmd}" {compiler.S.flags} -mcpu={build.mcu} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} {compiler.S.extra_flags} {build.extra_flags} {build.cpu_flags} {build.hs_flag} {build.common_flags} {compiler.libs.c.flags} {includes} "{source_file}" -o "{object_file}"
|
||||||
|
|
||||||
## Create archives
|
## Create archives
|
||||||
recipe.ar.pattern="{compiler.path}{compiler.ar.cmd}" {compiler.ar.flags} {compiler.ar.extra_flags} "{build.path}/{archive_file}" "{object_file}"
|
recipe.ar.pattern="{compiler.path}{compiler.ar.cmd}" {compiler.ar.flags} {compiler.ar.extra_flags} "{archive_file_path}" "{object_file}"
|
||||||
|
|
||||||
## Combine gc-sections, archives, and objects
|
## Combine gc-sections, archives, and objects
|
||||||
recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}" {compiler.c.elf.flags} -mcpu={build.mcu} "-T{build.variant.path}/{build.ldscript}" "-Wl,-Map,{build.path}/{build.project_name}.map" {compiler.c.elf.extra_flags} -o "{build.path}/{build.project_name}.elf" "-L{build.path}" -lm -lgcc -mthumb -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align -Wl,--warn-unresolved-symbols -Wl,--start-group {object_files} "{build.path}/{archive_file}" -Wl,--end-group
|
recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}" {compiler.c.elf.flags} -mcpu={build.mcu} "-T{build.variant.path}/{build.ldscript}" "-Wl,-Map,{build.path}/{build.project_name}.map" {compiler.c.elf.extra_flags} -o "{build.path}/{build.project_name}.elf" "-L{build.path}" -lm -lgcc -mthumb -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align -Wl,--warn-unresolved-symbols -Wl,--start-group {object_files} "{build.path}/{archive_file}" -Wl,--end-group
|
||||||
|
|
|
@ -76,7 +76,7 @@ recipe.S.o.pattern="{compiler.path}{compiler.c.cmd}" {compiler.S.flags} -mcpu={b
|
||||||
#recipe.S.o.pattern="{compiler.path}{compiler.c.cmd}" "{source_file}" -o "{object_file}"
|
#recipe.S.o.pattern="{compiler.path}{compiler.c.cmd}" "{source_file}" -o "{object_file}"
|
||||||
|
|
||||||
## Create archives
|
## Create archives
|
||||||
recipe.ar.pattern="{compiler.path}{compiler.ar.cmd}" {compiler.ar.flags} {compiler.ar.extra_flags} "{build.path}/{archive_file}" "{object_file}"
|
recipe.ar.pattern="{compiler.path}{compiler.ar.cmd}" {compiler.ar.flags} {compiler.ar.extra_flags} "{archive_file_path}" "{object_file}"
|
||||||
|
|
||||||
## Combine gc-sections, archives, and objects
|
## Combine gc-sections, archives, and objects
|
||||||
##recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}" {compiler.c.elf.flags} -mcpu={build.mcu} "-T{build.variant.path}/{build.ldscript}" "-Wl,-Map,{build.path}/{build.project_name}.map" {compiler.c.elf.extra_flags} -o "{build.path}/{build.project_name}.elf" "-L{build.path}" -lm -lgcc -mthumb -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align -Wl,--warn-unresolved-symbols -Wl,--start-group "{build.path}/syscalls_sam3.c.o" {object_files} "{build.variant.path}/{build.variant_system_lib}" "{build.path}/{archive_file}" -Wl,--end-group
|
##recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}" {compiler.c.elf.flags} -mcpu={build.mcu} "-T{build.variant.path}/{build.ldscript}" "-Wl,-Map,{build.path}/{build.project_name}.map" {compiler.c.elf.extra_flags} -o "{build.path}/{build.project_name}.elf" "-L{build.path}" -lm -lgcc -mthumb -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align -Wl,--warn-unresolved-symbols -Wl,--start-group "{build.path}/syscalls_sam3.c.o" {object_files} "{build.variant.path}/{build.variant_system_lib}" "{build.path}/{archive_file}" -Wl,--end-group
|
||||||
|
|
|
@ -1,36 +0,0 @@
|
||||||
/******************************************************************************
|
|
||||||
* The MIT License
|
|
||||||
*
|
|
||||||
* Copyright (c) 2010 Perry Hung.
|
|
||||||
*
|
|
||||||
* Permission is hereby granted, free of charge, to any person
|
|
||||||
* obtaining a copy of this software and associated documentation
|
|
||||||
* files (the "Software"), to deal in the Software without
|
|
||||||
* restriction, including without limitation the rights to use, copy,
|
|
||||||
* modify, merge, publish, distribute, sublicense, and/or sell copies
|
|
||||||
* of the Software, and to permit persons to whom the Software is
|
|
||||||
* furnished to do so, subject to the following conditions:
|
|
||||||
*
|
|
||||||
* The above copyright notice and this permission notice shall be
|
|
||||||
* included in all copies or substantial portions of the Software.
|
|
||||||
*
|
|
||||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
|
||||||
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
||||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
|
||||||
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
|
|
||||||
* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
|
|
||||||
* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
|
||||||
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
* SOFTWARE.
|
|
||||||
*****************************************************************************/
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @file dma.c
|
|
||||||
* @brief DMA initialization routine
|
|
||||||
*/
|
|
||||||
|
|
||||||
// #ifdef STM32F2
|
|
||||||
// #include "dmaF2.c"
|
|
||||||
// #else
|
|
||||||
// #include "dmaF1.c"
|
|
||||||
// #endif
|
|
|
@ -4,5 +4,6 @@ author=Various
|
||||||
email=
|
email=
|
||||||
sentence=Real Time Clock
|
sentence=Real Time Clock
|
||||||
paragraph=Real Time Clock for STM32F4
|
paragraph=Real Time Clock for STM32F4
|
||||||
|
category=Other
|
||||||
url=
|
url=
|
||||||
architectures=STM32F4
|
architectures=STM32F4
|
||||||
|
|
|
@ -4,5 +4,6 @@ author=Roger Clark
|
||||||
email=
|
email=
|
||||||
sentence=Serial Peripheral Interface
|
sentence=Serial Peripheral Interface
|
||||||
paragraph=SPI for STM32F4
|
paragraph=SPI for STM32F4
|
||||||
|
category=Communication
|
||||||
url=
|
url=
|
||||||
architectures=STM32F4
|
architectures=STM32F4
|
||||||
|
|
|
@ -3,6 +3,7 @@ author=ntruchsess
|
||||||
email=Norbert Truchsess <norbert.truchsess@t-online.de>
|
email=Norbert Truchsess <norbert.truchsess@t-online.de>
|
||||||
sentence=Ethernet library for ENC28J60
|
sentence=Ethernet library for ENC28J60
|
||||||
paragraph=implements the same API as stock Ethernet-lib. Just replace the include of Ethernet.h with UIPEthernet.h
|
paragraph=implements the same API as stock Ethernet-lib. Just replace the include of Ethernet.h with UIPEthernet.h
|
||||||
|
category=Communication
|
||||||
url=https://github.com/ntruchsess/arduino_uip
|
url=https://github.com/ntruchsess/arduino_uip
|
||||||
architectures=STM32F4
|
architectures=STM32F4
|
||||||
version=1.04
|
version=1.04
|
||||||
|
|
|
@ -76,7 +76,7 @@ recipe.S.o.pattern="{compiler.path}{compiler.c.cmd}" {compiler.S.flags} -mcpu={b
|
||||||
#recipe.S.o.pattern="{compiler.path}{compiler.c.cmd}" "{source_file}" -o "{object_file}"
|
#recipe.S.o.pattern="{compiler.path}{compiler.c.cmd}" "{source_file}" -o "{object_file}"
|
||||||
|
|
||||||
## Create archives
|
## Create archives
|
||||||
recipe.ar.pattern="{compiler.path}{compiler.ar.cmd}" {compiler.ar.flags} {compiler.ar.extra_flags} "{build.path}/{archive_file}" "{object_file}"
|
recipe.ar.pattern="{compiler.path}{compiler.ar.cmd}" {compiler.ar.flags} {compiler.ar.extra_flags} "{archive_file_path}" "{object_file}"
|
||||||
|
|
||||||
## Combine gc-sections, archives, and objects
|
## Combine gc-sections, archives, and objects
|
||||||
##recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}" {compiler.c.elf.flags} -mcpu={build.mcu} "-T{build.variant.path}/{build.ldscript}" "-Wl,-Map,{build.path}/{build.project_name}.map" {compiler.c.elf.extra_flags} -o "{build.path}/{build.project_name}.elf" "-L{build.path}" -lm -lgcc -mthumb -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align -Wl,--warn-unresolved-symbols -Wl,--start-group "{build.path}/syscalls_sam3.c.o" {object_files} "{build.variant.path}/{build.variant_system_lib}" "{build.path}/{archive_file}" -Wl,--end-group
|
##recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}" {compiler.c.elf.flags} -mcpu={build.mcu} "-T{build.variant.path}/{build.ldscript}" "-Wl,-Map,{build.path}/{build.project_name}.map" {compiler.c.elf.extra_flags} -o "{build.path}/{build.project_name}.elf" "-L{build.path}" -lm -lgcc -mthumb -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align -Wl,--warn-unresolved-symbols -Wl,--start-group "{build.path}/syscalls_sam3.c.o" {object_files} "{build.variant.path}/{build.variant_system_lib}" "{build.path}/{archive_file}" -Wl,--end-group
|
||||||
|
@ -102,11 +102,10 @@ recipe.size.regex.data=^(?:\.data|\.bss|\.noinit)\s+([0-9]+).*
|
||||||
# Upload using Maple bootloader over DFU
|
# Upload using Maple bootloader over DFU
|
||||||
tools.maple_upload.cmd=maple_upload
|
tools.maple_upload.cmd=maple_upload
|
||||||
tools.maple_upload.cmd.windows=maple_upload.bat
|
tools.maple_upload.cmd.windows=maple_upload.bat
|
||||||
#tools.maple_upload.cmd.linux=
|
|
||||||
tools.maple_upload.path={runtime.hardware.path}/tools/win
|
tools.maple_upload.path={runtime.hardware.path}/tools/win
|
||||||
tools.maple_upload.path.macosx={runtime.hardware.path}/tools/macosx
|
tools.maple_upload.path.macosx={runtime.hardware.path}/tools/macosx
|
||||||
tools.maple_upload.path.linux={runtime.hardware.path}/tools/linux
|
tools.maple_upload.path.linux={runtime.hardware.path}/tools/linux
|
||||||
|
tools.maple_upload.path.linux64={runtime.hardware.path}/tools/linux64
|
||||||
tools.maple_upload.upload.params.verbose=-d
|
tools.maple_upload.upload.params.verbose=-d
|
||||||
tools.maple_upload.upload.params.quiet=
|
tools.maple_upload.upload.params.quiet=
|
||||||
tools.maple_upload.upload.pattern="{path}/{cmd}" {serial.port.file} {upload.altID} {upload.usbID} "{build.path}/{build.project_name}.bin" {upload.dfuse_addr}
|
tools.maple_upload.upload.pattern="{path}/{cmd}" {serial.port.file} {upload.altID} {upload.usbID} "{build.path}/{build.project_name}.bin" {upload.dfuse_addr}
|
||||||
|
@ -116,9 +115,11 @@ tools.maple_upload.upload.pattern="{path}/{cmd}" {serial.port.file} {upload.altI
|
||||||
|
|
||||||
tools.serial_upload.cmd=serial_upload
|
tools.serial_upload.cmd=serial_upload
|
||||||
tools.serial_upload.cmd.windows=serial_upload.bat
|
tools.serial_upload.cmd.windows=serial_upload.bat
|
||||||
#tools.serial_upload.cmd.linux=
|
tools.serial_upload.cmd.macosx=serial_upload
|
||||||
tools.serial_upload.path={runtime.hardware.path}/tools/win
|
tools.serial_upload.path={runtime.hardware.path}/tools/win
|
||||||
|
tools.serial_upload.path.macosx={runtime.hardware.path}/tools/macosx
|
||||||
|
tools.serial_upload.path.linux={runtime.hardware.path}/tools/linux
|
||||||
|
tools.serial_upload.path.linux64={runtime.hardware.path}/tools/linux64
|
||||||
tools.serial_upload.upload.params.verbose=-d
|
tools.serial_upload.upload.params.verbose=-d
|
||||||
tools.serial_upload.upload.params.quiet=
|
tools.serial_upload.upload.params.quiet=
|
||||||
tools.serial_upload.upload.pattern="{path}/{cmd}" {serial.port.file} {upload.altID} {upload.usbID} "{build.path}/{build.project_name}.bin"
|
tools.serial_upload.upload.pattern="{path}/{cmd}" {serial.port.file} {upload.altID} {upload.usbID} "{build.path}/{build.project_name}.bin"
|
||||||
|
@ -127,9 +128,12 @@ tools.serial_upload.upload.pattern="{path}/{cmd}" {serial.port.file} {upload.alt
|
||||||
|
|
||||||
tools.stlink.cmd=stlink_upload
|
tools.stlink.cmd=stlink_upload
|
||||||
tools.stlink.cmd.windows=stlink_upload.bat
|
tools.stlink.cmd.windows=stlink_upload.bat
|
||||||
#tools.stlink.cmd.linux=stlink_upload
|
tools.stlink_upload.path.windows={runtime.hardware.path}/tools/win
|
||||||
tools.stlink.path={runtime.hardware.path}/tools/win
|
tools.stlink_upload.path.macosx={runtime.hardware.path}/tools/macosx
|
||||||
|
tools.stlink_upload.path.linux={runtime.hardware.path}/tools/linux
|
||||||
|
tools.stlink_upload.path.linux64={runtime.hardware.path}/tools/linux64
|
||||||
tools.stlink.path.linux={runtime.hardware.path}/tools/linux/
|
tools.stlink.path.linux={runtime.hardware.path}/tools/linux/
|
||||||
|
tools.stlink.path.macosx={runtime.hardware.path}/tools/macosx/
|
||||||
tools.stlink.upload.params.verbose=-d
|
tools.stlink.upload.params.verbose=-d
|
||||||
tools.stlink.upload.params.quiet=
|
tools.stlink.upload.params.quiet=
|
||||||
tools.stlink.upload.pattern="{path}/{cmd}" {serial.port.file} {upload.altID} {upload.usbID} "{build.path}/{build.project_name}.bin"
|
tools.stlink.upload.pattern="{path}/{cmd}" {serial.port.file} {upload.altID} {upload.usbID} "{build.path}/{build.project_name}.bin"
|
||||||
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue