Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Too many warning about "type qualifier is meaningless on cast type". #12

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 21 additions & 21 deletions ugui.c
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
/* -------------------------------------------------------------------------------- */
/* -- µGUI - Generic GUI module (C)Achim Döbler, 2015 -- */
/* -- µGUI - Generic GUI module (C)Achim Döbler, 2015 -- */
/* -------------------------------------------------------------------------------- */
// µGUI is a generic GUI module for embedded systems.
// µGUI is a generic GUI module for embedded systems.
// This is a free software that is open for education, research and commercial
// developments under license policy of following terms.
//
// Copyright (C) 2015, Achim Döbler, all rights reserved.
// Copyright (C) 2015, Achim Döbler, all rights reserved.
// URL: http://www.embeddedlightning.com/
//
// * The µGUI module is a free software and there is NO WARRANTY.
// * The µGUI module is a free software and there is NO WARRANTY.
// * No restriction on use. You can use, modify and redistribute it for
// personal, non-profit or commercial products UNDER YOUR RESPONSIBILITY.
// * Redistributions of source code must retain the above copyright notice.
Expand All @@ -27,7 +27,7 @@
// for giving valuable suggestions regarding real-time os support.
//
// Samuel Kleiser
// for reporting bugs and giving examples how to improve µGUI.
// for reporting bugs and giving examples how to improve µGUI.
/* -------------------------------------------------------------------------------- */
/* -- REVISION HISTORY -- */
/* -------------------------------------------------------------------------------- */
Expand All @@ -50,14 +50,14 @@
#include "ugui.h"

/* Static functions */
UG_RESULT _UG_WindowDrawTitle( UG_WINDOW* wnd );
void _UG_WindowUpdate( UG_WINDOW* wnd );
UG_RESULT _UG_WindowClear( UG_WINDOW* wnd );
void _UG_TextboxUpdate(UG_WINDOW* wnd, UG_OBJECT* obj);
void _UG_ButtonUpdate(UG_WINDOW* wnd, UG_OBJECT* obj);
void _UG_CheckboxUpdate(UG_WINDOW* wnd, UG_OBJECT* obj);
void _UG_ImageUpdate(UG_WINDOW* wnd, UG_OBJECT* obj);
void _UG_PutChar( char chr, UG_S16 x, UG_S16 y, UG_COLOR fc, UG_COLOR bc, const UG_FONT* font);
UG_RESULT _UG_WindowDrawTitle( UG_WINDOW* wnd );
void _UG_WindowUpdate( UG_WINDOW* wnd );
UG_RESULT _UG_WindowClear( UG_WINDOW* wnd );
void _UG_TextboxUpdate(UG_WINDOW* wnd, UG_OBJECT* obj);
void _UG_ButtonUpdate(UG_WINDOW* wnd, UG_OBJECT* obj);
void _UG_CheckboxUpdate(UG_WINDOW* wnd, UG_OBJECT* obj);
void _UG_ImageUpdate(UG_WINDOW* wnd, UG_OBJECT* obj);
void _UG_PutChar( char chr, UG_S16 x, UG_S16 y, UG_COLOR fc, UG_COLOR bc, const UG_FONT* font);

/* Pointer to the gui */
static UG_GUI* gui;
Expand Down Expand Up @@ -5265,14 +5265,14 @@ void _UG_PutChar( char chr, UG_S16 x, UG_S16 y, UG_COLOR fc, UG_COLOR bc, const

switch ( bt )
{
case 0xF6: bt = 0x94; break; //
case 0xD6: bt = 0x99; break; //
case 0xFC: bt = 0x81; break; //
case 0xDC: bt = 0x9A; break; //
case 0xE4: bt = 0x84; break; //
case 0xC4: bt = 0x8E; break; //
case 0xB5: bt = 0xE6; break; //
case 0xB0: bt = 0xF8; break; //
case 0xF6: bt = 0x94; break; // ö
case 0xD6: bt = 0x99; break; // Ö
case 0xFC: bt = 0x81; break; // ü
case 0xDC: bt = 0x9A; break; // Ü
case 0xE4: bt = 0x84; break; // ä
case 0xC4: bt = 0x8E; break; // Ä
case 0xB5: bt = 0xE6; break; // µ
case 0xB0: bt = 0xF8; break; // °
}

if (bt < font->start_char || bt > font->end_char) return;
Expand Down
4 changes: 2 additions & 2 deletions ugui.h
Original file line number Diff line number Diff line change
Expand Up @@ -155,8 +155,8 @@ typedef UG_U16 UG_COLOR;
/* -------------------------------------------------------------------------------- */
/* -- FUNCTION RESULTS -- */
/* -------------------------------------------------------------------------------- */
#define UG_RESULT_FAIL -1
#define UG_RESULT_OK 0
#define UG_RESULT_FAIL (UG_U8)(-1)
#define UG_RESULT_OK (UG_U8)(0)

/* -------------------------------------------------------------------------------- */
/* -- UNIVERSAL STRUCTURES -- */
Expand Down