Skip to content

Mega2560 bootloader - various bugfixes #1183

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

Merged
merged 6 commits into from
Mar 11, 2013
Merged

Mega2560 bootloader - various bugfixes #1183

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8e1f626
Added patch to bootloader for Mega2560. (Mark Sproul)
cmaglie Dec 22, 2012
7625c33
Saved old production firmware for Mega2560
cmaglie Dec 22, 2012
06ee62a
Fixed compile problems with avr gcc 4.6.2 (crosspack CrossPack-AVR-20…
cmaglie Dec 22, 2012
1066766
Mega2560 bootloader: fix wrong eeprom addressing
cmaglie Mar 7, 2013
8fa7d94
Mega2560 bootloader: use avr library functions for writing into EEPROM
cmaglie Mar 7, 2013
f8ad1bc
Fixed permissions
cmaglie Mar 7, 2013
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
Prev Previous commit
Next Next commit
Fixed compile problems with avr gcc 4.6.2 (crosspack CrossPack-AVR-20… 
…121207.dmg)
  • Loading branch information
@cmaglie
cmaglie committed Dec 22, 2012
commit 06ee62afc66e9917b3dc38bcf496de0e1a3d7d7d
2 changes: 1 addition & 1 deletion hardware/arduino/bootloaders/stk500v2/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ CINCS =
CFLAGS = -g$(DEBUG)
CFLAGS += $(CDEFS) $(CINCS)
CFLAGS += -O$(OPT)
CFLAGS += -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enums -mno-tablejump
CFLAGS += -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enums -fno-jump-tables
CFLAGS += -Wall -Wstrict-prototypes
CFLAGS += -Wa,-adhlns=$(<:.c=.lst)
CFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS))
Expand Down
118 changes: 57 additions & 61 deletions hardware/arduino/bootloaders/stk500v2/stk500boot.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1240,82 +1240,78 @@ unsigned long gEepromIndex;
void PrintDecInt(int theNumber, int digitCnt);

#ifdef _AVR_CPU_NAME_
prog_char gTextMsg_CPU_Name[] PROGMEM = _AVR_CPU_NAME_;
const char gTextMsg_CPU_Name[] PROGMEM = _AVR_CPU_NAME_;
#else
prog_char gTextMsg_CPU_Name[] PROGMEM = "UNKNOWN";
const char gTextMsg_CPU_Name[] PROGMEM = "UNKNOWN";
#endif

