Commit Graph

240 Commits

Author SHA1 Message Date
Jakob Meier
1ce45acba3 merged develop 2022-04-17 14:52:43 +02:00
be2834cb1a
linux ctrl only print warning once 2022-04-17 11:48:06 +02:00
d3403d341f
if gpssmm cant be opened, return prematurely 2022-04-17 01:06:37 +02:00
Jakob Meier
7b54855397 supervisor fixes detected during testing 2022-04-16 17:19:32 +02:00
57cc77e197
fixed some tiny bugs 2022-04-15 01:39:47 +02:00
25138d8931
update
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-04-14 09:42:59 +02:00
Jakob Meier
10343a0dab supervisor event buffer request 2022-04-14 07:52:21 +02:00
Irini Kosmidou
bbdd3c052e mutex
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-04-13 17:47:24 +02:00
Irini Kosmidou
9f3f264eac continued scex uart reader, some bugs
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-04-13 17:43:16 +02:00
Jakob Meier
bd8cd49117 event buffer request wip 2022-04-13 11:56:37 +02:00
Jakob Meier
7f51ffc8fb use structs instead of classes 2022-04-12 17:42:41 +02:00
Jakob Meier
05a85ab8a1 implemeted ICD changes 2022-04-11 16:52:50 +02:00
8a0999851f
update for new fsfw API
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
- Apply auto-formatter
2022-04-11 14:56:20 +02:00
Jakob Meier
b440fc3df6 ploc update
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-04-10 18:46:39 +02:00
d00cb6d4a5
updates for new dle parser API
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-04-09 15:38:09 +02:00
808e01dfd3
DLE FRAM packets can be read now
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-04-09 14:43:06 +02:00
6071e34771
some refactoring 2022-04-08 21:16:02 +02:00
f6bc884edd Merge remote-tracking branch 'origin/develop' into irini
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-04-08 20:50:13 +02:00
Irini Kosmidou
01d86a0c7b huge progress
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-04-08 19:12:21 +02:00
Irini Kosmidou
35f2d2cb9c solve merge comflioct
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-04-08 15:25:07 +02:00
Irini Kosmidou
188f8863d0 Merge remote-tracking branch 'origin/develop' into irini
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-04-08 15:21:31 +02:00
90e8d7ecaf
Merge remote-tracking branch 'origin/develop' into mueller/pcdu-hk-core-sets
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-04-08 14:15:58 +02:00
c83efd149e
small tweak
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
2022-04-08 11:41:17 +02:00
6ae9e539a6
more useful printout
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-04-08 11:40:35 +02:00
351920aa7b
some tweaks
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-04-08 11:31:29 +02:00
4a6840f098
bugfixes and improvements
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
- Tests finished
2022-04-08 11:22:16 +02:00
cb81798c0c Merge branch 'develop' into mueller/pcdu-hk-core-sets
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-04-07 17:34:08 +02:00
5801c17509 Merge remote-tracking branch 'origin/develop' into mueller/gps-time-update
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-04-07 17:24:05 +02:00
796b814b49
Add time file handling 2022-04-07 17:23:50 +02:00
Jakob Meier
dbe4f70d8e Merge branch 'meier/plocSupv' into meier/plocSupvUpdate 2022-04-07 12:26:30 +02:00
4e3fa54ae2
split P60 dock HK into core and aux HK
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-04-07 12:22:08 +02:00
bf849b24e6
Merge remote-tracking branch 'origin/develop' into mueller/hk-check
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
2022-04-07 11:59:02 +02:00
64dce75e09
hk update for gps
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-04-07 11:56:01 +02:00
ca92b85864
enable periodic HK by default
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
2022-04-07 11:22:29 +02:00
8f4f271331
longer HK intervals
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-04-07 11:15:28 +02:00
1876bbe449 Merge remote-tracking branch 'origin/develop' into mueller/gps-update
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-04-07 11:12:52 +02:00
5c4ae861b1
exclude gps changes
Some checks are pending
EIVE/eive-obsw/pipeline/pr-develop Build started...
EIVE/eive-obsw/pipeline/head Build queued...
2022-04-07 11:11:37 +02:00
1a5196f9d2
Merge remote-tracking branch 'origin/develop' into mueller/pl-pcdu-update-mode-handling
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-04-07 11:03:24 +02:00
8f391d3a68 Merge branch 'develop' into mueller/gps-update
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-04-07 11:00:22 +02:00
Jakob Meier
c0fd9aee6f update helper wip 2022-04-07 11:00:07 +02:00
c3aa9fb908
update for gps
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
- GPSD/NTPD finally seem to work now. Still keep code to set it manually for  now
2022-04-07 10:55:29 +02:00
a6d20de0a5
GPS linux controller update
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-04-07 10:02:56 +02:00
3f6a534db5 fixes identified during tests
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-04-06 17:27:44 +02:00
Jakob Meier
f058cf5e31 supervisor udpate wip
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-04-06 08:36:34 +02:00
Jakob Meier
9837a1b62c changes in supervisor commands
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-04-06 07:10:20 +02:00
6020b20fc9
hk handling
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-04-04 18:47:09 +02:00
65ce25ec7a
improved P60 HK handling
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-04-04 17:16:52 +02:00
ec880d4232
apply auto-formatter
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
2022-04-04 13:40:45 +02:00
b12ffb6f44
PL PCDU switch states like mode bitmask now
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-04-04 13:39:35 +02:00
36666f214c
Merge remote-tracking branch 'origin/develop' into mueller/master
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-04-03 20:15:41 +02:00
e9b2def10e mpsoc sending action command during startup to supervisor
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-03-31 11:50:33 +02:00
f427d372a7
Merge remote-tracking branch 'origin/develop' into mueller/master
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-03-30 13:11:11 +02:00
Jakob Meier
2dca9d598d mpsoc startup command 2022-03-30 09:19:30 +02:00
9cfb2bad51
only set time every 60 seconds
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-03-29 17:47:40 +02:00
a8457d7966
small safety mechanism for time
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-03-29 16:59:48 +02:00
0ba2caaf61
set the time in the code directly now
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-03-29 16:53:05 +02:00
Jakob Meier
25c3f39c82 star tracker switch 2022-03-29 07:58:22 +02:00
e6ad0978de
run auto-formatter
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-03-28 13:54:46 +02:00
d6ed952fa9 use power switcher to turn on supervisor
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-03-28 11:34:06 +02:00
Jakob Meier
758c4e6f4f uart isolator switch handling 2022-03-28 09:08:11 +02:00
Jakob Meier
e2c9bece05 adding uart isolator switches wip 2022-03-27 14:42:20 +02:00
Jakob Meier
6d04c278c3 run clang formatting script
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-03-27 13:07:18 +02:00
Jakob Meier
0d8ccd649a return execution finished in executeAction 2022-03-27 12:56:39 +02:00
Jakob Meier
022ae4091d preprocessor define correction 2022-03-27 12:20:25 +02:00
Jakob Meier
44a0d4af61 removed te0720 code form q7s files
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-03-27 10:56:40 +02:00
Jakob Meier
ceb7f40d35 fixed merge conflicts
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-03-27 10:44:32 +02:00
Jakob Meier
471a981ccf mpsoc flash write command 2022-03-26 20:47:25 +01:00
Jakob Meier
47a3804145 fixed conflicts
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-03-26 10:41:30 +01:00
Irini Kosmidou
df712c7100 scex reader task started
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-03-25 17:48:38 +01:00
4ccec03e47 changed some error messages to warnings 2022-03-25 09:40:43 +01:00
Jakob Meier
3df7a7f896 get status function
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-03-25 09:08:01 +01:00
1e2df7bf91 replay command
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-03-24 17:39:50 +01:00
368b01c081 include fixes
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-03-23 11:13:59 +01:00
Jakob Meier
f99e96a20a flash write tc, fix in pus data extraction
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-03-23 05:28:24 +01:00
Jakob Meier
78b3f28188 restructured flash write command 2022-03-22 11:35:44 +01:00
Jakob Meier
bbed4a3b6e e-band control commands 2022-03-21 16:21:51 +01:00
664670573a tc replay stop wip
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-03-21 11:05:41 +01:00
Jakob Meier
be45d21486 mpsoc flash delete command
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-03-21 08:53:55 +01:00
Jakob Meier
5875868f72 flash delete wip
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-03-21 08:35:28 +01:00
Jakob Meier
b8fb5c289c fix in mem write command 2022-03-17 19:51:00 +01:00
acd0307591
continued ACS board + SUS board assemblies
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
- Handling and Testing of basic FDIR
2022-03-17 19:23:39 +01:00
Jakob Meier
9dc124004d build configuration for trenz te0720-1cfa 2022-03-17 14:28:32 +01:00
84dead546c
name fix
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-03-08 09:54:02 +01:00
e2ad666d07 Merge branch 'mueller/additional-gcc-warnings' into mueller/system-subsystems
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-03-08 09:49:16 +01:00
10a2973dc7
minor update in fsfw
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-03-08 09:48:18 +01:00
39c47a1abf
Merge branch 'mueller/additional-gcc-warnings' into mueller/system-subsystems
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-03-08 09:44:38 +01:00
6ccf16f56d
enabled more GCC warnings
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-03-08 09:37:23 +01:00
32def71502
first version of ACS board ASS working
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
- Testes transition OFF to NORMAL for A side
- Refactored power switching so it can be used by SUS ass as well
- Generate events for sending switch command
- Generate event if switch state changes
- Deny Q7S switch commanding
2022-03-05 03:02:09 +01:00
8054694763
update for generator scripts
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
- Generators will now copy csv files into tmtc folder
- Bump fsfwgen dependency, some bugfixes
- Rerun formatter
- Rerun generator scripts
2022-03-04 15:14:02 +01:00
ff0da65662
started SUS assembly
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
fixes for PCDU code and switcher list handling
2022-03-03 15:37:36 +01:00
5255e7d2ed
finished ACS board ASS
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-03-03 10:12:59 +01:00
5873371d36
continued acs board assembly
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-03-02 17:56:54 +01:00
54fb646ea1 Merge remote-tracking branch 'origin/develop' into mueller/small-rpi-fix
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop Build started...
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-03-01 17:50:33 +01:00
27f9c0223c
use new cmake option
Some checks failed
EIVE/eive-obsw/pipeline/head Build queued...
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-03-01 17:48:05 +01:00
Jakob Meier
57b815c8ee progress printer
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-03-01 17:17:15 +01:00
Jakob Meier
f88674ed59 applied clang formatting 2022-02-27 15:48:42 +01:00
Jakob Meier
dfd817d27b refactored star tracker handler 2022-02-27 15:46:06 +01:00
Jakob Meier
e61dfc0401 fixed conflicts 2022-02-25 14:39:18 +01:00
Jakob Meier
e082f3973a star tracker flash read 2022-02-25 14:24:51 +01:00
2419e9fcc6 commands to disable and enable star tracker filename timestamping
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-02-24 13:47:52 +01:00
7ae2d7117e
deleted former file ,inc fix
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-02-23 19:12:41 +01:00
10e2600415
moved gps handler and deployment handler
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-02-23 19:08:12 +01:00
Jakob Meier
b822ee77bc star tracker firmware update
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-02-23 18:15:34 +01:00
9c625a5743 cmakelists.txt fix
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-02-22 20:36:47 +01:00
e58c375cb9 moved and refactored sus handler
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-02-22 20:34:25 +01:00
Jakob Meier
7d01aa463b Merge branch 'mohr/startracker' into meier/startracker 2022-02-21 10:04:15 +01:00
Jakob Meier
b10bf2c68d introduced bootloader and firmware submodes 2022-02-21 10:03:49 +01:00
91e0e9f233 Merge branch 'develop' into mohr/startracker
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Conflicts:
	CMakeLists.txt
	cmake/PreProjectConfig.cmake
	linux/fsfwconfig/events/translateEvents.cpp
