Commit Graph

291 Commits

Author SHA1 Message Date
33ff05c558
Merge remote-tracking branch 'origin/develop' into mueller/pl-pcdu-prep
All checks were successful
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
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-02-24 12:02:23 +01:00
768bb14842
minor tweaks
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-02-24 11:57:35 +01:00
0b215bf7e0
use radfet enable pin now
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-02-24 11:47:32 +01:00
9f60c82725
intermediate PR
Some checks are pending
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
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-02-23 18:15:34 +01:00
f5c1263dd3 now it compiles
All checks were successful
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
Some checks failed
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
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
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
50cf01376f Merge branch 'develop' into mohr/cmake
Some checks are pending
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
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
328a3b2d02 define fix
Some checks failed
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
Some checks failed
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
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-02-04 17:48:05 +01:00
b8011717f7
fix which adds back descriptions
Some checks failed
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
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-03 17:14:28 +01:00
4000c35299
added back more events
All checks were successful
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
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-02-03 16:25:16 +01:00
a77d5f3669
tested cfg set request
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-02-03 15:31:18 +01:00
9bf3e46e3c
tested some commands
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-02-03 15:03:35 +01:00
e142408bb8
bpx handler now working
All checks were successful
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
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-02-02 17:38:14 +01:00
988a5e6b31
battery handler not created
All checks were successful
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
All checks were successful
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
All checks were successful
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
Some checks failed
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
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-01-27 15:29:58 +01:00
26d66d2a36 issues with IMTQ
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-01-27 15:26:07 +01:00
a9c93db790 updated tmtc, IMTQ switch cmd added
All checks were successful
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
All checks were successful
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
All checks were successful
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
All checks were successful
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
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-01-19 18:05:17 +01:00
947134bfd1
reordered
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-01-19 14:39:39 +01:00
32236f9864
and another name
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-01-19 14:34:20 +01:00
eb23dc1b0f
better names
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-01-19 14:29:03 +01:00
5bd4f56bc6
flipped preproc defines
Some checks are pending
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
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-01-19 11:52:06 +01:00
5cc7331e90 applied clang formatting
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-01-18 11:41:19 +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
870dd717e4 tmtc update
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-01-17 15:48:13 +01:00
Jakob Meier
643584e1c5 rerun generator scripts
All checks were successful
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
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-01-17 08:40:56 +01:00
3b9959b8b3
removed gps from pst
Some checks failed
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
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-01-11 10:55:26 +01:00
Jakob Meier
f6a0fcbe0b merged develop
All checks were successful
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
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-01-02 10:38:22 +01:00
Jakob Meier
e26ffb6afd fpga download image command
Some checks failed
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
Some checks failed
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
All checks were successful
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
All checks were successful
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
All checks were successful
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
All checks were successful
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
Jakob Meier
5067519b8a fixed merge conflicts 2021-12-14 19:57:35 +01:00
Jakob Meier
717f2e21a0 star tracker improvements 2021-12-14 19:24:31 +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
af32941352
ADIS device handler can now handle multiple types
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
- Added handling for ADIS16507 and ADIS16505 type
2021-12-10 17:46:52 +01:00
Jakob Meier
f9581f3100 command to reset error signal 2021-12-10 10:07:23 +01:00
Jakob Meier
e64a3fb645 rerun generators 2021-12-09 15:02:30 +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
11704ea908 enabled ACS board A side
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2021-12-08 14:48:29 +01:00
Jakob Meier
fac6996a15 star tracker limits setting 2021-12-06 19:36:21 +01:00
Jakob Meier
077913400f star tracker image helper 2021-11-29 11:04:56 +01:00
14ba11738b adapted event name 2021-11-25 14:09:06 +01:00
fa89da4438 update event list
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2021-11-25 14:07:05 +01:00
be75332be7 update event list
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2021-11-25 14:03:21 +01:00
Jakob Meier
542aa994b7 link state now detected by bit and carrier lock flags 2021-11-24 15:55:25 +01:00
Jakob Meier
345ccf5392 transmit enable and timeout 2021-11-22 18:01:16 +01:00
Jakob Meier
ec7568337c object parser 2021-11-22 17:58:24 +01:00
Jakob Meier
c2dbebe56b gen events 2021-11-22 17:57:33 +01:00
Jakob Meier
63965e2f68 enabled rx lines of syrlinks rs485 transceiver chips 2021-11-21 13:59:18 +01:00
0f3e9de2b0 Merge branch 'develop' into meier/pdec
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2021-11-09 23:01:20 +01:00
Jakob Meier
556a3986c1 pdec handler 2021-11-01 12:41:20 +01:00
Jakob Meier
017e02e513 changes applied during flatsat debugging
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2021-10-29 19:11:46 +02:00
dac3068437
updated object translations
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
2021-10-13 15:54:30 +02:00
0237a22ae9
using old names again
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2021-10-13 15:42:55 +02:00
30cf0c7aad ADIS devices working now
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2021-10-12 18:34:04 +02:00
dcdf0c9843 updated object translation file
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2021-10-12 18:03:00 +02:00
7c673d6e7f bugfixes in max31685, indexing adapted
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2021-10-12 17:55:36 +02:00
221012f790
hosted build compiling again
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2021-10-11 19:34:34 +02:00
Jakob Meier
5da2a45881 gpios to enable rs485 tx clock and tx data
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2021-10-08 14:15:33 +02:00
Jakob Meier
c5c7a895a4 fixed merge conflicts 2021-10-08 11:40:46 +02:00
Jakob Meier
18f7d3e3c9 tm now sent over PTME 2021-10-07 17:23:41 +02:00
Jakob Meier
7f70673625 Merge branch 'develop' into meier/ptme
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2021-10-04 15:07:58 +02:00