prog_char gTextMsg_Explorer[] PROGMEM = "Arduino explorer stk500V2 by MLS";
prog_char gTextMsg_Prompt[] PROGMEM = "Bootloader>";
prog_char gTextMsg_HUH[] PROGMEM = "Huh?";
prog_char gTextMsg_COMPILED_ON[] PROGMEM = "Compiled on = ";
prog_char gTextMsg_CPU_Type[] PROGMEM = "CPU Type = ";
prog_char gTextMsg_AVR_ARCH[] PROGMEM = "__AVR_ARCH__= ";
prog_char gTextMsg_AVR_LIBC[] PROGMEM = "AVR LibC Ver= ";
prog_char gTextMsg_GCC_VERSION[] PROGMEM = "GCC Version = ";
prog_char gTextMsg_CPU_SIGNATURE[] PROGMEM = "CPU ID = ";
prog_char gTextMsg_FUSE_BYTE_LOW[] PROGMEM = "Low fuse = ";
prog_char gTextMsg_FUSE_BYTE_HIGH[] PROGMEM = "High fuse = ";
prog_char gTextMsg_FUSE_BYTE_EXT[] PROGMEM = "Ext fuse = ";
prog_char gTextMsg_FUSE_BYTE_LOCK[] PROGMEM = "Lock fuse = ";
prog_char gTextMsg_GCC_DATE_STR[] PROGMEM = __DATE__;
prog_char gTextMsg_AVR_LIBC_VER_STR[] PROGMEM = __AVR_LIBC_VERSION_STRING__;
prog_char gTextMsg_GCC_VERSION_STR[] PROGMEM = __VERSION__;
prog_char gTextMsg_VECTOR_HEADER[] PROGMEM = "V# ADDR op code instruction addr Interrupt";
prog_char gTextMsg_noVector[] PROGMEM = "no vector";
prog_char gTextMsg_rjmp[] PROGMEM = "rjmp ";
prog_char gTextMsg_jmp[] PROGMEM = "jmp ";
prog_char gTextMsg_WHAT_PORT[] PROGMEM = "What port:";
prog_char gTextMsg_PortNotSupported[] PROGMEM = "Port not supported";
prog_char gTextMsg_MustBeLetter[] PROGMEM = "Must be a letter";
prog_char gTextMsg_SPACE[] PROGMEM = " ";
prog_char gTextMsg_WriteToEEprom[] PROGMEM = "Writting EE";
prog_char gTextMsg_ReadingEEprom[] PROGMEM = "Reading EE";
prog_char gTextMsg_EEPROMerrorCnt[] PROGMEM = "EE err cnt=";
prog_char gTextMsg_PORT[] PROGMEM = "PORT";
const char gTextMsg_Explorer[] PROGMEM = "Arduino explorer stk500V2 by MLS";
const char gTextMsg_Prompt[] PROGMEM = "Bootloader>";
const char gTextMsg_HUH[] PROGMEM = "Huh?";
const char gTextMsg_COMPILED_ON[] PROGMEM = "Compiled on = ";
const char gTextMsg_CPU_Type[] PROGMEM = "CPU Type = ";
const char gTextMsg_AVR_ARCH[] PROGMEM = "__AVR_ARCH__= ";
const char gTextMsg_AVR_LIBC[] PROGMEM = "AVR LibC Ver= ";
const char gTextMsg_GCC_VERSION[] PROGMEM = "GCC Version = ";
const char gTextMsg_CPU_SIGNATURE[] PROGMEM = "CPU ID = ";
const char gTextMsg_FUSE_BYTE_LOW[] PROGMEM = "Low fuse = ";
const char gTextMsg_FUSE_BYTE_HIGH[] PROGMEM = "High fuse = ";
const char gTextMsg_FUSE_BYTE_EXT[] PROGMEM = "Ext fuse = ";
const char gTextMsg_FUSE_BYTE_LOCK[] PROGMEM = "Lock fuse = ";
const char gTextMsg_GCC_DATE_STR[] PROGMEM = __DATE__;
const char gTextMsg_AVR_LIBC_VER_STR[] PROGMEM = __AVR_LIBC_VERSION_STRING__;
const char gTextMsg_GCC_VERSION_STR[] PROGMEM = __VERSION__;
const char gTextMsg_VECTOR_HEADER[] PROGMEM = "V# ADDR op code instruction addr Interrupt";
const char gTextMsg_noVector[] PROGMEM = "no vector";
const char gTextMsg_rjmp[] PROGMEM = "rjmp ";
const char gTextMsg_jmp[] PROGMEM = "jmp ";
const char gTextMsg_WHAT_PORT[] PROGMEM = "What port:";
const char gTextMsg_PortNotSupported[] PROGMEM = "Port not supported";
const char gTextMsg_MustBeLetter[] PROGMEM = "Must be a letter";
const char gTextMsg_SPACE[] PROGMEM = " ";
const char gTextMsg_WriteToEEprom[] PROGMEM = "Writting EE";
const char gTextMsg_ReadingEEprom[] PROGMEM = "Reading EE";
const char gTextMsg_EEPROMerrorCnt[] PROGMEM = "EE err cnt=";
const char gTextMsg_PORT[] PROGMEM = "PORT";


//************************************************************************
//* Help messages
prog_char gTextMsg_HELP_MSG_0[] PROGMEM = "0=Zero addr";
prog_char gTextMsg_HELP_MSG_QM[] PROGMEM = "?=CPU stats";
prog_char gTextMsg_HELP_MSG_AT[] PROGMEM = "@=EEPROM test";
prog_char gTextMsg_HELP_MSG_B[] PROGMEM = "B=Blink LED";
prog_char gTextMsg_HELP_MSG_E[] PROGMEM = "E=Dump EEPROM";
prog_char gTextMsg_HELP_MSG_F[] PROGMEM = "F=Dump FLASH";
prog_char gTextMsg_HELP_MSG_H[] PROGMEM = "H=Help";
prog_char gTextMsg_HELP_MSG_L[] PROGMEM = "L=List I/O Ports";
// prog_char gTextMsg_HELP_MSG_Q[] PROGMEM = "Q=Quit & jump to user pgm";
prog_char gTextMsg_HELP_MSG_Q[] PROGMEM = "Q=Quit";
prog_char gTextMsg_HELP_MSG_R[] PROGMEM = "R=Dump RAM";
prog_char gTextMsg_HELP_MSG_V[] PROGMEM = "V=show interrupt Vectors";
prog_char gTextMsg_HELP_MSG_Y[] PROGMEM = "Y=Port blink";

