Update to v1.8.0 #100

Merged
muellerr merged 125 commits from develop into main 2021-09-24 10:17:43 +02:00
4 changed files with 6 additions and 2 deletions
Showing only changes of commit 5779f511cf - Show all commits

2
fsfw

@ -1 +1 @@
Subproject commit 924c150af27484f9eb4439ec80c048b46c226890 Subproject commit 73eb11f4f1e7cc80f61d04ad7722fe53608f8051

1
generators/.gitignore vendored Normal file
View File

@ -0,0 +1 @@
.~lock*

View File

@ -52,6 +52,8 @@ ReturnValue_t GPSHyperionHandler::buildNormalDeviceCommand(DeviceCommandId_t *id
ReturnValue_t GPSHyperionHandler::buildCommandFromCommand( ReturnValue_t GPSHyperionHandler::buildCommandFromCommand(
DeviceCommandId_t deviceCommand, const uint8_t *commandData, DeviceCommandId_t deviceCommand, const uint8_t *commandData,
size_t commandDataLen) { size_t commandDataLen) {
// By default, send nothing
rawPacketLen = 0;
switch(deviceCommand) { switch(deviceCommand) {
case(GpsHyperion::TRIGGER_RESET_PIN): { case(GpsHyperion::TRIGGER_RESET_PIN): {
if(resetCallback != nullptr) { if(resetCallback != nullptr) {
@ -181,6 +183,7 @@ ReturnValue_t GPSHyperionHandler::initializeLocalDataPool(
void GPSHyperionHandler::fillCommandAndReplyMap() { void GPSHyperionHandler::fillCommandAndReplyMap() {
// Reply length does not matter, packets should always arrive periodically // Reply length does not matter, packets should always arrive periodically
insertInReplyMap(GpsHyperion::GPS_REPLY, 4, &gpsSet, 0, true); insertInReplyMap(GpsHyperion::GPS_REPLY, 4, &gpsSet, 0, true);
insertInCommandMap(GpsHyperion::TRIGGER_RESET_PIN);
} }
void GPSHyperionHandler::modeChanged() { void GPSHyperionHandler::modeChanged() {

2
tmtc

@ -1 +1 @@
Subproject commit d84c6a7e70e68f28dcfb21ccfdaae6a0300eab40 Subproject commit cce04cc163c769136b7d6e3effa381a72d6f4c16