Add component name to one global variable

jpcornil-git · jpcornil-git · commit 769b1933c513 · 2024-12-13T15:18:37.000+01:00
diff --git a/examples/parts/sh1106_glut.c b/examples/parts/sh1106_glut.c
@@ -34,7 +34,7 @@
 #include <GL/glut.h>
 #endif
 
-sh1106_colour_t oled_colour_g;
+sh1106_colour_t sh1106_oled_colour_g;
 float sh1106_pix_size_g = 1.0;
 float sh1106_pix_gap_g = 0.0;
 
@@ -49,17 +49,17 @@ void
 sh1106_gl_init (float pix_size, sh1106_colour_t oled_colour)
 {
 	sh1106_pix_size_g = pix_size;
-	oled_colour_g = oled_colour;
+	sh1106_oled_colour_g = oled_colour;
 }
 
 void
 sh1106_gl_set_colour (uint8_t invert, float opacity)
 {
 	if (invert)
 	{
-		glColor4f (sh1106_colours[oled_colour_g][0],
-		           sh1106_colours[oled_colour_g][1],
-		           sh1106_colours[oled_colour_g][2],
+		glColor4f (sh1106_colours[sh1106_oled_colour_g][0],
+		           sh1106_colours[sh1106_oled_colour_g][1],
+		           sh1106_colours[sh1106_oled_colour_g][2],
 		           opacity);
 	} else
 	{

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@`
`34`	`34`	`#include <GL/glut.h>`
`35`	`35`	`#endif`
`36`	`36`
`37`		`-sh1106_colour_t oled_colour_g;`
	`37`	`+sh1106_colour_t sh1106_oled_colour_g;`
`38`	`38`	`float sh1106_pix_size_g = 1.0;`
`39`	`39`	`float sh1106_pix_gap_g = 0.0;`
`40`	`40`
`@@ -49,17 +49,17 @@ void`
`49`	`49`	`sh1106_gl_init (float pix_size, sh1106_colour_t oled_colour)`
`50`	`50`	`{`
`51`	`51`	`sh1106_pix_size_g = pix_size;`
`52`		`- oled_colour_g = oled_colour;`
	`52`	`+ sh1106_oled_colour_g = oled_colour;`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`void`
`56`	`56`	`sh1106_gl_set_colour (uint8_t invert, float opacity)`
`57`	`57`	`{`
`58`	`58`	`if (invert)`
`59`	`59`	`{`
`60`		`- glColor4f (sh1106_colours[oled_colour_g][0],`
`61`		`- sh1106_colours[oled_colour_g][1],`
`62`		`- sh1106_colours[oled_colour_g][2],`
	`60`	`+ glColor4f (sh1106_colours[sh1106_oled_colour_g][0],`
	`61`	`+ sh1106_colours[sh1106_oled_colour_g][1],`
	`62`	`+ sh1106_colours[sh1106_oled_colour_g][2],`
`63`	`63`	`opacity);`
`64`	`64`	`} else`
`65`	`65`	`{`