eive/eive-obsw
eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 1 Releases 120 Wiki Activity

changes in plocDefinitions and plocHandler

Browse Source
This commit is contained in:
Jakob Meier 2021-04-19 17:17:22 +02:00
parent cc075844fd
commit a973d67d07
3 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@ -580,3 +580,9 @@ Get info about ttyUL* devices
````
cat /proc/tty/driver
````
## Useful Q7S Linux Commands
Rebooting currently running image:
````
xsc_boot_copy -r
````

13
mission/devices/PlocHandler.cpp
View File

@ -106,8 +106,21 @@ ReturnValue_t PlocHandler::scanForReply(const uint8_t *start,
break;
case(PLOC::APID_ACK_FAILURE):
*foundLen = PLOC::SIZE_ACK_REPORT;
<<<<<<< Updated upstream
*foundId = rememberCommandId;
break;
=======
break;
case(PLOC::TM_READ_REPORT):
*foundLen = PLOC::SIZE_ACK_REPORT;
break;
case(PLOC::EXE_SUCCESS):
*foundLen = PLOC::SIZE_EXE_REPORT;
break;
case(PLOC::EXE_FAILURE):
*foundLen = PLOC::SIZE_EXE_REPORT;
break;
>>>>>>> Stashed changes
default:
sif::debug << "PlocHandler::scanForReply: Reply has invalid apid" << std::endl;
return IGNORE_REPLY_DATA;

8
mission/devices/devicedefinitions/PlocDefinitions.h
View File

@ -10,6 +10,14 @@ namespace PLOC {
static const DeviceCommandId_t NONE = 0x0;
static const DeviceCommandId_t TC_MEM_WRITE = 0x714;
static const DeviceCommandId_t TC_MEM_READ = 0x715;
<<<<<<< Updated upstream
=======
static const DeviceCommandId_t ACK_SUCCESS = 0x400;
static const DeviceCommandId_t ACK_FAILURE = 0x401;
static const DeviceCommandId_t EXE_SUCCESS = 0x402;
static const DeviceCommandId_t EXE_FAILURE = 0x403;
static const DeviceCommandId_t TM_READ_REPORT = 0x404;
>>>>>>> Stashed changes
static const uint16_t SIZE_ACK_REPORT = 14;
static const uint16_t SIZE_EXE_REPORT = 14;