Skip to content

Commit

Permalink
straggler SoM renaming
Browse files Browse the repository at this point in the history
  • Loading branch information
technobly committed May 31, 2019
1 parent fe982d5 commit 394f06f
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
- [gen 2] Binary size optimizations [#1720](https://github.com/particle-iot/device-os/pull/1720)
- Updates Tinker for all platforms [#1717](https://github.com/particle-iot/device-os/pull/1717)
- [gen 3] Adds button and RGB LED mirroring support [#1590](https://github.com/particle-iot/device-os/pull/1590)
- [boron-som] Disables system power management [#1722](https://github.com/particle-iot/device-os/pull/1722)
- [bsom] Disables system power management [#1722](https://github.com/particle-iot/device-os/pull/1722)
- [boron/LTE] Enable Cat M1-only mode and disable eDRX completely [#1723](https://github.com/particle-iot/device-os/pull/1723)
- [gen 3] QSPI flash is put into sleep mode and is deinitialized when entering STANDBY or STOP sleep mode [1725](https://github.com/particle-iot/device-os/pull/1725)
- [gen 3] Parameter check for SPI slave mode with HAL_SPI_INTERFACE1 [#1731](https://github.com/particle-iot/device-os/pull/1731)
Expand Down
8 changes: 4 additions & 4 deletions ci/enumerate_build_matrix.sh
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,14 @@ MAKE=runmake
# define build matrix dimensions
# "" means execute execute the $MAKE command without that var specified
DEBUG_BUILD=( y n )
PLATFORM=( core photon P1 electron xenon argon boron xenon-som argon-som boron-som )
PLATFORM=( core photon p1 electron xenon argon boron xsom asom bsom )
# P1 bootloader built with gcc 4.8.4 doesn't fit flash, disabling for now
PLATFORM_BOOTLOADER=( core photon electron xenon argon boron xenon-som argon-som boron-som )
PLATFORM_BOOTLOADER=( core photon electron xenon argon boron xsom asom bsom )
SPARK_CLOUD=( y n )
APP=( "" tinker product_id_and_version)
TEST=( wiring/api wiring/no_fixture )

MODULAR_PLATFORM=( photon P1 electron xenon argon boron xenon-som argon-som boron-som )
MODULAR_PLATFORM=( photon p1 electron xenon argon boron xsom asom bsom )

filterPlatform PLATFORM
filterPlatform MODULAR_PLATFORM
Expand Down Expand Up @@ -141,7 +141,7 @@ do
do
# Gen 3 overflow with modular DEBUG_BUILD=y, so skip those
if [[ "$db" = "y" ]]; then
if [[ "$p" = "xenon" ]] || [[ "$p" = "argon" ]] || [[ "$p" = "boron" ]] || [[ "$p" = "xenon-som" ]] || [[ "$p" = "argon-som" ]] || [[ "$p" = "boron-som" ]]; then
if [[ "$p" = "xenon" ]] || [[ "$p" = "argon" ]] || [[ "$p" = "boron" ]] || [[ "$p" = "xsom" ]] || [[ "$p" = "asom" ]] || [[ "$p" = "bsom" ]]; then
continue
fi
fi
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
#define MY_CS D5
#pragma message "Compiling for SPI1, MY_CS set to D5"
#elif (USE_SPI == 2)
#error "SPI2 not supported for xenon-som, argon-som or boron-som"
#error "SPI2 not supported for xsom, asom or bsom"
#else
#error "Not supported for Gen 3"
#endif // (USE_SPI == 0 || USE_SPI == 255)
Expand Down
2 changes: 1 addition & 1 deletion user/tests/wiring/spi_master_slave/spi_slave/spi_slave.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
#define MY_CS D5
#pragma message "Compiling for SPI1, MY_CS set to D5"
#elif (USE_SPI == 2)
#error "SPI2 not supported for xenon-som, argon-som or boron-som"
#error "SPI2 not supported for xsom, asom or bsom"
#else
#error "Not supported for Gen 3"
#endif // (USE_SPI == 0 || USE_SPI == 255)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#define MY_CS D5
#pragma message "Compiling for SPI1, MY_CS set to D5"
#elif (USE_SPI == 2)
#error "SPI2 not supported for xenon-som, argon-som or boron-som"
#error "SPI2 not supported for xsom, asom or bsom"
#else
#error "Not supported for Gen 3"
#endif // (USE_SPI == 0 || USE_SPI == 255)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#define MY_CS D5
#pragma message "Compiling for SPI1, MY_CS set to D5"
#elif (USE_SPI == 2)
#error "SPI2 not supported for xenon-som, argon-som or boron-som"
#error "SPI2 not supported for xsom, asom or bsom"
#else
#error "Not supported for Gen 3"
#endif // (USE_SPI == 0 || USE_SPI == 255)
Expand Down

0 comments on commit 394f06f

Please sign in to comment.