Skip to content

Commit f4bd928

Browse files
committed
Merge pull request nickgammon#26 from NicoHood/arduino_ide166
Added Arduino IDE 1.6.6 compatibility
2 parents 4654efe + 3b4794a commit f4bd928

File tree

4 files changed

+12
-6
lines changed

4 files changed

+12
-6
lines changed

Atmega_Board_Detector/ICSP_Utils.ino

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ const byte fuseCommands [4] = { writeLowFuseByte, writeHighFuseByte, writeExtend
5353

5454
// execute one programming instruction ... b1 is command, b2, b3, b4 are arguments
5555
// processor may return a result on the 4th transfer, this is returned.
56-
byte program (const byte b1, const byte b2 = 0, const byte b3 = 0, const byte b4 = 0)
56+
byte program (const byte b1, const byte b2 = 0, const byte b3 = 0, const byte b4 = 0);
57+
byte program (const byte b1, const byte b2, const byte b3, const byte b4)
5758
{
5859
noInterrupts ();
5960
#if USE_BIT_BANGED_SPI

Atmega_Board_Programmer/ICSP_Utils.ino

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ const byte fuseCommands [4] = { writeLowFuseByte, writeHighFuseByte, writeExtend
5353

5454
// execute one programming instruction ... b1 is command, b2, b3, b4 are arguments
5555
// processor may return a result on the 4th transfer, this is returned.
56-
byte program (const byte b1, const byte b2 = 0, const byte b3 = 0, const byte b4 = 0)
56+
byte program (const byte b1, const byte b2 = 0, const byte b3 = 0, const byte b4 = 0);
57+
byte program (const byte b1, const byte b2, const byte b3, const byte b4)
5758
{
5859
noInterrupts ();
5960
#if USE_BIT_BANGED_SPI

Atmega_Fuse_Calculator/Atmega_Fuse_Calculator.ino

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -519,15 +519,17 @@ byte lastAddressMSB = 0;
519519

520520
// execute one programming instruction ... b1 is command, b2, b3, b4 are arguments
521521
// processor may return a result on the 4th transfer, this is returned.
522-
byte program (const byte b1, const byte b2 = 0, const byte b3 = 0, const byte b4 = 0)
522+
byte program (const byte b1, const byte b2 = 0, const byte b3 = 0, const byte b4 = 0);
523+
byte program (const byte b1, const byte b2, const byte b3, const byte b4)
523524
{
524525
SPI.transfer (b1);
525526
SPI.transfer (b2);
526527
SPI.transfer (b3);
527528
return SPI.transfer (b4);
528529
} // end of program
529530

530-
void showHex (const byte b, const boolean newline = false)
531+
void showHex (const byte b, const boolean newline = false);
532+
void showHex (const byte b, const boolean newline)
531533
{
532534
Serial.print (F("0x"));
533535
// try to avoid using sprintf

Atmega_Self_Read_Signature/Atmega_Self_Read_Signature.ino

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,8 @@ const signatureType signatures [] =
122122
// if signature found in above table, this is its index
123123
int foundSig = -1;
124124

125-
void showHex (const byte b, const boolean newline = false)
125+
void showHex (const byte b, const boolean newline = false);
126+
void showHex (const byte b, const boolean newline)
126127
{
127128
// try to avoid using sprintf
128129
char buf [4] = { ((b >> 4) & 0x0F) | '0', (b & 0x0F) | '0', ' ' , 0 };
@@ -135,7 +136,8 @@ void showHex (const byte b, const boolean newline = false)
135136
Serial.println ();
136137
} // end of showHex
137138

138-
void showYesNo (const boolean b, const boolean newline = false)
139+
void showYesNo (const boolean b, const boolean newline = false);
140+
void showYesNo (const boolean b, const boolean newline)
139141
{
140142
if (b)
141143
Serial.print (F("Yes"));

0 commit comments

Comments
 (0)