Skip to content

Commit

Permalink
flasher code - does not compile
Browse files Browse the repository at this point in the history
  • Loading branch information
Nicolas Reinecke committed Feb 22, 2016
1 parent 1b7e7fc commit 3b63f31
Show file tree
Hide file tree
Showing 4 changed files with 245 additions and 2 deletions.
2 changes: 1 addition & 1 deletion stm32f103/bootloader/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ INCDIRS += stm32f103/bootloader/inc
INCDIRS += shared

SOURCES += stm32f103/bootloader/src/main.c
#SOURCES += stm32f103/bootloader/src/bootloader.c
SOURCES += stm32f103/bootloader/src/bootloader.c
SOURCES += stm32f103/bootloader/src/usart.c
SOURCES += stm32f103/bootloader/src/version.c
SOURCES += shared/common.c
Expand Down
242 changes: 242 additions & 0 deletions stm32f103/bootloader/src/bootloader.c
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,242 @@
#include "stm32f10x.h"
#include "usart.h"

#define BOOTLOADER_MAJOR_VERSION 3 // needed for Ext Erase in stm32loader.py
#define BOOTLOADER_MINOR_VERSION 0

#define CMD_GET (0x00)
#define CMD_GET_ID (0x02)
#define CMD_READ (0x11)
#define CMD_GO (0x21)
#define CMD_WRITE (0x31)
#define CMD_EXTERASE (0x44)

#define FLASH_START 0x80001000
#define FLASH_FLAG_EOP 0x1024

#define RAM_START 0x20000004
#define BOOTLOADER_SIZE 0x80000fff // FIXME

#define ACK (0x79)
#define NACK (0x1F)

typedef enum {
BLS_UNDEFINED,
BLS_INITED, // Has got 0x7F byte...
BLS_COMMAND_FIRST_BYTE, // Got first byte of command - waiting for inverted byte
BLS_EXPECT_DATA,
} BootloaderState;

