Skip to content

fix constness for newer avr-gcc versions. #2

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
Skyler84 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix constness for newer avr-gcc versions. #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 13 additions & 13 deletions image.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include "svgrgb565.h"

//27*11 = 297 * 2B = 594B
static uint16_t cannon_sprite[297] PROGMEM = {
static const uint16_t cannon_sprite[297] PROGMEM = {
BLACK,BLACK,BLACK,BLACK,BLACK,BLACK,BLACK,BLACK,BLACK,BLACK,BLACK,GREEN,GREEN,GREEN,GREEN,BLACK,BLACK,BLACK,BLACK,BLACK,BLACK,BLACK,BLACK,BLACK,BLACK,BLACK,BLACK,
BLACK,BLACK,BLACK,BLACK,BLACK,BLACK,BLACK,BLACK,BLACK,BLACK,GREEN,GREEN,GREEN,GREEN,GREEN,GREEN,BLACK,BLACK,BLACK,BLACK,BLACK,BLACK,BLACK,BLACK,BLACK,BLACK,BLACK,
BLACK,BLACK,BLACK,BLACK,BLACK,BLACK,BLACK,BLACK,BLACK,BLACK,GREEN,GREEN,GREEN,GREEN,GREEN,GREEN,BLACK,BLACK,BLACK,BLACK,BLACK,BLACK,BLACK,BLACK,BLACK,BLACK,BLACK,
Expand All @@ -32,7 +32,7 @@ static uint16_t cannon_sprite[297] PROGMEM = {
};

//27*11 = 297 * 2B = 594B
static uint16_t cannon_sprite_2[297] PROGMEM = {
static const uint16_t cannon_sprite_2[297] PROGMEM = {
BLACK,BLACK,BLACK,BLACK,BLACK,BLACK,BLACK,BLACK,BLACK,BLACK,BLACK,GREEN,BLACK,BLACK,GREEN,BLACK,BLACK,BLACK,BLACK,BLACK,BLACK,BLACK,BLACK,BLACK,BLACK,BLACK,BLACK,
BLACK,BLACK,BLACK,BLACK,BLACK,BLACK,BLACK,BLACK,BLACK,BLACK,BLACK,BLACK,BLACK,GREEN,BLACK,BLACK,BLACK,GREEN,BLACK,BLACK,BLACK,BLACK,BLACK,GREEN,BLACK,BLACK,BLACK,
BLACK,BLACK,BLACK,GREEN,BLACK,BLACK,GREEN,BLACK,BLACK,BLACK,GREEN,BLACK,GREEN,BLACK,GREEN,BLACK,BLACK,BLACK,BLACK,BLACK,GREEN,BLACK,BLACK,BLACK,GREEN,BLACK,BLACK,
Expand All @@ -47,7 +47,7 @@ static uint16_t cannon_sprite_2[297] PROGMEM = {
};

//27*11 = 297 * 2B = 594B
static uint16_t cannon_sprite_3[297] PROGMEM = {
static const uint16_t cannon_sprite_3[297] PROGMEM = {
BLACK,BLACK,BLACK,BLACK,BLACK,BLACK,BLACK,BLACK,BLACK,BLACK,BLACK,GREEN,BLACK,BLACK,BLACK,BLACK,BLACK,BLACK,BLACK,BLACK,BLACK,BLACK,BLACK,BLACK,BLACK,GREEN,BLACK,
BLACK,BLACK,GREEN,BLACK,BLACK,BLACK,BLACK,BLACK,BLACK,BLACK,BLACK,BLACK,BLACK,BLACK,BLACK,GREEN,BLACK,GREEN,BLACK,BLACK,BLACK,GREEN,BLACK,BLACK,BLACK,GREEN,BLACK,
BLACK,BLACK,GREEN,BLACK,GREEN,BLACK,BLACK,GREEN,BLACK,BLACK,BLACK,BLACK,BLACK,BLACK,GREEN,BLACK,BLACK,BLACK,BLACK,GREEN,BLACK,BLACK,GREEN,BLACK,BLACK,BLACK,GREEN,
Expand All @@ -62,7 +62,7 @@ static uint16_t cannon_sprite_3[297] PROGMEM = {
};

//9*8 = 72 * 2B = 144B
static uint16_t heart_sprite[72] PROGMEM = {
static const uint16_t heart_sprite[72] PROGMEM = {
BLACK,RED,RED,BLACK,BLACK,BLACK,RED,RED,BLACK,
RED,RED,RED,RED,BLACK,RED,RED,RED,RED,
RED,RED,RED,RED,RED,RED,RED,WHITE,RED,
Expand All @@ -74,7 +74,7 @@ static uint16_t heart_sprite[72] PROGMEM = {
};

//16x14
static uint16_t astro_sprite[] PROGMEM = {
static const uint16_t astro_sprite[] PROGMEM = {
BLACK,BLACK,BLACK,BLACK,BLACK,RED,RED,RED,RED,RED,RED,DARK_RED,BLACK,BLACK,BLACK,BLACK,
BLACK,BLACK,BLACK,BLACK,BLACK,RED,RED,RED,RED,RED,RED,DARK_RED,BLACK,BLACK,BLACK,BLACK,
BLACK,BLACK,BLACK,RED,RED,RED,RED,RED,RED,RED,RED,RED,RED,DARK_RED,BLACK,BLACK,
Expand All @@ -92,7 +92,7 @@ static uint16_t astro_sprite[] PROGMEM = {
};

//13x8 = 104 * 2B = 208B
static uint16_t monster_sprite_1A[] PROGMEM = {
static const uint16_t monster_sprite_1A[] PROGMEM = {
BLACK,BLACK,BLACK,BLACK,BLACK,WHITE,WHITE,BLACK,BLACK,BLACK,BLACK,BLACK,BLACK,
BLACK,BLACK,BLACK,BLACK,BLACK,WHITE,WHITE,BLACK,BLACK,BLACK,BLACK,BLACK,BLACK,
BLACK,BLACK,BLACK,BLACK,WHITE,WHITE,WHITE,WHITE,BLACK,BLACK,BLACK,BLACK,BLACK,
Expand All @@ -111,7 +111,7 @@ static uint16_t monster_sprite_1A[] PROGMEM = {
BLACK,BLACK,BLACK,WHITE,BLACK,BLACK,BLACK,BLACK,WHITE,BLACK,BLACK,BLACK,BLACK,
};
//13x8 = 104 * 2B = 208B
static uint16_t monster_sprite_1B[] PROGMEM = {
static const uint16_t monster_sprite_1B[] PROGMEM = {
BLACK,BLACK,BLACK,BLACK,BLACK,WHITE,WHITE,BLACK,BLACK,BLACK,BLACK,BLACK,BLACK,
BLACK,BLACK,BLACK,BLACK,BLACK,WHITE,WHITE,BLACK,BLACK,BLACK,BLACK,BLACK,BLACK,
BLACK,BLACK,BLACK,BLACK,WHITE,WHITE,WHITE,WHITE,BLACK,BLACK,BLACK,BLACK,BLACK,
Expand All @@ -130,7 +130,7 @@ static uint16_t monster_sprite_1B[] PROGMEM = {
BLACK,BLACK,WHITE,BLACK,WHITE,BLACK,BLACK,WHITE,BLACK,WHITE,BLACK,BLACK,BLACK
};
//13x8 = 104 * 2B = 208B
static uint16_t monster_sprite_2A[416] PROGMEM = {
static const uint16_t monster_sprite_2A[416] PROGMEM = {
BLACK,BLACK,BLACK,WHITE,BLACK,BLACK,BLACK,BLACK,BLACK,WHITE,BLACK,BLACK,BLACK,
BLACK,BLACK,BLACK,WHITE,BLACK,BLACK,BLACK,BLACK,BLACK,WHITE,BLACK,BLACK,BLACK,
BLACK,BLACK,BLACK,BLACK,WHITE,BLACK,BLACK,BLACK,WHITE,BLACK,BLACK,BLACK,BLACK,
Expand All @@ -149,7 +149,7 @@ static uint16_t monster_sprite_2A[416] PROGMEM = {
BLACK,BLACK,BLACK,BLACK,WHITE,WHITE,BLACK,WHITE,WHITE,BLACK,BLACK,BLACK,BLACK
};
//13x8 = 104 * 2B = 208B
static uint16_t monster_sprite_2B[416] PROGMEM = {
static const uint16_t monster_sprite_2B[416] PROGMEM = {
BLACK,BLACK,BLACK,WHITE,BLACK,BLACK,BLACK,BLACK,BLACK,WHITE,BLACK,BLACK,BLACK,
BLACK,BLACK,BLACK,WHITE,BLACK,BLACK,BLACK,BLACK,BLACK,WHITE,BLACK,BLACK,BLACK,
BLACK,WHITE,BLACK,BLACK,WHITE,BLACK,BLACK,BLACK,WHITE,BLACK,BLACK,WHITE,BLACK,
Expand All @@ -168,7 +168,7 @@ static uint16_t monster_sprite_2B[416] PROGMEM = {
BLACK,BLACK,WHITE,BLACK,BLACK,BLACK,BLACK,BLACK,BLACK,BLACK,WHITE,BLACK,BLACK
};
//13x8 = 104 * 2B = 208B
static uint16_t monster_sprite_3A[] PROGMEM = {
static const uint16_t monster_sprite_3A[] PROGMEM = {
BLACK,BLACK,BLACK,BLACK,WHITE,WHITE,WHITE,WHITE,BLACK,BLACK,BLACK,BLACK,BLACK,
BLACK,BLACK,BLACK,BLACK,WHITE,WHITE,WHITE,WHITE,BLACK,BLACK,BLACK,BLACK,BLACK,
BLACK,WHITE,WHITE,WHITE,WHITE,WHITE,WHITE,WHITE,WHITE,WHITE,WHITE,BLACK,BLACK,
Expand All @@ -187,7 +187,7 @@ static uint16_t monster_sprite_3A[] PROGMEM = {
BLACK,BLACK,WHITE,WHITE,BLACK,BLACK,BLACK,BLACK,WHITE,WHITE,BLACK,BLACK,BLACK
};
//13x8 = 104 * 2B = 208B
static uint16_t monster_sprite_3B[] PROGMEM = {
static const uint16_t monster_sprite_3B[] PROGMEM = {
BLACK,BLACK,BLACK,BLACK,WHITE,WHITE,WHITE,WHITE,BLACK,BLACK,BLACK,BLACK,BLACK,
BLACK,BLACK,BLACK,BLACK,WHITE,WHITE,WHITE,WHITE,BLACK,BLACK,BLACK,BLACK,BLACK,
BLACK,WHITE,WHITE,WHITE,WHITE,WHITE,WHITE,WHITE,WHITE,WHITE,WHITE,BLACK,BLACK,
Expand All @@ -206,7 +206,7 @@ static uint16_t monster_sprite_3B[] PROGMEM = {
WHITE,WHITE,BLACK,BLACK,BLACK,BLACK,BLACK,BLACK,BLACK,BLACK,WHITE,WHITE,BLACK
};
//13x8 = 104 * 2B = 208B
static uint16_t monster_sprite_exp[416] PROGMEM = {
static const uint16_t monster_sprite_exp[416] PROGMEM = {
BLACK,WHITE,BLACK,BLACK,WHITE,BLACK,BLACK,BLACK,WHITE,BLACK,BLACK,WHITE,BLACK,
BLACK,WHITE,BLACK,BLACK,WHITE,BLACK,BLACK,BLACK,WHITE,BLACK,BLACK,WHITE,BLACK,
BLACK,BLACK,WHITE,BLACK,BLACK,WHITE,BLACK,WHITE,BLACK,BLACK,WHITE,BLACK,BLACK,
Expand All @@ -226,7 +226,7 @@ static uint16_t monster_sprite_exp[416] PROGMEM = {
};

//4x9
static uint16_t triangle_sprite[28] PROGMEM = {
static const uint16_t triangle_sprite[28] PROGMEM = {
BLUE,BLACK,BLACK,BLACK,
BLUE,BLUE,BLACK,BLACK,
BLUE,BLUE,BLUE,BLACK,
Expand Down
6 changes: 3 additions & 3 deletions lcd/lcd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ void set_frame_rate_hz(uint8_t f) {
write_data(rtna);
}

void fill_image_pgm(uint16_t x, uint16_t y, uint16_t width, uint16_t height, uint16_t *col) {
void fill_image_pgm(uint16_t x, uint16_t y, uint16_t width, uint16_t height, const uint16_t *col) {
write_cmd(COLUMN_ADDRESS_SET);
write_data16(x);
write_data16(x+width);
Expand Down Expand Up @@ -162,7 +162,7 @@ void fill_image_pgm(uint16_t x, uint16_t y, uint16_t width, uint16_t height, uin
}
}

void fill_image_pgm_2b(uint16_t x, uint16_t y, uint16_t width, uint16_t height, uint16_t *col) {
void fill_image_pgm_2b(uint16_t x, uint16_t y, uint16_t width, uint16_t height, const uint16_t *col) {
write_cmd(COLUMN_ADDRESS_SET);
write_data16(x);
write_data16(x+width-1);
Expand Down Expand Up @@ -213,7 +213,7 @@ void fill_image_pgm_2b(uint16_t x, uint16_t y, uint16_t width, uint16_t height,
}
}

void fill_image(uint16_t x, uint16_t y, uint16_t width, uint16_t height, uint16_t *col) {
void fill_image(uint16_t x, uint16_t y, uint16_t width, uint16_t height, const uint16_t *col) {
write_cmd(COLUMN_ADDRESS_SET);
write_data16(x);
write_data16(x+width);
Expand Down
6 changes: 3 additions & 3 deletions lcd/lcd.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@ void display_string(char *str);
void display_string_xy(char *str, uint16_t x, uint16_t y);
void display_string_xy_col(char *str, uint16_t x, uint16_t y, uint16_t col);
void display_register(uint8_t reg);
void fill_image(uint16_t x, uint16_t y, uint16_t width, uint16_t height, uint16_t *col);
void fill_image_pgm(uint16_t x, uint16_t y, uint16_t width, uint16_t height, uint16_t *col);
void fill_image_pgm_2b(uint16_t x, uint16_t y, uint16_t width, uint16_t height, uint16_t *col);
void fill_image(uint16_t x, uint16_t y, uint16_t width, uint16_t height, const uint16_t *col);
void fill_image_pgm(uint16_t x, uint16_t y, uint16_t width, uint16_t height, const uint16_t *col);
void fill_image_pgm_2b(uint16_t x, uint16_t y, uint16_t width, uint16_t height, const uint16_t *col);
void display_uint8(uint8_t i);
void display_uint16(uint16_t i);
void display_uint32(uint32_t i);
Expand Down