aboutsummaryrefslogtreecommitdiffstats
path: root/demos
diff options
context:
space:
mode:
Diffstat (limited to 'demos')
-rw-r--r--demos/3rdparty/bubbles/main.c50
-rw-r--r--demos/3rdparty/notepad-2/main.c2
-rw-r--r--demos/3rdparty/notepad-2/notepadApp.c2
-rw-r--r--demos/3rdparty/notepad-2/notepadCore.c18
-rw-r--r--demos/3rdparty/notepad-2/notepadCore.h8
-rw-r--r--demos/applications/combo/mandelbrot.c2
-rw-r--r--demos/applications/mandelbrot/main.c2
-rw-r--r--demos/applications/notepad/main.c2
-rw-r--r--demos/benchmarks/main.c2
-rw-r--r--demos/games/justget10/jg10.c54
-rw-r--r--demos/games/minesweeper/mines.c28
-rw-r--r--demos/games/minesweeper/resources/romfs/userfonts.h8
-rw-r--r--demos/games/tetris/Example_Makefiles/stm32f4/board_SSD1289.h12
-rw-r--r--demos/games/tetris/Example_Makefiles/stm32f4/ginput_lld_mouse_board.h8
-rw-r--r--demos/games/tetris/Example_Makefiles/stm32f4/gmouse_lld_ADS7843_board.h8
-rw-r--r--demos/games/tetris/Example_Makefiles/stm32f4/gmouse_lld_ADS7843_board.h.old8
-rw-r--r--demos/games/tetris/Example_Makefiles/stm32f4_chibios_3.x/board_SSD1289.h12
-rw-r--r--demos/games/tetris/Example_Makefiles/stm32f4_chibios_3.x/ginput_lld_mouse_board.h8
-rw-r--r--demos/games/tetris/Example_Makefiles/stm32f4_chibios_3.x/gmouse_lld_ADS7843_board.h8
-rw-r--r--demos/games/tetris/tetris.c24
-rw-r--r--demos/modules/gadc/gwinosc.c4
-rw-r--r--demos/modules/gadc/gwinosc.h2
-rw-r--r--demos/modules/gaudio/oscilloscope/gwinosc.c12
-rw-r--r--demos/modules/gaudio/oscilloscope/gwinosc.h2
-rw-r--r--demos/modules/gaudio/play-vs1053/main.c4
-rw-r--r--demos/modules/gaudio/play-wave/main.c18
-rw-r--r--demos/modules/gdisp/arcsectors/main.c2
-rw-r--r--demos/modules/gdisp/fonts/font_Apple12.h8
-rw-r--r--demos/modules/gdisp/fonts/font_FreePixel10.h6
-rw-r--r--demos/modules/gdisp/fonts/font_GeosansLight11.h8
-rw-r--r--demos/modules/gdisp/fonts/font_GeosansLight11_aa.h8
-rw-r--r--demos/modules/gdisp/fonts/font_babyblue11_aa.h8
-rw-r--r--demos/modules/gdisp/fonts/font_hellovetica11.h8
-rw-r--r--demos/modules/gdisp/fonts/font_hellovetica11_aa.h8
-rw-r--r--demos/modules/gdisp/fonts/font_pf_ronda_seven11_aa.h8
-rw-r--r--demos/modules/gdisp/fonts_cyrillic/userfonts.h32
-rw-r--r--demos/modules/ginput/keyboard/main.c2
-rw-r--r--demos/modules/gtrans/basic/userfonts.h80
-rw-r--r--demos/modules/gwin/console/main.c2
-rw-r--r--demos/modules/gwin/frame/main.c2
-rw-r--r--demos/modules/gwin/graph/main.c2
-rw-r--r--demos/modules/gwin/keyboard/main.c2
-rw-r--r--demos/modules/gwin/textedit/main.c2
-rw-r--r--demos/tools/touch_driver_test/main.c2
-rw-r--r--demos/tools/uGFXnetDisplay/main.c28
45 files changed, 263 insertions, 263 deletions
diff --git a/demos/3rdparty/bubbles/main.c b/demos/3rdparty/bubbles/main.c
index 7ab4da2e..16e4177c 100644
--- a/demos/3rdparty/bubbles/main.c
+++ b/demos/3rdparty/bubbles/main.c
@@ -25,14 +25,14 @@
#define background RGB2COLOR(0,0,0)
-uint16_t width, height;
-int16_t sine[SCALE+(SCALE/4)];
-int16_t *cosi = &sine[SCALE/4]; /* cos(x) = sin(x+90d)... */
+gU16 width, height;
+gI16 sine[SCALE+(SCALE/4)];
+gI16 *cosi = &sine[SCALE/4]; /* cos(x) = sin(x+90d)... */
void initialize (void)
{
- uint16_t i;
+ gU16 i;
/* if you change the SCALE*1.25 back to SCALE, the program will
* occassionally overrun the cosi array -- however this actually
@@ -44,12 +44,12 @@ void initialize (void)
}
-void matrix (int16_t xyz[3][N], gColor col[N])
+void matrix (gI16 xyz[3][N], gColor col[N])
{
- static uint32_t t = 0;
- int16_t x = -SCALE, y = -SCALE;
- uint16_t i, s, d;
- uint8_t red,grn,blu;
+ static gU32 t = 0;
+ gI16 x = -SCALE, y = -SCALE;
+ gU16 i, s, d;
+ gU8 red,grn,blu;
#define RED_COLORS (32)
#define GREEN_COLORS (64)
@@ -81,13 +81,13 @@ void matrix (int16_t xyz[3][N], gColor col[N])
}
-void rotate (int16_t xyz[3][N], uint16_t angleX, uint16_t angleY, uint16_t angleZ)
+void rotate (gI16 xyz[3][N], gU16 angleX, gU16 angleY, gU16 angleZ)
{
- uint16_t i;
- int16_t tmpX, tmpY;
- int16_t sinx = sine[angleX], cosx = cosi[angleX];
- int16_t siny = sine[angleY], cosy = cosi[angleY];
- int16_t sinz = sine[angleZ], cosz = cosi[angleZ];
+ gU16 i;
+ gI16 tmpX, tmpY;
+ gI16 sinx = sine[angleX], cosx = cosi[angleX];
+ gI16 siny = sine[angleY], cosy = cosi[angleY];
+ gI16 sinz = sine[angleZ], cosz = cosi[angleZ];
for (i = 0; i < N; i++)
{
@@ -106,12 +106,12 @@ void rotate (int16_t xyz[3][N], uint16_t angleX, uint16_t angleY, uint16_t angle
}
-void draw(int16_t xyz[3][N], gColor col[N])
+void draw(gI16 xyz[3][N], gColor col[N])
{
- static uint16_t oldProjX[N] = {0};
- static uint16_t oldProjY[N] = {0};
- static uint8_t oldDotSize[N] = {0};
- uint16_t i, projX, projY, projZ, dotSize;
+ static gU16 oldProjX[N] = {0};
+ static gU16 oldProjY[N] = {0};
+ static gU8 oldDotSize[N] = {0};
+ gU16 i, projX, projY, projZ, dotSize;
for (i = 0; i < N; i++)
{
@@ -138,10 +138,10 @@ void draw(int16_t xyz[3][N], gColor col[N])
/* ---------------------------------------------------------------------- */
-int16_t angleX = 0, angleY = 0, angleZ = 0;
-int16_t speedX = 0, speedY = 0, speedZ = 0;
+gI16 angleX = 0, angleY = 0, angleZ = 0;
+gI16 speedX = 0, speedY = 0, speedZ = 0;
-int16_t xyz[3][N];
+gI16 xyz[3][N];
gColor col[N];
@@ -158,8 +158,8 @@ int main (void)
gfxSleepMilliseconds (10);
gdispClear (background); /* glitches.. */
- width = (uint16_t)gdispGetWidth();
- height = (uint16_t)gdispGetHeight();
+ width = (gU16)gdispGetWidth();
+ height = (gU16)gdispGetHeight();
initialize();
diff --git a/demos/3rdparty/notepad-2/main.c b/demos/3rdparty/notepad-2/main.c
index c61e7d94..f20d1899 100644
--- a/demos/3rdparty/notepad-2/main.c
+++ b/demos/3rdparty/notepad-2/main.c
@@ -66,7 +66,7 @@ const NColorScheme schemeDefault2 = {
.statusBarText = HTML2COLOR(0x000000)
};
-const char *tsCalibRead(uint16_t instance) {
+const char *tsCalibRead(gU16 instance) {
// This will perform a on-spot calibration
// Unless you read and add the co-efficients here
(void) instance;
diff --git a/demos/3rdparty/notepad-2/notepadApp.c b/demos/3rdparty/notepad-2/notepadApp.c
index 3b5d2cef..1f94070d 100644
--- a/demos/3rdparty/notepad-2/notepadApp.c
+++ b/demos/3rdparty/notepad-2/notepadApp.c
@@ -96,7 +96,7 @@ static void nbtnColorBarDraw(GHandle gh, gBool enabled, gBool isdown, const char
// Update selection - this is like lazy release.
if (k >= 0 && k <= 7) {
selPenWidth = k + 1;
- ncoreSetPenWidth((uint8_t) selPenWidth);
+ ncoreSetPenWidth((gU8) selPenWidth);
}
gdispFillArea(gh->x + NPAD_TOOLBAR_BTN_WIDTH * i, gh->y,
diff --git a/demos/3rdparty/notepad-2/notepadCore.c b/demos/3rdparty/notepad-2/notepadCore.c
index 73a877a9..4662a9ba 100644
--- a/demos/3rdparty/notepad-2/notepadCore.c
+++ b/demos/3rdparty/notepad-2/notepadCore.c
@@ -45,8 +45,8 @@
/* This is the drawing core */
static DECLARE_THREAD_STACK(waDrawThread, NCORE_THD_STACK_SIZE);
-static uint8_t nPenWidth = 1;
-static uint8_t nMode = NCORE_MODE_DRAW;
+static gU8 nPenWidth = 1;
+static gU8 nMode = NCORE_MODE_DRAW;
static gThread nThd;
@@ -72,9 +72,9 @@ static void draw_point(gCoord x, gCoord y) {
/* Bresenham's Line Drawing Algorithm
Modified version to draw line of variable thickness */
static void draw_line(gCoord x0, gCoord y0, gCoord x1, gCoord y1) {
- int16_t dy, dx;
- int16_t addx, addy;
- int16_t P, diff, i;
+ gI16 dy, dx;
+ gI16 addx, addy;
+ gI16 P, diff, i;
if (x1 >= x0) {
dx = x1 - x0;
@@ -223,13 +223,13 @@ void ncoreTerminateDrawThread(void) {
/* Get and set the pen width
* Brush is cicular, width is pixel radius */
-void ncoreSetPenWidth(uint8_t penWidth) { nPenWidth = penWidth; }
-uint8_t ncoreGetPenWidth(void) { return nPenWidth; }
+void ncoreSetPenWidth(gU8 penWidth) { nPenWidth = penWidth; }
+gU8 ncoreGetPenWidth(void) { return nPenWidth; }
/* Get and set the drawing color */
void ncoreSetPenColor(gColor penColor) { gwinSetColor(ncoreDrawingArea, penColor); }
gColor ncoreGetPenColor(void) { return ncoreDrawingArea->color; }
/* Set mode */
-void ncoreSetMode(uint8_t mode) { nMode = mode; }
-uint8_t ncoreGetMode(void) { return nMode; }
+void ncoreSetMode(gU8 mode) { nMode = mode; }
+gU8 ncoreGetMode(void) { return nMode; }
diff --git a/demos/3rdparty/notepad-2/notepadCore.h b/demos/3rdparty/notepad-2/notepadCore.h
index e4b78cdc..93fceb7d 100644
--- a/demos/3rdparty/notepad-2/notepadCore.h
+++ b/demos/3rdparty/notepad-2/notepadCore.h
@@ -54,15 +54,15 @@ void ncoreTerminateDrawThread(void);
/* Get and set the pen width
* Brush is cicular, width is pixel radius */
-void ncoreSetPenWidth(uint8_t penWidth);
-uint8_t ncoreGetPenWidth(void);
+void ncoreSetPenWidth(gU8 penWidth);
+gU8 ncoreGetPenWidth(void);
/* Get and set the drawing color */
void ncoreSetPenColor(gColor penColor);
gColor ncoreGetPenColor(void);
/* Get and set the pen mode */
-void ncoreSetMode(uint8_t mode);
-uint8_t ncoreGetMode(void);
+void ncoreSetMode(gU8 mode);
+gU8 ncoreGetMode(void);
#endif /* NOTEPADCORE_H_ */
diff --git a/demos/applications/combo/mandelbrot.c b/demos/applications/combo/mandelbrot.c
index 9299f7d8..f70aa356 100644
--- a/demos/applications/combo/mandelbrot.c
+++ b/demos/applications/combo/mandelbrot.c
@@ -36,7 +36,7 @@ static gThread thread;
static void mandelbrot(float x1, float y1, float x2, float y2) {
unsigned int i,j, width, height;
- uint16_t iter;
+ gU16 iter;
float fwidth, fheight;
float sy = y2 - y1;
diff --git a/demos/applications/mandelbrot/main.c b/demos/applications/mandelbrot/main.c
index d5af7720..c35ba411 100644
--- a/demos/applications/mandelbrot/main.c
+++ b/demos/applications/mandelbrot/main.c
@@ -31,7 +31,7 @@
void mandelbrot(float x1, float y1, float x2, float y2) {
unsigned int i,j, width, height;
- uint16_t iter;
+ gU16 iter;
gColor color;
float fwidth, fheight;
diff --git a/demos/applications/notepad/main.c b/demos/applications/notepad/main.c
index 43933355..85d8e0f0 100644
--- a/demos/applications/notepad/main.c
+++ b/demos/applications/notepad/main.c
@@ -75,7 +75,7 @@ GEventMouse ev;
int main(void) {
gColor color = GFX_BLACK;
- uint16_t pen = 0;
+ gU16 pen = 0;
gfxInit();
ginputGetMouse(0);
diff --git a/demos/benchmarks/main.c b/demos/benchmarks/main.c
index fa7f0b9a..772885fa 100644
--- a/demos/benchmarks/main.c
+++ b/demos/benchmarks/main.c
@@ -86,7 +86,7 @@ static int uitoa(unsigned int value, char * buf, int max) {
}
void benchmark(void) {
- uint32_t i, pixels, ms, pps;
+ gU32 i, pixels, ms, pps;
char pps_str[25];
gCoord height, width, rx, ry, rcx, rcy;
gColor random_color;
diff --git a/demos/games/justget10/jg10.c b/demos/games/justget10/jg10.c
index d6ec0e2e..bcb58508 100644
--- a/demos/games/justget10/jg10.c
+++ b/demos/games/justget10/jg10.c
@@ -16,7 +16,7 @@ GHandle jg10SelectionWidgetGCreate(GDisplay* g, jg10WidgetObject* wo, GWidgetIni
typedef struct { // Node properties
- uint8_t num; // Node number
+ gU8 num; // Node number
gBool check; // Node needs to be checked or not
gBool sel; // Node selected or not
} nodeProps;
@@ -29,7 +29,7 @@ gdispImage jg10Image[JG10_MAX_COUNT];
#define JG10_ANIM_DELAY 60
const char *jg10GraphAnim[] = {"a1.bmp","a2.bmp","a3.bmp","a4.bmp","background.bmp"}; // 5 elements (0-4)
gdispImage jg10ImageAnim[JG10_ANIM_IMAGES];
-uint8_t jg10MaxVal=4; // Max value in field...
+gU8 jg10MaxVal=4; // Max value in field...
gFont font;
#if JG10_SHOW_SPLASH
GTimer jg10SplashBlink;
@@ -42,7 +42,7 @@ static void initRng(void) {
srand(gfxSystemTicks());
}
-static uint32_t randomInt(uint32_t max) {
+static gU32 randomInt(gU32 max) {
return rand() % max;
}
@@ -86,12 +86,12 @@ static int uitoa(unsigned int value, char * buf, int max) {
return n;
}
-static gBool inRange(int16_t x, int16_t y) {
+static gBool inRange(gI16 x, gI16 y) {
if ((x >= 0) && (x < JG10_FIELD_WIDTH) && (y >= 0) && (y < JG10_FIELD_HEIGHT)) return gTrue; else return gFalse;
}
static void clean_SelCheck(void) {
- uint16_t i ,j;
+ gU16 i ,j;
for (i = 0; i < JG10_FIELD_WIDTH; i++) {
for (j = 0; j < JG10_FIELD_HEIGHT; j++) {
jg10Field[i][j].check = gFalse;
@@ -101,7 +101,7 @@ static void clean_SelCheck(void) {
}
static void remove_Selected(void) {
- uint16_t i ,j, step;
+ gU16 i ,j, step;
gTicks delay_start = 0;
gTicks delay=0;
for (step = 0; step < JG10_ANIM_IMAGES; step++) {
@@ -129,12 +129,12 @@ static void remove_Selected(void) {
// gwinRedraw(mainWin);
}
-static uint8_t jg10_randomer(uint8_t max, uint8_t th) {
- uint32_t r = randomInt((1<<max)-1);
+static gU8 jg10_randomer(gU8 max, gU8 th) {
+ gU32 r = randomInt((1<<max)-1);
if (r != 0) {
- for (int8_t i = max; i >= 0; i--) {
- if (r >= (uint32_t)(1<<i)) {
+ for (gI8 i = max; i >= 0; i--) {
+ if (r >= (gU32)(1<<i)) {
if ((max-i) >= th) {
return randomInt(max-i)+1;
} else {
@@ -147,20 +147,20 @@ static uint8_t jg10_randomer(uint8_t max, uint8_t th) {
}
static void movePiecesDown(void) {
- uint8_t tmp = 0;
+ gU8 tmp = 0;
gBool needToCheck = gTrue;
while (needToCheck) {
needToCheck = gFalse;
- for (int8_t y = (JG10_FIELD_HEIGHT-1); y >= 0; y--) {
- for (uint8_t x = 0; x < JG10_FIELD_WIDTH; x++) {
+ for (gI8 y = (JG10_FIELD_HEIGHT-1); y >= 0; y--) {
+ for (gU8 x = 0; x < JG10_FIELD_WIDTH; x++) {
if (jg10Field[x][y].num == 0) {
// check if there is at least single none empty piece
tmp = 0;
- for (int8_t tmpy = y; tmpy >= 0; tmpy--) {
+ for (gI8 tmpy = y; tmpy >= 0; tmpy--) {
if (jg10Field[x][tmpy].num != 0) tmp++;
}
if (tmp != 0) {
- for (int8_t tmpy = y; tmpy > 0; tmpy--) {
+ for (gI8 tmpy = y; tmpy > 0; tmpy--) {
jg10Field[x][tmpy].num = jg10Field[x][tmpy-1].num;
}
jg10Field[x][0].num = 0;
@@ -175,10 +175,10 @@ static void movePiecesDown(void) {
needToCheck = gTrue;
while (needToCheck) {
needToCheck = gFalse;
- for (int8_t y = (JG10_FIELD_HEIGHT-1); y >= 0; y--) {
- for (uint8_t x = 0; x < JG10_FIELD_WIDTH; x++) {
+ for (gI8 y = (JG10_FIELD_HEIGHT-1); y >= 0; y--) {
+ for (gU8 x = 0; x < JG10_FIELD_WIDTH; x++) {
if (jg10Field[x][y].num == 0) {
- for (int8_t tmpy = y; tmpy > 0; tmpy--) {
+ for (gI8 tmpy = y; tmpy > 0; tmpy--) {
jg10Field[x][tmpy].num = jg10Field[x][tmpy-1].num;
}
jg10Field[x][0].num = jg10_randomer(jg10MaxVal, 3);
@@ -193,7 +193,7 @@ static void movePiecesDown(void) {
static gBool checkForPossibleMove(void) {
gBool canMove = gFalse;
- uint16_t i ,j;
+ gU16 i ,j;
for (i = 0; i < JG10_FIELD_WIDTH; i++) {
for (j = 0; j < JG10_FIELD_HEIGHT; j++) {
if ((inRange(i,j-1) && jg10Field[i][j-1].num == jg10Field[i][j].num) ||
@@ -225,7 +225,7 @@ static void printCongrats(void) {
static DECLARE_THREAD_FUNCTION(thdJg10, msg) {
(void)msg;
- uint16_t x,y;
+ gU16 x,y;
while (!jg10GameOver) {
srand(gfxSystemTicks());
ginputGetMouseStatus(0, &ev);
@@ -278,8 +278,8 @@ static DECLARE_THREAD_FUNCTION(thdJg10, msg) {
static void initField(void) {
jg10MaxVal = 4;
- for (uint8_t x = 0; x < JG10_FIELD_WIDTH; x++) {
- for (uint8_t y = 0; y < JG10_FIELD_HEIGHT; y++) {
+ for (gU8 x = 0; x < JG10_FIELD_WIDTH; x++) {
+ for (gU8 y = 0; y < JG10_FIELD_HEIGHT; y++) {
jg10Field[x][y].num = randomInt(jg10MaxVal)+1;
//jg10Field[x][y].num = 1; // good for animation testing
//jg10Field[x][y].num = x+x+5; // good to get high score fast
@@ -295,15 +295,15 @@ static void initField(void) {
static void mainWinDraw(GWidgetObject* gw, void* param) {
(void)param;
- for (uint8_t x = 0; x < JG10_FIELD_WIDTH; x++) {
- for (uint8_t y = 0; y < JG10_FIELD_HEIGHT; y++) {
+ for (gU8 x = 0; x < JG10_FIELD_WIDTH; x++) {
+ for (gU8 y = 0; y < JG10_FIELD_HEIGHT; y++) {
gdispGImageDraw(gw->g.display, &jg10Image[jg10Field[x][y].num], (x*JG10_CELL_HEIGHT)+1, (y*JG10_CELL_WIDTH)+1, JG10_CELL_WIDTH, JG10_CELL_HEIGHT, 0, 0);
}
}
}
static void jg10SelectionWidget_Draw(GWidgetObject* gw, void* param) {
- int16_t x, y;
+ gI16 x, y;
gBool needToCheck = gTrue;
(void)param;
@@ -468,11 +468,11 @@ void jg10Start(void) {
void jg10Init(void) {
initRng();
- for (uint8_t i = 0; i < JG10_MAX_COUNT; i++) {
+ for (gU8 i = 0; i < JG10_MAX_COUNT; i++) {
gdispImageOpenFile(&jg10Image[i], jg10Graph[i]);
gdispImageCache(&jg10Image[i]);
}
- for (uint8_t i = 0; i < JG10_ANIM_IMAGES; i++) {
+ for (gU8 i = 0; i < JG10_ANIM_IMAGES; i++) {
gdispImageOpenFile(&jg10ImageAnim[i], jg10GraphAnim[i]);
gdispImageCache(&jg10ImageAnim[i]);
}
diff --git a/demos/games/minesweeper/mines.c b/demos/games/minesweeper/mines.c
index 5a0b4c41..4ae8f361 100644
--- a/demos/games/minesweeper/mines.c
+++ b/demos/games/minesweeper/mines.c
@@ -3,25 +3,25 @@
#include "mines.h"
typedef struct { // Node properties
- uint8_t num; // Node number, how many mines around
+ gU8 num; // Node number, how many mines around
gBool open; // Node shown or hidden
gBool check; // Node needs to be checked or not, used for opening up empty nodes
gBool flag; // Node is marked with flag by player
- uint16_t fieldNum; // Node number, used to randomize gamestart "animation"
+ gU16 fieldNum; // Node number, used to randomize gamestart "animation"
} nodeProps;
static GEventMouse ev;
static nodeProps minesField[MINES_FIELD_WIDTH][MINES_FIELD_HEIGHT]; // Mines field array
static gBool minesGameOver = gFalse;
static gBool minesGameWinner = gFalse;
-static int16_t minesEmptyNodes; // Empty node counter
-static int16_t minesFlags; // Flag counter
-static int16_t minesTime; // Time counter
+static gI16 minesEmptyNodes; // Empty node counter
+static gI16 minesFlags; // Flag counter
+static gI16 minesTime; // Time counter
static GTimer minesTimeCounterTimer;
static const char* minesGraph[] = {"1.bmp","2.bmp","3.bmp","4.bmp","5.bmp","6.bmp","7.bmp","8.bmp", "closed.bmp", "empty.bmp", "explode.bmp", "flag.bmp", "mine.bmp", "wrong.bmp"}; // 14 elements (0-13)
static gdispImage minesImage;
-static uint8_t minesStatusIconWidth = 0;
-static uint8_t minesStatusIconHeight = 0;
+static gU8 minesStatusIconWidth = 0;
+static gU8 minesStatusIconHeight = 0;
static gBool minesFirstGame = gTrue; // Just don't clear field for the first time, as we have black screen already... :/
static gBool minesSplashTxtVisible = gFalse;
#if MINES_SHOW_SPLASH
@@ -84,7 +84,7 @@ static void initRng(void)
srand(gfxSystemTicks());
}
-static uint32_t randomInt(uint32_t max)
+static gU32 randomInt(gU32 max)
{
return rand() % max;
}
@@ -125,7 +125,7 @@ static void minesTimeCounter(void* arg)
minesUpdateTime();
}
-static gBool inRange(int16_t x, int16_t y)
+static gBool inRange(gI16 x, gI16 y)
{
if ((x >= 0) && (x < MINES_FIELD_WIDTH) && (y >= 0) && (y < MINES_FIELD_HEIGHT))
return gTrue;
@@ -133,7 +133,7 @@ static gBool inRange(int16_t x, int16_t y)
return gFalse;
}
-static void showOne(int16_t x, int16_t y)
+static void showOne(gI16 x, gI16 y)
{
minesField[x][y].open = gTrue;
if (minesField[x][y].flag) {
@@ -167,7 +167,7 @@ static void showOne(int16_t x, int16_t y)
static void openEmptyNodes(void)
{
- int16_t x, y, i, j;
+ gI16 x, y, i, j;
gBool needToCheck = gTrue;
while (needToCheck) {
@@ -195,7 +195,7 @@ static void openEmptyNodes(void)
static DECLARE_THREAD_FUNCTION(thdMines, msg)
{
(void)msg;
- uint16_t x,y, delay;
+ gU16 x,y, delay;
gBool delayed = gFalse;
while (!minesGameOver) {
if (minesEmptyNodes == 0) {
@@ -265,7 +265,7 @@ static void printGameOver(void)
static void initField(void)
{
- int16_t x, y, mines, i, j;
+ gI16 x, y, mines, i, j;
minesFlags = 0;
minesGameOver = gFalse;
@@ -374,7 +374,7 @@ static void initField(void)
void minesStart(void)
{
- int16_t x, y;
+ gI16 x, y;
#if MINES_SHOW_SPLASH
gtimerStop(&minesSplashBlink);
diff --git a/demos/games/minesweeper/resources/romfs/userfonts.h b/demos/games/minesweeper/resources/romfs/userfonts.h
index e775aec0..232c8452 100644
--- a/demos/games/minesweeper/resources/romfs/userfonts.h
+++ b/demos/games/minesweeper/resources/romfs/userfonts.h
@@ -11,25 +11,25 @@
#error The font file is not compatible with this version of mcufont.
#endif
-static const uint8_t mf_rlefont_digital_7__mono_20_dictionary_data[39] = {
+static const gU8 mf_rlefont_digital_7__mono_20_dictionary_data[39] = {
0x81, 0x05, 0x81, 0x05, 0x81, 0x05, 0x81, 0x05, 0x81, 0x06, 0x80, 0x01, 0x07, 0x80, 0x05, 0x85,
0x05, 0x80, 0x81, 0x03, 0x03, 0x85, 0x0f, 0x44, 0x84, 0x85, 0x86, 0x88, 0x44, 0x44, 0x44, 0x44,
0x24, 0x84, 0x44, 0x44, 0x18, 0xc4, 0x83,
};
-static const uint16_t mf_rlefont_digital_7__mono_20_dictionary_offsets[13] = {
+static const gU16 mf_rlefont_digital_7__mono_20_dictionary_offsets[13] = {
0x0000, 0x0009, 0x000c, 0x000f, 0x0010, 0x0012, 0x0013, 0x0014,
0x0016, 0x001c, 0x0020, 0x0024, 0x0027,
};
-static const uint8_t mf_rlefont_digital_7__mono_20_glyph_data_0[63] = {
+static const gU8 mf_rlefont_digital_7__mono_20_glyph_data_0[63] = {
0x09, 0x1b, 0x18, 0x1c, 0x1a, 0x18, 0x1b, 0x09, 0x21, 0x19, 0x22, 0x21, 0x09, 0x83, 0x44, 0x21,
0x83, 0x20, 0x1f, 0x10, 0x09, 0x83, 0x44, 0x21, 0x82, 0x44, 0x21, 0x83, 0x09, 0x84, 0x23, 0x20,
0xec, 0x44, 0x09, 0x43, 0x20, 0x1f, 0x20, 0xec, 0x83, 0x09, 0x43, 0x20, 0x1f, 0x23, 0x0f, 0x09,
0x1b, 0x18, 0x22, 0x21, 0x09, 0x1b, 0x23, 0x23, 0x0f, 0x09, 0x1b, 0x23, 0x20, 0xec, 0x83,
};
-static const uint16_t mf_rlefont_digital_7__mono_20_glyph_offsets_0[10] = {
+static const gU16 mf_rlefont_digital_7__mono_20_glyph_offsets_0[10] = {
0x0000, 0x0007, 0x000c, 0x0014, 0x001c, 0x0022, 0x0029, 0x002f,
0x0034, 0x0039,
};
diff --git a/demos/games/tetris/Example_Makefiles/stm32f4/board_SSD1289.h b/demos/games/tetris/Example_Makefiles/stm32f4/board_SSD1289.h
index 35ef653d..e14def7d 100644
--- a/demos/games/tetris/Example_Makefiles/stm32f4/board_SSD1289.h
+++ b/demos/games/tetris/Example_Makefiles/stm32f4/board_SSD1289.h
@@ -18,8 +18,8 @@
// For a multiple display configuration we would put all this in a structure and then
// set g->board to that structure.
-#define GDISP_REG ((volatile uint16_t *) 0x60000000)[0] /* RS = 0 */
-#define GDISP_RAM ((volatile uint16_t *) 0x60020000)[0] /* RS = 1 */
+#define GDISP_REG ((volatile gU16 *) 0x60000000)[0] /* RS = 0 */
+#define GDISP_RAM ((volatile gU16 *) 0x60020000)[0] /* RS = 1 */
#define GDISP_DMA_STREAM STM32_DMA2_STREAM6
#define FSMC_BANK 0
@@ -116,7 +116,7 @@ static GFXINLINE void setpin_reset(GDisplay *g, gBool state) {
(void) state;
}
-static GFXINLINE void set_backlight(GDisplay *g, uint8_t percent) {
+static GFXINLINE void set_backlight(GDisplay *g, gU8 percent) {
(void) g;
pwmEnableChannel(&PWMD3, 2, percent);
}
@@ -129,12 +129,12 @@ static GFXINLINE void release_bus(GDisplay *g) {
(void) g;
}
-static GFXINLINE void write_index(GDisplay *g, uint16_t index) {
+static GFXINLINE void write_index(GDisplay *g, gU16 index) {
(void) g;
GDISP_REG = index;
}
-static GFXINLINE void write_data(GDisplay *g, uint16_t data) {
+static GFXINLINE void write_data(GDisplay *g, gU16 data) {
(void) g;
GDISP_RAM = data;
}
@@ -149,7 +149,7 @@ static GFXINLINE void setwritemode(GDisplay *g) {
FSMC_Bank1->BTCR[FSMC_BANK+1] = FSMC_BTR1_ADDSET_0 | FSMC_BTR1_DATAST_2 | FSMC_BTR1_BUSTURN_0; /* FSMC timing */
}
-static GFXINLINE uint16_t read_data(GDisplay *g) {
+static GFXINLINE gU16 read_data(GDisplay *g) {
(void) g;
return GDISP_RAM;
}
diff --git a/demos/games/tetris/Example_Makefiles/stm32f4/ginput_lld_mouse_board.h b/demos/games/tetris/Example_Makefiles/stm32f4/ginput_lld_mouse_board.h
index 4ba46339..6b599207 100644
--- a/demos/games/tetris/Example_Makefiles/stm32f4/ginput_lld_mouse_board.h
+++ b/demos/games/tetris/Example_Makefiles/stm32f4/ginput_lld_mouse_board.h
@@ -43,11 +43,11 @@ static GFXINLINE void release_bus(void)
spiReleaseBus(&SPID1);
}
-static GFXINLINE uint16_t read_value(uint16_t port)
+static GFXINLINE gU16 read_value(gU16 port)
{
- static uint8_t txbuf[3] = {0};
- static uint8_t rxbuf[3] = {0};
- uint16_t ret;
+ static gU8 txbuf[3] = {0};
+ static gU8 rxbuf[3] = {0};
+ gU16 ret;
txbuf[0] = port;
diff --git a/demos/games/tetris/Example_Makefiles/stm32f4/gmouse_lld_ADS7843_board.h b/demos/games/tetris/Example_Makefiles/stm32f4/gmouse_lld_ADS7843_board.h
index eef222fa..1114853c 100644
--- a/demos/games/tetris/Example_Makefiles/stm32f4/gmouse_lld_ADS7843_board.h
+++ b/demos/games/tetris/Example_Makefiles/stm32f4/gmouse_lld_ADS7843_board.h
@@ -85,15 +85,15 @@ static GFXINLINE void release_bus(GMouse* m) {
spiReleaseBus(&SPID1);
}
-static GFXINLINE uint16_t read_value(GMouse* m, uint16_t port) {
- static uint8_t txbuf[3] = {0};
- static uint8_t rxbuf[3] = {0};
+static GFXINLINE gU16 read_value(GMouse* m, gU16 port) {
+ static gU8 txbuf[3] = {0};
+ static gU8 rxbuf[3] = {0};
(void) m;
txbuf[0] = port;
spiExchange(&SPID1, 3, txbuf, rxbuf);
- return ((uint16_t)rxbuf[1] << 5) | (rxbuf[2] >> 3);
+ return ((gU16)rxbuf[1] << 5) | (rxbuf[2] >> 3);
}
#endif /* _GINPUT_LLD_MOUSE_BOARD_H */
diff --git a/demos/games/tetris/Example_Makefiles/stm32f4/gmouse_lld_ADS7843_board.h.old b/demos/games/tetris/Example_Makefiles/stm32f4/gmouse_lld_ADS7843_board.h.old
index f5f39c63..5b520a3d 100644
--- a/demos/games/tetris/Example_Makefiles/stm32f4/gmouse_lld_ADS7843_board.h.old
+++ b/demos/games/tetris/Example_Makefiles/stm32f4/gmouse_lld_ADS7843_board.h.old
@@ -57,10 +57,10 @@ static GFXINLINE void release_bus(void) {
spiReleaseBus(&SPID1);
}
-static GFXINLINE uint16_t read_value(uint16_t port) {
- static uint8_t txbuf[3] = {0};
- static uint8_t rxbuf[3] = {0};
- uint16_t ret;
+static GFXINLINE gU16 read_value(gU16 port) {
+ static gU8 txbuf[3] = {0};
+ static gU8 rxbuf[3] = {0};
+ gU16 ret;
txbuf[0] = port;
diff --git a/demos/games/tetris/Example_Makefiles/stm32f4_chibios_3.x/board_SSD1289.h b/demos/games/tetris/Example_Makefiles/stm32f4_chibios_3.x/board_SSD1289.h
index 9ad3edd5..41d0ea8f 100644
--- a/demos/games/tetris/Example_Makefiles/stm32f4_chibios_3.x/board_SSD1289.h
+++ b/demos/games/tetris/Example_Makefiles/stm32f4_chibios_3.x/board_SSD1289.h
@@ -18,8 +18,8 @@
// For a multiple display configuration we would put all this in a structure and then
// set g->board to that structure.
-#define GDISP_REG ((volatile uint16_t *) 0x60000000)[0] /* RS = 0 */
-#define GDISP_RAM ((volatile uint16_t *) 0x60020000)[0] /* RS = 1 */
+#define GDISP_REG ((volatile gU16 *) 0x60000000)[0] /* RS = 0 */
+#define GDISP_RAM ((volatile gU16 *) 0x60020000)[0] /* RS = 1 */
#define GDISP_DMA_STREAM STM32_DMA2_STREAM6
#define FSMC_BANK 0
@@ -114,7 +114,7 @@ static GFXINLINE void setpin_reset(GDisplay *g, gBool state) {
(void) state;
}
-static GFXINLINE void set_backlight(GDisplay *g, uint8_t percent) {
+static GFXINLINE void set_backlight(GDisplay *g, gU8 percent) {
(void) g;
pwmEnableChannel(&PWMD3, 2, percent);
}
@@ -127,12 +127,12 @@ static GFXINLINE void release_bus(GDisplay *g) {
(void) g;
}
-static GFXINLINE void write_index(GDisplay *g, uint16_t index) {
+static GFXINLINE void write_index(GDisplay *g, gU16 index) {
(void) g;
GDISP_REG = index;
}
-static GFXINLINE void write_data(GDisplay *g, uint16_t data) {
+static GFXINLINE void write_data(GDisplay *g, gU16 data) {
(void) g;
GDISP_RAM = data;
}
@@ -147,7 +147,7 @@ static GFXINLINE void setwritemode(GDisplay *g) {
FSMC_Bank1->BTCR[FSMC_BANK+1] = FSMC_BTR1_ADDSET_0 | FSMC_BTR1_DATAST_2 | FSMC_BTR1_BUSTURN_0; /* FSMC timing */
}
-static GFXINLINE uint16_t read_data(GDisplay *g) {
+static GFXINLINE gU16 read_data(GDisplay *g) {
(void) g;
return GDISP_RAM;
}
diff --git a/demos/games/tetris/Example_Makefiles/stm32f4_chibios_3.x/ginput_lld_mouse_board.h b/demos/games/tetris/Example_Makefiles/stm32f4_chibios_3.x/ginput_lld_mouse_board.h
index 4ba46339..6b599207 100644
--- a/demos/games/tetris/Example_Makefiles/stm32f4_chibios_3.x/ginput_lld_mouse_board.h
+++ b/demos/games/tetris/Example_Makefiles/stm32f4_chibios_3.x/ginput_lld_mouse_board.h
@@ -43,11 +43,11 @@ static GFXINLINE void release_bus(void)
spiReleaseBus(&SPID1);
}
-static GFXINLINE uint16_t read_value(uint16_t port)
+static GFXINLINE gU16 read_value(gU16 port)
{
- static uint8_t txbuf[3] = {0};
- static uint8_t rxbuf[3] = {0};
- uint16_t ret;
+ static gU8 txbuf[3] = {0};
+ static gU8 rxbuf[3] = {0};
+ gU16 ret;
txbuf[0] = port;
diff --git a/demos/games/tetris/Example_Makefiles/stm32f4_chibios_3.x/gmouse_lld_ADS7843_board.h b/demos/games/tetris/Example_Makefiles/stm32f4_chibios_3.x/gmouse_lld_ADS7843_board.h
index f5f39c63..5b520a3d 100644
--- a/demos/games/tetris/Example_Makefiles/stm32f4_chibios_3.x/gmouse_lld_ADS7843_board.h
+++ b/demos/games/tetris/Example_Makefiles/stm32f4_chibios_3.x/gmouse_lld_ADS7843_board.h
@@ -57,10 +57,10 @@ static GFXINLINE void release_bus(void) {
spiReleaseBus(&SPID1);
}
-static GFXINLINE uint16_t read_value(uint16_t port) {
- static uint8_t txbuf[3] = {0};
- static uint8_t rxbuf[3] = {0};
- uint16_t ret;
+static GFXINLINE gU16 read_value(gU16 port) {
+ static gU8 txbuf[3] = {0};
+ static gU8 rxbuf[3] = {0};
+ gU16 ret;
txbuf[0] = port;
diff --git a/demos/games/tetris/tetris.c b/demos/games/tetris/tetris.c
index cd4cc315..c0bbe3b0 100644
--- a/demos/games/tetris/tetris.c
+++ b/demos/games/tetris/tetris.c
@@ -62,7 +62,7 @@ F B
E C
D
*/
-const uint8_t sevenSegNumbers[10] = {0x3F, 0x06, 0x5B, 0x4F, 0x66, 0x6D, 0x7D, 0x07, 0x7F, 0x6F}; // 0,1,2,3,4,5,6,7,8,9
+const gU8 sevenSegNumbers[10] = {0x3F, 0x06, 0x5B, 0x4F, 0x66, 0x6D, 0x7D, 0x07, 0x7F, 0x6F}; // 0,1,2,3,4,5,6,7,8,9
const gColor tetrisShapeColors[9] = {GFX_BLACK, HTML2COLOR(0x009000), GFX_RED, GFX_BLUE, GFX_MAGENTA, GFX_SKYBLUE, GFX_ORANGE, HTML2COLOR(0xBBBB00), GFX_WHITE}; // shape colors
// default tetris shapes
const int tetrisShapes[TETRIS_SHAPE_COUNT][4][2] = {
@@ -143,7 +143,7 @@ static int uitoa(unsigned int value, char * buf, int max) {
return n;
}
-static void sevenSegDraw(int x, int y, uint8_t number, gColor color) {
+static void sevenSegDraw(int x, int y, gU8 number, gColor color) {
if (number & 0x01) gdispFillArea(x+SEVEN_SEG_HEIGHT+SEVEN_SEG_SIZE, y, SEVEN_SEG_WIDTH, SEVEN_SEG_HEIGHT, color); // A
if (number & 0x02) gdispFillArea(x+SEVEN_SEG_HEIGHT+(SEVEN_SEG_SIZE*2)+SEVEN_SEG_WIDTH, y+SEVEN_SEG_HEIGHT+SEVEN_SEG_SIZE, SEVEN_SEG_HEIGHT, SEVEN_SEG_WIDTH, color); // B
if (number & 0x04) gdispFillArea(x+SEVEN_SEG_HEIGHT+(SEVEN_SEG_SIZE*2)+SEVEN_SEG_WIDTH, y+(SEVEN_SEG_HEIGHT*2)+SEVEN_SEG_WIDTH+(SEVEN_SEG_SIZE*3), SEVEN_SEG_HEIGHT, SEVEN_SEG_WIDTH, color); // C
@@ -153,7 +153,7 @@ static void sevenSegDraw(int x, int y, uint8_t number, gColor color) {
if (number & 0x40) gdispFillArea(x+SEVEN_SEG_HEIGHT+SEVEN_SEG_SIZE, y+SEVEN_SEG_HEIGHT+SEVEN_SEG_WIDTH+(SEVEN_SEG_SIZE*2), SEVEN_SEG_WIDTH, SEVEN_SEG_HEIGHT, color); // G
}
-static void drawShape(uint8_t color) {
+static void drawShape(gU8 color) {
int i;
for (i = 0; i <= 3; i++) {
if (tetrisCurrentShape[i][1] <= 16 || tetrisCurrentShape[i][1] >= 19) {
@@ -167,14 +167,14 @@ static void drawShape(uint8_t color) {
}
}
-// static uint32_t randomInt(uint32_t max) { //getting random number from STM32 hardware RNG
-// static uint32_t new_value=0;
+// static gU32 randomInt(gU32 max) { //getting random number from STM32 hardware RNG
+// static gU32 new_value=0;
// while ((RNG->SR & RNG_SR_DRDY) == 0) { }
// new_value=RNG->DR % max;
// return new_value;
// }
-static uint32_t randomInt(uint32_t max) {
+static gU32 randomInt(gU32 max) {
return rand() % max;
}
@@ -200,9 +200,9 @@ static void createShape(void) {
memcpy(tetrisCurrentShape, tetrisOldShape, sizeof(tetrisCurrentShape)); // tetrisCurrentShape = tetrisOldShape;
}
-static void tellScore(uint8_t color) {
+static void tellScore(gU8 color) {
char pps_str[12];
- uint8_t i;
+ gU8 i;
uitoa(tetrisLines, pps_str, sizeof(pps_str));
gdispFillArea((TETRIS_FIELD_WIDTH*TETRIS_CELL_WIDTH)+5, gdispGetHeight()-50, gdispGetStringWidth(pps_str, font16)+4, gdispGetCharWidth('A', font16)+2, tetrisShapeColors[0]);
gdispDrawString((TETRIS_FIELD_WIDTH*TETRIS_CELL_WIDTH)+5, gdispGetHeight()-50, pps_str, font16, tetrisShapeColors[color]);
@@ -237,7 +237,7 @@ static void initField(void) {
tellScore(8);
}
-static void drawCell(int x, int y, uint8_t color) {
+static void drawCell(int x, int y, gU8 color) {
gdispFillArea((x*TETRIS_CELL_WIDTH)+2, gdispGetHeight()-TETRIS_CELL_HEIGHT-(y*TETRIS_CELL_HEIGHT)-3, TETRIS_CELL_WIDTH-2, TETRIS_CELL_HEIGHT-2, tetrisShapeColors[color]);
if (color != 0) {
gdispDrawBox((x*TETRIS_CELL_WIDTH)+2, gdispGetHeight()-TETRIS_CELL_HEIGHT-(y*TETRIS_CELL_HEIGHT)-3, TETRIS_CELL_WIDTH-1, TETRIS_CELL_HEIGHT-1, tetrisShapeColors[8]);
@@ -246,7 +246,7 @@ static void drawCell(int x, int y, uint8_t color) {
}
}
-static void printText(uint8_t color) {
+static void printText(gU8 color) {
gdispDrawString((TETRIS_FIELD_WIDTH*TETRIS_CELL_WIDTH)+TETRIS_CELL_WIDTH, gdispGetHeight()-(TETRIS_FIELD_HEIGHT*TETRIS_CELL_HEIGHT), "Next", font16, tetrisShapeColors[color]);
gdispDrawString((TETRIS_FIELD_WIDTH*TETRIS_CELL_WIDTH)+5, gdispGetHeight()-70, "Lines", font16, tetrisShapeColors[color]);
}
@@ -294,7 +294,7 @@ static gBool stay(gBool down) {
static void clearCompleteLines(void) {
gBool t;
- uint8_t reiz = 0;
+ gU8 reiz = 0;
int l,k,j;
l = 0;
while (l <= 16) {
@@ -429,7 +429,7 @@ static void goLeft(void) {
static DECLARE_THREAD_FUNCTION(thdTetris, arg) {
(void)arg;
- uint8_t i;
+ gU8 i;
while (!tetrisGameOver) {
// key handling
if (gfxSystemTicks() - tetrisPreviousKeyTime >= gfxMillisecondsToTicks(tetrisKeySpeed) || gfxSystemTicks() <= gfxMillisecondsToTicks(tetrisKeySpeed)) {
diff --git a/demos/modules/gadc/gwinosc.c b/demos/modules/gadc/gwinosc.c
index b018fe7e..b9154d11 100644
--- a/demos/modules/gadc/gwinosc.c
+++ b/demos/modules/gadc/gwinosc.c
@@ -57,7 +57,7 @@ static const gwinVMT scopeVMT = {
0, // The after-clear routine
};
-GHandle gwinGScopeCreate(GDisplay *g, GScopeObject *gs, GWindowInit *pInit, uint32_t physdev, uint32_t frequency) {
+GHandle gwinGScopeCreate(GDisplay *g, GScopeObject *gs, GWindowInit *pInit, gU32 physdev, gU32 frequency) {
/* Initialise the base class GWIN */
if (!(gs = (GScopeObject *)_gwindowCreate(g, &gs->g, pInit, &scopeVMT, 0)))
return 0;
@@ -87,7 +87,7 @@ void gwinScopeWaitForTrace(GHandle gh) {
adcsample_t *pa;
gCoord *pc;
GDataBuffer *pd;
- uint8_t shr;
+ gU8 shr;
#if TRIGGER_METHOD == TRIGGER_POSITIVERAMP
gBool rdytrigger;
int flsamples;
diff --git a/demos/modules/gadc/gwinosc.h b/demos/modules/gadc/gwinosc.h
index 15ef2f3a..49b6e032 100644
--- a/demos/modules/gadc/gwinosc.h
+++ b/demos/modules/gadc/gwinosc.h
@@ -80,7 +80,7 @@ extern "C" {
/**
* Create a scope window.
*/
- GHandle gwinGScopeCreate(GDisplay *g, GScopeObject *gs, GWindowInit *pInit, uint32_t physdev, uint32_t frequency);
+ GHandle gwinGScopeCreate(GDisplay *g, GScopeObject *gs, GWindowInit *pInit, gU32 physdev, gU32 frequency);
#define gwinScopeCreate(gs,pI,pd,f) gwinGScopeCreate(GDISP,gs,pI,pd,f)
/**
diff --git a/demos/modules/gaudio/oscilloscope/gwinosc.c b/demos/modules/gaudio/oscilloscope/gwinosc.c
index e46640e8..001dbc68 100644
--- a/demos/modules/gaudio/oscilloscope/gwinosc.c
+++ b/demos/modules/gaudio/oscilloscope/gwinosc.c
@@ -64,7 +64,7 @@ static const gwinVMT scopeVMT = {
0, // The after-clear routine
};
-GHandle gwinGScopeCreate(GDisplay *g, GScopeObject *gs, GWindowInit *pInit, uint16_t channel, uint32_t frequency, ArrayDataFormat format) {
+GHandle gwinGScopeCreate(GDisplay *g, GScopeObject *gs, GWindowInit *pInit, gU16 channel, gU32 frequency, ArrayDataFormat format) {
/* Make sure the audio parameters are valid first */
if (!gaudioRecordInit(channel, frequency, format))
return 0;
@@ -100,10 +100,10 @@ void gwinScopeWaitForTrace(GHandle gh) {
int i;
gCoord x, y;
gCoord yoffset;
- uint8_t *pa8;
- uint16_t *pa16;
+ gU8 *pa8;
+ gU16 *pa16;
gCoord *pc;
- uint8_t shr;
+ gU8 shr;
#if TRIGGER_METHOD == TRIGGER_POSITIVERAMP
gBool rdytrigger;
@@ -132,8 +132,8 @@ void gwinScopeWaitForTrace(GHandle gh) {
x = gs->nextx;
pc = gs->lastscopetrace+x;
- pa8 = (uint8_t *)(paud+1);
- pa16 = (uint16_t *)(paud+1);
+ pa8 = (gU8 *)(paud+1);
+ pa16 = (gU16 *)(paud+1);
#if TRIGGER_METHOD == TRIGGER_POSITIVERAMP
rdytrigger = gFalse;
diff --git a/demos/modules/gaudio/oscilloscope/gwinosc.h b/demos/modules/gaudio/oscilloscope/gwinosc.h
index e77a61b2..99e81dad 100644
--- a/demos/modules/gaudio/oscilloscope/gwinosc.h
+++ b/demos/modules/gaudio/oscilloscope/gwinosc.h
@@ -81,7 +81,7 @@ extern "C" {
/**
* Create a scope window.
*/
- GHandle gwinGScopeCreate(GDisplay *g, GScopeObject *gs, GWindowInit *pInit, uint16_t channel, uint32_t frequency, ArrayDataFormat format);
+ GHandle gwinGScopeCreate(GDisplay *g, GScopeObject *gs, GWindowInit *pInit, gU16 channel, gU32 frequency, ArrayDataFormat format);
#define gwinScopeCreate(gs,pI,ch,f,fmt) gwinGScopeCreate(GDISP,gs,pI,ch,f,fmt)
/**
diff --git a/demos/modules/gaudio/play-vs1053/main.c b/demos/modules/gaudio/play-vs1053/main.c
index 8cfa60f6..663bcd12 100644
--- a/demos/modules/gaudio/play-vs1053/main.c
+++ b/demos/modules/gaudio/play-vs1053/main.c
@@ -46,8 +46,8 @@ int main(void) {
gFont font;
GFILE *f;
char *errmsg;
- uint32_t toplay;
- uint32_t len;
+ gU32 toplay;
+ gU32 len;
GDataBuffer *pd;
// Initialise everything
diff --git a/demos/modules/gaudio/play-wave/main.c b/demos/modules/gaudio/play-wave/main.c
index c6a5ea84..8b54d185 100644
--- a/demos/modules/gaudio/play-wave/main.c
+++ b/demos/modules/gaudio/play-wave/main.c
@@ -48,10 +48,10 @@ int main(void) {
gFont font;
GFILE *f;
char *errmsg;
- uint32_t toplay;
- uint32_t frequency;
+ gU32 toplay;
+ gU32 frequency;
ArrayDataFormat datafmt;
- uint32_t len;
+ gU32 len;
GDataBuffer *pd;
// Initialise everything
@@ -92,8 +92,8 @@ repeatplay:
}
// Read the fmt block
- len = (((uint32_t)(uint8_t)whdr[16])<<0) | (((uint32_t)(uint8_t)whdr[17])<<8)
- | (((uint32_t)(uint8_t)whdr[18])<<16) | (((uint32_t)(uint8_t)whdr[19])<<24);
+ len = (((gU32)(gU8)whdr[16])<<0) | (((gU32)(gU8)whdr[17])<<8)
+ | (((gU32)(gU8)whdr[18])<<16) | (((gU32)(gU8)whdr[19])<<24);
if (len > sizeof(whdr) || len < 16) {
errmsg = "Err: Bad fmt len";
goto theend;
@@ -123,8 +123,8 @@ repeatplay:
#endif
// Get the sample frequency (little endian format) and format
- frequency = (((uint32_t)(uint8_t)whdr[4])<<0) | (((uint32_t)(uint8_t)whdr[5])<<8)
- | (((uint32_t)(uint8_t)whdr[6])<<16) | (((uint32_t)(uint8_t)whdr[7])<<24);
+ frequency = (((gU32)(gU8)whdr[4])<<0) | (((gU32)(gU8)whdr[5])<<8)
+ | (((gU32)(gU8)whdr[6])<<16) | (((gU32)(gU8)whdr[7])<<24);
datafmt = whdr[14] == 8 ? ARRAY_DATA_8BITUNSIGNED : ARRAY_DATA_16BITSIGNED;
// Initialise the audio output device
@@ -146,8 +146,8 @@ repeatplay:
}
// Get the block length (little endian format)
- toplay = (((uint32_t)(uint8_t)whdr[4])<<0) | (((uint32_t)(uint8_t)whdr[5])<<8)
- | (((uint32_t)(uint8_t)whdr[6])<<16) | (((uint32_t)(uint8_t)whdr[7])<<24);
+ toplay = (((gU32)(gU8)whdr[4])<<0) | (((gU32)(gU8)whdr[5])<<8)
+ | (((gU32)(gU8)whdr[6])<<16) | (((gU32)(gU8)whdr[7])<<24);
// Stop scanning when this is a data block
if (whdr[0] == 'd' && whdr[1] == 'a' && whdr[2] == 't' && whdr[3] == 'a')
diff --git a/demos/modules/gdisp/arcsectors/main.c b/demos/modules/gdisp/arcsectors/main.c
index 6a9a2737..4943f423 100644
--- a/demos/modules/gdisp/arcsectors/main.c
+++ b/demos/modules/gdisp/arcsectors/main.c
@@ -31,7 +31,7 @@
int main(void) {
gCoord width, height, r1, r2, cx, cy;
- uint8_t sectors;
+ gU8 sectors;
// Initialize and clear the display
gfxInit();
diff --git a/demos/modules/gdisp/fonts/font_Apple12.h b/demos/modules/gdisp/fonts/font_Apple12.h
index 38e124d7..512612a9 100644
--- a/demos/modules/gdisp/fonts/font_Apple12.h
+++ b/demos/modules/gdisp/fonts/font_Apple12.h
@@ -11,7 +11,7 @@
#error The font file is not compatible with this version of mcufont.
#endif
-static const uint8_t mf_rlefont_phpoXxi1Y_dictionary_data[193] = {
+static const gU8 mf_rlefont_phpoXxi1Y_dictionary_data[193] = {
0x04, 0x81, 0x04, 0x01, 0x81, 0x04, 0x0d, 0x81, 0x05, 0x80, 0x03, 0x80, 0x0b, 0x80, 0x09, 0x81,
0x08, 0x83, 0x06, 0x01, 0x80, 0x08, 0x02, 0x81, 0x02, 0x81, 0x06, 0x84, 0x04, 0x80, 0x0a, 0x81,
0x02, 0x0f, 0x80, 0x85, 0x02, 0x04, 0x81, 0x04, 0x81, 0x81, 0x06, 0x31, 0x81, 0x08, 0x08, 0x82,
@@ -27,7 +27,7 @@ static const uint8_t mf_rlefont_phpoXxi1Y_dictionary_data[193] = {
0xc7,
};
-static const uint16_t mf_rlefont_phpoXxi1Y_dictionary_offsets[76] = {
+static const gU16 mf_rlefont_phpoXxi1Y_dictionary_offsets[76] = {
0x0000, 0x0003, 0x0006, 0x0008, 0x000a, 0x000c, 0x0011, 0x0013,
0x0016, 0x0018, 0x001b, 0x001d, 0x0021, 0x0023, 0x0025, 0x0029,
0x002b, 0x002d, 0x002e, 0x0031, 0x0033, 0x0036, 0x0037, 0x0039,
@@ -40,7 +40,7 @@ static const uint16_t mf_rlefont_phpoXxi1Y_dictionary_offsets[76] = {
0x00b5, 0x00b8, 0x00bc, 0x00c1,
};
-static const uint8_t mf_rlefont_phpoXxi1Y_glyph_data_0[954] = {
+static const gU8 mf_rlefont_phpoXxi1Y_glyph_data_0[954] = {
0x0c, 0x00, 0x10, 0x0c, 0x32, 0x4b, 0x4b, 0x2d, 0x31, 0x10, 0x0d, 0x2f, 0x1a, 0x4d, 0x4d, 0x4d,
0x4d, 0x37, 0x10, 0x0c, 0x00, 0x1a, 0x4d, 0x4d, 0x19, 0x80, 0x8b, 0x70, 0x44, 0xd1, 0x1b, 0x83,
0x64, 0x4d, 0x4d, 0x4d, 0x37, 0x10, 0x0c, 0x5c, 0x22, 0x9f, 0x3c, 0x9e, 0x29, 0x93, 0x4e, 0x4d,
@@ -103,7 +103,7 @@ static const uint8_t mf_rlefont_phpoXxi1Y_glyph_data_0[954] = {
0x35, 0x85, 0x80, 0x10, 0x0c, 0x24, 0x3d, 0x8a, 0x7a, 0x10,
};
-static const uint16_t mf_rlefont_phpoXxi1Y_glyph_offsets_0[95] = {
+static const gU16 mf_rlefont_phpoXxi1Y_glyph_offsets_0[95] = {
0x0000, 0x0003, 0x000a, 0x0013, 0x0026, 0x0034, 0x0041, 0x0051,
0x0056, 0x0061, 0x006d, 0x007c, 0x0083, 0x008b, 0x0091, 0x0097,
0x009f, 0x00ac, 0x00b3, 0x00bd, 0x00c7, 0x00d0, 0x00db, 0x00e7,
diff --git a/demos/modules/gdisp/fonts/font_FreePixel10.h b/demos/modules/gdisp/fonts/font_FreePixel10.h
index a9a74018..30e3cddf 100644
--- a/demos/modules/gdisp/fonts/font_FreePixel10.h
+++ b/demos/modules/gdisp/fonts/font_FreePixel10.h
@@ -11,7 +11,7 @@
#error The font file is not compatible with this version of mcufont.
#endif
-static const uint8_t mf_bwfont_phpdxISdS_glyph_data_0[888] = {
+static const gU8 mf_bwfont_phpdxISdS_glyph_data_0[888] = {
0x00, 0x00, 0x00, 0x00, 0x7c, 0x01, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x00,
0x88, 0x00, 0xfc, 0x01, 0x88, 0x00, 0xfc, 0x01, 0x88, 0x00, 0x00, 0x00, 0x98, 0x00, 0x04, 0x01,
0xfe, 0x01, 0x24, 0x01, 0xe8, 0x00, 0x00, 0x00, 0x08, 0x01, 0xd4, 0x00, 0x28, 0x01, 0x90, 0x02,
@@ -70,7 +70,7 @@ static const uint8_t mf_bwfont_phpdxISdS_glyph_data_0[888] = {
0x00, 0x00, 0x30, 0x00, 0x30, 0x00, 0x30, 0x00,
};
-static const uint16_t mf_bwfont_phpdxISdS_glyph_offsets_0[96] = {
+static const gU16 mf_bwfont_phpdxISdS_glyph_offsets_0[96] = {
0x0000, 0x0000, 0x0003, 0x0008, 0x000d, 0x0013, 0x0019, 0x001e,
0x0021, 0x0025, 0x0028, 0x002c, 0x0031, 0x0034, 0x0038, 0x003b,
0x0040, 0x0045, 0x0049, 0x004e, 0x0053, 0x0058, 0x005d, 0x0062,
@@ -85,7 +85,7 @@ static const uint16_t mf_bwfont_phpdxISdS_glyph_offsets_0[96] = {
0x019f, 0x01a4, 0x01a9, 0x01ad, 0x01b1, 0x01b4, 0x01b8, 0x01bc,
};
-static const uint8_t mf_bwfont_phpdxISdS_glyph_widths_0[95] = {
+static const gU8 mf_bwfont_phpdxISdS_glyph_widths_0[95] = {
0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05,
0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05,
0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05,
diff --git a/demos/modules/gdisp/fonts/font_GeosansLight11.h b/demos/modules/gdisp/fonts/font_GeosansLight11.h
index be6c674f..896b8948 100644
--- a/demos/modules/gdisp/fonts/font_GeosansLight11.h
+++ b/demos/modules/gdisp/fonts/font_GeosansLight11.h
@@ -11,7 +11,7 @@
#error The font file is not compatible with this version of mcufont.
#endif
-static const uint8_t mf_rlefont_phppBNCNS_dictionary_data[123] = {
+static const gU8 mf_rlefont_phppBNCNS_dictionary_data[123] = {
0x12, 0x80, 0x02, 0x80, 0x02, 0x83, 0x05, 0x01, 0x80, 0x06, 0x01, 0x83, 0x04, 0x04, 0x84, 0x05,
0x80, 0x03, 0x80, 0x05, 0x03, 0x80, 0x09, 0x80, 0x06, 0x81, 0x06, 0x27, 0x02, 0x80, 0x06, 0x02,
0x82, 0x03, 0x04, 0x80, 0x07, 0x01, 0x80, 0x02, 0x80, 0x03, 0x80, 0x81, 0x80, 0x06, 0x0b, 0x06,
@@ -22,7 +22,7 @@ static const uint8_t mf_rlefont_phppBNCNS_dictionary_data[123] = {
0x2d, 0x1f, 0x2e, 0x1f, 0x1c, 0x00, 0x21, 0xf5, 0x49, 0xa6, 0xfa,
};
-static const uint16_t mf_rlefont_phppBNCNS_dictionary_offsets[50] = {
+static const gU16 mf_rlefont_phppBNCNS_dictionary_offsets[50] = {
0x0000, 0x0001, 0x0005, 0x0007, 0x000a, 0x000d, 0x000f, 0x0011,
0x0014, 0x0019, 0x001b, 0x001c, 0x001f, 0x0022, 0x0025, 0x0027,
0x0029, 0x002b, 0x002c, 0x002e, 0x002f, 0x0030, 0x0035, 0x0037,
@@ -32,7 +32,7 @@ static const uint16_t mf_rlefont_phppBNCNS_dictionary_offsets[50] = {
0x007a, 0x007b,
};
-static const uint8_t mf_rlefont_phppBNCNS_glyph_data_0[731] = {
+static const gU8 mf_rlefont_phppBNCNS_glyph_data_0[731] = {
0x03, 0x00, 0x10, 0x03, 0x1b, 0x33, 0x2b, 0x27, 0x10, 0x02, 0xc7, 0x64, 0x10, 0x06, 0x2b, 0xce,
0x64, 0x8b, 0x98, 0x64, 0x8b, 0x1e, 0x10, 0x06, 0xfc, 0x2f, 0x3f, 0x3f, 0x3a, 0x39, 0xe8, 0x85,
0x98, 0x54, 0x86, 0x24, 0x1e, 0x10, 0x05, 0xe6, 0x2c, 0x91, 0x94, 0x87, 0x39, 0x1f, 0x37, 0xe6,
@@ -81,7 +81,7 @@ static const uint8_t mf_rlefont_phppBNCNS_glyph_data_0[731] = {
0x10, 0x02, 0x2a, 0x3d, 0x33, 0x27, 0x10, 0x05, 0x22, 0xe2, 0x10,
};
-static const uint16_t mf_rlefont_phppBNCNS_glyph_offsets_0[95] = {
+static const gU16 mf_rlefont_phppBNCNS_glyph_offsets_0[95] = {
0x0000, 0x0003, 0x0009, 0x000d, 0x0017, 0x0026, 0x0034, 0x0040,
0x0044, 0x0049, 0x0050, 0x0055, 0x005c, 0x0061, 0x0066, 0x006a,
0x0071, 0x007c, 0x0080, 0x0089, 0x0094, 0x00a0, 0x00a9, 0x00b2,
diff --git a/demos/modules/gdisp/fonts/font_GeosansLight11_aa.h b/demos/modules/gdisp/fonts/font_GeosansLight11_aa.h
index 78a90c24..333c8c97 100644
--- a/demos/modules/gdisp/fonts/font_GeosansLight11_aa.h
+++ b/demos/modules/gdisp/fonts/font_GeosansLight11_aa.h
@@ -11,7 +11,7 @@
#error The font file is not compatible with this version of mcufont.
#endif
-static const uint8_t mf_rlefont_phpTJ5Kmd_dictionary_data[201] = {
+static const gU8 mf_rlefont_phpTJ5Kmd_dictionary_data[201] = {
0x02, 0x06, 0xc7, 0x02, 0x03, 0x0d, 0xc3, 0xc5, 0x01, 0x05, 0x08, 0xc7, 0x08, 0x04, 0x01, 0xc1,
0xc6, 0x06, 0x0c, 0x06, 0x01, 0xc7, 0x06, 0xd8, 0xc6, 0x09, 0x38, 0x09, 0xd7, 0x01, 0xc6, 0xc7,
0x02, 0xc7, 0x07, 0x0a, 0x07, 0xc4, 0x01, 0x39, 0xc8, 0xc2, 0xc7, 0x02, 0xc1, 0x03, 0xc7, 0xc8,
@@ -27,7 +27,7 @@ static const uint8_t mf_rlefont_phpTJ5Kmd_dictionary_data[201] = {
0x54, 0x09, 0x29, 0x05, 0x2d, 0x1e, 0x03, 0x1a, 0x37,
};
-static const uint16_t mf_rlefont_phpTJ5Kmd_dictionary_offsets[84] = {
+static const gU16 mf_rlefont_phpTJ5Kmd_dictionary_offsets[84] = {
0x0000, 0x0001, 0x0004, 0x0005, 0x0006, 0x0009, 0x000a, 0x000b,
0x000d, 0x000e, 0x0012, 0x0013, 0x0014, 0x0017, 0x0018, 0x001a,
0x001b, 0x001c, 0x001d, 0x001f, 0x0023, 0x0024, 0x0025, 0x0027,
@@ -41,7 +41,7 @@ static const uint16_t mf_rlefont_phpTJ5Kmd_dictionary_offsets[84] = {
0x00c1, 0x00c5, 0x00c7, 0x00c9,
};
-static const uint8_t mf_rlefont_phpTJ5Kmd_glyph_data_0[1615] = {
+static const gU8 mf_rlefont_phpTJ5Kmd_glyph_data_0[1615] = {
0x03, 0x00, 0x10, 0x03, 0x1b, 0x5c, 0x5c, 0x05, 0x46, 0x09, 0x10, 0x02, 0x22, 0x05, 0x59, 0x3a,
0x10, 0x06, 0x1a, 0x46, 0x3e, 0x3e, 0x23, 0x02, 0x04, 0x07, 0x05, 0x4e, 0x23, 0x3e, 0x03, 0x01,
0x23, 0x3f, 0x05, 0x07, 0x55, 0x1d, 0x3e, 0x3e, 0x10, 0x06, 0x1b, 0x02, 0x09, 0x0b, 0x09, 0x32,
@@ -145,7 +145,7 @@ static const uint8_t mf_rlefont_phpTJ5Kmd_glyph_data_0[1615] = {
0x36, 0x1e, 0x2a, 0x2c, 0x60, 0x26, 0x05, 0x04, 0x10, 0x05, 0x27, 0x04, 0x40, 0x3d, 0x10,
};
-static const uint16_t mf_rlefont_phpTJ5Kmd_glyph_offsets_0[95] = {
+static const gU16 mf_rlefont_phpTJ5Kmd_glyph_offsets_0[95] = {
0x0000, 0x0003, 0x000b, 0x0011, 0x0029, 0x004b, 0x006b, 0x008e,
0x0094, 0x00a4, 0x00b7, 0x00c1, 0x00ca, 0x00d3, 0x00da, 0x00de,
0x00ed, 0x010a, 0x0112, 0x0126, 0x0145, 0x015d, 0x0177, 0x0194,
diff --git a/demos/modules/gdisp/fonts/font_babyblue11_aa.h b/demos/modules/gdisp/fonts/font_babyblue11_aa.h
index 031c7453..343b10e0 100644
--- a/demos/modules/gdisp/fonts/font_babyblue11_aa.h
+++ b/demos/modules/gdisp/fonts/font_babyblue11_aa.h
@@ -11,7 +11,7 @@
#error The font file is not compatible with this version of mcufont.
#endif
-static const uint8_t mf_rlefont_phptTISF3_dictionary_data[311] = {
+static const gU8 mf_rlefont_phptTISF3_dictionary_data[311] = {
0x1b, 0x01, 0xc5, 0xc6, 0x01, 0x04, 0x03, 0x02, 0x05, 0xca, 0x03, 0xca, 0x03, 0x08, 0x06, 0x0b,
0xc1, 0xc8, 0xca, 0x09, 0xea, 0x03, 0xc5, 0xc6, 0x04, 0xc2, 0x04, 0xc5, 0xc6, 0x01, 0xc3, 0xc4,
0x22, 0x09, 0xc1, 0xe3, 0x05, 0xc5, 0xca, 0xd8, 0xc6, 0x04, 0xe3, 0xc2, 0x04, 0xc5, 0xca, 0xd8,
@@ -34,7 +34,7 @@ static const uint8_t mf_rlefont_phptTISF3_dictionary_data[311] = {
0x2b, 0x1b, 0x03, 0x0a, 0x50, 0x1c, 0x48,
};
-static const uint16_t mf_rlefont_phptTISF3_dictionary_offsets[100] = {
+static const gU16 mf_rlefont_phptTISF3_dictionary_offsets[100] = {
0x0000, 0x0001, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000d,
0x000e, 0x000f, 0x0010, 0x0013, 0x0014, 0x0015, 0x0018, 0x001a,
0x001e, 0x0021, 0x002a, 0x0030, 0x0031, 0x0033, 0x0035, 0x0037,
@@ -50,7 +50,7 @@ static const uint16_t mf_rlefont_phptTISF3_dictionary_offsets[100] = {
0x0131, 0x0133, 0x0135, 0x0137,
};
-static const uint8_t mf_rlefont_phptTISF3_glyph_data_0[1487] = {
+static const gU8 mf_rlefont_phptTISF3_glyph_data_0[1487] = {
0x03, 0x00, 0x10, 0x02, 0x64, 0x66, 0x03, 0x04, 0x47, 0x28, 0x03, 0x23, 0x35, 0x09, 0x1b, 0x25,
0x0a, 0x20, 0x35, 0x09, 0x10, 0x06, 0x00, 0x23, 0x08, 0x3c, 0x02, 0x1d, 0x72, 0x0b, 0x2d, 0x72,
0x0b, 0x2d, 0x09, 0x4a, 0x1d, 0x09, 0x4a, 0x10, 0x06, 0x1c, 0x74, 0x44, 0x03, 0x0b, 0x03, 0x1d,
@@ -146,7 +146,7 @@ static const uint8_t mf_rlefont_phptTISF3_glyph_data_0[1487] = {
0x18, 0x01, 0x02, 0x01, 0x44, 0x1b, 0x07, 0x38, 0x07, 0x41, 0x78, 0x4e, 0x04, 0x03, 0x10,
};
-static const uint16_t mf_rlefont_phptTISF3_glyph_offsets_0[95] = {
+static const gU16 mf_rlefont_phptTISF3_glyph_offsets_0[95] = {
0x0000, 0x0003, 0x000a, 0x0015, 0x0028, 0x004f, 0x0070, 0x008e,
0x0094, 0x00a2, 0x00b0, 0x00c3, 0x00d7, 0x00df, 0x00e6, 0x00eb,
0x00f9, 0x0103, 0x0111, 0x0123, 0x013a, 0x014f, 0x0166, 0x017a,
diff --git a/demos/modules/gdisp/fonts/font_hellovetica11.h b/demos/modules/gdisp/fonts/font_hellovetica11.h
index d82e8e71..3b35ef6c 100644
--- a/demos/modules/gdisp/fonts/font_hellovetica11.h
+++ b/demos/modules/gdisp/fonts/font_hellovetica11.h
@@ -11,7 +11,7 @@
#error The font file is not compatible with this version of mcufont.
#endif
-static const uint8_t mf_rlefont_phptWBvQt_dictionary_data[244] = {
+static const gU8 mf_rlefont_phptWBvQt_dictionary_data[244] = {
0x05, 0x07, 0x0b, 0x80, 0x0c, 0x0a, 0x03, 0x80, 0x80, 0x05, 0x81, 0x05, 0x80, 0x05, 0x81, 0x05,
0x80, 0x05, 0x81, 0x05, 0x80, 0x07, 0x80, 0x01, 0x32, 0x87, 0x04, 0x80, 0x06, 0x81, 0x06, 0x80,
0x04, 0x81, 0x02, 0x84, 0x04, 0x80, 0x0c, 0x80, 0x0c, 0x80, 0x07, 0x80, 0x04, 0x80, 0x01, 0x80,
@@ -30,7 +30,7 @@ static const uint8_t mf_rlefont_phptWBvQt_dictionary_data[244] = {
0x8e, 0x0f, 0x3c, 0x8c,
};
-static const uint16_t mf_rlefont_phptWBvQt_dictionary_offsets[70] = {
+static const gU16 mf_rlefont_phptWBvQt_dictionary_offsets[70] = {
0x0000, 0x0001, 0x0002, 0x0005, 0x0006, 0x0008, 0x0018, 0x0019,
0x001a, 0x001e, 0x0023, 0x0024, 0x0025, 0x002b, 0x002f, 0x0032,
0x0037, 0x0039, 0x003c, 0x003e, 0x0041, 0x0047, 0x0049, 0x004c,
@@ -42,7 +42,7 @@ static const uint16_t mf_rlefont_phptWBvQt_dictionary_offsets[70] = {
0x00e6, 0x00ea, 0x00ec, 0x00ef, 0x00f1, 0x00f4,
};
-static const uint8_t mf_rlefont_phptWBvQt_glyph_data_0[725] = {
+static const gU8 mf_rlefont_phptWBvQt_glyph_data_0[725] = {
0x02, 0x00, 0x10, 0x05, 0x47, 0x4d, 0x24, 0x1b, 0x1b, 0x1a, 0x10, 0x06, 0xe6, 0x5c, 0x5c, 0x5c,
0x0f, 0x10, 0x03, 0x00, 0x10, 0x03, 0x47, 0x0f, 0x10, 0x05, 0x2a, 0x47, 0x4e, 0x06, 0x1e, 0x33,
0xc0, 0x10, 0x05, 0x2a, 0xfe, 0x10, 0x05, 0x33, 0x3a, 0x33, 0x33, 0xa4, 0x10, 0x05, 0x33, 0x3b,
@@ -91,7 +91,7 @@ static const uint8_t mf_rlefont_phptWBvQt_glyph_data_0[725] = {
0x1f, 0x10, 0x01, 0x00, 0x10,
};
-static const uint16_t mf_rlefont_phptWBvQt_glyph_offsets_0[95] = {
+static const gU16 mf_rlefont_phptWBvQt_glyph_offsets_0[95] = {
0x0000, 0x0003, 0x000b, 0x0012, 0x0012, 0x0012, 0x0012, 0x0015,
0x0000, 0x0000, 0x0012, 0x0012, 0x0019, 0x001d, 0x0022, 0x0000,
0x0012, 0x0012, 0x0012, 0x0012, 0x0012, 0x0012, 0x0012, 0x0012,
diff --git a/demos/modules/gdisp/fonts/font_hellovetica11_aa.h b/demos/modules/gdisp/fonts/font_hellovetica11_aa.h
index 194c1216..53a625a6 100644
--- a/demos/modules/gdisp/fonts/font_hellovetica11_aa.h
+++ b/demos/modules/gdisp/fonts/font_hellovetica11_aa.h
@@ -11,7 +11,7 @@
#error The font file is not compatible with this version of mcufont.
#endif
-static const uint8_t mf_rlefont_phpMM3UuI_dictionary_data[351] = {
+static const gU8 mf_rlefont_phpMM3UuI_dictionary_data[351] = {
0x0d, 0xc4, 0xce, 0x07, 0xc5, 0x80, 0xc2, 0x02, 0xc5, 0x80, 0xc2, 0x02, 0xc5, 0x80, 0xc2, 0x05,
0xc5, 0x80, 0xc2, 0x05, 0x03, 0xc5, 0x80, 0xc2, 0x40, 0x32, 0xf2, 0x0c, 0x83, 0x0c, 0xf4, 0x1d,
0x06, 0xc5, 0x2d, 0x40, 0x04, 0x80, 0xc7, 0xf6, 0x06, 0xc7, 0xc6, 0x80, 0xc2, 0x09, 0x80, 0xc2,
@@ -36,7 +36,7 @@ static const uint8_t mf_rlefont_phpMM3UuI_dictionary_data[351] = {
0x32, 0x32, 0x30, 0x83, 0x30, 0x06, 0x2e, 0x2e, 0x2e, 0x1a, 0x38, 0x18, 0x05, 0x4d, 0x1b,
};
-static const uint16_t mf_rlefont_phpMM3UuI_dictionary_offsets[98] = {
+static const gU16 mf_rlefont_phpMM3UuI_dictionary_offsets[98] = {
0x0000, 0x0001, 0x0003, 0x0007, 0x000b, 0x0014, 0x0018, 0x0020,
0x0022, 0x0023, 0x0025, 0x0028, 0x0029, 0x002b, 0x002e, 0x0031,
0x0036, 0x0039, 0x003b, 0x003f, 0x0040, 0x0042, 0x0043, 0x0044,
@@ -52,7 +52,7 @@ static const uint16_t mf_rlefont_phpMM3UuI_dictionary_offsets[98] = {
0x015c, 0x015f,
};
-static const uint8_t mf_rlefont_phpMM3UuI_glyph_data_0[1386] = {
+static const gU8 mf_rlefont_phpMM3UuI_glyph_data_0[1386] = {
0x02, 0x00, 0x10, 0x06, 0x6a, 0x64, 0x2b, 0x18, 0x60, 0x10, 0x08, 0x1b, 0x6b, 0x6b, 0x6b, 0x2a,
0x10, 0x03, 0x00, 0x10, 0x05, 0x2d, 0x56, 0x38, 0x10, 0x06, 0x2b, 0x33, 0x38, 0x38, 0x10, 0x06,
0x1e, 0x10, 0x06, 0x33, 0x60, 0x10, 0x06, 0x48, 0x6c, 0x4a, 0x3e, 0x3f, 0x31, 0x60, 0x10, 0x06,
@@ -142,7 +142,7 @@ static const uint8_t mf_rlefont_phpMM3UuI_glyph_data_0[1386] = {
0x6c, 0x2b, 0x4e, 0x22, 0x23, 0x29, 0x10, 0x01, 0x00, 0x10,
};
-static const uint16_t mf_rlefont_phpMM3UuI_glyph_offsets_0[95] = {
+static const gU16 mf_rlefont_phpMM3UuI_glyph_offsets_0[95] = {
0x0000, 0x0003, 0x000a, 0x0011, 0x0011, 0x0011, 0x0011, 0x0014,
0x0000, 0x0000, 0x0011, 0x0011, 0x0019, 0x001f, 0x0022, 0x0000,
0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011,
diff --git a/demos/modules/gdisp/fonts/font_pf_ronda_seven11_aa.h b/demos/modules/gdisp/fonts/font_pf_ronda_seven11_aa.h
index e20e9815..ba5cd8f3 100644
--- a/demos/modules/gdisp/fonts/font_pf_ronda_seven11_aa.h
+++ b/demos/modules/gdisp/fonts/font_pf_ronda_seven11_aa.h
@@ -11,7 +11,7 @@
#error The font file is not compatible with this version of mcufont.
#endif
-static const uint8_t mf_rlefont_phpMbOYHb_dictionary_data[226] = {
+static const gU8 mf_rlefont_phpMbOYHb_dictionary_data[226] = {
0x80, 0x04, 0x02, 0x81, 0x03, 0x80, 0x03, 0x04, 0x07, 0x03, 0x80, 0x0b, 0x18, 0x02, 0x01, 0x83,
0x09, 0x0a, 0x03, 0x32, 0x84, 0x32, 0x81, 0x0b, 0x40, 0x07, 0x84, 0xc6, 0x83, 0x08, 0x80, 0x0b,
0x80, 0x0b, 0x80, 0x08, 0x80, 0x05, 0x40, 0x15, 0x06, 0xcb, 0x04, 0x31, 0xc6, 0x01, 0x80, 0x01,
@@ -29,7 +29,7 @@ static const uint8_t mf_rlefont_phpMbOYHb_dictionary_data[226] = {
0x1c, 0x0b,
};
-static const uint16_t mf_rlefont_phpMbOYHb_dictionary_offsets[81] = {
+static const gU16 mf_rlefont_phpMbOYHb_dictionary_offsets[81] = {
0x0000, 0x0002, 0x0004, 0x0007, 0x0008, 0x0009, 0x000c, 0x000d,
0x000e, 0x0010, 0x0011, 0x0012, 0x0013, 0x0015, 0x0017, 0x0018,
0x001a, 0x001c, 0x001e, 0x0024, 0x0026, 0x0028, 0x002b, 0x002d,
@@ -43,7 +43,7 @@ static const uint16_t mf_rlefont_phpMbOYHb_dictionary_offsets[81] = {
0x00e2,
};
-static const uint8_t mf_rlefont_phpMbOYHb_glyph_data_0[1283] = {
+static const gU8 mf_rlefont_phpMbOYHb_glyph_data_0[1283] = {
0x04, 0x00, 0x10, 0x04, 0x46, 0x48, 0x0d, 0xc4, 0x1e, 0x39, 0x10, 0x06, 0x51, 0x38, 0x57, 0x1b,
0xa8, 0x10, 0x08, 0x46, 0x0f, 0x38, 0x94, 0x42, 0x8e, 0x39, 0x0c, 0x0f, 0x0c, 0x18, 0x94, 0x42,
0x8e, 0x39, 0x0a, 0x0f, 0x0a, 0x2b, 0xac, 0x84, 0xac, 0x84, 0xac, 0x10, 0x08, 0x23, 0x40, 0x1e,
@@ -127,7 +127,7 @@ static const uint8_t mf_rlefont_phpMbOYHb_glyph_data_0[1283] = {
0x42, 0x64, 0x10,
};
-static const uint16_t mf_rlefont_phpMbOYHb_glyph_offsets_0[95] = {
+static const gU16 mf_rlefont_phpMbOYHb_glyph_offsets_0[95] = {
0x0000, 0x0003, 0x000b, 0x0012, 0x002c, 0x0057, 0x006c, 0x008d,
0x0090, 0x00a5, 0x00b6, 0x00cb, 0x00d4, 0x00db, 0x00e0, 0x00e5,
0x00f9, 0x0103, 0x010a, 0x0124, 0x013a, 0x0152, 0x015e, 0x0170,
diff --git a/demos/modules/gdisp/fonts_cyrillic/userfonts.h b/demos/modules/gdisp/fonts_cyrillic/userfonts.h
index 4cb6b503..97d4bb7c 100644
--- a/demos/modules/gdisp/fonts_cyrillic/userfonts.h
+++ b/demos/modules/gdisp/fonts_cyrillic/userfonts.h
@@ -11,7 +11,7 @@
#error The font file is not compatible with this version of mcufont.
#endif
-static const uint8_t mf_rlefont_php6ySCWY_dictionary_data[352] = {
+static const gU8 mf_rlefont_php6ySCWY_dictionary_data[352] = {
0x11, 0x09, 0x80, 0x03, 0x0f, 0x80, 0x0f, 0x80, 0x41, 0x01, 0x80, 0xc5, 0x80, 0xce, 0xc6, 0x0f,
0x80, 0x0e, 0x02, 0x09, 0x80, 0x09, 0x0b, 0xc2, 0xce, 0x04, 0x0f, 0x0d, 0xc1, 0xcc, 0x05, 0x80,
0x09, 0x80, 0x05, 0x80, 0xce, 0xc2, 0x01, 0x80, 0xc3, 0x40, 0x01, 0xce, 0xc7, 0x06, 0x80, 0x03,
@@ -36,7 +36,7 @@ static const uint8_t mf_rlefont_php6ySCWY_dictionary_data[352] = {
0x29, 0x22, 0x4e, 0x1a, 0x45, 0x3e, 0x31, 0x1f, 0x1b, 0x1b, 0x4c, 0x56, 0x01, 0x28, 0x1a, 0x23,
};
-static const uint16_t mf_rlefont_php6ySCWY_dictionary_offsets[138] = {
+static const gU16 mf_rlefont_php6ySCWY_dictionary_offsets[138] = {
0x0000, 0x0001, 0x0003, 0x0004, 0x0008, 0x000b, 0x000d, 0x000f,
0x0011, 0x0012, 0x0013, 0x0014, 0x0016, 0x0017, 0x0019, 0x001a,
0x001b, 0x001c, 0x001e, 0x0022, 0x0024, 0x0027, 0x0029, 0x002b,
@@ -57,7 +57,7 @@ static const uint16_t mf_rlefont_php6ySCWY_dictionary_offsets[138] = {
0x015e, 0x0160,
};
-static const uint8_t mf_rlefont_php6ySCWY_glyph_data_0[1460] = {
+static const gU8 mf_rlefont_php6ySCWY_glyph_data_0[1460] = {
0x06, 0x00, 0x10, 0x02, 0x3c, 0x1b, 0x1b, 0x27, 0x01, 0x1f, 0x07, 0x10, 0x04, 0x38, 0x3f, 0x67,
0x70, 0x06, 0x0c, 0x28, 0x43, 0x08, 0x10, 0x08, 0x00, 0x3c, 0xa0, 0x5a, 0x37, 0x07, 0x19, 0xcc,
0x32, 0xa0, 0x5a, 0x37, 0x07, 0x60, 0xa6, 0x4c, 0xa6, 0x10, 0x08, 0x46, 0x1f, 0x5f, 0x56, 0x33,
@@ -152,7 +152,7 @@ static const uint8_t mf_rlefont_php6ySCWY_glyph_data_0[1460] = {
0x05, 0x0c, 0x36, 0x10,
};
-static const uint16_t mf_rlefont_php6ySCWY_glyph_offsets_0[95] = {
+static const gU16 mf_rlefont_php6ySCWY_glyph_offsets_0[95] = {
0x0000, 0x0003, 0x000c, 0x0017, 0x002a, 0x0043, 0x0071, 0x0093,
0x0098, 0x00a3, 0x00af, 0x00bb, 0x00c2, 0x00c8, 0x00ce, 0x00d1,
0x00e8, 0x0100, 0x0106, 0x011c, 0x012e, 0x0147, 0x0156, 0x016b,
@@ -167,7 +167,7 @@ static const uint16_t mf_rlefont_php6ySCWY_glyph_offsets_0[95] = {
0x053c, 0x0554, 0x056e, 0x0580, 0x058d, 0x0594, 0x05a4,
};
-static const uint8_t mf_rlefont_php6ySCWY_glyph_data_1[1341] = {
+static const gU8 mf_rlefont_php6ySCWY_glyph_data_1[1341] = {
0x06, 0x00, 0x10, 0x02, 0x3c, 0x7e, 0x01, 0x9e, 0x10, 0x00, 0x02, 0x3c, 0x7e, 0x0f, 0x7e, 0x0d,
0x06, 0x28, 0x18, 0x0d, 0x1b, 0x10, 0x05, 0x18, 0x61, 0x5c, 0x5f, 0x84, 0x24, 0x0d, 0x0f, 0x43,
0x5f, 0x0b, 0x01, 0x29, 0x5f, 0x52, 0x35, 0x5f, 0x06, 0x0d, 0x8a, 0x97, 0x27, 0x0c, 0x5f, 0x4a,
@@ -254,7 +254,7 @@ static const uint8_t mf_rlefont_php6ySCWY_glyph_data_1[1341] = {
0x06, 0x2e, 0x34, 0x7f, 0x5f, 0x0b, 0x0e, 0x02, 0x3e, 0x08, 0x2d, 0x39, 0x10,
};
-static const uint16_t mf_rlefont_php6ySCWY_glyph_offsets_1[96] = {
+static const gU16 mf_rlefont_php6ySCWY_glyph_offsets_1[96] = {
0x0000, 0x0003, 0x0009, 0x0009, 0x0009, 0x0009, 0x000a, 0x0016,
0x0009, 0x0032, 0x0009, 0x0042, 0x0009, 0x0009, 0x004f, 0x0009,
0x005f, 0x006a, 0x0075, 0x007c, 0x0084, 0x0009, 0x0009, 0x0089,
@@ -269,24 +269,24 @@ static const uint16_t mf_rlefont_php6ySCWY_glyph_offsets_1[96] = {
0x04ce, 0x04df, 0x04f1, 0x04fa, 0x050c, 0x0513, 0x0522, 0x0530,
};
-static const uint8_t mf_rlefont_php6ySCWY_glyph_data_2[17] = {
+static const gU8 mf_rlefont_php6ySCWY_glyph_data_2[17] = {
0x05, 0x21, 0x07, 0x08, 0x28, 0x5a, 0x42, 0x70, 0x08, 0x57, 0x01, 0x24, 0x08, 0x21, 0x06, 0x01,
0x10,
};
-static const uint16_t mf_rlefont_php6ySCWY_glyph_offsets_2[1] = {
+static const gU16 mf_rlefont_php6ySCWY_glyph_offsets_2[1] = {
0x0000,
};
-static const uint8_t mf_rlefont_php6ySCWY_glyph_data_3[16] = {
+static const gU8 mf_rlefont_php6ySCWY_glyph_data_3[16] = {
0x06, 0x38, 0x05, 0x0e, 0x58, 0x02, 0x08, 0x32, 0x8f, 0x4c, 0x08, 0x01, 0x05, 0x0c, 0x36, 0x10,
};
-static const uint16_t mf_rlefont_php6ySCWY_glyph_offsets_3[1] = {
+static const gU16 mf_rlefont_php6ySCWY_glyph_offsets_3[1] = {
0x0000,
};
-static const uint8_t mf_rlefont_php6ySCWY_glyph_data_4[1096] = {
+static const gU8 mf_rlefont_php6ySCWY_glyph_data_4[1096] = {
0x08, 0xac, 0x4c, 0x18, 0x37, 0x6e, 0x0f, 0x8f, 0x10, 0x00, 0x08, 0x38, 0x93, 0x1e, 0x6a, 0x2a,
0x37, 0x75, 0x2b, 0x10, 0x08, 0x38, 0x37, 0x01, 0x19, 0x1b, 0x33, 0x43, 0x19, 0x81, 0x81, 0x33,
0x1e, 0x10, 0x08, 0x8d, 0x9a, 0x29, 0x22, 0xc5, 0x35, 0x60, 0xc2, 0x8a, 0x22, 0xc5, 0x35, 0x19,
@@ -358,7 +358,7 @@ static const uint8_t mf_rlefont_php6ySCWY_glyph_data_4[1096] = {
0x0f, 0x2f, 0x76, 0x6c, 0x08, 0x49, 0x0d, 0x10,
};
-static const uint16_t mf_rlefont_php6ySCWY_glyph_offsets_4[81] = {
+static const gU16 mf_rlefont_php6ySCWY_glyph_offsets_4[81] = {
0x0000, 0x0009, 0x0009, 0x0009, 0x0009, 0x0009, 0x0009, 0x0009,
0x0009, 0x0009, 0x0009, 0x0009, 0x0009, 0x0009, 0x0009, 0x000a,
0x0014, 0x0022, 0x0034, 0x003a, 0x0052, 0x0059, 0x0081, 0x0093,
@@ -372,7 +372,7 @@ static const uint16_t mf_rlefont_php6ySCWY_glyph_offsets_4[81] = {
0x0438,
};
-static const uint8_t mf_rlefont_php6ySCWY_glyph_data_5[159] = {
+static const gU8 mf_rlefont_php6ySCWY_glyph_data_5[159] = {
0x06, 0x27, 0x62, 0x3c, 0x8f, 0x10, 0x08, 0x5e, 0x2e, 0x37, 0x2d, 0x10, 0x00, 0x02, 0x38, 0x06,
0x7e, 0x0a, 0x7e, 0x0d, 0x07, 0x10, 0x02, 0x3c, 0x05, 0x87, 0x10, 0x02, 0x1c, 0x04, 0x20, 0x0e,
0x10, 0x04, 0x38, 0x06, 0x07, 0x09, 0x04, 0x24, 0x4f, 0x07, 0x40, 0x5f, 0x0d, 0x08, 0x5c, 0x10,
@@ -385,7 +385,7 @@ static const uint8_t mf_rlefont_php6ySCWY_glyph_data_5[159] = {
0x5a, 0x08, 0x10, 0x05, 0x62, 0x5a, 0x08, 0x20, 0x78, 0x28, 0x78, 0x5f, 0x5a, 0x08, 0x10,
};
-static const uint16_t mf_rlefont_php6ySCWY_glyph_offsets_5[40] = {
+static const gU16 mf_rlefont_php6ySCWY_glyph_offsets_5[40] = {
0x0000, 0x0006, 0x000c, 0x000c, 0x000c, 0x000d, 0x0016, 0x001b,
0x000c, 0x0021, 0x0030, 0x003b, 0x000c, 0x000c, 0x000c, 0x0044,
0x000c, 0x000c, 0x000c, 0x004a, 0x000c, 0x000c, 0x000c, 0x000c,
@@ -393,14 +393,14 @@ static const uint16_t mf_rlefont_php6ySCWY_glyph_offsets_5[40] = {
0x000c, 0x000c, 0x000c, 0x000c, 0x000c, 0x000c, 0x0085, 0x0093,
};
-static const uint8_t mf_rlefont_php6ySCWY_glyph_data_6[50] = {
+static const gU8 mf_rlefont_php6ySCWY_glyph_data_6[50] = {
0x0d, 0x38, 0x0b, 0x08, 0x26, 0x0b, 0x00, 0x64, 0x1e, 0xd4, 0x42, 0xcc, 0x58, 0x29, 0xd4, 0x34,
0x07, 0xe8, 0x58, 0x29, 0x00, 0xcc, 0x34, 0x06, 0xf6, 0x64, 0x1e, 0x21, 0xc8, 0x34, 0x4a, 0x60,
0xc6, 0x5d, 0x67, 0x91, 0xc5, 0xc5, 0x34, 0x10, 0x00, 0x06, 0x62, 0x51, 0x03, 0x0b, 0x60, 0xb4,
0x1d, 0x10,
};
-static const uint16_t mf_rlefont_php6ySCWY_glyph_offsets_6[13] = {
+static const gU16 mf_rlefont_php6ySCWY_glyph_offsets_6[13] = {
0x0000, 0x0028, 0x0028, 0x0028, 0x0028, 0x0028, 0x0028, 0x0028,
0x0028, 0x0028, 0x0028, 0x0028, 0x0029,
};
diff --git a/demos/modules/ginput/keyboard/main.c b/demos/modules/ginput/keyboard/main.c
index d6a987b0..0e10de8b 100644
--- a/demos/modules/ginput/keyboard/main.c
+++ b/demos/modules/ginput/keyboard/main.c
@@ -98,7 +98,7 @@ int main(void) {
if (pk->bytecount) {
gwinPrintf(GW, " Keys:");
for (i = 0; i < pk->bytecount; i++)
- gwinPrintf(GW, " 0x%02X", (int)(uint8_t)pk->c[i]);
+ gwinPrintf(GW, " 0x%02X", (int)(gU8)pk->c[i]);
gwinPrintf(GW, " [");
for (i = 0; i < pk->bytecount; i++)
gwinPrintf(GW, "%c", pk->c[i] >= ' ' && pk->c[i] <= '~' ? pk->c[i] : ' ');
diff --git a/demos/modules/gtrans/basic/userfonts.h b/demos/modules/gtrans/basic/userfonts.h
index b00d1889..2ae28ed5 100644
--- a/demos/modules/gtrans/basic/userfonts.h
+++ b/demos/modules/gtrans/basic/userfonts.h
@@ -11,7 +11,7 @@
#error The font file is not compatible with this version of mcufont.
#endif
-static const uint8_t mf_rlefont_phpRVS9jE_dictionary_data[1423] = {
+static const gU8 mf_rlefont_phpRVS9jE_dictionary_data[1423] = {
0x05, 0xc2, 0xce, 0x29, 0x0a, 0x15, 0x0d, 0x07, 0x86, 0x13, 0x85, 0x80, 0x16, 0x80, 0x16, 0x80,
0x08, 0x33, 0xcd, 0xde, 0x80, 0x06, 0x80, 0x0f, 0x80, 0x06, 0x80, 0x01, 0x0f, 0xc3, 0xcb, 0x0e,
0x01, 0x80, 0x01, 0x80, 0x13, 0x82, 0x0c, 0x03, 0xc1, 0x40, 0x0b, 0xcd, 0xc2, 0x04, 0x89, 0x16,
@@ -103,7 +103,7 @@ static const uint8_t mf_rlefont_phpRVS9jE_dictionary_data[1423] = {
0x3e, 0x00, 0x5a, 0x1d, 0x0b, 0x04, 0x1b, 0x2c, 0x96, 0x28, 0x29, 0x21, 0x27, 0x5d, 0x89,
};
-static const uint16_t mf_rlefont_phpRVS9jE_dictionary_offsets[233] = {
+static const gU16 mf_rlefont_phpRVS9jE_dictionary_offsets[233] = {
0x0000, 0x0001, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008,
0x000a, 0x000b, 0x0011, 0x0012, 0x0014, 0x001c, 0x001d, 0x001f,
0x0020, 0x0023, 0x0025, 0x0026, 0x0027, 0x0029, 0x002b, 0x002e,
@@ -136,7 +136,7 @@ static const uint16_t mf_rlefont_phpRVS9jE_dictionary_offsets[233] = {
0x058f,
};
-static const uint8_t mf_rlefont_phpRVS9jE_glyph_data_0[2382] = {
+static const gU8 mf_rlefont_phpRVS9jE_glyph_data_0[2382] = {
0x05, 0x00, 0x10, 0x06, 0x52, 0xfe, 0xfe, 0x0e, 0x56, 0x0d, 0x25, 0x34, 0x4e, 0x10, 0x06, 0x4c,
0x73, 0x94, 0x9d, 0x29, 0xcd, 0x10, 0x0d, 0x56, 0xf9, 0x09, 0x0a, 0x00, 0x67, 0x03, 0x3e, 0x0d,
0x53, 0xa8, 0x3e, 0x8e, 0x02, 0x00, 0x09, 0x0a, 0x27, 0x8e, 0x2a, 0x20, 0x25, 0x0a, 0x09, 0x00,
@@ -288,7 +288,7 @@ static const uint8_t mf_rlefont_phpRVS9jE_glyph_data_0[2382] = {
0x1c, 0x21, 0x1d, 0x58, 0x30, 0x0f, 0x64, 0x10, 0x0d, 0x22, 0x75, 0xdf, 0xfc, 0x10,
};
-static const uint16_t mf_rlefont_phpRVS9jE_glyph_offsets_0[95] = {
+static const gU16 mf_rlefont_phpRVS9jE_glyph_offsets_0[95] = {
0x0000, 0x0003, 0x000e, 0x0016, 0x0053, 0x0086, 0x00af, 0x00f4,
0x00f8, 0x011c, 0x0145, 0x015f, 0x0169, 0x0173, 0x0178, 0x017d,
0x019c, 0x01d5, 0x01e1, 0x020d, 0x023a, 0x025c, 0x027f, 0x02bb,
@@ -303,7 +303,7 @@ static const uint16_t mf_rlefont_phpRVS9jE_glyph_offsets_0[95] = {
0x08d4, 0x0900, 0x090a, 0x090f, 0x0928, 0x092e, 0x0948,
};
-static const uint8_t mf_rlefont_phpRVS9jE_glyph_data_1[1970] = {
+static const gU8 mf_rlefont_phpRVS9jE_glyph_data_1[1970] = {
0x0a, 0x00, 0x10, 0x06, 0x2d, 0x4e, 0x00, 0x34, 0x0d, 0x56, 0x0e, 0x56, 0x3f, 0x10, 0x0a, 0x56,
0xf9, 0x4e, 0x35, 0x2c, 0x7a, 0x0f, 0x64, 0x25, 0x9b, 0x3c, 0x74, 0x02, 0x09, 0x45, 0xa9, 0x4b,
0x45, 0x60, 0x4b, 0x45, 0x43, 0x4b, 0x45, 0x60, 0x4b, 0x45, 0xa9, 0x4b, 0x25, 0x9b, 0x3c, 0x74,
@@ -430,7 +430,7 @@ static const uint8_t mf_rlefont_phpRVS9jE_glyph_data_1[1970] = {
0x05, 0x10,
};
-static const uint16_t mf_rlefont_phpRVS9jE_glyph_offsets_1[128] = {
+static const gU16 mf_rlefont_phpRVS9jE_glyph_offsets_1[128] = {
0x0000, 0x0003, 0x000e, 0x003a, 0x0050, 0x0083, 0x00ad, 0x00b5,
0x00ed, 0x00f1, 0x013d, 0x015b, 0x0180, 0x0186, 0x018b, 0x01d8,
0x01dc, 0x01f0, 0x01fe, 0x0212, 0x022a, 0x0231, 0x024d, 0x0272,
@@ -449,25 +449,25 @@ static const uint16_t mf_rlefont_phpRVS9jE_glyph_offsets_1[128] = {
0x075b, 0x075b, 0x075b, 0x075b, 0x075b, 0x075b, 0x0787, 0x079b,
};
-static const uint8_t mf_rlefont_phpRVS9jE_glyph_data_2[11] = {
+static const gU8 mf_rlefont_phpRVS9jE_glyph_data_2[11] = {
0x05, 0x33, 0xe6, 0x33, 0x1a, 0xe5, 0x10, 0x03, 0x59, 0xb5, 0x10,
};
-static const uint16_t mf_rlefont_phpRVS9jE_glyph_offsets_2[2] = {
+static const gU16 mf_rlefont_phpRVS9jE_glyph_offsets_2[2] = {
0x0000, 0x0007,
};
-static const uint8_t mf_rlefont_phpRVS9jE_glyph_data_3[43] = {
+static const gU8 mf_rlefont_phpRVS9jE_glyph_data_3[43] = {
0x09, 0x52, 0xfe, 0x0f, 0x9b, 0x06, 0x31, 0x0f, 0x04, 0x3c, 0x31, 0x48, 0x05, 0x31, 0x05, 0x0f,
0x02, 0x31, 0x0a, 0xa2, 0x30, 0x55, 0xfe, 0x1f, 0x10, 0x04, 0x4c, 0xf7, 0x3b, 0x0f, 0x6e, 0x31,
0x8e, 0x07, 0x3b, 0x63, 0xa2, 0x30, 0x03, 0x8e, 0x56, 0xf7, 0x10,
};
-static const uint16_t mf_rlefont_phpRVS9jE_glyph_offsets_3[2] = {
+static const gU16 mf_rlefont_phpRVS9jE_glyph_offsets_3[2] = {
0x0000, 0x0019,
};
-static const uint8_t mf_rlefont_phpRVS9jE_glyph_data_4[183] = {
+static const gU8 mf_rlefont_phpRVS9jE_glyph_data_4[183] = {
0x11, 0x52, 0x9b, 0x7a, 0x0e, 0x2a, 0x20, 0x37, 0x05, 0x86, 0x02, 0x4b, 0x1d, 0x03, 0x60, 0x33,
0x0f, 0x25, 0x09, 0x07, 0x18, 0x0f, 0x25, 0x2e, 0x28, 0x27, 0x3a, 0x0f, 0x20, 0x92, 0x3a, 0x0f,
0x25, 0x2e, 0x28, 0x27, 0x09, 0x07, 0x18, 0x0f, 0x25, 0x03, 0x60, 0x33, 0x0f, 0x45, 0x06, 0x86,
@@ -482,72 +482,72 @@ static const uint8_t mf_rlefont_phpRVS9jE_glyph_data_4[183] = {
0xdc, 0x01, 0x08, 0x23, 0xb1, 0xc9, 0x10,
};
-static const uint16_t mf_rlefont_phpRVS9jE_glyph_offsets_4[16] = {
+static const gU16 mf_rlefont_phpRVS9jE_glyph_offsets_4[16] = {
0x0000, 0x0039, 0x007c, 0x007c, 0x007c, 0x007c, 0x007c, 0x007c,
0x007c, 0x007c, 0x007c, 0x007c, 0x007d, 0x0090, 0x009b, 0x00ad,
};
-static const uint8_t mf_rlefont_phpRVS9jE_glyph_data_5[24] = {
+static const gU8 mf_rlefont_phpRVS9jE_glyph_data_5[24] = {
0x09, 0x32, 0xcd, 0xd7, 0x1d, 0x9b, 0x60, 0xdd, 0x10, 0x00, 0x0c, 0x32, 0xe3, 0x40, 0x20, 0xbc,
0x10, 0x09, 0x22, 0xeb, 0xdc, 0xd1, 0xf6, 0x10,
};
-static const uint16_t mf_rlefont_phpRVS9jE_glyph_offsets_5[7] = {
+static const gU16 mf_rlefont_phpRVS9jE_glyph_offsets_5[7] = {
0x0000, 0x0009, 0x0009, 0x0009, 0x0009, 0x000a, 0x0011,
};
-static const uint8_t mf_rlefont_phpRVS9jE_glyph_data_6[40] = {
+static const gU8 mf_rlefont_phpRVS9jE_glyph_data_6[40] = {
0x0a, 0xf9, 0xa1, 0x97, 0x3e, 0x63, 0x0f, 0x06, 0x30, 0x0a, 0x83, 0x76, 0x3e, 0x2c, 0x0c, 0x31,
0x06, 0x2a, 0x48, 0x31, 0x8a, 0x1c, 0x4f, 0x1c, 0x76, 0x30, 0x6b, 0x1c, 0xa6, 0x1c, 0x5a, 0x1c,
0x46, 0x30, 0xa8, 0x01, 0x3b, 0x97, 0x50, 0x10,
};
-static const uint16_t mf_rlefont_phpRVS9jE_glyph_offsets_6[1] = {
+static const gU16 mf_rlefont_phpRVS9jE_glyph_offsets_6[1] = {
0x0000,
};
-static const uint8_t mf_rlefont_phpRVS9jE_glyph_data_7[12] = {
+static const gU8 mf_rlefont_phpRVS9jE_glyph_data_7[12] = {
0x08, 0x00, 0x22, 0x57, 0xcb, 0x5d, 0x10, 0x08, 0x22, 0xeb, 0xdc, 0x10,
};
-static const uint16_t mf_rlefont_phpRVS9jE_glyph_offsets_7[2] = {
+static const gU16 mf_rlefont_phpRVS9jE_glyph_offsets_7[2] = {
0x0000, 0x0007,
};
-static const uint8_t mf_rlefont_phpRVS9jE_glyph_data_8[51] = {
+static const gU8 mf_rlefont_phpRVS9jE_glyph_data_8[51] = {
0x08, 0x52, 0xcc, 0x04, 0x10, 0x08, 0x2d, 0xe6, 0x10, 0x08, 0x79, 0x9e, 0x50, 0x31, 0x6a, 0xe7,
0x6a, 0xe7, 0x9e, 0x50, 0x10, 0x08, 0x1e, 0x78, 0x4a, 0x1c, 0x65, 0x1c, 0x7c, 0x0e, 0x10, 0x08,
0x4c, 0xf0, 0x10, 0x08, 0x00, 0x22, 0x84, 0x0c, 0x0a, 0x45, 0x9b, 0x60, 0x04, 0x3d, 0x45, 0x6d,
0x00, 0xa0, 0x10,
};
-static const uint16_t mf_rlefont_phpRVS9jE_glyph_offsets_8[6] = {
+static const gU16 mf_rlefont_phpRVS9jE_glyph_offsets_8[6] = {
0x0000, 0x0005, 0x0009, 0x0015, 0x001f, 0x0023,
};
-static const uint8_t mf_rlefont_phpRVS9jE_glyph_data_9[63] = {
+static const gU8 mf_rlefont_phpRVS9jE_glyph_data_9[63] = {
0x0c, 0x2d, 0x71, 0xaa, 0x25, 0x58, 0x99, 0x9b, 0x06, 0x64, 0x2b, 0x9b, 0x2e, 0x9b, 0x68, 0x2b,
0x09, 0x06, 0x1e, 0x5e, 0x2b, 0x68, 0x32, 0x9b, 0x0d, 0x37, 0x72, 0x28, 0x89, 0xd5, 0x19, 0x2b,
0x0c, 0x06, 0x1e, 0x51, 0x2b, 0x08, 0x76, 0x35, 0x2c, 0x62, 0x37, 0x2c, 0x0e, 0x0b, 0x01, 0x2c,
0x4d, 0x02, 0x1d, 0x57, 0x50, 0x00, 0x9e, 0x0f, 0x06, 0x2b, 0x74, 0x70, 0x77, 0x02, 0x10,
};
-static const uint16_t mf_rlefont_phpRVS9jE_glyph_offsets_9[1] = {
+static const gU16 mf_rlefont_phpRVS9jE_glyph_offsets_9[1] = {
0x0000,
};
-static const uint8_t mf_rlefont_phpRVS9jE_glyph_data_10[49] = {
+static const gU8 mf_rlefont_phpRVS9jE_glyph_data_10[49] = {
0x09, 0x38, 0x75, 0x44, 0x0e, 0x20, 0x0d, 0x1d, 0x0c, 0x06, 0x98, 0x02, 0x00, 0x05, 0x43, 0x45,
0xac, 0x35, 0x9a, 0x3e, 0x0e, 0x0a, 0x35, 0xa4, 0x25, 0x63, 0x0f, 0x06, 0x35, 0x0c, 0x05, 0x45,
0x98, 0x02, 0x35, 0x3d, 0x25, 0x0b, 0x0d, 0x38, 0x0f, 0x02, 0x45, 0x0e, 0x0a, 0x38, 0x8d, 0x09,
0x10,
};
-static const uint16_t mf_rlefont_phpRVS9jE_glyph_offsets_10[1] = {
+static const gU16 mf_rlefont_phpRVS9jE_glyph_offsets_10[1] = {
0x0000,
};
-static const uint8_t mf_rlefont_phpRVS9jE_glyph_data_11[235] = {
+static const gU8 mf_rlefont_phpRVS9jE_glyph_data_11[235] = {
0x08, 0xd0, 0x75, 0x97, 0x20, 0x10, 0x10, 0xd0, 0x75, 0x20, 0x2f, 0x10, 0x00, 0x05, 0x4c, 0x44,
0x1c, 0x09, 0x83, 0x7d, 0x0f, 0x10, 0x05, 0x52, 0x97, 0x30, 0x67, 0x0c, 0x30, 0x07, 0x60, 0x30,
0x0c, 0x06, 0x10, 0x05, 0x5c, 0x75, 0x0f, 0xfa, 0x33, 0x5e, 0x1c, 0x6f, 0x10, 0x08, 0x4c, 0x44,
@@ -565,7 +565,7 @@ static const uint8_t mf_rlefont_phpRVS9jE_glyph_data_11[235] = {
0x08, 0x0e, 0x30, 0x07, 0x6a, 0x31, 0xab, 0x02, 0x30, 0x09, 0x10,
};
-static const uint16_t mf_rlefont_phpRVS9jE_glyph_offsets_11[40] = {
+static const gU16 mf_rlefont_phpRVS9jE_glyph_offsets_11[40] = {
0x0000, 0x0006, 0x000c, 0x000c, 0x000c, 0x000d, 0x0016, 0x0023,
0x000c, 0x002d, 0x003c, 0x0047, 0x000c, 0x0053, 0x005b, 0x0065,
0x000c, 0x000c, 0x000c, 0x007a, 0x000c, 0x000c, 0x000c, 0x000c,
@@ -573,26 +573,26 @@ static const uint16_t mf_rlefont_phpRVS9jE_glyph_offsets_11[40] = {
0x000c, 0x000c, 0x000c, 0x000c, 0x000c, 0x000c, 0x00c0, 0x00d5,
};
-static const uint8_t mf_rlefont_phpRVS9jE_glyph_data_12[46] = {
+static const gU8 mf_rlefont_phpRVS9jE_glyph_data_12[46] = {
0x0a, 0x69, 0x51, 0x48, 0x0b, 0x04, 0x45, 0x0a, 0x4f, 0x01, 0x02, 0x8d, 0x25, 0x51, 0x18, 0x07,
0x25, 0x46, 0x31, 0x0b, 0x20, 0x0c, 0x3e, 0x4e, 0x32, 0x0b, 0x77, 0x0b, 0x3b, 0x46, 0x1c, 0x51,
0x18, 0x07, 0x45, 0x0a, 0x4f, 0x01, 0x91, 0x0f, 0x3e, 0x9a, 0x48, 0x0b, 0x04, 0x10,
};
-static const uint16_t mf_rlefont_phpRVS9jE_glyph_offsets_12[1] = {
+static const gU16 mf_rlefont_phpRVS9jE_glyph_offsets_12[1] = {
0x0000,
};
-static const uint8_t mf_rlefont_phpRVS9jE_glyph_data_13[26] = {
+static const gU8 mf_rlefont_phpRVS9jE_glyph_data_13[26] = {
0x10, 0x52, 0x20, 0x08, 0x00, 0x07, 0x85, 0x9d, 0x0f, 0x0b, 0x01, 0x0a, 0x85, 0x9d, 0x0f, 0x49,
0x05, 0x85, 0x9d, 0x85, 0x0c, 0x28, 0x9d, 0x73, 0x28, 0x10,
};
-static const uint16_t mf_rlefont_phpRVS9jE_glyph_offsets_13[1] = {
+static const gU16 mf_rlefont_phpRVS9jE_glyph_offsets_13[1] = {
0x0000,
};
-static const uint8_t mf_rlefont_phpRVS9jE_glyph_data_14[360] = {
+static const gU8 mf_rlefont_phpRVS9jE_glyph_data_14[360] = {
0x08, 0x40, 0xf9, 0xee, 0x0f, 0x64, 0x3b, 0x61, 0x55, 0x6f, 0x30, 0x61, 0x1c, 0xa1, 0x3e, 0x07,
0x0d, 0x0e, 0x08, 0x98, 0x45, 0x07, 0x6a, 0x01, 0xa1, 0x0d, 0x45, 0x50, 0x35, 0x67, 0x0a, 0x45,
0x3d, 0x63, 0x0f, 0x04, 0x45, 0x0a, 0x06, 0x8f, 0x0d, 0x0a, 0x27, 0x2c, 0x0a, 0x0e, 0x8c, 0x10,
@@ -618,7 +618,7 @@ static const uint8_t mf_rlefont_phpRVS9jE_glyph_data_14[360] = {
0x08, 0x1c, 0x08, 0x03, 0x31, 0x0b, 0x86, 0x10,
};
-static const uint16_t mf_rlefont_phpRVS9jE_glyph_offsets_14[42] = {
+static const gU16 mf_rlefont_phpRVS9jE_glyph_offsets_14[42] = {
0x0000, 0x0030, 0x0030, 0x0030, 0x0031, 0x0030, 0x0030, 0x0030,
0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x006c, 0x0030, 0x007c,
0x00af, 0x0030, 0x0030, 0x00b4, 0x0030, 0x0030, 0x0030, 0x00d5,
@@ -627,16 +627,16 @@ static const uint16_t mf_rlefont_phpRVS9jE_glyph_offsets_14[42] = {
0x0030, 0x0141,
};
-static const uint8_t mf_rlefont_phpRVS9jE_glyph_data_15[23] = {
+static const gU8 mf_rlefont_phpRVS9jE_glyph_data_15[23] = {
0x0d, 0x18, 0x75, 0xdf, 0xfc, 0x01, 0x2b, 0x63, 0xac, 0x0e, 0x0b, 0x99, 0x01, 0x58, 0x1d, 0x0d,
0x55, 0x02, 0x06, 0xac, 0x0e, 0xfc, 0x10,
};
-static const uint16_t mf_rlefont_phpRVS9jE_glyph_offsets_15[1] = {
+static const gU16 mf_rlefont_phpRVS9jE_glyph_offsets_15[1] = {
0x0000,
};
-static const uint8_t mf_rlefont_phpRVS9jE_glyph_data_16[106] = {
+static const gU8 mf_rlefont_phpRVS9jE_glyph_data_16[106] = {
0x0d, 0x1e, 0x5c, 0x5a, 0x30, 0x07, 0x65, 0x27, 0x77, 0x77, 0x3e, 0x98, 0x03, 0x31, 0x74, 0x06,
0x3e, 0x77, 0x77, 0x27, 0x03, 0x86, 0x30, 0x0a, 0x07, 0x10, 0x00, 0x0d, 0x32, 0x5c, 0x7e, 0x7a,
0x25, 0x9b, 0x07, 0xac, 0x6d, 0x03, 0x2b, 0x63, 0x7a, 0x0d, 0x09, 0x87, 0x45, 0x0f, 0x64, 0x31,
@@ -646,11 +646,11 @@ static const uint8_t mf_rlefont_phpRVS9jE_glyph_data_16[106] = {
0x6d, 0x02, 0x45, 0x0d, 0x09, 0x55, 0x00, 0x1a, 0x2f, 0x10,
};
-static const uint16_t mf_rlefont_phpRVS9jE_glyph_offsets_16[6] = {
+static const gU16 mf_rlefont_phpRVS9jE_glyph_offsets_16[6] = {
0x0000, 0x001a, 0x001a, 0x001a, 0x001b, 0x0042,
};
-static const uint8_t mf_rlefont_phpRVS9jE_glyph_data_17[72] = {
+static const gU8 mf_rlefont_phpRVS9jE_glyph_data_17[72] = {
0x08, 0x22, 0x63, 0x04, 0x1c, 0x0b, 0x0b, 0x30, 0x26, 0x4f, 0x31, 0x6e, 0x90, 0x3e, 0x9b, 0x0b,
0x35, 0x5b, 0x45, 0x09, 0x04, 0x35, 0x05, 0x09, 0x1d, 0x2c, 0x0c, 0x33, 0x0c, 0x01, 0x25, 0x8a,
0x33, 0x05, 0x08, 0x25, 0x76, 0x33, 0x6b, 0x25, 0x5f, 0x33, 0x4a, 0x25, 0x6b, 0x33, 0x76, 0x45,
@@ -658,17 +658,17 @@ static const uint8_t mf_rlefont_phpRVS9jE_glyph_data_17[72] = {
0x6f, 0x31, 0x0b, 0x0b, 0x30, 0x63, 0x04, 0x10,
};
-static const uint16_t mf_rlefont_phpRVS9jE_glyph_offsets_17[1] = {
+static const gU16 mf_rlefont_phpRVS9jE_glyph_offsets_17[1] = {
0x0000,
};
-static const uint8_t mf_rlefont_phpRVS9jE_glyph_data_18[47] = {
+static const gU8 mf_rlefont_phpRVS9jE_glyph_data_18[47] = {
0x0a, 0x52, 0x44, 0x97, 0x4b, 0x27, 0x0c, 0x05, 0x35, 0x4b, 0x9d, 0x31, 0x0f, 0x20, 0x92, 0xc6,
0x72, 0xc6, 0x72, 0xc6, 0x72, 0xc6, 0x72, 0x10, 0x0a, 0x52, 0x58, 0x77, 0x45, 0x6a, 0x35, 0x4b,
0x9d, 0x72, 0x1e, 0x0f, 0x2a, 0x72, 0xc6, 0x72, 0xc6, 0x72, 0xc6, 0x72, 0xc6, 0x72, 0x10,
};
-static const uint16_t mf_rlefont_phpRVS9jE_glyph_offsets_18[2] = {
+static const gU16 mf_rlefont_phpRVS9jE_glyph_offsets_18[2] = {
0x0000, 0x0018,
};
diff --git a/demos/modules/gwin/console/main.c b/demos/modules/gwin/console/main.c
index 9cd4af76..057fa61d 100644
--- a/demos/modules/gwin/console/main.c
+++ b/demos/modules/gwin/console/main.c
@@ -33,7 +33,7 @@
GHandle GW1, GW2, GW3;
int main(void) {
- uint8_t i;
+ gU8 i;
gFont font1, font2;
/* initialize and clear the display */
diff --git a/demos/modules/gwin/frame/main.c b/demos/modules/gwin/frame/main.c
index 18e15046..d3ea97f8 100644
--- a/demos/modules/gwin/frame/main.c
+++ b/demos/modules/gwin/frame/main.c
@@ -8,7 +8,7 @@ static GHandle ghButton1, ghButton2, ghButton3;
static GHandle ghWindow1;
static void _updateColor(void) {
- uint32_t color;
+ gU32 color;
color = (unsigned)gwinSliderGetPosition(ghSliderR) << 16;
color |= (unsigned)gwinSliderGetPosition(ghSliderG) << 8;
diff --git a/demos/modules/gwin/graph/main.c b/demos/modules/gwin/graph/main.c
index 19c6c76c..4a89dd04 100644
--- a/demos/modules/gwin/graph/main.c
+++ b/demos/modules/gwin/graph/main.c
@@ -63,7 +63,7 @@ static const GGraphStyle GraphStyle2 = {
int main(void) {
GHandle gh;
- uint16_t i;
+ gU16 i;
gfxInit();
diff --git a/demos/modules/gwin/keyboard/main.c b/demos/modules/gwin/keyboard/main.c
index 29f5f519..f1f47032 100644
--- a/demos/modules/gwin/keyboard/main.c
+++ b/demos/modules/gwin/keyboard/main.c
@@ -121,7 +121,7 @@ int main(void) {
if (pk->bytecount) {
gwinPrintf(ghConsole, " Keys:");
for (i = 0; i < pk->bytecount; i++)
- gwinPrintf(ghConsole, " 0x%02X", (int)(uint8_t)pk->c[i]);
+ gwinPrintf(ghConsole, " 0x%02X", (int)(gU8)pk->c[i]);
gwinPrintf(ghConsole, " [");
for (i = 0; i < pk->bytecount; i++)
gwinPrintf(ghConsole, "%c", pk->c[i] >= ' ' && pk->c[i] <= '~' ? pk->c[i] : ' ');
diff --git a/demos/modules/gwin/textedit/main.c b/demos/modules/gwin/textedit/main.c
index 034d01aa..42dad5f4 100644
--- a/demos/modules/gwin/textedit/main.c
+++ b/demos/modules/gwin/textedit/main.c
@@ -145,7 +145,7 @@ int main(void) {
if (pk->bytecount) {
gwinPrintf(ghConsole, " Keys:");
for (i = 0; i < pk->bytecount; i++)
- gwinPrintf(ghConsole, " 0x%02X", (int)(uint8_t)pk->c[i]);
+ gwinPrintf(ghConsole, " 0x%02X", (int)(gU8)pk->c[i]);
gwinPrintf(ghConsole, " [");
for (i = 0; i < pk->bytecount; i++)
gwinPrintf(ghConsole, "%c", pk->c[i] >= ' ' && pk->c[i] <= '~' ? pk->c[i] : ' ');
diff --git a/demos/tools/touch_driver_test/main.c b/demos/tools/touch_driver_test/main.c
index 2a1e6486..ec570b1d 100644
--- a/demos/tools/touch_driver_test/main.c
+++ b/demos/tools/touch_driver_test/main.c
@@ -96,7 +96,7 @@ int main(void) {
GMouse * m;
GMouseVMT * vmt;
GMouseJitter * pjit;
- uint32_t calerr;
+ gU32 calerr;
gfxInit(); // Initialize the display
diff --git a/demos/tools/uGFXnetDisplay/main.c b/demos/tools/uGFXnetDisplay/main.c
index a4ba943f..4eba5f78 100644
--- a/demos/tools/uGFXnetDisplay/main.c
+++ b/demos/tools/uGFXnetDisplay/main.c
@@ -134,15 +134,15 @@ static gFont font;
/**
* Get a whole packet of data.
- * Len is specified in the number of uint16_t's we want as our protocol only talks uint16_t's.
+ * Len is specified in the number of gU16's we want as our protocol only talks gU16's.
* If the connection closes before we get all the data - the call returns gFalse.
*/
-static gBool getpkt(uint16_t *pkt, int len) {
+static gBool getpkt(gU16 *pkt, int len) {
int got;
int have;
// Get the packet of data
- len *= sizeof(uint16_t);
+ len *= sizeof(gU16);
have = 0;
while(len && (got = recv(netfd, ((char *)pkt)+have, len, 0)) > 0) {
have += got;
@@ -151,7 +151,7 @@ static gBool getpkt(uint16_t *pkt, int len) {
if (len)
return gFalse;
- // Convert each uint16_t to host order
+ // Convert each gU16 to host order
for(got = 0, have /= 2; got < have; got++)
pkt[got] = ntohs(pkt[got]);
@@ -160,19 +160,19 @@ static gBool getpkt(uint16_t *pkt, int len) {
/**
* Send a whole packet of data.
- * Len is specified in the number of uint16_t's we want to send as our protocol only talks uint16_t's.
+ * Len is specified in the number of gU16's we want to send as our protocol only talks gU16's.
* Note that contents of the packet are modified to ensure it will cross the wire in the correct format.
* If the connection closes before we send all the data - the call returns gFalse.
*/
-static gBool sendpkt(uint16_t *pkt, int len) {
+static gBool sendpkt(gU16 *pkt, int len) {
int i;
- // Convert each uint16_t to network order
+ // Convert each gU16 to network order
for(i = 0; i < len; i++)
pkt[i] = htons(pkt[i]);
// Send it
- len *= sizeof(uint16_t);
+ len *= sizeof(gU16);
return send(netfd, (const char *)pkt, len, 0) == len;
}
@@ -185,8 +185,8 @@ static gBool sendpkt(uint16_t *pkt, int len) {
static DECLARE_THREAD_STACK(waNetThread, 512);
static DECLARE_THREAD_FUNCTION(NetThread, param) {
GEventMouse *pem;
- uint16_t cmd[2];
- uint16_t lbuttons;
+ gU16 cmd[2];
+ gU16 lbuttons;
gCoord lx, ly;
(void) param;
@@ -327,7 +327,7 @@ static SOCKET_TYPE doConnect(proto_args) {
* There are two prototypes - one for systems with a command line and one for embedded systems without one.
*/
int main(proto_args) {
- uint16_t cmd[5];
+ gU16 cmd[5];
unsigned cnt;
@@ -403,13 +403,13 @@ int main(proto_args) {
gdispControl(cmd[0], (void *)(unsigned)cmd[1]);
switch(cmd[0]) {
case GDISP_CONTROL_ORIENTATION:
- cmd[1] = (uint16_t)gdispGetOrientation() == cmd[1] ? 1 : 0;
+ cmd[1] = (gU16)gdispGetOrientation() == cmd[1] ? 1 : 0;
break;
case GDISP_CONTROL_POWER:
- cmd[1] = (uint16_t)gdispGetPowerMode() == cmd[1] ? 1 : 0;
+ cmd[1] = (gU16)gdispGetPowerMode() == cmd[1] ? 1 : 0;
break;
case GDISP_CONTROL_BACKLIGHT:
- cmd[1] = (uint16_t)gdispGetBacklight() == cmd[1] ? 1 : 0;
+ cmd[1] = (gU16)gdispGetBacklight() == cmd[1] ? 1 : 0;
break;
default:
cmd[1] = 0;