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

Release v1.2.0 #47

Merged
meierj merged 229 commits from develop into master 2021-06-21 17:58:40 +02:00
Conversation 1 Commits 229 Files Changed 202 +27
3 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7c28b2a0bc - Show all commits

6
README.md
View File

@ -579,4 +579,10 @@ Eclipse indexer.
Get info about ttyUL* devices Get info about ttyUL* devices
```` ````
cat /proc/tty/driver 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; break;
case(PLOC::APID_ACK_FAILURE): case(PLOC::APID_ACK_FAILURE):
*foundLen = PLOC::SIZE_ACK_REPORT; *foundLen = PLOC::SIZE_ACK_REPORT;
<<<<<<< Updated upstream
*foundId = rememberCommandId; *foundId = rememberCommandId;
break; 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: default:
sif::debug << "PlocHandler::scanForReply: Reply has invalid apid" << std::endl; sif::debug << "PlocHandler::scanForReply: Reply has invalid apid" << std::endl;
return IGNORE_REPLY_DATA; 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 NONE = 0x0;
static const DeviceCommandId_t TC_MEM_WRITE = 0x714; static const DeviceCommandId_t TC_MEM_WRITE = 0x714;
static const DeviceCommandId_t TC_MEM_READ = 0x715; 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_ACK_REPORT = 14;
static const uint16_t SIZE_EXE_REPORT = 14; static const uint16_t SIZE_EXE_REPORT = 14;