prog_char gTextMsg_END[] PROGMEM = "*";
const char gTextMsg_HELP_MSG_0[] PROGMEM = "0=Zero addr";
const char gTextMsg_HELP_MSG_QM[] PROGMEM = "?=CPU stats";
const char gTextMsg_HELP_MSG_AT[] PROGMEM = "@=EEPROM test";
const char gTextMsg_HELP_MSG_B[] PROGMEM = "B=Blink LED";
const char gTextMsg_HELP_MSG_E[] PROGMEM = "E=Dump EEPROM";
const char gTextMsg_HELP_MSG_F[] PROGMEM = "F=Dump FLASH";
const char gTextMsg_HELP_MSG_H[] PROGMEM = "H=Help";
const char gTextMsg_HELP_MSG_L[] PROGMEM = "L=List I/O Ports";
// const char gTextMsg_HELP_MSG_Q[] PROGMEM = "Q=Quit & jump to user pgm";
const char gTextMsg_HELP_MSG_Q[] PROGMEM = "Q=Quit";
const char gTextMsg_HELP_MSG_R[] PROGMEM = "R=Dump RAM";
const char gTextMsg_HELP_MSG_V[] PROGMEM = "V=show interrupt Vectors";
const char gTextMsg_HELP_MSG_Y[] PROGMEM = "Y=Port blink";

const char gTextMsg_END[] PROGMEM = "*";


//************************************************************************
void PrintFromPROGMEM(void *dataPtr, unsigned char offset)
void PrintFromPROGMEM(const void *dataPtr, unsigned char offset)
{
uint8_t ii;
char theChar;

ii = offset;
theChar = 1;
dataPtr += offset;

while (theChar != 0)
{
do {
#if (FLASHEND > 0x10000)
theChar = pgm_read_byte_far((uint32_t)dataPtr + ii);
theChar = pgm_read_byte_far((uint16_t)dataPtr++);
#else
theChar = pgm_read_byte_near((uint32_t)dataPtr + ii);
theChar = pgm_read_byte_near((uint16_t)dataPtr++);
#endif
if (theChar != 0)
{
sendchar(theChar);
}
ii++;
}
} while (theChar != 0);
}

//************************************************************************
Expand All @@ -1327,7 +1323,7 @@ void PrintNewLine(void)


//************************************************************************
void PrintFromPROGMEMln(void *dataPtr, unsigned char offset)
void PrintFromPROGMEMln(const void *dataPtr, unsigned char offset)
{
PrintFromPROGMEM(dataPtr, offset);

Expand Down Expand Up @@ -1523,7 +1519,7 @@ unsigned char *ramPtr;
break;

case kDUMP_EEPROM:
theValue = eeprom_read_byte((void *)myAddressPointer);
theValue = eeprom_read_byte((uint8_t *)(uint16_t)myAddressPointer);
break;

case kDUMP_RAM:
Expand Down Expand Up @@ -1567,9 +1563,9 @@ int errorCount;
PrintNewLine();
ii = 0;
#if (FLASHEND > 0x10000)
while (((theChar = pgm_read_byte_far(gTextMsg_Explorer + ii)) != '*') && (ii < 512))
while (((theChar = pgm_read_byte_far(((uint16_t)gTextMsg_Explorer) + ii)) != '*') && (ii < 512))
#else
while (((theChar = pgm_read_byte_near(gTextMsg_Explorer + ii)) != '*') && (ii < 512))
while (((theChar = pgm_read_byte_near(((uint16_t)gTextMsg_Explorer) + ii)) != '*') && (ii < 512))
#endif
{
eeprom_write_byte((uint8_t *)ii, theChar);
Expand All @@ -1592,9 +1588,9 @@ int errorCount;
errorCount = 0;
ii = 0;
#if (FLASHEND > 0x10000)
while (((theChar = pgm_read_byte_far(gTextMsg_Explorer + ii)) != '*') && (ii < 512))
while (((theChar = pgm_read_byte_far((uint16_t)gTextMsg_Explorer + ii)) != '*') && (ii < 512))
#else
while (((theChar = pgm_read_byte_near(gTextMsg_Explorer + ii)) != '*') && (ii < 512))
while (((theChar = pgm_read_byte_near((uint16_t)gTextMsg_Explorer + ii)) != '*') && (ii < 512))
#endif
{
theEEPROMchar = eeprom_read_byte((uint8_t *)ii);
Expand Down
Loading