Skip to content

Commit b6f873c

Browse files
Wenn0101Wenn0101
authored
Merge pull request #338 from sparkfun/release-candidate
v2.0.5
2 parents 58fb804 + 57ce244 commit b6f873c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+903
-37
lines changed

Diff for: ‎.github/workflows/generate-variants.yml

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ jobs:
2222
with:
2323
jobs: |
2424
[
25+
{"name": "lora-thing-plus-explorable-lib", "config": {"base": "compile --library --source=mbed-os", "tgt": "LORA_THING_PLUS_EXPLORABLE", "tool": "GCC_ARM"}, "user": {"variant": {"name": "LoRa_THING_PLUS_expLoRaBLE", "loc": "variants/LoRa_THING_PLUS_expLoRaBLE"}}},
2526
{"name": "artemis-redboard-lib", "config": {"base": "compile --library --source=mbed-os", "tgt": "SFE_ARTEMIS", "tool": "GCC_ARM"}, "user": {"variant": {"name": "ARTEMIS", "loc": "variants/SFE_ARTEMIS"}}},
2627
{"name": "artemis-redboard-atp-lib", "config": {"base": "compile --library --source=mbed-os", "tgt": "SFE_ARTEMIS_ATP", "tool": "GCC_ARM"}, "user": {"variant": {"name": "ARTEMIS_ATP", "loc": "variants/SFE_ARTEMIS_ATP"}}},
2728
{"name": "artemis-dev-kit-lib", "config": {"base": "compile --library --source=mbed-os", "tgt": "SFE_ARTEMIS_DK", "tool": "GCC_ARM"}, "user": {"variant": {"name": "ARTEMIS_DEV_KIT", "loc": "variants/SFE_ARTEMIS_DK"}}},

Diff for: ‎boards.txt

+44
Original file line numberDiff line numberDiff line change
@@ -315,3 +315,47 @@ sfe_artemis_module.menu.loader.option_asb.build.ldscript={runtime.platform.path}
315315

316316
sfe_artemis_module.menu.loader.option_svl.upload.tool=svl
317317
sfe_artemis_module.menu.loader.option_svl.build.ldscript={runtime.platform.path}/tools/uploaders/svl/0x10000.ld
318+
319+
320+
###############################################################
321+
322+
lora_thing_plus.name=LoRa Thing Plus expLoRaBLE
323+
lora_thing_plus.build.core=arduino
324+
lora_thing_plus.build.variant=LoRa_THING_PLUS_expLoRaBLE
325+
lora_thing_plus.build.board=LoRa_THING_PLUS_expLoRaBLE
326+
lora_thing_plus.upload.maximum_size=983040
327+
lora_thing_plus.upload.maximum_data_size=393216
328+
lora_thing_plus.build.export_format=bin
329+
lora_thing_plus.upload.sbl_baud=115200
330+
lora_thing_plus.build.arch=APOLLO3
331+
lora_thing_plus.build.mcu=cortex-m4
332+
lora_thing_plus.build.f_cpu=48000000L
333+
lora_thing_plus.build.includes=
334+
lora_thing_plus.build.defines=
335+
lora_thing_plus.build.preferred_export_format=bin
336+
lora_thing_plus.build.defs=
337+
lora_thing_plus.build.libs=
338+
339+
340+
lora_thing_plus.menu.svl_baud.921600=921600
341+
lora_thing_plus.menu.svl_baud.460800=460800
342+
lora_thing_plus.menu.svl_baud.230400=230400
343+
lora_thing_plus.menu.svl_baud.115200=115200
344+
lora_thing_plus.menu.svl_baud.57600=57600
345+
lora_thing_plus.menu.loader.option_svl=SparkFun Variable Loader (Recommended)
346+
lora_thing_plus.menu.loader.option_asb=Ambiq Secure Bootloader (Advanced)
347+
348+
lora_thing_plus.menu.svl_baud.57600.upload.svl_baud=57600
349+
lora_thing_plus.menu.svl_baud.115200.upload.svl_baud=115200
350+
lora_thing_plus.menu.svl_baud.230400.upload.svl_baud=230400
351+
lora_thing_plus.menu.svl_baud.460800.upload.svl_baud=460800
352+
lora_thing_plus.menu.svl_baud.921600.upload.svl_baud=921600
353+
354+
lora_thing_plus.upload.asb_baud=115200
355+
356+
357+
lora_thing_plus.menu.loader.option_asb.upload.tool=asb
358+
lora_thing_plus.menu.loader.option_asb.build.ldscript={runtime.platform.path}/tools/uploaders/asb/0xC000.ld
359+
360+
lora_thing_plus.menu.loader.option_svl.upload.tool=svl
361+
lora_thing_plus.menu.loader.option_svl.build.ldscript={runtime.platform.path}/tools/uploaders/svl/0x10000.ld

Diff for: ‎cores/mbed-os

Diff for: ‎platform.txt

+14-14
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,21 @@ defines.variant={build.defines}
1515
defines.extra=
1616
defines.all={defines.variant} {defines.arduino} {defines.mbed} {defines.extra} -DCORDIO_ZERO_COPY_HCI
1717
defines.preproc={defines.all}
18-
defines.asm={defines.all} @{build.variant.path}/mbed/.asm-symbols
19-
defines.c={defines.all} @{build.variant.path}/mbed/.c-symbols
20-
defines.cxx={defines.all} @{build.variant.path}/mbed/.cxx-symbols
21-
defines.ld={defines.all} @{build.variant.path}/mbed/.ld-symbols
18+
defines.asm={defines.all} "@{build.variant.path}/mbed/.asm-symbols"
19+
defines.c={defines.all} "@{build.variant.path}/mbed/.c-symbols"
20+
defines.cxx={defines.all} "@{build.variant.path}/mbed/.cxx-symbols"
21+
defines.ld={defines.all} "@{build.variant.path}/mbed/.ld-symbols"
2222

2323
# includes
2424
includes.core={includes} "-I{cores.path}/arduino" "-I{cores.path}/arduino/mbed-bridge" "-I{cores.path}/arduino/mbed-bridge/core-api"
25-
includes.mbed=@{build.variant.path}/mbed/.includes
25+
includes.mbed="@{build.variant.path}/mbed/.includes"
2626
includes.variant={build.includes}
27-
includes.extra="-I{cores.path}/mbed-os/drivers/"
27+
includes.extra=
2828
includes.all={includes.core} {includes.mbed} {includes.variant} {includes.extra}
2929

3030
# libraries
31-
libs.core=-Wl,--whole-archive {archive_file_path} -Wl,--no-whole-archive
32-
libs.mbed=-Wl,--whole-archive {build.variant.path}/mbed/libmbed-os.a -Wl,--no-whole-archive
31+
libs.core=-Wl,--whole-archive "{archive_file_path}" -Wl,--no-whole-archive
32+
libs.mbed=-Wl,--whole-archive "{build.variant.path}/mbed/libmbed-os.a" -Wl,--no-whole-archive
3333
libs.variant={build.libs}
3434
libs.extra=
3535
libs.all={libs.core} {libs.mbed} {libs.variant} {libs.extra}
@@ -43,19 +43,19 @@ compiler.warning_flags.all={compiler.warning_flags.default} -Wextra
4343

4444
# flags
4545
compiler.preproc.flags={compiler.cxx.flags} -w -x c++ -E -CC {compiler.preproc.extra_flags}
46-
compiler.asm.flags=-include {build.variant.path}/mbed/mbed_config.h -iprefix{runtime.platform.path}/cores/ @{build.variant.path}/mbed/.asm-flags {compiler.asm.extra_flags}
47-
compiler.c.flags=-iprefix{runtime.platform.path}/cores/ @{build.variant.path}/mbed/.c-flags {compiler.c.extra_flags}
48-
compiler.cxx.flags=-include {build.variant.path}/mbed/mbed_config.h -include {cores.path}/arduino/sdk/ArduinoSDK.h -iprefix{runtime.platform.path}/cores/ @{build.variant.path}/mbed/.cxx-flags {compiler.cxx.extra_flags}
49-
compiler.ld.flags=@{build.variant.path}/mbed/.ld-flags {compiler.ld.extra_flags} --specs=nano.specs -lsupc++ -lstdc++ -lm
46+
compiler.asm.flags=-include "{build.variant.path}/mbed/mbed_config.h" -iprefix "{runtime.platform.path}/cores/" "@{build.variant.path}/mbed/.asm-flags" {compiler.asm.extra_flags}
47+
compiler.c.flags=-iprefix "{runtime.platform.path}/cores/" "@{build.variant.path}/mbed/.c-flags" {compiler.c.extra_flags}
48+
compiler.cxx.flags=-include "{build.variant.path}/mbed/mbed_config.h" -include "{cores.path}/arduino/sdk/ArduinoSDK.h" -iprefix "{runtime.platform.path}/cores/" "@{build.variant.path}/mbed/.cxx-flags" {compiler.cxx.extra_flags}
49+
compiler.ld.flags="@{build.variant.path}/mbed/.ld-flags" {compiler.ld.extra_flags} --specs=nano.specs -lsupc++ -lstdc++ -lm
5050
compiler.ar.flags=rcsP {compiler.ar.extra_flags} {compiler.ar.extra_flags}
5151
compiler.axf2bin.flags={compiler.axf2bin.extra_flags} {compiler.axf2bin.extra_flags} -O binary
5252
compiler.axf2hex.flags={compiler.axf2hex.extra_flags} {compiler.axf2hex.extra_flags} -O ihex
5353

5454
# extra flags (can be overridden in platform.local.txt)
5555
compiler.preproc.extra_flags=
5656
compiler.asm.extra_flags=
57-
compiler.c.extra_flags=
58-
compiler.cxx.extra_flags=
57+
compiler.c.extra_flags=-MMD
58+
compiler.cxx.extra_flags=-MMD
5959
compiler.ld.extra_flags=
6060
compiler.ar.extra_flags=
6161
compiler.axf2bin.extra_flags=

Diff for: ‎tools/config/blocklist.json

+2
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
},
1313
"cxx": {
1414
"flags": [
15+
"-MMD",
1516
"-Wvla",
1617
"-Wall",
1718
"-Wextra",
@@ -21,6 +22,7 @@
2122
},
2223
"c": {
2324
"flags": [
25+
"-MMD",
2426
"-Wvla",
2527
"-Wall",
2628
"-Wextra",

Diff for: ‎variants/LoRa_THING_PLUS_expLoRaBLE/config/pins.cpp

+45
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
/*
2+
// This file is subject to the terms and conditions defined in
3+
// file 'LICENSE.md', which is part of this source code package.
4+
*/
5+
6+
#include "bridge/pins.h"
7+
8+
const pin_size_t variantPinCount = 33;
9+
10+
PinState variantPinStates[variantPinCount] = {
11+
{D0, 0, NULL, /*NULL, NULL, NULL,*/ NULL},
12+
{D1, 1, NULL, /*NULL, NULL, NULL,*/ NULL},
13+
{D2, 2, NULL, /*NULL, NULL, NULL,*/ NULL},
14+
{D3, 3, NULL, /*NULL, NULL, NULL,*/ NULL},
15+
{D4, 4, NULL, /*NULL, NULL, NULL,*/ NULL},
16+
{D5, 5, NULL, /*NULL, NULL, NULL,*/ NULL},
17+
{D6, 6, NULL, /*NULL, NULL, NULL,*/ NULL},
18+
{D7, 7, NULL, /*NULL, NULL, NULL,*/ NULL},
19+
{D8, 8, NULL, /*NULL, NULL, NULL,*/ NULL},
20+
{D9, 9, NULL, /*NULL, NULL, NULL,*/ NULL},
21+
{D10, 10, NULL, /*NULL, NULL, NULL,*/ NULL},
22+
{D11, 11, NULL, /*NULL, NULL, NULL,*/ NULL},
23+
{D12, 12, NULL, /*NULL, NULL, NULL,*/ NULL},
24+
{D13, 13, NULL, /*NULL, NULL, NULL,*/ NULL},
25+
{D14, 14, NULL, /*NULL, NULL, NULL,*/ NULL},
26+
{D15, 15, NULL, /*NULL, NULL, NULL,*/ NULL},
27+
{D16, 16, NULL, /*NULL, NULL, NULL,*/ NULL},
28+
{D17, 17, NULL, /*NULL, NULL, NULL,*/ NULL},
29+
{D18, 18, NULL, /*NULL, NULL, NULL,*/ NULL},
30+
{D19, 19, NULL, /*NULL, NULL, NULL,*/ NULL},
31+
{D20, 20, NULL, /*NULL, NULL, NULL,*/ NULL},
32+
{D21, 21, NULL, /*NULL, NULL, NULL,*/ NULL},
33+
{D22, 22, NULL, /*NULL, NULL, NULL,*/ NULL},
34+
{D23, 23, NULL, /*NULL, NULL, NULL,*/ NULL},
35+
{D24, 24, NULL, /*NULL, NULL, NULL,*/ NULL},
36+
37+
{D36, 36, NULL, /*NULL, NULL, NULL,*/ NULL},
38+
{D38, 38, NULL, /*NULL, NULL, NULL,*/ NULL},
39+
{D39, 39, NULL, /*NULL, NULL, NULL,*/ NULL},
40+
{D40, 40, NULL, /*NULL, NULL, NULL,*/ NULL},
41+
{D42, 42, NULL, /*NULL, NULL, NULL,*/ NULL},
42+
{D43, 43, NULL, /*NULL, NULL, NULL,*/ NULL},
43+
{D44, 44, NULL, /*NULL, NULL, NULL,*/ NULL},
44+
{D47, 47, NULL, /*NULL, NULL, NULL,*/ NULL},
45+
};

Diff for: ‎variants/LoRa_THING_PLUS_expLoRaBLE/config/pins.h

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
/*
2+
// This file is subject to the terms and conditions defined in
3+
// file 'LICENSE.md', which is part of this source code package.
4+
*/
5+
6+
#ifndef _VARIANT_PINS_H_
7+
#define _VARIANT_PINS_H_
8+
9+
#define LED_BUILTIN pinNumberByName(LED1)
10+
11+
#endif // _VARIANT_PINS_H_

Diff for: ‎variants/LoRa_THING_PLUS_expLoRaBLE/mbed/.asm-flags

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
-c -x assembler-with-cpp

Diff for: ‎variants/LoRa_THING_PLUS_expLoRaBLE/mbed/.asm-macros

Whitespace-only changes.

Diff for: ‎variants/LoRa_THING_PLUS_expLoRaBLE/mbed/.asm-symbols

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
-DAM_PACKAGE_BGA -DARM_MATH_CM4 -DCORDIO_ZERO_COPY_HCI -D__CMSIS_RTOS -D__CORTEX_M4 -D__FPU_PRESENT=1 -D__MBED_CMSIS_RTOS_CM

Diff for: ‎variants/LoRa_THING_PLUS_expLoRaBLE/mbed/.c-flags

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
-c -std=gnu11 -DMBED_MINIMAL_PRINTF -DMBED_TRAP_ERRORS_ENABLED=1 -Os -fdata-sections -ffunction-sections -fmessage-length=0 -fno-exceptions -fomit-frame-pointer -funsigned-char -g -mcpu=cortex-m4 -mfloat-abi=softfp -mfpu=fpv4-sp-d16 -mthumb

Diff for: ‎variants/LoRa_THING_PLUS_expLoRaBLE/mbed/.c-macros

Whitespace-only changes.

Diff for: ‎variants/LoRa_THING_PLUS_expLoRaBLE/mbed/.c-symbols

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
-DAM_PACKAGE_BGA -DARM_MATH_CM4 -DCOMPONENT_FLASHIAP=1 -DCORDIO_ZERO_COPY_HCI -DDEVICE_FLASH=1 -DDEVICE_I2C=1 -DDEVICE_INTERRUPTIN=1 -DDEVICE_LPTICKER=1 -DDEVICE_MPU=1 -DDEVICE_SERIAL=1 -DDEVICE_SPI=1 -DDEVICE_STDIO_MESSAGES=1 -DDEVICE_USTICKER=1 -DFEATURE_BLE=1 -DTARGET_AMA3B1KK -DTARGET_Ambiq_Micro -DTARGET_Apollo3 -DTARGET_CORDIO -DTARGET_CORTEX -DTARGET_CORTEX_M -DTARGET_FAMILY_Apollo3 -DTARGET_LIKE_CORTEX_M4 -DTARGET_LIKE_MBED -DTARGET_LoRa_THING_PLUS_expLoRaBLE -DTARGET_M4 -DTARGET_NAME=LoRa_THING_PLUS_expLoRaBLE -DTARGET_RELEASE -DTARGET_RTOS_M4_M7 -DTOOLCHAIN_GCC -DTOOLCHAIN_GCC_ARM -D__CMSIS_RTOS -D__CORTEX_M4 -D__FPU_PRESENT=1 -D__MBED_CMSIS_RTOS_CM -D__MBED__=1

Diff for: ‎variants/LoRa_THING_PLUS_expLoRaBLE/mbed/.cxx-flags

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
-c -fno-rtti -std=gnu++14 -DMBED_MINIMAL_PRINTF -DMBED_TRAP_ERRORS_ENABLED=1 -Os -fdata-sections -ffunction-sections -fmessage-length=0 -fno-exceptions -fomit-frame-pointer -funsigned-char -g -mcpu=cortex-m4 -mfloat-abi=softfp -mfpu=fpv4-sp-d16 -mthumb

Diff for: ‎variants/LoRa_THING_PLUS_expLoRaBLE/mbed/.cxx-macros

Whitespace-only changes.

Diff for: ‎variants/LoRa_THING_PLUS_expLoRaBLE/mbed/.cxx-symbols

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
-DAM_PACKAGE_BGA -DARM_MATH_CM4 -DCOMPONENT_FLASHIAP=1 -DCORDIO_ZERO_COPY_HCI -DDEVICE_FLASH=1 -DDEVICE_I2C=1 -DDEVICE_INTERRUPTIN=1 -DDEVICE_LPTICKER=1 -DDEVICE_MPU=1 -DDEVICE_SERIAL=1 -DDEVICE_SPI=1 -DDEVICE_STDIO_MESSAGES=1 -DDEVICE_USTICKER=1 -DFEATURE_BLE=1 -DTARGET_AMA3B1KK -DTARGET_Ambiq_Micro -DTARGET_Apollo3 -DTARGET_CORDIO -DTARGET_CORTEX -DTARGET_CORTEX_M -DTARGET_FAMILY_Apollo3 -DTARGET_LIKE_CORTEX_M4 -DTARGET_LIKE_MBED -DTARGET_LoRa_THING_PLUS_expLoRaBLE -DTARGET_M4 -DTARGET_NAME=LoRa_THING_PLUS_expLoRaBLE -DTARGET_RELEASE -DTARGET_RTOS_M4_M7 -DTOOLCHAIN_GCC -DTOOLCHAIN_GCC_ARM -D__CMSIS_RTOS -D__CORTEX_M4 -D__FPU_PRESENT=1 -D__MBED_CMSIS_RTOS_CM -D__MBED__=1

0 commit comments

Comments
 (0)