Commit Graph

7080 Commits

Author SHA1 Message Date
c44d8e6437 Merge branch 'main' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-main Build started...
2023-06-09 18:37:22 +02:00
4146050807
changelog 2023-06-09 18:37:18 +02:00
bd2f1bf7f2 route CFDP to live VC0 2023-06-09 18:36:30 +02:00
020daf9a77 Merge pull request 'minor tweaks to fix main build' (#673) from minor-tweaks into main
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #673
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
2023-06-09 18:32:39 +02:00
e3ae6260ad
changelog
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-v3.0.0-dev This commit looks good
2023-06-09 18:26:41 +02:00
45b9e88915
route CFDP to live VC0 2023-06-09 18:25:59 +02:00
cf48a18733
bump fsfw
Some checks are pending
EIVE/eive-obsw/pipeline/head This commit looks good
EIVE/-/pipeline/head Build started...
2023-06-09 18:12:32 +02:00
9e787a7e44
Merge branch 'v3.0.0-dev' into v4.0.0-dev
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2023-06-09 18:10:38 +02:00
9cd38a33d4
minor tweaks to fix main build
Some checks are pending
EIVE/eive-obsw/pipeline/head Build queued...
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2023-06-09 17:16:01 +02:00
9740435d65 Merge pull request 'Core Controller Dir Listing FSM' (#669) from core-ctrl-dir-listing-fsm into v3.0.0-dev
All checks were successful
EIVE/eive-obsw/pipeline/pr-main This commit looks good
Reviewed-on: #669
2023-06-09 14:45:39 +02:00
b2535662e6 Merge branch 'v3.0.0-dev' into core-ctrl-dir-listing-fsm
Some checks are pending
EIVE/eive-obsw/pipeline/pr-v3.0.0-dev Build queued...
2023-06-09 14:44:44 +02:00
1cf318fca1 Merge pull request 'Remove TCP IP components' (#672) from remove-tcp-ip-components into v3.0.0-dev
All checks were successful
EIVE/eive-obsw/pipeline/pr-main This commit looks good
Reviewed-on: #672
2023-06-09 14:44:35 +02:00
171d4976c3
removing printout
Some checks are pending
EIVE/eive-obsw/pipeline/pr-v3.0.0-dev Build started...
2023-06-09 14:40:47 +02:00
e13fee75d0
this is dumb
Some checks are pending
EIVE/eive-obsw/pipeline/pr-v3.0.0-dev Build started...
2023-06-09 14:38:54 +02:00
8e1af9cfba
include stuff
All checks were successful
EIVE/eive-obsw/pipeline/pr-v3.0.0-dev This commit looks good
2023-06-09 14:36:10 +02:00
cd6b7d90be
add one more cfg constant
All checks were successful
EIVE/eive-obsw/pipeline/pr-v3.0.0-dev This commit looks good
2023-06-09 14:25:59 +02:00
3bdbc67e0d
Merge remote-tracking branch 'origin/v3.0.0-dev' into core-ctrl-dir-listing-fsm
All checks were successful
EIVE/eive-obsw/pipeline/pr-v3.0.0-dev This commit looks good
2023-06-09 14:24:42 +02:00
fe1cc9444d
changelog
Some checks failed
EIVE/eive-obsw/pipeline/pr-v3.0.0-dev There was a failure building this commit
2023-06-09 14:10:06 +02:00
019d1a7b0d
that should do the job
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
EIVE/eive-obsw/pipeline/pr-v3.0.0-dev There was a failure building this commit
2023-06-09 13:51:10 +02:00
1453b2abdc
afmt
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2023-06-09 13:48:57 +02:00
fe70d2e047 Merge pull request 'Bump FSFW and TMTC: CFDP bugfix' (#671) from bump-fsfw-tmtc into v3.0.0-dev
All checks were successful
EIVE/eive-obsw/pipeline/pr-main This commit looks good
Reviewed-on: #671
2023-06-09 13:42:39 +02:00
900cb060e4 Merge branch 'bump-fsfw-tmtc' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into bump-fsfw-tmtc
Some checks are pending
EIVE/eive-obsw/pipeline/pr-v3.0.0-dev Build queued...
2023-06-09 13:42:22 +02:00
bd7f28152a
bump fsfw 2023-06-09 13:42:16 +02:00
9ec3eca10a Merge branch 'v3.0.0-dev' into bump-fsfw-tmtc
Some checks are pending
EIVE/eive-obsw/pipeline/pr-v3.0.0-dev Build started...
2023-06-09 13:40:16 +02:00
4212fbef02 Merge pull request 'Move 2 pool variables' (#659) from move-pdu-datavar into v3.0.0-dev
All checks were successful
EIVE/eive-obsw/pipeline/pr-main This commit looks good
Reviewed-on: #659
2023-06-09 13:40:01 +02:00
6c1dfafb2e
changelog
Some checks are pending
EIVE/eive-obsw/pipeline/head Build queued...
EIVE/eive-obsw/pipeline/pr-v3.0.0-dev This commit looks good
2023-06-09 13:13:05 +02:00
18ba3a711a
bump fsfw
Some checks are pending
EIVE/eive-obsw/pipeline/head Build queued...
2023-06-09 13:11:50 +02:00
c1f8512b01
changelog
All checks were successful
EIVE/eive-obsw/pipeline/pr-v3.0.0-dev This commit looks good
2023-06-09 13:10:29 +02:00
c14bbe4a93 Merge branch 'v3.0.0-dev' into move-pdu-datavar
All checks were successful
EIVE/eive-obsw/pipeline/pr-v3.0.0-dev This commit looks good
2023-06-09 13:09:34 +02:00
0e171997d7 Merge pull request 'Rework config of GYRs' (#630) from gyr-confg-rework-2 into v3.0.0-dev
All checks were successful
EIVE/eive-obsw/pipeline/pr-main This commit looks good
Reviewed-on: #630
2023-06-09 13:09:19 +02:00
e08a2b76b9 Merge branch 'v3.0.0-dev' into move-pdu-datavar
All checks were successful
EIVE/eive-obsw/pipeline/pr-v3.0.0-dev This commit looks good
2023-06-09 13:05:32 +02:00
6ef593d8f3
bump fsfw
Some checks are pending
EIVE/eive-obsw/pipeline/pr-v3.0.0-dev Build started...
2023-06-09 13:04:16 +02:00
08e7a8cf97
Merge branch 'v3.0.0-dev' into gyr-confg-rework-2
All checks were successful
EIVE/eive-obsw/pipeline/pr-v3.0.0-dev This commit looks good
2023-06-09 12:48:36 +02:00
d90ccd62f8
bump changelog and tmtc
All checks were successful
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2023-06-09 12:47:07 +02:00
cab20a8c77 changelog
All checks were successful
EIVE/eive-obsw/pipeline/pr-v3.0.0-dev This commit looks good
2023-06-08 09:55:46 +02:00
6fdd9da2a0 Merge branch 'v3.0.0-dev' into gyr-confg-rework-2
All checks were successful
EIVE/eive-obsw/pipeline/pr-v3.0.0-dev This commit looks good
2023-06-08 09:36:07 +02:00
410fd1c425 final setting of dec rate filter
All checks were successful
EIVE/eive-obsw/pipeline/pr-v3.0.0-dev This commit looks good
2023-06-08 09:11:24 +02:00
deb154770d
increased service 1 queue depth
All checks were successful
EIVE/eive-obsw/pipeline/pr-v3.0.0-dev This commit looks good
2023-06-07 16:21:51 +02:00
dcf3b1b1fe
added debug statement for testing
All checks were successful
EIVE/eive-obsw/pipeline/pr-v3.0.0-dev This commit looks good
2023-06-07 15:55:26 +02:00
06c5344d8a this might actually work
All checks were successful
EIVE/eive-obsw/pipeline/pr-v3.0.0-dev This commit looks good
2023-06-07 15:14:03 +02:00
26ed774806
changelog
All checks were successful
EIVE/eive-obsw/pipeline/pr-v3.0.0-dev This commit looks good
2023-06-07 14:25:13 +02:00
06b381d965
dir listing dump state machine
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-v3.0.0-dev This commit looks good
2023-06-07 14:20:58 +02:00
4bcfb8f5a2 still doesnt work
All checks were successful
EIVE/eive-obsw/pipeline/pr-v3.0.0-dev This commit looks good
2023-06-07 14:13:32 +02:00
b8064c4a39
bump fsfw
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2023-06-07 13:50:11 +02:00
5ca96b2dd3
bump fsfw
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2023-06-07 13:49:12 +02:00
9aec8960b9
hi
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2023-06-07 13:43:23 +02:00
de35764ede Merge pull request 'ACS Ptg Ctrl Fixes' (#643) from acs-ptg-ctrl-fixes-2 into v3.0.0-dev
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
EIVE/eive-obsw/pipeline/pr-main This commit looks good
Reviewed-on: #643
2023-06-07 11:49:09 +02:00
376c359d6e Merge branch 'v3.0.0-dev' into acs-ptg-ctrl-fixes-2
Some checks are pending
EIVE/eive-obsw/pipeline/pr-v3.0.0-dev Build started...
2023-06-07 11:47:57 +02:00
a110bf32aa
another small fix
All checks were successful
EIVE/eive-obsw/pipeline/pr-v3.0.0-dev This commit looks good
2023-06-07 11:46:23 +02:00
f4c9a4bda2
fix for indexing
All checks were successful
EIVE/eive-obsw/pipeline/pr-v3.0.0-dev This commit looks good
2023-06-07 11:38:02 +02:00