Merge branch 'master' into devel

This commit is contained in:
Oskar Weigl
2018-04-07 18:22:16 -07:00
2 changed files with 2 additions and 2 deletions
+1 -1
View File
@@ -166,7 +166,7 @@ void StartDefaultTask(void const * argument)
thread_cmd_parse = osThreadCreate(osThread(task_cmd_parse), NULL);
// Start USB interrupt handler thread
osThreadDef(task_usb_pump, usb_update_thread, osPriorityNormal, 0, 512);
osThreadDef(task_usb_pump, usb_update_thread, osPriorityAboveNormal, 0, 512);
thread_usb_pump = osThreadCreate(osThread(task_usb_pump), NULL);
//If we get to here, then the default task is done.
+1 -1
View File
@@ -118,7 +118,7 @@ the device during upgrade. Otherwise, if something goes wrong, you need an exter
programmer to recover the device. This will be fixed in the future.
### Flashing the firmware (external Programmer)
* **Make sure you have [configured the parameters first](#configuring-parameters)**
* **Make sure you have [configured the build first](#configuring-the-build)**
* Connect `GND`, `SWD`, and `SWC` on connector J2 to the programmer. Note: Always plug in `GND` first!
* You need to power the board by only **ONE** of the following: VCC(3.3v), 5V, or the main power connection (the DC bus). The USB port (J1) does not power the board.
* Run `make flash` in the `Firmware` directory.