Jakob Meier
e61dfc0401
fixed conflicts
2022-02-25 14:39:18 +01:00
07da61d8c5
Merge remote-tracking branch 'origin/develop' into mueller/plpcdu-sus-updates
2022-02-25 11:16:04 +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
42da2f2153
Merge branch 'mueller/rad-sensor-update' into mueller/master
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-02-24 11:52:16 +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
c7c2ae0ca3
Merge remote-tracking branch 'origin/develop' into mueller/plpcdu-sus-updates
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-02-23 19:02:10 +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
4da0555bfd
moved some more code to mission folder
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
2022-02-22 19:28:04 +01:00
121b4ed974
apply clang format
2022-02-22 13:49:01 +01:00
8abd6c39e7
Merge branch 'mueller/plpcdu-sus-updates' into mueller/master
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-02-22 13:27:41 +01:00
4eb5e8acba
something is not working yet
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-02-22 10:39:34 +01:00
bd0df3493f
update object list
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-02-21 17:31:56 +01:00
c683097635
continued pl pcdu handler
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-02-21 16:57:16 +01:00
4fce0fd0e0
cleaned up config flags a bit
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-02-19 16:42:22 +01:00
fc3fb70025
some more rtd tests
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-02-18 18:21:42 +01:00
a01ddf6a5b
updated PST
EIVE/eive-obsw/pipeline/pr-develop Build queued...
2022-02-18 13:10:06 +01:00
ec7d624cca
added missing gpioID
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-02-17 20:53:45 +01:00
effe461380
nothing works
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-02-16 21:29:37 +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
3387a71399
more sus testing
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-02-16 15:16:36 +01:00
f5879f5867
possible some fixes in decoder logic
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-02-15 20:40:44 +01:00
41b029f12b
Merge remote-tracking branch 'origin/develop' into mueller/master
EIVE/eive-obsw/pipeline/head This commit looks good
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-02-15 16:54:08 +01:00
666188036f
Merge branch 'mueller/plpcdu' into mueller/master
EIVE/eive-obsw/pipeline/head This commit looks good
2022-02-15 16:07:25 +01:00
4af119d904
changed default TMTC handler
EIVE/eive-obsw/pipeline/head This commit looks good
2022-02-15 14:41:41 +01:00
938c361097
some minor fixes
EIVE/eive-obsw/pipeline/head This commit looks good
2022-02-14 19:41:03 +01:00
a38dd52d7b
no perform op
EIVE/eive-obsw/pipeline/head This commit looks good
2022-02-14 18:42:46 +01:00
84f77642d5
sus 0 on now
EIVE/eive-obsw/pipeline/head This commit looks good
2022-02-14 18:41:46 +01:00
2a4905a1f7
somethings still wrong
EIVE/eive-obsw/pipeline/head This commit looks good
2022-02-14 18:38:35 +01:00
a1409fbcdf
update SuS code
EIVE/eive-obsw/pipeline/head This commit looks good
2022-02-14 17:13:06 +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
66bd5f8fbf
refactoring
EIVE/eive-obsw/pipeline/head This commit looks good
2022-02-11 17:38:02 +01:00
602a6cd86e
branch 'mueller/master' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into mueller/master
2022-02-11 17:04:36 +01:00
201bfd1b07
merge
2022-02-11 17:03:20 +01:00
Jakob Meier
685b9cd1fb
fixed conflicts
2022-02-11 15:09:45 +01:00
ce566b0fa8
implemented core switch on state machine
EIVE/eive-obsw/pipeline/head This commit looks good
2022-02-10 18:02:49 +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
9313fa4639
plpcdu stuff
EIVE/eive-obsw/pipeline/head This commit looks good
2022-02-10 15:39:54 +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
826cb13c3e
update config.h.in
EIVE/eive-obsw/pipeline/head This commit looks good
2022-02-07 11:56:53 +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
d8ec051e13
stuff
EIVE/eive-obsw/pipeline/head This commit looks good
2022-01-11 10:55:26 +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
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
Jakob Meier
e26ffb6afd
fpga download image command
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2021-12-29 20:33:20 +01:00
940c770b44
Merge remote-tracking branch 'origin/develop' into mueller/master
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2021-12-22 15:25:06 +01:00
861d92f3c2
update uart device names
EIVE/eive-obsw/pipeline/head This commit looks good
2021-12-21 18:13:20 +01:00
Jakob Meier
337a485fc1
rerun generators
2021-12-21 17:27:23 +01:00
636c1fdf26
added GNSS enable pin handling
EIVE/eive-obsw/pipeline/head This commit looks good
2021-12-20 13:37:28 +01:00
Jakob Meier
e3841d180e
merged develop
2021-12-19 12:15:18 +01:00
e442a8c968
ACS and TCS board working together now
EIVE/eive-obsw/pipeline/head This commit looks good
2021-12-17 14:20:22 +01:00
481756b014
fix script, experiment with timing
2021-12-15 11:49:50 +01:00
5ae6a61ec0
fixes for gyro adis handler
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
2021-12-15 10:15:06 +01:00