From 2fde472e91ab6b96762896e2f32c3e1ddbe50260 Mon Sep 17 00:00:00 2001 From: Nathan Seidle Date: Wed, 7 Aug 2019 10:19:44 -0600 Subject: [PATCH 1/2] Updating variants for Edge v2.1 PCB --- variants/SparkFun_Edge_V2/config/variant.cpp | 74 ++++++++++---------- variants/SparkFun_Edge_V2/config/variant.h | 18 +++-- 2 files changed, 49 insertions(+), 43 deletions(-) diff --git a/variants/SparkFun_Edge_V2/config/variant.cpp b/variants/SparkFun_Edge_V2/config/variant.cpp index f5fb8fe4..8c2c4e7e 100644 --- a/variants/SparkFun_Edge_V2/config/variant.cpp +++ b/variants/SparkFun_Edge_V2/config/variant.cpp @@ -28,53 +28,53 @@ const ap3_gpio_pad_t ap3_variant_pinmap[AP3_VARIANT_NUM_PINS] = { AP3_GPIO_PAD_UNUSED, AP3_GPIO_PAD_UNUSED, AP3_GPIO_PAD_UNUSED, - 4, AP3_GPIO_PAD_UNUSED, - 6, - 7, + 5, //Camera D5 + 6, //Camera D4 + 7, //Camera PCLK + 8, //Camera SCL + 9, //Camera SDA AP3_GPIO_PAD_UNUSED, + 11, //Camera D1 + 12, //Mic CLK + 13, //Camera Trig + 14, //Camera D0 + 15, //Camera VSync + 16, //GPIO 16 + 17, //LED Green + 18, //LED Blue + 19, //LED Red + 20, //SWDCK + 21, //SWDIO AP3_GPIO_PAD_UNUSED, + 23, //Camera INT AP3_GPIO_PAD_UNUSED, - 11, - 12, - 13, - 14, - 15, - 16, - 17, - 18, - 19, - 20, - 21, - 22, - 23, - 24, - 25, - 26, - 27, - 28, - 29, + 25, //Camera D2 + 26, //Camera MCLK + 27, //Camera HSync + 28, //Camera D7 + 29, //Mic DATA AP3_GPIO_PAD_UNUSED, - 31, - 32, - 33, - 34, - 35, + 31, //GPIO 31 + 32, //Camera 1.8V Enable + 33, //GPIO 33 + 34, //Camera D3 + 35, //Camera D6 AP3_GPIO_PAD_UNUSED, - 37, + 37, //LED Yellow AP3_GPIO_PAD_UNUSED, - 39, - 40, + 39, //Qwiic SCL + 40, //Qwiic SDA AP3_GPIO_PAD_UNUSED, - 42, - 43, - 44, - 45, + 42, //Accel SCL + 43, //Accel SDA + 44, //GPIO 44 + 45, //GPIO 45 AP3_GPIO_PAD_UNUSED, AP3_GPIO_PAD_UNUSED, - 48, - 49, + 48, //Boot TX + 49, //Boot RX }; // Uart Definitions -Uart Serial(0, 49, 48);// declares a Uart object called Serial using instance 0 of Apollo3 UART peripherals with RX on pin 49 and TX on pin 48 (note, you specify *pins* not Apollo3 pads. This uses the variant's pin map to determine the Apollo3 pad) +Uart Serial(0, 49, 48); // declares a Uart object called Serial using instance 0 of Apollo3 UART peripherals with RX on pin 49 and TX on pin 48 (note, you specify *pins* not Apollo3 pads. This uses the variant's pin map to determine the Apollo3 pad) diff --git a/variants/SparkFun_Edge_V2/config/variant.h b/variants/SparkFun_Edge_V2/config/variant.h index fe585bed..700cbc6c 100644 --- a/variants/SparkFun_Edge_V2/config/variant.h +++ b/variants/SparkFun_Edge_V2/config/variant.h @@ -30,25 +30,31 @@ SOFTWARE. extern const ap3_gpio_pad_t ap3_variant_pinmap[AP3_VARIANT_NUM_PINS]; // Uart declarations -class Uart; // Forward declaration of Uart +class Uart; // Forward declaration of Uart extern Uart Serial; // Wire defines #define WIRE_INTERFACES_COUNT 3 -#define WireQwiic Wire // Giving Wire an alias of "WireQwiic" in case people want to use it -#define AP3_Wire_IOM 4 // Secify that Wire uses IOMaster instance 4 +#define WireQwiic Wire // Giving Wire an alias of "WireQwiic" in case people want to use it +#define AP3_Wire_IOM 4 // Secify that Wire uses IOMaster instance 4 #define WireAccel Wire1 #define AP3_Wire1_IOM 3 #define WireCamera Wire2 -#define AP3_Wire1_IOM 2 +#define AP3_Wire2_IOM 1 // SPI Defines -#define SPI_INTERFACES_COUNT 0 //Edge V2 doesn't have any fully-exposed SPI ports - +#define SPI_INTERFACES_COUNT 0 //Edge V2 doesn't have any fully-exposed SPI ports #define LED_BUILTIN 19 +#define LED_GREEN 17 +#define LED_BLUE 18 +#define LED_RED 19 +#define LED_YELLOW 37 + +#define MIC_DATA 29 +#define MIC_CLOCK 12 #endif // _AP3_VARIANT_H_ \ No newline at end of file From 78511d8d590f5bd3967ff6e4c161aa382d6ab14d Mon Sep 17 00:00:00 2001 From: Nathan Seidle Date: Wed, 7 Aug 2019 10:21:22 -0600 Subject: [PATCH 2/2] Update boards and directories to Edge2 Board name is Edge2 not Edge v2 --- boards.txt | 66 +++++++++---------- .../bsp/README.md | 0 .../config/variant.cpp | 0 .../config/variant.h | 0 .../linker_scripts/gcc/ambiq_sbl_app.ld | 0 .../linker_scripts/gcc/artemis_sbl_svl_app.ld | 0 .../startup/startup_gcc.c | 0 7 files changed, 33 insertions(+), 33 deletions(-) rename variants/{SparkFun_Edge_V2 => SparkFun_Edge2}/bsp/README.md (100%) rename variants/{SparkFun_Edge_V2 => SparkFun_Edge2}/config/variant.cpp (100%) rename variants/{SparkFun_Edge_V2 => SparkFun_Edge2}/config/variant.h (100%) rename variants/{SparkFun_Edge_V2 => SparkFun_Edge2}/linker_scripts/gcc/ambiq_sbl_app.ld (100%) rename variants/{SparkFun_Edge_V2 => SparkFun_Edge2}/linker_scripts/gcc/artemis_sbl_svl_app.ld (100%) rename variants/{SparkFun_Edge_V2 => SparkFun_Edge2}/startup/startup_gcc.c (100%) diff --git a/boards.txt b/boards.txt index 65b773c3..668c94d1 100644 --- a/boards.txt +++ b/boards.txt @@ -221,39 +221,39 @@ edge.menu.loader.sparkfun_svl.build.ldscript={build.variant.path}/linker_scripts ############################################################### -edgeV2.name=SparkFun Edge V2 -edgeV2.build.variant=SparkFun_Edge_V2 -edgeV2.build.board=SFE_EDGE_V2 -edgeV2.upload.maximum_size=960000 -edgeV2.upload.sbl_baud=115200 -edgeV2.build.arch=APOLLO3 -edgeV2.build.mcu=cortex-m4 -edgeV2.build.f_cpu=48000000L -edgeV2.build.core=arduino -edgeV2.build.includes=-I{build.variant.path}/config -edgeV2.build.extra_flags=-DPART_apollo3 -DAM_PACKAGE_BGA -DAM_PART_APOLLO3 -edgeV2.build.ldscript={build.variant.path}/linker_scripts/gcc/flash_with_bootloader.ld -edgeV2.build.defs= -edgeV2.build.libs= -edgeV2.menu.svl_baud.921600=921600 -edgeV2.menu.svl_baud.460800=460800 -edgeV2.menu.svl_baud.230400=230400 -edgeV2.menu.svl_baud.115200=115200 -edgeV2.menu.svl_baud.57600=57600 -edgeV2.menu.loader.sparkfun_svl=SparkFun Variable Loader (Recommended) -edgeV2.menu.loader.ambiq_sbl=Ambiq Secure Bootloader (Advanced) - -edgeV2.menu.svl_baud.57600.upload.svl_baud=57600 -edgeV2.menu.svl_baud.115200.upload.svl_baud=115200 -edgeV2.menu.svl_baud.230400.upload.svl_baud=230400 -edgeV2.menu.svl_baud.460800.upload.svl_baud=460800 -edgeV2.menu.svl_baud.921600.upload.svl_baud=921600 - -edgeV2.menu.loader.ambiq_sbl.upload.tool=ambiq_bin2board -edgeV2.menu.loader.ambiq_sbl.build.ldscript={build.variant.path}/linker_scripts/gcc/ambiq_sbl_app.ld - -edgeV2.menu.loader.sparkfun_svl.upload.tool=artemis_svl -edgeV2.menu.loader.sparkfun_svl.build.ldscript={build.variant.path}/linker_scripts/gcc/artemis_sbl_svl_app.ld +edge2.name=SparkFun Edge2 +edge2.build.variant=SparkFun_Edge2 +edge2.build.board=SFE_EDGE2 +edge2.upload.maximum_size=960000 +edge2.upload.sbl_baud=115200 +edge2.build.arch=APOLLO3 +edge2.build.mcu=cortex-m4 +edge2.build.f_cpu=48000000L +edge2.build.core=arduino +edge2.build.includes=-I{build.variant.path}/config +edge2.build.extra_flags=-DPART_apollo3 -DAM_PACKAGE_BGA -DAM_PART_APOLLO3 +edge2.build.ldscript={build.variant.path}/linker_scripts/gcc/flash_with_bootloader.ld +edge2.build.defs= +edge2.build.libs= +edge2.menu.svl_baud.921600=921600 +edge2.menu.svl_baud.460800=460800 +edge2.menu.svl_baud.230400=230400 +edge2.menu.svl_baud.115200=115200 +edge2.menu.svl_baud.57600=57600 +edge2.menu.loader.sparkfun_svl=SparkFun Variable Loader (Recommended) +edge2.menu.loader.ambiq_sbl=Ambiq Secure Bootloader (Advanced) + +edge2.menu.svl_baud.57600.upload.svl_baud=57600 +edge2.menu.svl_baud.115200.upload.svl_baud=115200 +edge2.menu.svl_baud.230400.upload.svl_baud=230400 +edge2.menu.svl_baud.460800.upload.svl_baud=460800 +edge2.menu.svl_baud.921600.upload.svl_baud=921600 + +edge2.menu.loader.ambiq_sbl.upload.tool=ambiq_bin2board +edge2.menu.loader.ambiq_sbl.build.ldscript={build.variant.path}/linker_scripts/gcc/ambiq_sbl_app.ld + +edge2.menu.loader.sparkfun_svl.upload.tool=artemis_svl +edge2.menu.loader.sparkfun_svl.build.ldscript={build.variant.path}/linker_scripts/gcc/artemis_sbl_svl_app.ld ############################################################### diff --git a/variants/SparkFun_Edge_V2/bsp/README.md b/variants/SparkFun_Edge2/bsp/README.md similarity index 100% rename from variants/SparkFun_Edge_V2/bsp/README.md rename to variants/SparkFun_Edge2/bsp/README.md diff --git a/variants/SparkFun_Edge_V2/config/variant.cpp b/variants/SparkFun_Edge2/config/variant.cpp similarity index 100% rename from variants/SparkFun_Edge_V2/config/variant.cpp rename to variants/SparkFun_Edge2/config/variant.cpp diff --git a/variants/SparkFun_Edge_V2/config/variant.h b/variants/SparkFun_Edge2/config/variant.h similarity index 100% rename from variants/SparkFun_Edge_V2/config/variant.h rename to variants/SparkFun_Edge2/config/variant.h diff --git a/variants/SparkFun_Edge_V2/linker_scripts/gcc/ambiq_sbl_app.ld b/variants/SparkFun_Edge2/linker_scripts/gcc/ambiq_sbl_app.ld similarity index 100% rename from variants/SparkFun_Edge_V2/linker_scripts/gcc/ambiq_sbl_app.ld rename to variants/SparkFun_Edge2/linker_scripts/gcc/ambiq_sbl_app.ld diff --git a/variants/SparkFun_Edge_V2/linker_scripts/gcc/artemis_sbl_svl_app.ld b/variants/SparkFun_Edge2/linker_scripts/gcc/artemis_sbl_svl_app.ld similarity index 100% rename from variants/SparkFun_Edge_V2/linker_scripts/gcc/artemis_sbl_svl_app.ld rename to variants/SparkFun_Edge2/linker_scripts/gcc/artemis_sbl_svl_app.ld diff --git a/variants/SparkFun_Edge_V2/startup/startup_gcc.c b/variants/SparkFun_Edge2/startup/startup_gcc.c similarity index 100% rename from variants/SparkFun_Edge_V2/startup/startup_gcc.c rename to variants/SparkFun_Edge2/startup/startup_gcc.c