rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-11-30 08:24:11 +01:00
Code Issues Releases Activity

OP-21/Flight Bootloader - Minor bug fix.

Browse Source 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@1508 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
zedamota 2010-09-02 22:43:32 +00:00 committed by zedamota
parent 7a66232be0
commit 749267aee5
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
flight/Bootloaders/OpenPilot/op_dfu.c
View File

@ -138,7 +138,7 @@ if (EchoReqFlag == 1) {
}
switch (Command) {
case EnterDFU:
if ((DeviceState == idle) && (Data0 < numberOfDevices)) {
if (((DeviceState == idle) && (Data0 < numberOfDevices)) || (DeviceState == DFUidle)) {
DeviceState = DFUidle;
currentProgrammingDestination = devicesTable[Data0].programmingType;
currentDeviceCanRead = devicesTable[Data0].readWriteFlags & 0x01;
@ -197,7 +197,7 @@ case Upload:
Aditionals = Count;
} else if (Count == Next_Packet - 1) {
uint8_t numberOfWords = 14;
if (Count == SizeOfTransfer)//is this the last packet?
if (Count == SizeOfTransfer-1)//is this the last packet?
{
numberOfWords = SizeOfLastPacket;
}
@ -262,14 +262,14 @@ case Req_Capabilities:
Buffer[8] = WRFlags >> 8;
Buffer[9] = WRFlags;
} else {
Buffer[2] = devicesTable[Data0].sizeOfCode >> 24;
Buffer[3] = devicesTable[Data0].sizeOfCode >> 16;
Buffer[4] = devicesTable[Data0].sizeOfCode >> 8;
Buffer[5] = devicesTable[Data0].sizeOfCode;
Buffer[2] = devicesTable[Data0-1].sizeOfCode >> 24;
Buffer[3] = devicesTable[Data0-1].sizeOfCode >> 16;
Buffer[4] = devicesTable[Data0-1].sizeOfCode >> 8;
Buffer[5] = devicesTable[Data0-1].sizeOfCode;
Buffer[6] = Data0;
Buffer[7] = devicesTable[Data0].sizeOfHash;
Buffer[8] = devicesTable[Data0].sizeOfDescription;
Buffer[8] = devicesTable[Data0].devID;
Buffer[7] = devicesTable[Data0-1].sizeOfHash;
Buffer[8] = devicesTable[Data0-1].sizeOfDescription;
Buffer[9] = devicesTable[Data0-1].devID;
}
USB_SIL_Write(EP1_IN, (uint8_t*) Buffer, 64);
SetEPTxValid(ENDP1);