diff --git a/FdsKey/Core/Inc/sdcard.h b/FdsKey/Core/Inc/sdcard.h index b05088e..1d78d96 100644 --- a/FdsKey/Core/Inc/sdcard.h +++ b/FdsKey/Core/Inc/sdcard.h @@ -5,7 +5,7 @@ #define SD_SPI_PORT hspi3 -#define SD_INIT_TRIES 16 +#define SD_INIT_TRIES 32 #define SD_TIMEOUT 1000 // milliseconds #define SD_IDLE_RETRY_COUNT 100 #define SD_ANSWER_RETRY_COUNT 32 diff --git a/FdsKey/Core/Src/servicemenu.c b/FdsKey/Core/Src/servicemenu.c index 686eced..fa740d5 100644 --- a/FdsKey/Core/Src/servicemenu.c +++ b/FdsKey/Core/Src/servicemenu.c @@ -62,16 +62,21 @@ HAL_StatusTypeDef service_settings_save() static void uint64_to_str(uint64_t d, char* str) { - int len = 0; + int len = 0, p; uint64_t tmp; for (tmp = d; tmp; tmp /= 10) - { len++; - } if (!len) len++; + len += (len - 1) / 3; str[len] = 0; - for (; d; d/= 10, len--) + for (p = 1; len; d /= 10, len--, p++) { + if (p % 4 == 0) + { + str[len - 1] = '.'; + len--; + p++; + } str[len - 1] = '0' + (d % 10); } } @@ -154,7 +159,7 @@ static void draw_item(uint8_t line, SETTING_ID item, uint8_t is_selected) } break; case SERVICE_SETTING_SD_CAPACITY: - parameter_name = "SD capacity"; + parameter_name = "SD size"; uint64_to_str(SD_read_capacity(), value_v); break; case SERVICE_SETTING_SD_MANUFACTURER_ID: @@ -291,7 +296,7 @@ void service_menu() HAL_Delay(5); } } - draw_item(oled_get_line() / 8 + selection - line, selection, 1); + //draw_item(oled_get_line() / 8 + selection - line, selection, 1); button_check_screen_off(); HAL_Delay(1); } diff --git a/FdsKey_bootloader/Core/Inc/sdcard.h b/FdsKey_bootloader/Core/Inc/sdcard.h index b05088e..1d78d96 100644 --- a/FdsKey_bootloader/Core/Inc/sdcard.h +++ b/FdsKey_bootloader/Core/Inc/sdcard.h @@ -5,7 +5,7 @@ #define SD_SPI_PORT hspi3 -#define SD_INIT_TRIES 16 +#define SD_INIT_TRIES 32 #define SD_TIMEOUT 1000 // milliseconds #define SD_IDLE_RETRY_COUNT 100 #define SD_ANSWER_RETRY_COUNT 32