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

some changes for P60Dock cookie

Browse Source
This commit is contained in:
Jakob Meier 2020-12-05 14:52:18 +01:00
parent ad97a5538c
commit c0ce686478
4 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bsp_linux/comIF/cookies/P60DockCookie.cpp
View File

@ -1,8 +1,8 @@
#include "bsp_linux/comIF/cookies/P60DockCookie.h" #include "bsp_linux/comIF/cookies/P60DockCookie.h"
P60DockCookie::P60DockCookie(char* canInterface_, uint8_t cspAddress_) : P60DockCookie::P60DockCookie(uint8_t cspAddress_) :
canInterface(canInterface_), cspAddress(cspAddress_) { cspAddress(cspAddress_) {
} }

5
bsp_linux/comIF/cookies/P60DockCookie.h
View File

@ -16,10 +16,9 @@ class P60DockCookie: public CookieIF {
public: public:
/** /**
* Constructor for the CSP cookie * Constructor for the CSP cookie
* @param canInterface_ The CAN interface to use. E.g. "can0" or "can1".
* @param cspAddress_ The CSP address of the target device. * @param cspAddress_ The CSP address of the target device.
*/ */
P60DockCookie(char* canInterface_, uint8_t cspAddress_); P60DockCookie(uint8_t cspAddress_);
virtual ~P60DockCookie(); virtual ~P60DockCookie();
uint8_t getCspAddress(); uint8_t getCspAddress();
@ -40,7 +39,7 @@ public:
private: private:
char* canInterface; char canInterface[5] = "can0";
uint8_t cspAddress; uint8_t cspAddress;
int bitrate = 1000; int bitrate = 1000;
MessageType_t nextMessage = MESSAGE_NONE; MessageType_t nextMessage = MESSAGE_NONE;

3
mission/core/GenericFactory.cpp
View File

@ -85,9 +85,8 @@ void ObjectFactory::produceGenericObjects() {
new CService200ModeCommanding(objects::PUS_SERVICE_200_MODE_MGMT, new CService200ModeCommanding(objects::PUS_SERVICE_200_MODE_MGMT,
apid::EIVE_OBSW, pus::PUS_SERVICE_200); apid::EIVE_OBSW, pus::PUS_SERVICE_200);
char canInterface[] = "can0";
/* Cookies */ /* Cookies */
P60DockCookie* p60DockCookie = new P60DockCookie(canInterface, addresses::P60DOCK); P60DockCookie* p60DockCookie = new P60DockCookie(addresses::P60DOCK);
/* Communication interfaces */ /* Communication interfaces */
new P60DockComIF(objects::P60_DOCK_COM_IF); new P60DockComIF(objects::P60_DOCK_COM_IF);

2
tmtc

@ -1 +1 @@
Subproject commit 3fc71f9094e8fb670942f0c29a9dea0b6e03d17f Subproject commit 0c0e0595f177b8fe4100902058a10e8d5ad34663