Skip to content

Commit 3f429a9

Browse files
damellisdamellis
committed
Fixing static is not at beginning of declaration warnings (maniacbug).
1 parent 3ece282 commit 3f429a9

File tree

4 files changed

+60
-60
lines changed

4 files changed

+60
-60
lines changed

Diff for: ‎cores/arduino/WInterrupts.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232

3333
#include "wiring_private.h"
3434

35-
volatile static voidFuncPtr intFunc[EXTERNAL_NUM_INTERRUPTS];
35+
static volatile voidFuncPtr intFunc[EXTERNAL_NUM_INTERRUPTS];
3636
// volatile static voidFuncPtr twiIntFunc;
3737

3838
void attachInterrupt(uint8_t interruptNum, void (*userFunc)(void), int mode) {

Diff for: ‎variants/leonardo/pins_arduino.h

+18-18
Original file line numberDiff line numberDiff line change
@@ -35,29 +35,29 @@
3535
#define RXLED0 PORTB |= (1<<0)
3636
#define RXLED1 PORTB &= ~(1<<0)
3737

38-
const static uint8_t SDA = 2;
39-
const static uint8_t SCL = 3;
38+
static const uint8_t SDA = 2;
39+
static const uint8_t SCL = 3;
4040

4141
// Map SPI port to 'new' pins D14..D17
42-
const static uint8_t SS = 17;
43-
const static uint8_t MOSI = 16;
44-
const static uint8_t MISO = 14;
45-
const static uint8_t SCK = 15;
42+
static const uint8_t SS = 17;
43+
static const uint8_t MOSI = 16;
44+
static const uint8_t MISO = 14;
45+
static const uint8_t SCK = 15;
4646

4747
// Mapping of analog pins as digital I/O
4848
// A6-A11 share with digital pins
49-
const static uint8_t A0 = 18;
50-
const static uint8_t A1 = 19;
51-
const static uint8_t A2 = 20;
52-
const static uint8_t A3 = 21;
53-
const static uint8_t A4 = 22;
54-
const static uint8_t A5 = 23;
55-
const static uint8_t A6 = 24; // D4
56-
const static uint8_t A7 = 25; // D6
57-
const static uint8_t A8 = 26; // D8
58-
const static uint8_t A9 = 27; // D9
59-
const static uint8_t A10 = 28; // D10
60-
const static uint8_t A11 = 29; // D12
49+
static const uint8_t A0 = 18;
50+
static const uint8_t A1 = 19;
51+
static const uint8_t A2 = 20;
52+
static const uint8_t A3 = 21;
53+
static const uint8_t A4 = 22;
54+
static const uint8_t A5 = 23;
55+
static const uint8_t A6 = 24; // D4
56+
static const uint8_t A7 = 25; // D6
57+
static const uint8_t A8 = 26; // D8
58+
static const uint8_t A9 = 27; // D9
59+
static const uint8_t A10 = 28; // D10
60+
static const uint8_t A11 = 29; // D12
6161

6262
// __AVR_ATmega32U4__ has an unusual mapping of pins to channels
6363
extern const uint8_t PROGMEM analog_pin_to_channel_PGM[];

Diff for: ‎variants/mega/pins_arduino.h

+23-23
Original file line numberDiff line numberDiff line change
@@ -32,31 +32,31 @@
3232
#define analogInputToDigitalPin(p) ((p < 16) ? (p) + 54 : -1)
3333
#define digitalPinHasPWM(p) (((p) >= 2 && (p) <= 13) || ((p) >= 44 && (p)<= 46))
3434

35-
const static uint8_t SS = 53;
36-
const static uint8_t MOSI = 51;
37-
const static uint8_t MISO = 50;
38-
const static uint8_t SCK = 52;
35+
static const uint8_t SS = 53;
36+
static const uint8_t MOSI = 51;
37+
static const uint8_t MISO = 50;
38+
static const uint8_t SCK = 52;
3939

40-
const static uint8_t SDA = 20;
41-
const static uint8_t SCL = 21;
42-
const static uint8_t LED_BUILTIN = 13;
40+
static const uint8_t SDA = 20;
41+
static const uint8_t SCL = 21;
42+
static const uint8_t LED_BUILTIN = 13;
4343

44-
const static uint8_t A0 = 54;
45-
const static uint8_t A1 = 55;
46-
const static uint8_t A2 = 56;
47-
const static uint8_t A3 = 57;
48-
const static uint8_t A4 = 58;
49-
const static uint8_t A5 = 59;
50-
const static uint8_t A6 = 60;
51-
const static uint8_t A7 = 61;
52-
const static uint8_t A8 = 62;
53-
const static uint8_t A9 = 63;
54-
const static uint8_t A10 = 64;
55-
const static uint8_t A11 = 65;
56-
const static uint8_t A12 = 66;
57-
const static uint8_t A13 = 67;
58-
const static uint8_t A14 = 68;
59-
const static uint8_t A15 = 69;
44+
static const uint8_t A0 = 54;
45+
static const uint8_t A1 = 55;
46+
static const uint8_t A2 = 56;
47+
static const uint8_t A3 = 57;
48+
static const uint8_t A4 = 58;
49+
static const uint8_t A5 = 59;
50+
static const uint8_t A6 = 60;
51+
static const uint8_t A7 = 61;
52+
static const uint8_t A8 = 62;
53+
static const uint8_t A9 = 63;
54+
static const uint8_t A10 = 64;
55+
static const uint8_t A11 = 65;
56+
static const uint8_t A12 = 66;
57+
static const uint8_t A13 = 67;
58+
static const uint8_t A14 = 68;
59+
static const uint8_t A15 = 69;
6060

6161
// A majority of the pins are NOT PCINTs, SO BE WARNED (i.e. you cannot use them as receive pins)
6262
// Only pins available for RECEIVE (TRANSMIT can be on any pin):

Diff for: ‎variants/standard/pins_arduino.h

+18-18
Original file line numberDiff line numberDiff line change
@@ -37,23 +37,23 @@
3737
#define digitalPinHasPWM(p) ((p) == 3 || (p) == 5 || (p) == 6 || (p) == 9 || (p) == 10 || (p) == 11)
3838
#endif
3939

40-
const static uint8_t SS = 10;
41-
const static uint8_t MOSI = 11;
42-
const static uint8_t MISO = 12;
43-
const static uint8_t SCK = 13;
44-
45-
const static uint8_t SDA = 18;
46-
const static uint8_t SCL = 19;
47-
const static uint8_t LED_BUILTIN = 13;
48-
49-
const static uint8_t A0 = 14;
50-
const static uint8_t A1 = 15;
51-
const static uint8_t A2 = 16;
52-
const static uint8_t A3 = 17;
53-
const static uint8_t A4 = 18;
54-
const static uint8_t A5 = 19;
55-
const static uint8_t A6 = 20;
56-
const static uint8_t A7 = 21;
40+
static const uint8_t SS = 10;
41+
static const uint8_t MOSI = 11;
42+
static const uint8_t MISO = 12;
43+
static const uint8_t SCK = 13;
44+
45+
static const uint8_t SDA = 18;
46+
static const uint8_t SCL = 19;
47+
static const uint8_t LED_BUILTIN = 13;
48+
49+
static const uint8_t A0 = 14;
50+
static const uint8_t A1 = 15;
51+
static const uint8_t A2 = 16;
52+
static const uint8_t A3 = 17;
53+
static const uint8_t A4 = 18;
54+
static const uint8_t A5 = 19;
55+
static const uint8_t A6 = 20;
56+
static const uint8_t A7 = 21;
5757

5858
#define digitalPinToPCICR(p) (((p) >= 0 && (p) <= 21) ? (&PCICR) : ((uint8_t *)0))
5959
#define digitalPinToPCICRbit(p) (((p) <= 7) ? 2 : (((p) <= 13) ? 0 : 1))
@@ -215,4 +215,4 @@ const uint8_t PROGMEM digital_pin_to_timer_PGM[] = {
215215

216216
#endif
217217

218-
#endif
218+
#endif

0 commit comments

Comments
 (0)