Skip to content

Commit 2482d2a

Browse files
committed
Formatting and indentation
1 parent 1436bdc commit 2482d2a

File tree

4 files changed

+11
-13
lines changed

4 files changed

+11
-13
lines changed

source/daplink/cmsis-dap/DAP.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1777,8 +1777,6 @@ void DAP_Setup(void) {
17771777

17781778
// Default settings
17791779
DAP_Data.debug_port = 0U;
1780-
// DAP_Data.fast_clock = 0U;
1781-
// DAP_Data.clock_delay = CLOCK_DELAY(DAP_DEFAULT_SWJ_CLOCK);
17821780
DAP_Data.transfer.idle_cycles = 0U;
17831781
DAP_Data.transfer.retry_count = 100U;
17841782
DAP_Data.transfer.match_retry = 0U;

source/daplink/drag-n-drop/intelhex.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ enum hex_record_t {
3232
START_SEG_ADDR_RECORD = 3,
3333
EXT_LINEAR_ADDR_RECORD = 4,
3434
START_LINEAR_ADDR_RECORD = 5,
35-
CUSTOM_METADATA_RECORD = 0x0A,
36-
CUSTOM_DATA_RECORD = 0x0D,
35+
CUSTOM_METADATA_RECORD = 0x0A,
36+
CUSTOM_DATA_RECORD = 0x0D,
3737
};
3838

3939
typedef union hex_line_t hex_line_t;

source/daplink/interface/main.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -387,14 +387,14 @@ void main_task(void * arg)
387387

388388
case USB_CONNECTED:
389389
case USB_DISCONNECTED:
390-
if (usbd_configured()) {
391-
usb_state = USB_CONNECTED;
392-
}
393-
else {
394-
usb_state = USB_DISCONNECTED;
395-
usb_state_count = USB_CONNECT_DELAY;
396-
usb_no_config_count = USB_CONFIGURE_TIMEOUT;
397-
}
390+
if (usbd_configured()) {
391+
usb_state = USB_CONNECTED;
392+
}
393+
else {
394+
usb_state = USB_DISCONNECTED;
395+
usb_state_count = USB_CONNECT_DELAY;
396+
usb_no_config_count = USB_CONFIGURE_TIMEOUT;
397+
}
398398
default:
399399
break;
400400
}

source/daplink/settings/settings_rom.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ typedef struct __attribute__((__packed__)) cfg_setting {
4444
uint8_t auto_rst;
4545
uint8_t automation_allowed;
4646
uint8_t overflow_detect;
47+
uint8_t detect_incompatible_target;
4748

4849
// Add new members here
49-
uint8_t detect_incompatible_target;
5050

5151
} cfg_setting_t;
5252

0 commit comments

Comments
 (0)