Commit Graph

1797 Commits

Author SHA1 Message Date
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
486fa9cae2 Merge pull request 'moved gps handler and deployment handler' (#152) from mueller/move-deply-handler into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #152
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-02-25 11:22:52 +01:00
39f4ef6ccb
remove faulty include
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-02-25 11:21:34 +01:00
cca0d5735e
Merge remote-tracking branch 'origin/develop' into mueller/move-deply-handler
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-02-25 11:18:35 +01:00
9010f58636 Merge pull request 'PL PCDU Preparation + Update for new Devicetree' (#153) from mueller/pl-pcdu-prep into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #153
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-02-25 11:12:09 +01:00
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
e01f2a8947 Merge branch 'develop' into mueller/move-deply-handler
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-02-24 17:37:46 +01:00
Jakob Meier
3593f5ab8c corrected output 2022-02-24 16:42:07 +01:00
9eb990b3a2 Merge pull request 'Use RADFET Enable Pin' (#149) from mueller/rad-sensor-update into develop
Some checks reported errors
EIVE/eive-obsw/pipeline/head Something is wrong with the build of this commit
Reviewed-on: #149
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-02-24 14:11:05 +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
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
3edf7572b6
order
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 11:58:11 +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
e56532367f
check returnvalue
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-02-24 11:55:06 +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
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
a067014116 Merge branch 'develop' into mueller/rad-sensor-update
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-02-23 19:03:08 +01:00
c83020d2c1 Merge pull request 'this fixes SCEX ping for RPi' (#147) from mueller/uart-test-task-update into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #147
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-02-23 18:49:39 +01:00
fd85ab3122 Merge pull request 'ctor fix for srv5' (#148) from mueller/srv5-ctor-fix into develop
Reviewed-on: #148
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-02-23 18:49:01 +01:00
2551e673d8 Merge pull request 'adaptions to updated fsfw' (#150) from mueller/pass-mq-args into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #150
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-02-23 18:48:16 +01:00
4ad3339331 Merge pull request 'moved and refactored sus handler' (#151) from mueller/sus-update into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #151
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-02-23 18:46:45 +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
d5b22ca636 small fix in obj factory
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:50:56 +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
ee53485d4e update dev conf 2022-02-22 20:44:23 +01:00
940115b588 fsfw update
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-02-22 20:38:28 +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
d27a57ab28 adaptions to updated fsfw
Some checks failed
EIVE/eive-obsw/pipeline/head Build queued...
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-02-22 20:27:13 +01:00
bf9f40aad3 update rad sensor
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-02-22 20:20:14 +01:00
9387fdce1c ctor fix for srv5
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:17:15 +01:00
398277ca08 this fixes SCEX ping for RPi
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:13:16 +01:00
6c988ecf50 Merge pull request 'fixes for RPi build' (#146) from mueller/rpi-fixes into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #146
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-02-22 18:17:33 +01:00
3f35dbfad8 Merge pull request 'add max1227 module' (#145) from mueller/max1227-module into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #145
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-02-22 18:16:57 +01:00
b9e8346e82 Merge pull request 'watchdog updates' (#144) from mueller/watchdog-tweaks into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #144
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-02-22 18:16:12 +01:00
7a97471ed9 Merge pull request 'create unique bin name again' (#143) from mueller/create-unique-bin-name into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #143
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-02-22 18:15:11 +01:00
27ee6bfffc
fixes for RPi build
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 13:50:46 +01:00
f5c525699e
REAMDE fix
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 13:47:02 +01:00
7427d93c1d
fix in config file
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-02-22 13:46:13 +01:00
63ec6d3eae
add max1227 module
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 13:39:04 +01:00
56a57fadc8
update project file
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-02-22 13:37:26 +01:00
0f9690f6c2
watchdog updates
Some checks failed
EIVE/eive-obsw/pipeline/head Build queued...
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-02-22 13:35:12 +01:00
7c1dcb5f11 Merge branch 'develop' into mueller/create-unique-bin-name
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-21 14:46:56 +01:00
8394f6226a Merge pull request 'important bugfix for ADIS handler' (#141) from mueller/adis-hotfix into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #141
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-02-21 11:07:18 +01:00
9c7a203930
make unique name optional
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-02-21 10:41:22 +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