Steins7/stm32f1xx_HBL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

debug #2

Merged
Steins7 merged 11 commits from debug into rework 2024-04-20 11:15:32 +00:00
Conversation 0 Commits 11 Files Changed 4 +18 -16
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 727aadaba9 - Show all commits

34
srv/format.c
View File

@ -21,9 +21,9 @@ uint32_t buffer_write(uint8_t byte, void* arg);
uint32_t render_format(FormatCallback callback, void* arg, uint32_t render_format(FormatCallback callback, void* arg,
const char* restrict format, va_list va); const char* restrict format, va_list va);
uint32_t render_signed(FormatCallback callback, void* arg, uint32_t render_signed(FormatCallback callback, void* arg,
va_list va, uint8_t size, uint8_t base); int32_t number, uint8_t base);
uint32_t render_unsigned(FormatCallback callback, void* arg, uint32_t render_unsigned(FormatCallback callback, void* arg,
va_list* va, uint8_t size, uint8_t base); uint32_t number, uint8_t base);
//--local variables------------------------------------------------------------- //--local variables-------------------------------------------------------------
@ -74,7 +74,6 @@ uint32_t buffer_write(uint8_t byte, void* arg)
uint32_t render_format(FormatCallback callback, void* arg, uint32_t render_format(FormatCallback callback, void* arg,
const char* restrict format, va_list va) const char* restrict format, va_list va)
{ {
uint8_t size;
bool in_format = false; bool in_format = false;
for (const char* c = format; *c != '\0'; ++c) { for (const char* c = format; *c != '\0'; ++c) {
@ -84,12 +83,6 @@ uint32_t render_format(FormatCallback callback, void* arg,
case '%': case '%':
callback('%', arg); callback('%', arg);
break; break;
case 'h':
size = size / 2;
continue;
case 'l':
size = size * 2;
continue;
case 'c': case 'c':
callback((uint8_t)va_arg(va, uint32_t), arg); callback((uint8_t)va_arg(va, uint32_t), arg);
break; break;
@ -102,13 +95,13 @@ uint32_t render_format(FormatCallback callback, void* arg,
} }
break; break;
case 'i': case 'i':
//render_signed(callback, arg, va, size, 10); render_signed(callback, arg, va_arg(va, int32_t), 10);
break; break;
case 'u': case 'u':
render_unsigned(callback, arg, &va, size, 10); render_unsigned(callback, arg, va_arg(va, uint32_t), 10);
break; break;
case 'x': case 'x':
render_unsigned(callback, arg, &va, size, 16); render_unsigned(callback, arg, va_arg(va, uint32_t), 16);
break; break;
default: default:
//TODO manage error //TODO manage error
@ -118,7 +111,6 @@ uint32_t render_format(FormatCallback callback, void* arg,
switch (*c) { switch (*c) {
case '%': case '%':
in_format = true; in_format = true;
size = 4;
continue; continue;
default: default:
callback(*c, arg); callback(*c, arg);
@ -132,10 +124,20 @@ uint32_t render_format(FormatCallback callback, void* arg,
return 0; return 0;
} }
uint32_t render_unsigned(FormatCallback callback, void* arg, uint32_t render_signed(FormatCallback callback, void* arg,
va_list* va, uint8_t size, uint8_t base) int32_t number, uint8_t base)
{
if (number < 0) {
callback('-', arg);
number = -number;
}
return render_unsigned(callback, arg, (uint32_t)number, base);
}
uint32_t render_unsigned(FormatCallback callback, void* arg,
uint32_t number, uint8_t base)
{ {
uint32_t number = va_arg(*va, uint32_t);
uint32_t base_power = base; uint32_t base_power = base;
while (base_power <= number) { while (base_power <= number) {