From 4f042382a205f2dc63f2aea25ed89e460b395f17 Mon Sep 17 00:00:00 2001 From: Mike Iannacone Date: Tue, 20 Jul 2021 10:34:48 -0400 Subject: [PATCH 1/2] bugfix re: mismatched brackets in c3text.c --- src/c3text.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/c3text.c b/src/c3text.c index 8f23c2d..4158826 100644 --- a/src/c3text.c +++ b/src/c3text.c @@ -173,7 +173,8 @@ c3text_add( glyph = gl; gc++; origin.x += kerning; - kerning = texture_glyph_get_kerning(glyph, s[i]); + kerning = texture_glyph_get_kerning(glyph, s[i]); + } int x0 = (int)( origin.x + glyph->offset_x ); int y0 = (int)( origin.y - glyph->offset_y ); @@ -194,7 +195,7 @@ c3text_add( c3tex_array_add(&t->geometry.textures, *(c3vec2*)&vertices[vi][3]); c3colorf_array_add(&t->geometry.colorf, color); } - for (int vi = 0; vi < 6; vi++) + for (int vi = 0; vi < 6; vi++) { c3indices_array_add(&t->geometry.indices, basev + indices[vi]); origin.x += glyph->advance_x; } From 55f40b8c2cefb5d1b225ceb40aa0016b767dc544 Mon Sep 17 00:00:00 2001 From: Mike Iannacone Date: Tue, 20 Jul 2021 10:33:16 -0400 Subject: [PATCH 2/2] bugfix to avr init/deinit names --- src/reprap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/reprap.c b/src/reprap.c index 4bfc2e6..d8d7093 100644 --- a/src/reprap.c +++ b/src/reprap.c @@ -281,8 +281,8 @@ int main(int argc, char *argv[]) // snprintf(avr_flash_path, sizeof(avr_flash_path), "%s/%s", pwd, "simduino_flash.bin"); strcpy(avr_flash_path, "reprap_flash.bin"); // register our own functions - avr->special_init = avr_special_init; - avr->special_deinit = avr_special_deinit; + avr->custom.init = avr_special_init; + avr->custom.deinit = avr_special_deinit; avr_init(avr); avr->frequency = 20000000; avr->aref = avr->avcc = avr->vcc = 5 * 1000; // needed for ADC