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

Fixed "unkown chip id", piped output and st-util -v #763

Merged
merged 3 commits into from Jan 24, 2019
Merged

Fixed "unkown chip id", piped output and st-util -v #763

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b167d27
Set SWD clock before using SWD (#107, #568 ?)
jicksaw Jan 21, 2019
48e2fcf
Make st-util -v print more than default
jicksaw Jan 21, 2019
08af942
Flush output streams explicitly. Fix #665
jicksaw Jan 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/gdbserver/gdb-server.c
View file
Open in desktop
Expand Up @@ -151,7 +151,7 @@ int parse_options(int argc, char** argv, st_state_t *st) {
if (optarg) {
st->logging_level = atoi(optarg);
} else {
st->logging_level = DEFAULT_LOGGING_LEVEL;
st->logging_level = DEBUG_LOGGING_LEVEL;
}
break;
case '1':
Expand Down
5 changes: 5 additions & 0 deletions src/logging.c
View file
Open in desktop
Expand Up @@ -22,6 +22,10 @@ int ugly_log(int level, const char *tag, const char *format, ...) {
if (level > max_level) {
return 0;
}

// Flush to maintain order of streams
fflush(stdout);

va_list args;
va_start(args, format);
time_t mytt = time(NULL);
Expand All @@ -46,6 +50,7 @@ int ugly_log(int level, const char *tag, const char *format, ...) {
break;
}
vfprintf(stderr, format, args);
fflush(stderr);
va_end(args);
return 1;
}
6 changes: 3 additions & 3 deletions src/usb.c
View file
Open in desktop
Expand Up @@ -923,6 +923,9 @@ stlink_t *stlink_open_usb(enum ugly_loglevel verbose, bool reset, char serial[16
// Initialize stlink version (sl->version)
stlink_version(sl);

// Set the stlink clock speed (default is 1800kHz)
stlink_set_swdclk(sl, STLINK_SWDCLK_1P8MHZ_DIVISOR);

if (reset) {
if( sl->version.stlink_v > 1 ) stlink_jtag_reset(sl, 2);
stlink_reset(sl);
Expand All @@ -931,9 +934,6 @@ stlink_t *stlink_open_usb(enum ugly_loglevel verbose, bool reset, char serial[16

ret = stlink_load_device_params(sl);

// Set the stlink clock speed (default is 1800kHz)
stlink_set_swdclk(sl, STLINK_SWDCLK_1P8MHZ_DIVISOR);

on_libusb_error:
if (ret == -1) {
stlink_close(sl);
Expand Down