Add UDB diff from our local fork

Just adding some changes that happened earlier in the UDB code. No impact on DAPLink.
ARMmbed · Jun 27, 2023 · fad8b8c · fad8b8c
1 parent dcf8dd1
commit fad8b8c
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 12 deletions.
diff --git a/source/board/udb/include/udb_adapter_detector.h b/source/board/udb/include/udb_adapter_detector.h
@@ -10,7 +10,7 @@ typedef enum
  ADAPTER_UDB_6_FLEX = 2,
  ADAPTER_UDB_17_FLEX = 3,
  ADAPTER_UDB_12_FLEX = 4,
- ADAPTER_TYPE_5  = 5,
+ ADAPTER_JOKER_FLEX_V2 = 5,
  ADAPTER_TYPE_6 = 6,
  ADAPTER_TYPE_7 = 7,
  ADAPTER_TYPE_8 = 8,

diff --git a/source/board/udb/source/udb_adapter_detector.c b/source/board/udb/source/udb_adapter_detector.c
@@ -26,7 +26,7 @@ static const uint16_t k_adapter_type_adc_map[] =
  [ADAPTER_UDB_6_FLEX] = 46871,
  [ADAPTER_UDB_17_FLEX] = 43470,
  [ADAPTER_UDB_12_FLEX] = 40147,
- [ADAPTER_TYPE_5]  = 36988,
+ [ADAPTER_JOKER_FLEX_V2] = 36988,
  [ADAPTER_TYPE_6] = 33697,
  [ADAPTER_TYPE_7] = 30231,
  [ADAPTER_TYPE_8] = 26850,
@@ -49,7 +49,7 @@ static const char* k_adapter_type_name[] =
  [ADAPTER_UDB_6_FLEX] = "UDB_6_FLEX",
  [ADAPTER_UDB_17_FLEX] = "UDB_17_FLEX",
  [ADAPTER_UDB_12_FLEX] = "UDB_12_FLEX",
- [ADAPTER_TYPE_5] = "TYPE_5",
+ [ADAPTER_JOKER_FLEX_V2] = "JOKER_FLEX_V2",
  [ADAPTER_TYPE_6] = "TYPE_6",
  [ADAPTER_TYPE_7] = "TYPE_7",
  [ADAPTER_TYPE_8] = "TYPE_8",

diff --git a/source/board/udb/source/udb_version.c b/source/board/udb/source/udb_version.c
@@ -43,7 +43,6 @@ enum {
  HW_VERSION_PIN_1,
  HW_VERSION_PIN_2,
  HW_VERSION_PIN_3,
- HW_VERSION_PIN_4,
  HW_VERSION_PIN_COUNT,
 };
 
@@ -81,21 +80,16 @@ static const hw_version_pin_type_t s_hw_version_pins[HW_VERSION_PIN_COUNT] =
  .pin = GPIO_PIN_5,
  },
  [HW_VERSION_PIN_1] =
- {
- .port = GPIOD,
- .pin = GPIO_PIN_7,
- },
- [HW_VERSION_PIN_2] =
  {
  .port = GPIOB,
  .pin = GPIO_PIN_2,
  },
- [HW_VERSION_PIN_3] =
+ [HW_VERSION_PIN_2] =
  {
  .port = GPIOD,
  .pin = GPIO_PIN_8,
  },
- [HW_VERSION_PIN_4] =
+ [HW_VERSION_PIN_3] =
  {
  .port = GPIOD,
  .pin = GPIO_PIN_5,

diff --git a/source/hic_hal/stm32/stm32h743xx/read_uid.c b/source/hic_hal/stm32/stm32h743xx/read_uid.c
@@ -26,7 +26,7 @@ void read_unique_id(uint32_t *id)
 {
  uint32_t Device_Serial0, Device_Serial1, Device_Serial2;
 
- Device_Serial0 = *(uint32_t*)(0x1FF1E800); //elee change from F103 value, (0x1FFFF7E8);
+ Device_Serial0 = *(uint32_t*)(0x1FF1E800);
  Device_Serial1 = *(uint32_t*)(0x1FF1E804);
  Device_Serial2 = *(uint32_t*)(0x1FF1E808);
 

diff --git a/test/udb_integration_test/requirements.txt b/test/udb_integration_test/requirements.txt
@@ -1,2 +1,3 @@
 pyOCD==0.34.*
 pexpect
+pyserial