Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Fix msom usb + ble setup names #2753

Merged
merged 2 commits into from
Mar 14, 2024
Merged

Fix msom usb + ble setup names #2753

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
879ab00
Fix msom usb + ble setup names. Fix P2 BLE name. Fix esomx BLE name
scott-brust Jan 26, 2024
552749e
Update names
mrlambchop Mar 11, 2024
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
8 changes: 4 additions & 4 deletions bootloader/src/nRF52840/usbd_device.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,13 +142,13 @@ class NrfDevice : public Device {
#elif PLATFORM_ID == PLATFORM_BORON
# define USBD_PRODUCT_NAME "Boron"
#elif PLATFORM_ID == PLATFORM_ESOMX
# define USBD_PRODUCT_NAME "E SoM X"
# define USBD_PRODUCT_NAME "E-SoM-X"
#elif PLATFORM_ID == PLATFORM_ASOM
# define USBD_PRODUCT_NAME "A SoM"
# define USBD_PRODUCT_NAME "A-SoM"
#elif PLATFORM_ID == PLATFORM_BSOM
# define USBD_PRODUCT_NAME "B SoM"
# define USBD_PRODUCT_NAME "B-SoM"
#elif PLATFORM_ID == PLATFORM_B5SOM
# define USBD_PRODUCT_NAME "B5 SoM"
# define USBD_PRODUCT_NAME "B5-SoM"
#elif PLATFORM_ID == PLATFORM_TRACKER
# define USBD_PRODUCT_NAME "Tracker"
#endif
Expand Down
12 changes: 6 additions & 6 deletions build/platform-id.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ PLATFORM_MCU=nRF52840
PLATFORM_NET=UBLOXSARA
PLATFORM_WIZNET=W5500
MCU_DEVICE=nRF52840
PRODUCT_DESC=Production E SoM X
PRODUCT_DESC=Production E-SoM-X
USBD_VID_PARTICLE=0x2B04
USBD_PID_DFU=0xD00F
USBD_PID_CDC=0xC00F
Expand All @@ -155,7 +155,7 @@ PLATFORM_MCU=nRF52840
PLATFORM_NET=ESP32
PLATFORM_WIZNET=W5500
MCU_DEVICE=nRF52840
PRODUCT_DESC=Production A SoM
PRODUCT_DESC=Production A-SoM
USBD_VID_PARTICLE=0x2B04
USBD_PID_DFU=0xD016
USBD_PID_CDC=0xC016
Expand All @@ -173,7 +173,7 @@ PLATFORM_MCU=nRF52840
PLATFORM_NET=UBLOXSARA
PLATFORM_WIZNET=W5500
MCU_DEVICE=nRF52840
PRODUCT_DESC=Production B SoM
PRODUCT_DESC=Production B-SoM
USBD_VID_PARTICLE=0x2B04
USBD_PID_DFU=0xD017
USBD_PID_CDC=0xC017
Expand All @@ -191,7 +191,7 @@ PLATFORM_MCU=nRF52840
PLATFORM_NET=QUECTEL
PLATFORM_WIZNET=W5500
MCU_DEVICE=nRF52840
PRODUCT_DESC=Production B5 SoM
PRODUCT_DESC=Production B5-SoM
USBD_VID_PARTICLE=0x2B04
USBD_PID_DFU=0xD019
USBD_PID_CDC=0xC019
Expand Down Expand Up @@ -253,7 +253,7 @@ PLATFORM_GEN=3
PLATFORM_MCU=rtl872x
PLATFORM_NET=rtl872x
PLATFORM_WIZNET=W5500
PRODUCT_DESC=Production Tron
PRODUCT_DESC=Production P2
USBD_VID_PARTICLE=0x2B04
USBD_PID_DFU=0xD020
USBD_PID_CDC=0xC020
Expand All @@ -279,7 +279,7 @@ PLATFORM_GEN=3
PLATFORM_MCU=rtl872x
PLATFORM_NET=rtl872x
PLATFORM_WIZNET=W5500
PRODUCT_DESC=Production M SoM
PRODUCT_DESC=Production M-SoM
USBD_VID_PARTICLE=0x2B04
USBD_PID_DFU=0xD023
USBD_PID_CDC=0xC023
Expand Down
6 changes: 3 additions & 3 deletions hal/src/b5som/app_usbd_string_config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
*
* List of product names defined the same way like in @ref APP_USBD_STRINGS_MANUFACTURER
*/
#define APP_USBD_STRINGS_PRODUCT APP_USBD_STRING_DESC("B5 SOM CDC Mode")
#define APP_USBD_STRINGS_PRODUCT APP_USBD_STRING_DESC("B5-SoM CDC Mode")

/**
* @brief Define whether @ref APP_USBD_STRINGS_PRODUCT is created by @ref APP_USBD_STRING_DESC
Expand Down Expand Up @@ -124,8 +124,8 @@
* - @c ... : List of string descriptors for each defined language.
*/
#define APP_USBD_STRINGS_USER \
X(APP_USER_1, , APP_USBD_STRING_DESC("B5SOM Serial")) \
X(USBD_CONTROL_STRING_IDX, , APP_USBD_STRING_DESC("B5SOM Control Interface")) \
X(APP_USER_1, , APP_USBD_STRING_DESC("B5-SoM Serial")) \
X(USBD_CONTROL_STRING_IDX, , APP_USBD_STRING_DESC("B5-SoM Control Interface")) \
X(USBD_WCID_STRING_IDX, = 0xee, APP_USBD_STRING_DESC("MSFT100\xee"))

/** @} */
Expand Down
12 changes: 6 additions & 6 deletions hal/src/boron/app_usbd_string_config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,10 @@
APP_USBD_STRING_DESC("Boron CDC Mode")
#elif PLATFORM_ID == PLATFORM_ESOMX
#define APP_USBD_STRINGS_PRODUCT \
APP_USBD_STRING_DESC("E SoM X CDC Mode")
APP_USBD_STRING_DESC("E-SoM-X CDC Mode")
#elif PLATFORM_ID == PLATFORM_BSOM
#define APP_USBD_STRINGS_PRODUCT \
APP_USBD_STRING_DESC("B SoM CDC Mode")
APP_USBD_STRING_DESC("B-SoM CDC Mode")
#else
#error "Unknown boron variant"
#endif // PLATFORM_ID == PLATFORM_BORON
Expand Down Expand Up @@ -142,13 +142,13 @@
X(USBD_WCID_STRING_IDX, = 0xee, APP_USBD_STRING_DESC("MSFT100\xee"))
#elif PLATFORM_ID == PLATFORM_BSOM
#define APP_USBD_STRINGS_USER \
X(APP_USER_1, , APP_USBD_STRING_DESC("B SoM Serial")) \
X(USBD_CONTROL_STRING_IDX, , APP_USBD_STRING_DESC("B SoM Control Interface")) \
X(APP_USER_1, , APP_USBD_STRING_DESC("B-SoM Serial")) \
X(USBD_CONTROL_STRING_IDX, , APP_USBD_STRING_DESC("B-SoM Control Interface")) \
X(USBD_WCID_STRING_IDX, = 0xee, APP_USBD_STRING_DESC("MSFT100\xee"))
#elif PLATFORM_ID == PLATFORM_ESOMX
#define APP_USBD_STRINGS_USER \
X(APP_USER_1, , APP_USBD_STRING_DESC("E SoM X Serial")) \
X(USBD_CONTROL_STRING_IDX, , APP_USBD_STRING_DESC("E SoM X Control Interface")) \
X(APP_USER_1, , APP_USBD_STRING_DESC("E-SoM-X Serial")) \
X(USBD_CONTROL_STRING_IDX, , APP_USBD_STRING_DESC("E-SoM-X Control Interface")) \
X(USBD_WCID_STRING_IDX, = 0xee, APP_USBD_STRING_DESC("MSFT100\xee"))
#else
#error "Unknown boron variant"
Expand Down
2 changes: 1 addition & 1 deletion hal/src/boron/hal_platform_config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
#endif // PLATFORM_ID != PLATFORM_BORON

#if PLATFORM_ID == PLATFORM_ESOMX
#define PRODUCT_SERIES "Eseries"
#define PRODUCT_SERIES "E-SoMX"
#else
#define PRODUCT_SERIES "boron"
#endif
6 changes: 3 additions & 3 deletions hal/src/msom/hal_platform_config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@
#define HAL_PLATFORM_FLASH_MX25R6435FZNIL0 (1)

#if defined(MODULE_FUNCTION) && MODULE_FUNCTION != 2 // MOD_FUNC_BOOTLOADER
#define HAL_PLATFORM_USB_PRODUCT_STRING "Mseries"
#define HAL_PLATFORM_USB_PRODUCT_STRING "M-SoM"
#else
#define HAL_PLATFORM_USB_PRODUCT_STRING "Mseries DFU Mode"
#define HAL_PLATFORM_USB_PRODUCT_STRING "M-SoM DFU Mode"
#endif // defined(MODULE_FUNCTION) && MODULE_FUNCTION != 2 // MOD_FUNC_BOOTLOADER

#define PRODUCT_SERIES "Mseries"
#define PRODUCT_SERIES "M-SoM"

#if HAL_PLATFORM_ETHERNET
#define HAL_PLATFORM_ETHERNET_WIZNETIF_CS_PIN_DEFAULT (D8)
Expand Down
2 changes: 1 addition & 1 deletion hal/src/tron/hal_platform_config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
#define HAL_PLATFORM_USB_PRODUCT_STRING "P2 DFU Mode"
#endif // defined(MODULE_FUNCTION) && MODULE_FUNCTION != 2 // MOD_FUNC_BOOTLOADER

#define PRODUCT_SERIES "Pseries"
#define PRODUCT_SERIES "P2"

#define PLATFORM_P2_MODEL_BARE_SOM_DEFAULT (0xffff)
#define PLATFORM_P2_PHOTON_2 (0x0001)
Expand Down