Attachment 911703 Details for Bug 1112648 – Partial fix

[patch] Partial fix

arduino-const.patch (text/plain), 2.08 KB, created by Miro Hrončok on 2014-06-24 12:12:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Miro Hrončok

Created: 2014-06-24 12:12:18 UTC

Size: 2.08 KB

patch

obsolete

>diff --git a/libraries/Robot_Control/Squawk.cpp b/libraries/Robot_Control/Squawk.cpp
>index 5b39ebe..55b6b99 100644
>--- a/libraries/Robot_Control/Squawk.cpp
>+++ b/libraries/Robot_Control/Squawk.cpp
>@@ -81,7 +81,7 @@ osc_t osc[4];
> uint8_t pcm = 128;
> 
> // ProTracker period tables
>-uint16_t period_tbl[84] PROGMEM = {
>+const uint16_t period_tbl[84] PROGMEM = {
>   3424, 3232, 3048, 2880, 2712, 2560, 2416, 2280, 2152, 2032, 1920, 1814,
>   1712, 1616, 1524, 1440, 1356, 1280, 1208, 1140, 1076, 1016,  960,  907,
>    856,  808,  762,  720,  678,  640,  604,  570,  538,  508,  480,  453,
>@@ -92,7 +92,7 @@ uint16_t period_tbl[84] PROGMEM = {
> };
> 
> // ProTracker sine table
>-int8_t sine_tbl[32] PROGMEM = {
>+const int8_t sine_tbl[32] PROGMEM = {
>   0x00, 0x0C, 0x18, 0x25, 0x30, 0x3C, 0x47, 0x51, 0x5A, 0x62, 0x6A, 0x70, 0x76, 0x7A, 0x7D, 0x7F,
>   0x7F, 0x7F, 0x7D, 0x7A, 0x76, 0x70, 0x6A, 0x62, 0x5A, 0x51, 0x47, 0x3C, 0x30, 0x25, 0x18, 0x0C,
> };
>@@ -598,4 +598,4 @@ void squawk_playroutine() {
>   }
> 
>   lockout = false;
>-}
>\ No newline at end of file
>+}
>diff --git a/libraries/Robot_Control/SquawkSD.cpp b/libraries/Robot_Control/SquawkSD.cpp
>index 3c97ef4..365cdc5 100644
>--- a/libraries/Robot_Control/SquawkSD.cpp
>+++ b/libraries/Robot_Control/SquawkSD.cpp
>@@ -13,7 +13,7 @@ class StreamFile : public SquawkStream {
> 
> static StreamFile file;
> 
>-extern uint16_t period_tbl[84] PROGMEM;
>+const extern uint16_t period_tbl[84] PROGMEM;
> 
> void SquawkSynthSD::play(Fat16 melody) {
> 	SquawkSynth::pause();
>@@ -179,4 +179,4 @@ void SquawkSynthSD::convert(Fat16 in, Fat16 out) {
>       out.write(note[2] | (sample[2] == 0 ? 0x00 : 0x80));
>     }
>   }
>-}*/
>\ No newline at end of file
>+}*/
>diff --git a/libraries/Robot_Control/glcdfont.c b/libraries/Robot_Control/glcdfont.c
>index abc3631..b3a4126 100644
>--- a/libraries/Robot_Control/glcdfont.c
>+++ b/libraries/Robot_Control/glcdfont.c
>@@ -6,7 +6,7 @@
> 
> // standard ascii 5x7 font
> 
>-static unsigned char  font[] PROGMEM = {
>+const static unsigned char  font[] PROGMEM = {
>         0x00, 0x00, 0x00, 0x00, 0x00,   
> 	0x3E, 0x5B, 0x4F, 0x5B, 0x3E, 	
> 	0x3E, 0x6B, 0x4F, 0x6B, 0x3E,

Actions: View | Diff

Attachments on bug 1112648: 911703