[esomx] Fix BLE prov, i2c, pwm tests. Move pwm off NFC pins (B0/B1)

scott-brust · scott-brust · commit 98cda16a9fd3 · 2022-07-12T09:35:48.000-07:00
diff --git a/build/create_module.py b/build/create_module.py
@@ -235,7 +235,7 @@ def parse_dependency(dep):
         return ModuleDependency(func, version, index)
     return ModuleDependency()
 
-GEN3_PLATFORMS = [Platform.ARGON, Platform.BORON, Platform.ASOM, Platform.BSOM, Platform.B5SOM, Platform.TRACKER]
+GEN3_PLATFORMS = [Platform.ARGON, Platform.BORON, Platform.ASOM, Platform.BSOM, Platform.B5SOM, Platform.TRACKER, Platform.ESOMX]
 GEN3_RADIO_STACK_VERSION_OFFSET = 0x300c
 GEN3_RADIO_STACK_MBR_OFFSET = 0x1000
 GEN3_RADIO_STACK_FLAGS = ModuleFlags.DROP_MODULE_INFO
diff --git a/hal/src/boron/hal_platform_config.h b/hal/src/boron/hal_platform_config.h
@@ -58,7 +58,7 @@
 #endif // PLATFORM_ID != PLATFORM_BORON
 
 #if PLATFORM_ID == PLATFORM_ESOMX
-#define PRODUCT_SERIES "E Series"
+#define PRODUCT_SERIES "Eseries"
 #else
 #define PRODUCT_SERIES "boron"
 #endif
