Skip to content

v2.0.5 #338

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 18 commits into from
Feb 1, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/generate-variants.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ jobs:
with:
jobs: |
[
{"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"}}},
{"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"}}},
{"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"}}},
{"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"}}},
Expand Down
44 changes: 44 additions & 0 deletions boards.txt
Original file line number Diff line number Diff line change
Expand Up @@ -315,3 +315,47 @@ sfe_artemis_module.menu.loader.option_asb.build.ldscript={runtime.platform.path}

sfe_artemis_module.menu.loader.option_svl.upload.tool=svl
sfe_artemis_module.menu.loader.option_svl.build.ldscript={runtime.platform.path}/tools/uploaders/svl/0x10000.ld


###############################################################

lora_thing_plus.name=LoRa Thing Plus expLoRaBLE
lora_thing_plus.build.core=arduino
lora_thing_plus.build.variant=LoRa_THING_PLUS_expLoRaBLE
lora_thing_plus.build.board=LoRa_THING_PLUS_expLoRaBLE
lora_thing_plus.upload.maximum_size=983040
lora_thing_plus.upload.maximum_data_size=393216
lora_thing_plus.build.export_format=bin
lora_thing_plus.upload.sbl_baud=115200
lora_thing_plus.build.arch=APOLLO3
lora_thing_plus.build.mcu=cortex-m4
lora_thing_plus.build.f_cpu=48000000L
lora_thing_plus.build.includes=
lora_thing_plus.build.defines=
lora_thing_plus.build.preferred_export_format=bin
lora_thing_plus.build.defs=
lora_thing_plus.build.libs=


lora_thing_plus.menu.svl_baud.921600=921600
lora_thing_plus.menu.svl_baud.460800=460800
lora_thing_plus.menu.svl_baud.230400=230400
lora_thing_plus.menu.svl_baud.115200=115200
lora_thing_plus.menu.svl_baud.57600=57600
lora_thing_plus.menu.loader.option_svl=SparkFun Variable Loader (Recommended)
lora_thing_plus.menu.loader.option_asb=Ambiq Secure Bootloader (Advanced)

lora_thing_plus.menu.svl_baud.57600.upload.svl_baud=57600
lora_thing_plus.menu.svl_baud.115200.upload.svl_baud=115200
lora_thing_plus.menu.svl_baud.230400.upload.svl_baud=230400
lora_thing_plus.menu.svl_baud.460800.upload.svl_baud=460800
lora_thing_plus.menu.svl_baud.921600.upload.svl_baud=921600

lora_thing_plus.upload.asb_baud=115200


lora_thing_plus.menu.loader.option_asb.upload.tool=asb
lora_thing_plus.menu.loader.option_asb.build.ldscript={runtime.platform.path}/tools/uploaders/asb/0xC000.ld

lora_thing_plus.menu.loader.option_svl.upload.tool=svl
lora_thing_plus.menu.loader.option_svl.build.ldscript={runtime.platform.path}/tools/uploaders/svl/0x10000.ld
28 changes: 14 additions & 14 deletions platform.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,21 @@ defines.variant={build.defines}
defines.extra=
defines.all={defines.variant} {defines.arduino} {defines.mbed} {defines.extra} -DCORDIO_ZERO_COPY_HCI
defines.preproc={defines.all}
defines.asm={defines.all} @{build.variant.path}/mbed/.asm-symbols
defines.c={defines.all} @{build.variant.path}/mbed/.c-symbols
defines.cxx={defines.all} @{build.variant.path}/mbed/.cxx-symbols
defines.ld={defines.all} @{build.variant.path}/mbed/.ld-symbols
defines.asm={defines.all} "@{build.variant.path}/mbed/.asm-symbols"
defines.c={defines.all} "@{build.variant.path}/mbed/.c-symbols"
defines.cxx={defines.all} "@{build.variant.path}/mbed/.cxx-symbols"
defines.ld={defines.all} "@{build.variant.path}/mbed/.ld-symbols"