void bootloader(void)
{

// setLEDs(0b11);
int flashy = 0;
BootloaderState state = BLS_UNDEFINED;
char currentCommand = 0;

unsigned int buttonLifted = 0;
unsigned int buttonPressed = 0;

while (1) {
int f = (flashy>>9) & 0x7F;
if (f&0x40) f=128-f;
// bool ledState = (((flashy++)&0xFF)<f);

// flash led
int d = _getc();
if (d>=0) { // if we have data
if (state==BLS_EXPECT_DATA) {

} else if (state==BLS_INITED) {
currentCommand = d;
if (d!=255) state = BLS_COMMAND_FIRST_BYTE;
} else if (state==BLS_COMMAND_FIRST_BYTE) {
if (currentCommand == d^0xFF) {
unsigned int addr,i;
char chksum, chksumc, buffer[256];
unsigned int nBytesMinusOne, nPages;
// confirmed
switch (currentCommand) {
case CMD_GET: // get bootloader info
_putc(ACK);
_putc(6); // 7 bytes
// now report what we support
_putc(BOOTLOADER_MAJOR_VERSION<<4 | BOOTLOADER_MINOR_VERSION); // Bootloader version
// list supported commands
_putc(CMD_GET);
_putc(CMD_GET_ID);
_putc(CMD_READ);
_putc(CMD_GO);
_putc(CMD_WRITE);
_putc(CMD_EXTERASE); // erase
_putc(ACK); // last byte
break;
case CMD_GET_ID: // get chip ID
_putc(ACK);
_putc(1); // 2 bytes
// 0x430 F1 XL density
// 0x414 F1 high density
// 0x6433 F401 CD

_putc(0x04); _putc(0x14); // FIXME processor id

_putc(ACK); // last byte
break;
case CMD_READ: // read memory
_putc(ACK);
addr = _getc_blocking() << 24;
addr |= _getc_blocking() << 16;
addr |= _getc_blocking() << 8;
addr |= _getc_blocking();
chksum = _getc_blocking();
// TODO: check checksum
_putc(ACK);
// setLEDs(2); // green = wait for data
nBytesMinusOne = _getc_blocking();
chksum = _getc_blocking();
// TODO: check checksum
_putc(ACK);
for (i=0;i<=nBytesMinusOne;i++)
_putc(((unsigned char*)addr)[i]);
// setLEDs(0); // off
flashy = 0; // reset glowing
break;
case CMD_GO: // read memory
_putc(ACK);
addr = _getc_blocking() << 24;
addr |= _getc_blocking() << 16;
addr |= _getc_blocking() << 8;
addr |= _getc_blocking();
chksum = _getc_blocking();
// TODO: check checksum
_putc(ACK);
// setLEDs(7); // jumping...
unsigned int *ResetHandler = (unsigned int *)(addr + 4);
void (*startPtr)() = *ResetHandler;
startPtr();
break;
case CMD_WRITE: // write memory
_putc(ACK);
addr = _getc_blocking() << 24;
addr |= _getc_blocking() << 16;
addr |= _getc_blocking() << 8;
addr |= _getc_blocking();
chksumc = ((addr)&0xFF)^((addr>>8)&0xFF)^((addr>>16)&0xFF)^((addr>>24)&0xFF);
chksum = _getc_blocking();
if (chksumc != chksum) {
_putc(NACK);
break;
}
_putc(ACK);
// setLEDs(2); // green = wait for data
nBytesMinusOne = _getc_blocking();
chksumc = nBytesMinusOne;
for (i=0;i<=nBytesMinusOne;i++) {
buffer[i] = _getc_blocking();
chksumc = chksumc^buffer[i];
}
chksum = _getc_blocking(); // FIXME found to be stalled here
// setLEDs(1); // red = write
if (chksumc != chksum || (nBytesMinusOne+1)&3!=0) {
_putc(NACK);
break;
}
if (addr>=FLASH_START && addr<RAM_START) {
#ifdef STM32API2
FLASH_Unlock();
#else
FLASH_UnlockBank1();
#endif
#if defined(STM32F2) || defined(STM32F4)
FLASH_ClearFlag(FLASH_FLAG_EOP | FLASH_FLAG_OPERR | FLASH_FLAG_WRPERR |
FLASH_FLAG_PGAERR | FLASH_FLAG_PGPERR|FLASH_FLAG_PGSERR);
#elif defined(STM32F3)
FLASH_ClearFlag(FLASH_FLAG_EOP | FLASH_FLAG_PGERR | FLASH_FLAG_WRPERR);
#else
FLASH_ClearFlag(FLASH_FLAG_EOP | FLASH_FLAG_PGERR | FLASH_FLAG_WRPRTERR);
#endif
for (i=0;i<=nBytesMinusOne;i+=4) {
unsigned int realaddr = addr+i;
if (realaddr >= (FLASH_START+BOOTLOADER_SIZE)) // protect bootloader
FLASH_ProgramWord(realaddr, *(unsigned int*)&buffer[i]);
}
#ifdef STM32API2
FLASH_Lock();
#else
FLASH_LockBank1();
#endif
} else {
// normal write
for (i=0;i<=nBytesMinusOne;i+=4) {
unsigned int realaddr = addr+i;
*((unsigned int*)realaddr) = *(unsigned int*)&buffer[i];
}
}

// setLEDs(0); // off
flashy = 0; // reset glowing
_putc(ACK); // TODO - could speed up writes by ACKing beforehand if we have space
break;
case CMD_EXTERASE: // erase memory
_putc(ACK);
nPages = _getc_blocking() << 8;
nPages |= _getc_blocking();
chksum = _getc_blocking();
// TODO: check checksum
if (nPages == 0xFFFF) {
// all pages (except us!)
// setLEDs(1); // red = write
#if defined(STM32F2) || defined(STM32F4)
FLASH_Unlock();
#else
FLASH_UnlockBank1();
#endif
#if defined(STM32F2) || defined(STM32F4)
FLASH_ClearFlag(FLASH_FLAG_EOP | FLASH_FLAG_OPERR | FLASH_FLAG_WRPERR |
FLASH_FLAG_PGAERR | FLASH_FLAG_PGPERR|FLASH_FLAG_PGSERR);
#elif defined(STM32F3)
FLASH_ClearFlag(FLASH_FLAG_EOP | FLASH_FLAG_PGERR | FLASH_FLAG_WRPERR);
#else
FLASH_ClearFlag(FLASH_FLAG_EOP | FLASH_FLAG_PGERR | FLASH_FLAG_WRPRTERR);
#endif

#if defined(STM32F2) || defined(STM32F4)
for (i=1;i<8;i++) { // might as well do all of them
// setLEDs(1 << (i&1)); // R,G,R,G,...
FLASH_EraseSector(FLASH_Sector_0 + (FLASH_Sector_1-FLASH_Sector_0)*i, VoltageRange_3); // a FLASH_Sector_## constant
}
FLASH_Lock();
#else
for (i=BOOTLOADER_SIZE;i<FLASH_TOTAL;i+=FLASH_PAGE_SIZE) {
// setLEDs(1 << (i%3)); // R,G,B,etc
FLASH_ErasePage((uint32_t)(FLASH_START + i));
}
FLASH_LockBank1();
#endif
// setLEDs(0); // off
_putc(ACK);
} else {
_putc(NACK); // not implemented
}
break;
default: // unknown command
_putc(NACK);
break;
}
} else {
// not correct
_putc(NACK);
}
state = BLS_INITED;
} else {
switch (d) {
case 0x7F: // initialisation byte
_putc(state == BLS_UNDEFINED ? ACK : NACK);
state = BLS_INITED;
break;
}
}
}
}
}
Empty file added stm32f103/bootloader/src/bootloader.h
View file
Empty file.
3 changes: 2 additions & 1 deletion stm32f103/bootloader/src/main.c
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#include "stm32f10x.h"
#include "version.h"
#include "bootloader.h"
#include "usart.h"

extern uint32_t _app_start;
Expand Down Expand Up @@ -101,7 +102,7 @@ int main(void)
GPIOC->BSRR = 0x10002; //gelb
#ifdef BOOT_UART2
usart_init();
//bootloader();
bootloader();
#endif // BOOT_UART2
while (1);
} else {
Expand Down

0 comments on commit 3b63f31

Please sign in to comment.