diff --git a/hal/src/boron/pinmap_hal.c b/hal/src/boron/pinmap_hal.c
@@ -136,8 +136,8 @@ static Hal_Pin_Info s_pin_map[TOTAL_PINS] = {
 /* D5            - 05 */ { NRF_PORT_1,    11,          PIN_MODE_NONE, PF_NONE, ADC_CHANNEL_NONE, PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, 8, EXTI_CHANNEL_NONE, 0},
 /* D6            - 06 */ { NRF_PORT_NONE, PIN_INVALID, PIN_MODE_NONE, PF_NONE, ADC_CHANNEL_NONE, PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, 0, EXTI_CHANNEL_NONE, 0},
 /* D7            - 07 */ { NRF_PORT_NONE, PIN_INVALID, PIN_MODE_NONE, PF_NONE, ADC_CHANNEL_NONE, PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, 0, EXTI_CHANNEL_NONE, 0},
-/* D8  / TX      - 08 */ { NRF_PORT_0,    6,           PIN_MODE_NONE, PF_NONE, ADC_CHANNEL_NONE, PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, 8, EXTI_CHANNEL_NONE, 0},
-/* D9  / RX      - 09 */ { NRF_PORT_0,    8,           PIN_MODE_NONE, PF_NONE, ADC_CHANNEL_NONE, PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, 8, EXTI_CHANNEL_NONE, 0},
+/* D8  / TX      - 08 */ { NRF_PORT_0,    6,           PIN_MODE_NONE, PF_NONE, ADC_CHANNEL_NONE, 2,                 0,                8, EXTI_CHANNEL_NONE, 0},
+/* D9  / RX      - 09 */ { NRF_PORT_0,    8,           PIN_MODE_NONE, PF_NONE, ADC_CHANNEL_NONE, 2,                 1,                8, EXTI_CHANNEL_NONE, 0},
 /* D10 / A0      - 10 */ { NRF_PORT_0,    3,           PIN_MODE_NONE, PF_NONE, 0,                PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, 8, EXTI_CHANNEL_NONE, 0},
 /* D11 / A1      - 11 */ { NRF_PORT_0,    2,           PIN_MODE_NONE, PF_NONE, 1,                PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, 8, EXTI_CHANNEL_NONE, 0},
 /* D12 / A2      - 12 */ { NRF_PORT_0,    28,          PIN_MODE_NONE, PF_NONE, 2,                PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, 8, EXTI_CHANNEL_NONE, 0},
@@ -146,8 +146,8 @@ static Hal_Pin_Info s_pin_map[TOTAL_PINS] = {
 /* D15 / A5      - 15 */ { NRF_PORT_0,    31,          PIN_MODE_NONE, PF_NONE, 5,                3,                 1,                8, EXTI_CHANNEL_NONE, 0},
 /* D16 / A6      - 16 */ { NRF_PORT_0,    4,           PIN_MODE_NONE, PF_NONE, 6,                3,                 2,                8, EXTI_CHANNEL_NONE, 0},
 /* D17 / A7      - 17 */ { NRF_PORT_0,    5,           PIN_MODE_NONE, PF_NONE, 7,                PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, 8, EXTI_CHANNEL_NONE, 0},
-/* D18 / B0      - 18 */ { NRF_PORT_0,    10,          PIN_MODE_NONE, PF_NONE, ADC_CHANNEL_NONE, 2,                 0,                8, EXTI_CHANNEL_NONE, 0},
-/* D19 / B1      - 19 */ { NRF_PORT_0,    9,           PIN_MODE_NONE, PF_NONE, ADC_CHANNEL_NONE, 2,                 1,                8, EXTI_CHANNEL_NONE, 0},
+/* D18 / B0      - 18 */ { NRF_PORT_0,    10,          PIN_MODE_NONE, PF_NONE, ADC_CHANNEL_NONE, PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, 8, EXTI_CHANNEL_NONE, 0},
+/* D19 / B1      - 19 */ { NRF_PORT_0,    9,           PIN_MODE_NONE, PF_NONE, ADC_CHANNEL_NONE, PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, 8, EXTI_CHANNEL_NONE, 0},
 /* D20 / B2      - 20 */ { NRF_PORT_1,    12,          PIN_MODE_NONE, PF_NONE, ADC_CHANNEL_NONE, 2,                 2,                8, EXTI_CHANNEL_NONE, 0},
 /* D21 / B3      - 21 */ { NRF_PORT_1,    13,          PIN_MODE_NONE, PF_NONE, ADC_CHANNEL_NONE, 2,                 3,                8, EXTI_CHANNEL_NONE, 0},
 /* D22 / B4      - 22 */ { NRF_PORT_NONE, PIN_INVALID, PIN_MODE_NONE, PF_NONE, ADC_CHANNEL_NONE, PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, 0, EXTI_CHANNEL_NONE, 0},
diff --git a/system/src/ble_provisioning_mode_handler.cpp b/system/src/ble_provisioning_mode_handler.cpp
@@ -86,6 +86,7 @@ int BleProvisioningModeHandler::constructControlRequestAdvData() {
     CHECK_TRUE(tempAdvData.append(BLE_SIG_AD_TYPE_FLAGS), SYSTEM_ERROR_NO_MEMORY);
     CHECK_TRUE(tempAdvData.append(BLE_SIG_ADV_FLAGS_LE_ONLY_GENERAL_DISC_MODE), SYSTEM_ERROR_NO_MEMORY);
 
+    // Advertising data is limited to 31 bytes, which means the true maximum advertising device name length is only 14 bytes (accounting for all of the below data fields)
     char devName[BLE_MAX_DEV_NAME_LEN + 1] = {};
     CHECK(hal_ble_gap_get_device_name(devName, sizeof(devName), nullptr));
 
diff --git a/user/tests/wiring/no_fixture/i2c.cpp b/user/tests/wiring/no_fixture/i2c.cpp
@@ -15,7 +15,7 @@ std::pair<hal_pin_t, hal_pin_t> i2cToSdaSclPins(hal_i2c_interface_t i2c) {
             return {SDA, SCL};
         }
         case HAL_I2C_INTERFACE2: {
-#if PLATFORM_ID == PLATFORM_BORON || PLATFORM_ID == PLATFORM_TRACKER
+#if PLATFORM_ID == PLATFORM_BORON || PLATFORM_ID == PLATFORM_TRACKER || PLATFORM_ID == PLATFORM_ESOMX
             return {PMIC_SDA, PMIC_SCL};
 #else
             return {D2, D3};
diff --git a/user/tests/wiring/no_fixture/led.cpp b/user/tests/wiring/no_fixture/led.cpp
@@ -239,7 +239,7 @@ test(LED_11_MirroringWorks) {
 # if PLATFORM_ID == PLATFORM_ARGON || PLATFORM_ID == PLATFORM_BORON
     const pin_t pins[3] = {A4, A5, A3};
 # elif PLATFORM_ID == PLATFORM_ESOMX
-    const pin_t pins[3] = {B0, B1, B2};
+    const pin_t pins[3] = {A3, A4, A5};
 # else
     // SoM
     const hal_pin_t pins[3] = {A1, A0, A7};
diff --git a/user/tests/wiring/no_fixture_long_running/pwm.cpp b/user/tests/wiring/no_fixture_long_running/pwm.cpp
@@ -37,7 +37,7 @@ const PinMapping pwm_pins[] = {
 #elif PLATFORM_ID == PLATFORM_P2
         PIN(D1), PIN(A2), PIN(A5), PIN(S0), PIN(S1) /* , PIN(RGBR), PIN(RGBG), PIN(RGBB) */
 #elif (PLATFORM_ID == PLATFORM_ESOMX)
-        PIN(D0), PIN(D1), PIN(D2), PIN(A3), PIN(A4), PIN(A5), PIN(A6), PIN(B0), PIN(B1), PIN(B2), PIN(B3), PIN(C4), PIN(C5) /* , PIN(RGBR), PIN(RGBG), PIN(RGBB) */
+        PIN(D0), PIN(D1), PIN(D2), PIN(A3), PIN(A4), PIN(A5), PIN(A6), PIN(TX), PIN(RX), PIN(B2), PIN(B3), PIN(C4), PIN(C5) /* , PIN(RGBR), PIN(RGBG), PIN(RGBB) */
 #else
 #error "Unsupported platform"
 #endif

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ std::pair<hal_pin_t, hal_pin_t> i2cToSdaSclPins(hal_i2c_interface_t i2c) {`
`15`	`15`	`return {SDA, SCL};`
`16`	`16`	`}`
`17`	`17`	`case HAL_I2C_INTERFACE2: {`
`18`		`-#if PLATFORM_ID == PLATFORM_BORON \|\| PLATFORM_ID == PLATFORM_TRACKER`
	`18`	`+#if PLATFORM_ID == PLATFORM_BORON \|\| PLATFORM_ID == PLATFORM_TRACKER \|\| PLATFORM_ID == PLATFORM_ESOMX`
`19`	`19`	`return {PMIC_SDA, PMIC_SCL};`
`20`	`20`	`#else`
`21`	`21`	`return {D2, D3};`