# includes
includes.core={includes} "-I{cores.path}/arduino" "-I{cores.path}/arduino/mbed-bridge" "-I{cores.path}/arduino/mbed-bridge/core-api"
includes.mbed=@{build.variant.path}/mbed/.includes
includes.mbed="@{build.variant.path}/mbed/.includes"
includes.variant={build.includes}
includes.extra="-I{cores.path}/mbed-os/drivers/"
includes.extra=
includes.all={includes.core} {includes.mbed} {includes.variant} {includes.extra}

# libraries
libs.core=-Wl,--whole-archive {archive_file_path} -Wl,--no-whole-archive
libs.mbed=-Wl,--whole-archive {build.variant.path}/mbed/libmbed-os.a -Wl,--no-whole-archive
libs.core=-Wl,--whole-archive "{archive_file_path}" -Wl,--no-whole-archive
libs.mbed=-Wl,--whole-archive "{build.variant.path}/mbed/libmbed-os.a" -Wl,--no-whole-archive
libs.variant={build.libs}
libs.extra=
libs.all={libs.core} {libs.mbed} {libs.variant} {libs.extra}
Expand All @@ -43,19 +43,19 @@ compiler.warning_flags.all={compiler.warning_flags.default} -Wextra

# flags
compiler.preproc.flags={compiler.cxx.flags} -w -x c++ -E -CC {compiler.preproc.extra_flags}
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}
compiler.c.flags=-iprefix{runtime.platform.path}/cores/ @{build.variant.path}/mbed/.c-flags {compiler.c.extra_flags}
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}
compiler.ld.flags=@{build.variant.path}/mbed/.ld-flags {compiler.ld.extra_flags} --specs=nano.specs -lsupc++ -lstdc++ -lm
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}
compiler.c.flags=-iprefix "{runtime.platform.path}/cores/" "@{build.variant.path}/mbed/.c-flags" {compiler.c.extra_flags}
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}
compiler.ld.flags="@{build.variant.path}/mbed/.ld-flags" {compiler.ld.extra_flags} --specs=nano.specs -lsupc++ -lstdc++ -lm
compiler.ar.flags=rcsP {compiler.ar.extra_flags} {compiler.ar.extra_flags}
compiler.axf2bin.flags={compiler.axf2bin.extra_flags} {compiler.axf2bin.extra_flags} -O binary
compiler.axf2hex.flags={compiler.axf2hex.extra_flags} {compiler.axf2hex.extra_flags} -O ihex

