8e3f40a780
Merge remote-tracking branch 'origin/develop' into mueller/system-subsystems
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-03-14 17:48:20 +01:00
Jakob Meier
9fc1e57943
fixed conflicts
2022-03-14 14:35:07 +01:00
Jakob Meier
d99825e20e
core housekeeping
2022-03-13 16:32:40 +01:00
dd37f90b47
update for gen scripts, small fixes
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-03-11 14:33:09 +01:00
39c47a1abf
Merge branch 'mueller/additional-gcc-warnings' into mueller/system-subsystems
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
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
62229cb999
bugfixes for NORMAL to OFF transition
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-03-07 18:39:33 +01:00
597ab9c74c
update event list again
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-03-07 17:10:30 +01:00
b9139d5c40
update event list
2022-03-07 17:03:08 +01:00
e678b53452
switch initialization is now optional (default on)
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-03-07 15:55:26 +01:00
a2fee43c8c
Merge remote-tracking branch 'origin/develop' into mueller/system-subsystems
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-03-07 15:44:18 +01:00
2ef1befb9c
common gpioIds.h file
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-03-07 15:29:27 +01:00
b53900071c
subsystem ID bugfix
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-03-07 13:20:17 +01:00
d5c755a331
update events and objects
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-03-07 11:36:40 +01:00
970b8c33e5
Merge remote-tracking branch 'origin/develop' into mueller/system-subsystems
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-03-07 11:35:28 +01:00
59b89b730d
bump fsfwgen dependency
2022-03-07 11:34:32 +01:00
debc72014a
regenerate object and events
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-03-07 11:08:50 +01:00
32def71502
first version of ACS board ASS working
...
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
cbb8103278
some more bugfixes
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-03-04 18:33:23 +01:00
0904cadde5
continued ACS board assembly
2022-03-04 18:12:16 +01:00
4eb948c5ef
start acs task
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-03-04 16:03:57 +01:00
8054694763
update for generator scripts
...
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
c4ed263e6c
Merge branch 'develop' into mueller/system-subsystems
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-03-04 14:52:12 +01:00
7b9023cb6f
Merge pull request 'Update for generator scripts' ( #163 ) from mueller/generators-update into develop
...
EIVE/eive-obsw/pipeline/head Something is wrong with the build of this commit
Reviewed-on: #163
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-03-04 09:56:08 +01:00
63c4095d4d
Merge remote-tracking branch 'origin/develop' into mueller/system-subsystems
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-03-03 15:50:31 +01:00
ff0da65662
started SUS assembly
...
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
5ce46beebf
Merge remote-tracking branch 'origin/develop' into mueller/adis-optimization
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-03-03 13:38:21 +01:00
0f60d82c06
Merge remote-tracking branch 'origin/develop' into mueller/generators-update
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head Something is wrong with the build of this commit
2022-03-03 13:37:51 +01:00
f413ed6f7d
Merge branch 'mohr/buildfix' into mohr/catch2
2022-03-02 17:52:41 +01:00
05bd1cc8c6
forgot one
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-03-02 17:47:48 +01:00
2f51f58c7e
Merge branch 'develop' into mohr/catch2
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-03-02 17:12:24 +01:00
33483b81a6
update generator scripts
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-03-01 18:05:11 +01:00
3b1f088596
use OSAL define instead of dedicated define
EIVE/eive-obsw/pipeline/head Build queued...
2022-03-01 17:57:48 +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
33ff05c558
Merge remote-tracking branch 'origin/develop' into mueller/pl-pcdu-prep
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
2022-02-24 23:46:06 +01:00
5bf4e50849
clean up includes
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-02-24 12:02:23 +01:00
768bb14842
minor tweaks
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-02-24 11:57:35 +01:00
0b215bf7e0
use radfet enable pin now
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-02-24 11:47:32 +01:00
9f60c82725
intermediate PR
EIVE/eive-obsw/pipeline/head Build queued...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-02-23 19:26:02 +01:00
Jakob Meier
b822ee77bc
star tracker firmware update
EIVE/eive-obsw/pipeline/head This commit looks good
2022-02-23 18:15:34 +01:00
f5c1263dd3
now it compiles
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
2022-02-22 20:47:09 +01:00
3400c538b3
added EventManagerMock, to be extended and moved into fsfw some day
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-02-16 18:15:06 +01:00
91e0e9f233
Merge branch 'develop' into mohr/startracker
...
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
7adff2c9a8
firmware update wip
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
50cf01376f
Merge branch 'develop' into mohr/cmake
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head Build queued...
2022-02-10 16:22:28 +01:00
4d154b7cee
reworked cmake, unfortunately a big one due to interdependence
...
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
328a3b2d02
define fix
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-02-08 13:11:54 +01:00
Jakob Meier
92eb403e35
egse define fiX
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-02-08 13:09:50 +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
bb8ccd2842
fixed conflicts
2022-02-05 16:17:01 +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
c42b3f56c3
applied clang-format
EIVE/eive-obsw/pipeline/head This commit looks good
2022-02-04 17:48:05 +01:00
b8011717f7
fix which adds back descriptions
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-02-03 17:31:33 +01:00
5aa800af6e
added back more events
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-03 17:14:28 +01:00
4000c35299
added back more events
EIVE/eive-obsw/pipeline/head This commit looks good
2022-02-03 17:10:11 +01:00
39471d8261
added back some events
2022-02-03 17:06:40 +01:00
2cdd192eeb
fix decode error with imtq defintions
EIVE/eive-obsw/pipeline/head This commit looks good
2022-02-03 16:25:16 +01:00
a77d5f3669
tested cfg set request
EIVE/eive-obsw/pipeline/head This commit looks good
2022-02-03 15:31:18 +01:00
9bf3e46e3c
tested some commands
EIVE/eive-obsw/pipeline/head This commit looks good
2022-02-03 15:03:35 +01:00
e142408bb8
bpx handler now working
EIVE/eive-obsw/pipeline/head This commit looks good
2022-02-03 13:37:48 +01:00
6440567585
update event list
2022-02-03 12:03:47 +01:00
344390da14
bugfixes
2022-02-03 12:02:25 +01:00
7d5b4325e2
add bpx handler in I2C PST
EIVE/eive-obsw/pipeline/head This commit looks good
2022-02-02 17:38:14 +01:00
988a5e6b31
battery handler not created
EIVE/eive-obsw/pipeline/head This commit looks good
2022-02-02 17:36:40 +01:00
9cdc67ad6c
Merge remote-tracking branch 'origin/develop' into mueller/master
2022-02-02 09:43:58 +01:00
Jakob Meier
d91ceb6fa7
idented preprocessor define
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
2022-02-01 11:47:04 +01:00
Jakob Meier
4edbbf223c
firmware update wip
2022-02-01 11:45:22 +01:00
4050521e5a
added GNSS select pin
EIVE/eive-obsw/pipeline/head This commit looks good
2022-02-01 11:17:00 +01:00
Jakob Meier
c1726f897b
dynamic switching of cadu data sample time and clock manipulation
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-01-30 17:16:17 +01:00
521b47d9fc
decoupled IMTQ handler from OBSWConfig.h
EIVE/eive-obsw/pipeline/head This commit looks good
2022-01-27 15:29:58 +01:00
26d66d2a36
issues with IMTQ
EIVE/eive-obsw/pipeline/head This commit looks good
2022-01-27 15:26:07 +01:00
a9c93db790
updated tmtc, IMTQ switch cmd added
EIVE/eive-obsw/pipeline/head This commit looks good
2022-01-27 15:06:36 +01:00
745526ce8a
Merge pull request 'PCDU switch callback' ( #128 ) from mueller/pcdu-switch-callback into develop
...
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #128
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-01-19 19:46:56 +01:00
262837bf0b
Merge remote-tracking branch 'origin/develop' into mueller/pcdu-switch-callback
EIVE/eive-obsw/pipeline/head This commit looks good
2022-01-19 18:18:41 +01:00
c88371b37a
Merge remote-tracking branch 'origin/develop' into flipped-tmtctest-preproc-define
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
2022-01-19 18:10:12 +01:00
1eb6017a9d
callback working
EIVE/eive-obsw/pipeline/head This commit looks good
2022-01-19 18:05:17 +01:00
947134bfd1
reordered
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-01-19 14:39:39 +01:00
32236f9864
and another name
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-01-19 14:34:20 +01:00
eb23dc1b0f
better names
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-01-19 14:29:03 +01:00
5bd4f56bc6
flipped preproc defines
EIVE/eive-obsw/pipeline/head Build queued...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-01-19 14:17:55 +01:00
a50f852b9d
Merge remote-tracking branch 'origin/develop' into mueller/clang-formatting-applied
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-01-19 11:52:06 +01:00
5cc7331e90
applied clang formatting
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-01-18 11:41:19 +01:00
77c45c0de9
applied formatting
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
870dd717e4
tmtc update
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-01-17 15:48:13 +01:00
Jakob Meier
643584e1c5
rerun generator scripts
EIVE/eive-obsw/pipeline/head This commit looks good
2022-01-17 15:36:37 +01:00
Jakob Meier
952dfde5b7
bug fixes in star tracker handler
EIVE/eive-obsw/pipeline/head This commit looks good
2022-01-17 08:40:56 +01:00
3b9959b8b3
removed gps from pst
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-01-15 13:51:27 +01:00
70ab486081
removed GPS flags
2022-01-15 13:50:21 +01:00
Jakob Meier
1133ea08c8
ploc mpsoc handler improved tc mem read
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-01-11 17:58:59 +01:00
d8ec051e13
stuff
EIVE/eive-obsw/pipeline/head This commit looks good
2022-01-11 10:55:26 +01:00
Jakob Meier
996a8a226e
flash write wip
2022-01-06 18:05:21 +01:00
Jakob Meier
ee0d3bb446
Merge branch 'meier/startracker' into meier/plocMPSoC
2022-01-03 09:14:42 +01:00
Jakob Meier
f6a0fcbe0b
merged develop
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-01-03 08:07:47 +01:00
Jakob Meier
632759bf8a
improvements in ploc mpsoc handler
2022-01-03 08:01:55 +01:00
7a28cba71b
Merge branch 'mueller/master' into mueller/gnss-update
EIVE/eive-obsw/pipeline/head This commit looks good
2022-01-02 10:38:22 +01:00