Compare commits

..

No commits in common. "stable" and "v1.8.4" have entirely different histories.

4 changed files with 3 additions and 5 deletions

2
.gitmodules vendored
View File

@ -1,3 +1,3 @@
[submodule "libopencm3"] [submodule "libopencm3"]
path = libopencm3 path = libopencm3
url = https://github.com/flirc/libopencm3.git url = git@github.com:flirc/libopencm3.git

View File

@ -175,13 +175,11 @@ static void usbdfu_getstatus_complete(usbd_device *usbd_dev, struct usb_setup_da
uint32_t *dat = (uint32_t *)(prog.buf + 1); uint32_t *dat = (uint32_t *)(prog.buf + 1);
nvmctrl_erase_row(*dat); //flash_erase_page(*dat); nvmctrl_erase_row(*dat); //flash_erase_page(*dat);
} }
break;
case CMD_SETADDR: case CMD_SETADDR:
{ {
uint32_t *dat = (uint32_t *)(prog.buf + 1); uint32_t *dat = (uint32_t *)(prog.buf + 1);
prog.addr = *dat; prog.addr = *dat;
} }
break;
} }
} else { } else {
//uint32_t baseaddr = prog.addr + ((prog.blocknum - 2) * //uint32_t baseaddr = prog.addr + ((prog.blocknum - 2) *

View File

@ -25,4 +25,4 @@ MEMORY
} }
/* Include the common ld script from libopenstm32. */ /* Include the common ld script from libopenstm32. */
INCLUDE cortex-m-generic.ld INCLUDE libopencm3_samd.ld

View File

@ -25,4 +25,4 @@ MEMORY
} }
/* Include the common ld script from libopenstm32. */ /* Include the common ld script from libopenstm32. */
INCLUDE cortex-m-generic.ld INCLUDE libopencm3_samd.ld