# extra flags (can be overridden in platform.local.txt)
compiler.preproc.extra_flags=
compiler.asm.extra_flags=
compiler.c.extra_flags=
compiler.cxx.extra_flags=
compiler.c.extra_flags=-MMD
compiler.cxx.extra_flags=-MMD
compiler.ld.extra_flags=
compiler.ar.extra_flags=
compiler.axf2bin.extra_flags=
Expand Down
2 changes: 2 additions & 0 deletions tools/config/blocklist.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
},
"cxx": {
"flags": [
"-MMD",
"-Wvla",
"-Wall",
"-Wextra",
Expand All @@ -21,6 +22,7 @@
},
"c": {
"flags": [
"-MMD",
"-Wvla",
"-Wall",
"-Wextra",
Expand Down
45 changes: 45 additions & 0 deletions variants/LoRa_THING_PLUS_expLoRaBLE/config/pins.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
/*
// This file is subject to the terms and conditions defined in
// file 'LICENSE.md', which is part of this source code package.
*/

#include "bridge/pins.h"

const pin_size_t variantPinCount = 33;

PinState variantPinStates[variantPinCount] = {
{D0, 0, NULL, /*NULL, NULL, NULL,*/ NULL},
{D1, 1, NULL, /*NULL, NULL, NULL,*/ NULL},
{D2, 2, NULL, /*NULL, NULL, NULL,*/ NULL},
{D3, 3, NULL, /*NULL, NULL, NULL,*/ NULL},
{D4, 4, NULL, /*NULL, NULL, NULL,*/ NULL},
{D5, 5, NULL, /*NULL, NULL, NULL,*/ NULL},
{D6, 6, NULL, /*NULL, NULL, NULL,*/ NULL},
{D7, 7, NULL, /*NULL, NULL, NULL,*/ NULL},
{D8, 8, NULL, /*NULL, NULL, NULL,*/ NULL},
{D9, 9, NULL, /*NULL, NULL, NULL,*/ NULL},
{D10, 10, NULL, /*NULL, NULL, NULL,*/ NULL},
{D11, 11, NULL, /*NULL, NULL, NULL,*/ NULL},
{D12, 12, NULL, /*NULL, NULL, NULL,*/ NULL},
{D13, 13, NULL, /*NULL, NULL, NULL,*/ NULL},
{D14, 14, NULL, /*NULL, NULL, NULL,*/ NULL},
{D15, 15, NULL, /*NULL, NULL, NULL,*/ NULL},
{D16, 16, NULL, /*NULL, NULL, NULL,*/ NULL},
{D17, 17, NULL, /*NULL, NULL, NULL,*/ NULL},
{D18, 18, NULL, /*NULL, NULL, NULL,*/ NULL},
{D19, 19, NULL, /*NULL, NULL, NULL,*/ NULL},
{D20, 20, NULL, /*NULL, NULL, NULL,*/ NULL},
{D21, 21, NULL, /*NULL, NULL, NULL,*/ NULL},
{D22, 22, NULL, /*NULL, NULL, NULL,*/ NULL},
{D23, 23, NULL, /*NULL, NULL, NULL,*/ NULL},
{D24, 24, NULL, /*NULL, NULL, NULL,*/ NULL},

{D36, 36, NULL, /*NULL, NULL, NULL,*/ NULL},
{D38, 38, NULL, /*NULL, NULL, NULL,*/ NULL},
{D39, 39, NULL, /*NULL, NULL, NULL,*/ NULL},
{D40, 40, NULL, /*NULL, NULL, NULL,*/ NULL},
{D42, 42, NULL, /*NULL, NULL, NULL,*/ NULL},
{D43, 43, NULL, /*NULL, NULL, NULL,*/ NULL},
{D44, 44, NULL, /*NULL, NULL, NULL,*/ NULL},
{D47, 47, NULL, /*NULL, NULL, NULL,*/ NULL},
};
11 changes: 11 additions & 0 deletions variants/LoRa_THING_PLUS_expLoRaBLE/config/pins.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
/*
// This file is subject to the terms and conditions defined in
// file 'LICENSE.md', which is part of this source code package.
*/

#ifndef _VARIANT_PINS_H_
#define _VARIANT_PINS_H_

#define LED_BUILTIN pinNumberByName(LED1)

#endif // _VARIANT_PINS_H_
1 change: 1 addition & 0 deletions variants/LoRa_THING_PLUS_expLoRaBLE/mbed/.asm-flags
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
-c -x assembler-with-cpp
Empty file.
1 change: 1 addition & 0 deletions variants/LoRa_THING_PLUS_expLoRaBLE/mbed/.asm-symbols
Original file line number Diff line number Diff line change
@@ -0,0 +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
1 change: 1 addition & 0 deletions variants/LoRa_THING_PLUS_expLoRaBLE/mbed/.c-flags
Original file line number Diff line number Diff line change
@@ -0,0 +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
Empty file.
1 change: 1 addition & 0 deletions variants/LoRa_THING_PLUS_expLoRaBLE/mbed/.c-symbols
Original file line number Diff line number Diff line change
@@ -0,0 +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
1 change: 1 addition & 0 deletions variants/LoRa_THING_PLUS_expLoRaBLE/mbed/.cxx-flags
Original file line number Diff line number Diff line change
@@ -0,0 +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
Empty file.
1 change: 1 addition & 0 deletions variants/LoRa_THING_PLUS_expLoRaBLE/mbed/.cxx-symbols
Original file line number Diff line number Diff line change
@@ -0,0 +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
Loading