2022-02-16 15:21:24 +01:00
Jakob Meier
88a9f8f8de introduced current program check
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-02-14 16:42:04 +01:00
Jakob Meier
7adff2c9a8 firmware update wip
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-02-14 11:28:15 +01:00
Jakob Meier
685b9cd1fb fixed conflicts 2022-02-11 15:09:45 +01:00
Jakob Meier
b1973f77f7 integrated log level, log suscription and debug camera parameter setting in startup routine
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-02-11 08:24:35 +01:00
Jakob Meier
c9e5fbc361 all parameter requests implemented 2022-02-10 18:39:37 +01:00
Jakob Meier
ac49f3f72b Merge branch 'meier/startrackerRoofTest' into meier/startrackeregse 2022-02-10 11:47:50 +01:00
4d154b7cee reworked cmake, unfortunately a big one due to interdependence
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
- /mission is a library now, in preparation of unittests (which bring their own main)
- eive-simple is now only available in bsp=arm/q7s (but is still not compiling)
- watchdog and simple are their own executables, not configurations any more
- moved some q7s specific code into /bsp-q7s to flatten if-hierarchy in main CMakeLists.txt
- compiler and linker options are not globally applied to all targets
- linux is the default fsfw osal now, as current code does not compile on hosted
2022-02-09 21:38:56 +01:00
Jakob Meier
07e68bd05b param request wip 2022-02-09 19:46:12 +01:00
Jakob Meier
a65072b743 changed egse default config to ground 2022-02-09 19:27:08 +01:00
Jakob Meier
3035aea885 wip parameter requests 2022-02-09 19:20:19 +01:00
Jakob Meier
cfce44ca3a change default name of json file 2022-02-08 16:01:06 +01:00
c3e20d6a11 debugging
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-02-08 11:59:22 +01:00
Jakob Meier
4823496b58 fixed conflicts 2022-02-08 10:34:23 +01:00
Jakob Meier
83d99a6662 run clang format script 2022-02-05 18:08:54 +01:00
Jakob Meier
68d56c4cd3 star tracker files moved to linux directory 2022-02-05 18:06:18 +01:00
Jakob Meier
b4d1046928 obsw configuration running on egse 2022-02-05 15:39:16 +01:00
Jakob Meier
e67bcd4e26 setup egse project 2022-02-05 13:19:20 +01:00
77c45c0de9
applied formatting
Some checks failed
EIVE/eive-obsw/pipeline/head Build queued...
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-01-17 15:58:27 +01:00
Jakob Meier
5067519b8a fixed merge conflicts 2021-12-14 19:57:35 +01:00
5fadb8f86d
moved heater handler
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2021-12-14 17:35:21 +01:00
54e5fef8fd
update to updated fsfw
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2021-12-09 13:43:28 +01:00
52d8ae5ffb compiling for windows again
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2021-12-08 17:23:35 +01:00
e98b985d66 cleaning up preproc defines 2021-08-17 17:48:51 +02:00
9790b395e6
include replacements
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2021-08-03 15:58:01 +02:00
009234612a
updated retval list
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2021-08-02 12:50:36 +02:00
b3dfbcf7fe removed fsfw_hal 2021-07-15 19:06:57 +02:00
bd7f15ebb6 fixed merge conflicts 2021-06-24 17:49:23 +02:00
b7e26be45e object manager singleton now 2021-06-08 16:45:25 +02:00
623f52398e moved fsfwconfig into linux folder 2021-05-17 20:03:56 +02:00
3dca311baa generated event translation files 2021-05-17 19:39:35 +02:00
d380e3106a q7s compiling 2021-05-17 16:53:06 +02:00
6f9a1853ff host compiling again 2021-05-17 16:37:29 +02:00