Skip to content

Improve code quality #343

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.

Sign up for GitHub

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

Open
coderobe wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Improve code quality #343

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2a94435
Remove duplicate 'const' declaration specifier
coderobe Jan 3, 2018
6bcdc85
Replace '*' in boolean context with boolean-and (&&)
coderobe Jan 3, 2018
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
8 changes: 4 additions & 4 deletions inc/display.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ extern uint8_t ScreenBuffer[];

extern const image_t **Images;

extern const image_t const *font0_1306[];
extern const image_t const *font0_1327[];
extern const image_t const *font1_1306[];
extern const image_t const *font1_1327[];
extern const image_t *font0_1306[];
extern const image_t *font0_1327[];
extern const image_t *font1_1306[];
extern const image_t *font1_1327[];

//-------------------------------------------------------------------------

Expand Down
2 changes: 1 addition & 1 deletion src/battery.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ const Battery_t BatteryRXMini =
20
};

const Battery_t const Batteries[] =
const Battery_t Batteries[] =
{
// Generic 18650
{
Expand Down
4 changes: 2 additions & 2 deletions src/fonts.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ const image_t f0img1306_00FD = { 6, 8, { 0, 8, 8, 8, 8, 8 } };
const image_t f0img1306_00FE = { 64, 64, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 96, 224, 128, 0, 0, 0, 0, 0, 0, 0, 2, 204, 48, 48, 204, 2, 0, 0, 2, 254, 2, 254, 2, 0, 0, 0, 0, 0, 0, 0, 128, 224, 96, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 3, 6, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 6, 3, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 6, 12, 8, 24, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 24, 8, 12, 6, 3, 3, 0, 0, 0, 0, 0, 16, 32, 32, 192, 192, 32, 32, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 224, 64, 64, 64, 64, 64, 64, 64, 224, 58, 17, 17, 16, 16, 17, 17, 58, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 15, 5, 5, 5, 5, 5, 5, 5, 15, 0, 0, 0, 0, 0, 128, 128, 192, 96, 32, 48, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 32, 96, 192, 128, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 192, 96, 0, 0, 0, 0, 0, 0, 128, 128, 128, 0, 0, 0, 0, 0, 128, 0, 0, 0, 0, 0, 0, 0, 0, 96, 192, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 7, 1, 0, 0, 0, 0, 0, 0, 0, 64, 127, 64, 0, 0, 96, 24, 6, 1, 6, 24, 96, 0, 0, 0, 0, 0, 0, 1, 7, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } };
const image_t f0img1306_00FF = { 64, 128, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } };

const image_t const *font0_1306[] __block1__ =
const image_t *font0_1306[] __block1__ =
{
&f0img1306_0001,
&f0img1306_0002,
Expand Down Expand Up @@ -665,7 +665,7 @@ const image_t f1img1306_00F7 = { 5, 24, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 112,
//const image_t f1img1306_00FE = { 12, 40, { 0, 254, 253, 251, 7, 7, 7, 7, 251, 253, 254, 0, 0, 15, 151, 155, 156, 156, 156, 156, 155, 151, 143, 0, 0, 255, 254, 253, 3, 3, 3, 3, 3, 1, 0, 0, 0, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 127, 191, 223, 224, 224, 224, 224, 224, 192, 128, 0 } };
const image_t f1img1306_00FE = { 64, 64, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 248, 0, 16, 248, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 254, 0, 224, 18, 18, 18, 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 248, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 64, 224, 0, 192, 32, 32, 192, 0, 0, 0, 0, 0, 7, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 32, 32, 32, 192, 0, 0, 0, 0, 0, 0, 0, 31, 0, 15, 16, 16, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, 17, 17, 17, 0, 0, 0, 0, 0, 96, 144, 144, 96, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 144, 144, 96, 0, 0, 0, 8, 8, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 8, 7, 0, 0, 0, 0, 0, 176, 72, 72, 176, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 120, 128, 128, 120, 0, 0, 0, 0, 0, 0, 0, 0, 3, 4, 4, 3, 0, 0, 0, 0, 0, 0, 32, 32, 32, 192, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 224, 32, 32, 32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 31, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 59, 68, 68, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 17, 17, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } };

const image_t const *font1_1306[] __block1__ =
const image_t *font1_1306[] __block1__ =
{
&f1img1306_0001,
&f1img1306_0002,
Expand Down
16 changes: 8 additions & 8 deletions src/menus.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ struct mitem_s
struct menu_s
{
const uint8_t* const caption;
const struct menu_s const *parent;
const struct menu_s *parent;
void (*on_enter)();
void (*on_drawitem)( int mi, int y, int sel );
void (*on_selectitem)();
Expand All @@ -86,7 +86,7 @@ struct menu_s
const mitem_t mitems[];
};

const menu_t const *CurrentMenu;
const menu_t *CurrentMenu;
uint8_t CurrentMenuItem;


Expand Down Expand Up @@ -2527,7 +2527,7 @@ __myevic__ int MenuDataAction( int event, const mdata_t *data )
if ( *p == desc->def1 )
break;

*p += desc->inc * ( KeyTicks >= 105 ) ? 10 : 1;
*p += desc->inc && ( KeyTicks >= 105 ) ? 10 : 1;

if ( *p > desc->max )
{
Expand All @@ -2545,7 +2545,7 @@ __myevic__ int MenuDataAction( int event, const mdata_t *data )
if ( *p == desc->def1 )
break;

*p += desc->inc * ( KeyTicks >= 105 ) ? 10 : 1;
*p += desc->inc && ( KeyTicks >= 105 ) ? 10 : 1;

if ( *p > desc->max )
{
Expand All @@ -2563,7 +2563,7 @@ __myevic__ int MenuDataAction( int event, const mdata_t *data )
if ( *p == desc->def1 )
break;

*p += desc->inc * ( KeyTicks >= 105 ) ? 10 : 1;
*p += desc->inc && ( KeyTicks >= 105 ) ? 10 : 1;

if ( *p > desc->max )
{
Expand Down Expand Up @@ -2594,7 +2594,7 @@ __myevic__ int MenuDataAction( int event, const mdata_t *data )
if ( *p == desc->def1 )
break;

uint16_t inc = desc->inc * ( KeyTicks >= 105 ) ? 10 : 1;
uint16_t inc = desc->inc && ( KeyTicks >= 105 ) ? 10 : 1;

if ( ( *p <= desc->min + inc ) || ( ( *p -= inc ) < desc->min ) )
{
Expand All @@ -2612,7 +2612,7 @@ __myevic__ int MenuDataAction( int event, const mdata_t *data )
if ( *p == desc->def1 )
break;

uint16_t inc = desc->inc * ( KeyTicks >= 105 ) ? 10 : 1;
uint16_t inc = desc->inc && ( KeyTicks >= 105 ) ? 10 : 1;

if ( ( *p -= inc ) < desc->min )
{
Expand All @@ -2630,7 +2630,7 @@ __myevic__ int MenuDataAction( int event, const mdata_t *data )
if ( *p == desc->def1 )
break;

uint16_t inc = desc->inc * ( KeyTicks >= 105 ) ? 10 : 1;
uint16_t inc = desc->inc && ( KeyTicks >= 105 ) ? 10 : 1;

if ( ( *p -= inc ) < desc->min )
{
Expand Down
2 changes: 1 addition & 1 deletion src/miscs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -512,7 +512,7 @@ const obj3d_t isoca =
isoca_lines
};

const obj3d_t const *objects3d[] =
const obj3d_t *objects3d[] =
{
&tetra,
&cube,
Expand Down