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

Update to v1.1.0 #29

Merged
muellerr merged 427 commits from develop into master 2021-04-25 12:43:23 +02:00
Conversation 0 Commits 427 Files Changed 381 +7 -8
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 95ab220f6e - Show all commits

6
bsp_q7s/ObjectFactory.cpp
View File

@ -95,9 +95,9 @@ void ObjectFactory::produce(){
* Setting PCDU devices to mode normal immediately after start up because PCDU is always * Setting PCDU devices to mode normal immediately after start up because PCDU is always
* running. * running.
*/ */
// p60dockhandler->setModeNormal(); p60dockhandler->setModeNormal();
// pdu1handler->setModeNormal(); pdu1handler->setModeNormal();
// pdu2handler->setModeNormal(); pdu2handler->setModeNormal();
acuhandler->setModeNormal(); acuhandler->setModeNormal();
#endif #endif
/* Temperature sensors */ /* Temperature sensors */

2
bsp_q7s/gpio/GpioIF.h
View File

@ -40,7 +40,7 @@ public:
virtual ReturnValue_t pullLow(gpioId_t gpioId) = 0; virtual ReturnValue_t pullLow(gpioId_t gpioId) = 0;
/** /**
* @brief This function requires a child to implement the functionaliy to read the state of * @brief This function requires a child to implement the functionality to read the state of
* an ouput or input gpio. * an ouput or input gpio.
* *
* @param gpioId A unique number which specifies the GPIO to read. * @param gpioId A unique number which specifies the GPIO to read.

7
mission/devices/devicedefinitions/GomspaceDefinitions.h
View File

@ -356,10 +356,9 @@ namespace P60System {
namespace P60Dock { namespace P60Dock {
/* The maximum size of a reply from the P60 dock. Maximum size is reached
* when retrieving the full parameter configuration table. 412 bytes of /** Max reply size reached when requesting full hk table */
* payload data and 12 bytes of CSP header data. */ static const uint16_t MAX_REPLY_LENGTH = 407;
static const uint16_t MAX_REPLY_LENGTH = 424;
static const uint16_t MAX_CONFIGTABLE_ADDRESS = 408; static const uint16_t MAX_CONFIGTABLE_ADDRESS = 408;
static const uint16_t MAX_HKTABLE_ADDRESS = 187; static const uint16_t MAX_HKTABLE_ADDRESS = 187;