Release v1.2.0 #47

Merged
meierj merged 229 commits from develop into master 2021-06-21 17:58:40 +02:00

229 Commits

Author SHA1 Message Date
a2255e2cfe Merge pull request 'Small fix for hosted BSP' (#46) from mueller/update into develop
Reviewed-on: #46
2021-06-21 17:57:53 +02:00
1046334c0c Merge remote-tracking branch 'origin/develop' into mueller/master 2021-06-21 17:48:03 +02:00
3f91973637 Merge pull request 'meier/ImtqHandler' (#44) from meier/ImtqHandler into develop
Reviewed-on: #44
2021-06-21 17:47:21 +02:00
0bcfafc76d
Merge remote-tracking branch 'origin/develop' into meier/ImtqHandler 2021-06-21 17:45:56 +02:00
1d98fa9bfa
tmtc update 2021-06-21 17:44:01 +02:00
0407aad611 Merge pull request 'Update Package' (#45) from mueller/update-package into develop
Reviewed-on: #45
2021-06-21 17:38:56 +02:00
0c92a9a941
tmtc update 2021-06-21 17:35:30 +02:00
26cad171df added tmtc 2021-06-21 17:27:54 +02:00
c23f1fc762 Merge branch 'meier/ImtqHandler' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into meier/ImtqHandler 2021-06-21 17:26:01 +02:00
4b4ac7902f applied changes according to pr comments 2021-06-21 17:25:13 +02:00
0ada1d8dfc
tmtc update 2021-06-21 17:19:12 +02:00
ec2f9d243b
hosted build fixes 2021-06-21 17:09:49 +02:00
9097438cc2
script correction 2021-06-21 17:05:20 +02:00
89dc521e04
small q7s fix 2021-06-21 17:00:34 +02:00
85c3300e0b
hal update 2021-06-21 16:57:36 +02:00
5bbf0255ef
fixes for updated fsfw 2021-06-21 16:54:33 +02:00
67a1a84615
fsfw hal update 2021-06-21 16:51:27 +02:00
7424d1edfc Merge branch 'mueller/master' of https://egit.irs.uni-stuttgart.de/eive/eive_obsw into mueller/master 2021-06-21 16:46:56 +02:00
2b25b3a605
q7s compiling 2021-06-21 16:46:49 +02:00
e2ac721432
minor tweaks, fsfw_hal update 2021-06-21 16:20:11 +02:00
95e625922e
gps test complete 2021-06-16 18:38:06 +02:00
6d09006f1a
compiling again 2021-06-16 17:19:14 +02:00
64427dd12d
removed obj folder 2021-06-15 17:16:28 +02:00
bdc1b384f7
removed _dep, _bin, _obj 2021-06-15 17:12:23 +02:00
236244bbb4
added gps definitions file 2021-06-15 17:07:47 +02:00
78cb72d12d
added startup and shutdown sequence 2021-06-15 16:44:31 +02:00
16066b4cf9
fsfw update 2021-06-15 16:18:18 +02:00
66e1c71615
updated submodules 2021-06-15 16:11:07 +02:00
d74f8860c8 fixed merge conflicts 2021-06-15 15:39:39 +02:00
677963a528
fsfw update and gomspace handler doc crossref 2021-06-15 15:37:37 +02:00
56a7198753 Merge pull request 'Update Package' (#43) from mueller/update-package into develop
Reviewed-on: #43
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2021-06-15 15:14:53 +02:00
89b11d725b IMTQ handler complete 2021-06-15 15:13:47 +02:00
2604876d0e
cross referencing 2021-06-15 13:58:19 +02:00
e39d6a8ec9
comment block 2021-06-15 13:40:58 +02:00
80c3323553
fsfw and fsfw_hal update 2021-06-15 13:32:57 +02:00
ab8b3ae116 IMTQ positive x dipole test 2021-06-12 15:45:24 +02:00
2b03838b94
small cmake fix 2021-06-12 15:27:24 +02:00
32fa7026a1
moved gyro handler to archive 2021-06-12 15:21:17 +02:00
b7ae1bfed7
updated launch cfg 2021-06-12 15:17:27 +02:00
a7243dfc01
updated mingw configs 2021-06-12 15:15:37 +02:00
b6047455a8
updated proj name 2021-06-12 15:12:07 +02:00
8652ca0c12
submodule update 2021-06-12 15:09:25 +02:00
fd1cccd600
proj file update 2021-06-11 15:07:18 +02:00
6cac70b7c5
small update 2021-06-11 15:07:09 +02:00
76c6702f41
minor updates 2021-06-11 15:06:46 +02:00
46d49e130b fixed merge conflicts 2021-06-11 14:55:28 +02:00
7f8d0b6e14 Merge remote-tracking branch 'origin/develop' into mueller/master 2021-06-11 13:43:48 +02:00
d42a273336 Merge pull request 'Generators & CMake & FSFW Update' (#42) from mueller/generators-cmake-fsfw-update into develop
Reviewed-on: #42
2021-06-11 13:22:45 +02:00
b84a81556f positive x axis self test, untested 2021-06-11 11:53:43 +02:00
a09d121551
and another update 2021-06-11 11:19:58 +02:00
e61a17164a
updated indexers 2021-06-11 11:18:03 +02:00
03b59c7f00
updated project file again 2021-06-11 11:13:46 +02:00
93c4fda8d9
updated project file 2021-06-11 11:10:31 +02:00
7acd21039e
bugfixes for RPi 2021-06-11 11:01:23 +02:00
185e5fd730 Merge branch 'mueller/master' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into mueller/master 2021-06-11 10:53:12 +02:00
3ba85abd86
hal update 2021-06-11 10:53:07 +02:00
7f6aedce71
dockerifle update 2021-06-09 12:22:32 +02:00
d3781ab46f
trying ipv6 curl 2021-06-09 12:09:13 +02:00
95a3882fa1 bug fixes in ImtqHandler 2021-06-09 12:00:41 +02:00
06919d4f6a
hal update 2021-06-09 11:34:14 +02:00
ab560bc0fc
removed jenkinsfile 2021-06-08 17:11:04 +02:00
2b3d4306b9
updated generators 2021-06-08 17:10:47 +02:00
c28e608a33
removed submodule 2021-06-08 17:07:23 +02:00
de82746f40
using configuration files now 2021-06-08 17:04:28 +02:00
b271d0d47b
small tweak 2021-06-08 16:47:32 +02:00
3a024c9a30
object manager singleton now 2021-06-08 16:45:25 +02:00
62cd36469f
docker file update 2021-06-08 16:10:15 +02:00
ee66d0a349
updated docker files 2021-06-08 16:03:19 +02:00
1f52e1f35f
trying older version 2021-06-08 15:53:38 +02:00
477ddbde69
fsfw update 2021-06-08 15:37:20 +02:00
Martin Zietz
427e36ed15 some fixes in IMTQ Handler 2021-06-06 14:11:05 +02:00
d7024e1ee7 added self test, untested 2021-06-04 16:45:54 +02:00
7dfaedd1d5 fixed merge conflicts and added threshold configuration to Max31865Handler 2021-06-02 10:25:35 +02:00
e532512042 Merge branch 'mueller/master' of https://egit.irs.uni-stuttgart.de/eive/eive_obsw into mueller/master 2021-05-31 17:06:41 +02:00
295805f522
updated FSFW and CMakeLIsts 2021-05-31 17:06:29 +02:00
84266dddc5
simple jenkinsfile 2021-05-28 20:18:08 +02:00
f287745eeb
smaller corrections 2021-05-28 18:39:14 +02:00
a2cd806dbf
some stubs 2021-05-27 21:06:37 +02:00
d6d11e26e7 rtd test 2021-05-27 19:05:08 +02:00
d3328ce013
added srv3 to linux bsp 2021-05-27 16:20:40 +02:00
c27830334d minor changes 2021-05-27 15:24:19 +02:00
a3020b4dac
fsfw update 2021-05-27 14:10:23 +02:00
30eb733e82
small include fix 2021-05-27 14:09:07 +02:00
2193db6705
updated submodules 2021-05-27 14:06:52 +02:00
72939f569d compile failure 2021-05-27 14:04:33 +02:00
70e43960ae rtd update 2021-05-27 13:50:05 +02:00
1a4f928689 Merge pull request 'Update Package' (#38) from mueller/adis-handler-spi-update into develop
Reviewed-on: eive/eive_obsw#38
2021-05-27 13:48:12 +02:00
22439fe192 ptme bridge wip 2021-05-27 13:07:57 +02:00
e7e3b26b24
fsfw update 2021-05-27 11:57:06 +02:00
546273d5b8
added core controller stub 2021-05-26 14:16:16 +02:00
37fb33e378
adis handler fixes 2021-05-26 13:41:26 +02:00
4a7087fa5a
adis handler continued 2021-05-26 13:30:12 +02:00
a73d31b0fb
added a few more commands 2021-05-26 13:11:48 +02:00
b03c6f686e moved uart com if 2021-05-25 17:21:44 +02:00
2be6589251 some more corrections 2021-05-25 15:45:48 +02:00
501a775db0 small correction 2021-05-25 15:43:09 +02:00
de6e30498a fsfw_hal update 2021-05-25 15:38:21 +02:00
1d325b88b7 smaller bugfixes 2021-05-25 15:16:18 +02:00
4b78ccaae4 fsfw_hal update 2021-05-25 14:01:54 +02:00
54699837b1 some bugfixes for adis datasets 2021-05-25 13:53:03 +02:00
d864b8abf9 adis handler continued 2021-05-25 12:45:51 +02:00
6cc825f3da updated README 2021-05-25 11:39:58 +02:00
7b048baa71 reply handling for sensor data implemented 2021-05-24 21:15:23 +02:00
608e3eeda2 sensor handling moved to separate function 2021-05-24 20:59:19 +02:00
64bb0ae242 adis handler continued 2021-05-24 20:57:12 +02:00
33554899ae adis handler continued 2021-05-24 20:33:59 +02:00
76b0f3d821 added dockerignore 2021-05-24 15:47:48 +02:00
55def0d20e added docker-compose file 2021-05-24 15:47:09 +02:00
80972a074b fixes dockerfiles 2021-05-24 15:45:57 +02:00
284940bad9 updated links 2021-05-24 15:10:00 +02:00
8823cd856e updated all cloud links 2021-05-24 15:09:11 +02:00
c9dba5a628 initializing query size 2021-05-24 14:37:31 +02:00
c130112b75 q7s build working 2021-05-24 14:35:14 +02:00
7b931e89c6 trying out some stuff 2021-05-24 14:13:47 +02:00
d33a9cfff6 using tar.gz now 2021-05-24 14:08:55 +02:00
f5a181205a fixed hosted dockerfile 2021-05-24 12:43:22 +02:00
0252ded2c1 updated README with wget commands 2021-05-24 01:54:03 +02:00
76a4d63d9d added way to get sysroot with wget 2021-05-24 01:49:17 +02:00
3c41991896 updated RPi build config and scripts 2021-05-24 01:34:32 +02:00
b413ee00d2 updated build configs 2021-05-24 01:30:44 +02:00
6e86794541 small fix for q7s 2021-05-24 01:28:31 +02:00
bb75a74011 test pst 2021-05-24 01:20:44 +02:00
cca4e49bed added empty definitions file 2021-05-24 00:31:47 +02:00
47ca9b869c added gyro stubs 2021-05-24 00:30:46 +02:00
6a49db7daf fixes for linux board 2021-05-23 20:44:54 +02:00
88ccaa7c40
updated dockerfile 2021-05-21 19:53:50 +02:00
06e4147c77
added hosted dockerfile 2021-05-21 13:59:47 +02:00
3fad091f96 Merge pull request 'some objects missing' (#37) from mueller/missing-objects into develop
Reviewed-on: eive/eive_obsw#37
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2021-05-20 18:25:51 +02:00
56184a0cc3 Merge remote-tracking branch 'origin/develop' into mueller/missing-objects 2021-05-18 16:51:54 +02:00
afa4c41164 Merge remote-tracking branch 'origin/develop' into mueller/missing-objects 2021-05-18 16:51:29 +02:00
c679a2a755
some objects missing 2021-05-18 16:49:24 +02:00
b9907e3cf2 Merge pull request 'Update package 3' (#36) from mueller/update-package-3 into develop
Reviewed-on: eive/eive_obsw#36
2021-05-18 16:38:56 +02:00
78a008c7d9 Merge branch 'develop' into mueller/update-package-3 2021-05-18 16:38:25 +02:00
05e119c032
fsfw update 2021-05-18 16:19:33 +02:00
11192d7670
fix for hosted bsp 2021-05-18 16:17:51 +02:00
fbb7dfa5ee
bsp name is gen csv 2021-05-18 16:16:02 +02:00
3cf93164a4
updated all auto-generated files 2021-05-18 16:14:11 +02:00
d9aa3684d3 Merge pull request 'Update package 2' (#35) from mueller/update-package-2 into develop
Reviewed-on: eive/eive_obsw#35
2021-05-18 15:48:18 +02:00
12dbc8f117 Merge remote-tracking branch 'origin/develop' into mueller/update-package-2 2021-05-18 15:38:47 +02:00
018356f606 Merge pull request 'Update Package v1.2.0' (#34) from mueller/update-package into develop
Reviewed-on: eive/eive_obsw#34
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2021-05-18 12:32:45 +02:00
9ccd0d2e72
moved fsfwconfig into linux folder 2021-05-17 20:03:56 +02:00
fd29f6ce85
hosted compiling with event translation 2021-05-17 19:51:38 +02:00
da94a61cfe
default bsp is q7s 2021-05-17 19:50:24 +02:00
e5921bece3
regenerated hosted events 2021-05-17 19:50:07 +02:00
5c591f628a
compiling with translation files 2021-05-17 19:49:29 +02:00
da17ec22fb
generated event translation files 2021-05-17 19:39:35 +02:00
73e2b6eea8
moved makefiles to archive 2021-05-17 19:17:38 +02:00
ed5bb4406c
deleted .db 2021-05-17 19:13:45 +02:00
c0bde2ddeb
generated for host as well 2021-05-17 19:13:00 +02:00
17d187d4b0
generated header file as well 2021-05-17 19:12:25 +02:00
99acbccf84
generated translation file 2021-05-17 19:03:37 +02:00
6837ee641b
object update 2021-05-17 18:58:15 +02:00
ff93529bac
continued object id gen 2021-05-17 18:56:38 +02:00
0ab9d3bbe9
modgen update 2021-05-17 18:28:33 +02:00
0742e91c0a
update tmtc 2021-05-17 18:17:57 +02:00
507be0958a
update tmtc 2021-05-17 18:15:10 +02:00
51a6456b48
tmtc update 2021-05-17 18:09:08 +02:00
452eaaa76b
tmtc update 2021-05-17 18:02:56 +02:00
c76aec726f
tmtc update 2021-05-17 18:02:16 +02:00
8c2b0ae06e
updated tmtc 2021-05-17 17:42:19 +02:00
c908f55820
removed hosted OBSWversion.h 2021-05-17 17:08:48 +02:00
558e0ac882
bumped OBSW version 2021-05-17 17:07:34 +02:00
0179a34a62
updated project files 2021-05-17 17:05:16 +02:00
ed2c7a2ec1
q7s compiling 2021-05-17 16:53:06 +02:00
b11ca551c7
host compiling again 2021-05-17 16:37:29 +02:00
fd9d6c6180
common config files 2021-05-17 16:22:51 +02:00
b3c4f2e48d
updating everything 2021-05-17 16:10:53 +02:00
e2a9bed4d8
Merge remote-tracking branch 'origin/develop' into mueller/master 2021-05-17 16:02:04 +02:00
3d6ae3116f
update fsfw_hal 2021-05-17 15:59:46 +02:00
9e6a7c6faf Merge pull request 'meier/master' (#33) from meier/master into develop
Reviewed-on: eive/eive_obsw#33
Reviewed-by: Robin Müller <robin.mueller.m@gmail.com>
2021-05-17 14:59:46 +02:00
09e66ceb49 Merge branch 'develop' into meier/master 2021-05-17 13:56:54 +02:00
8508957f5b added etl and tmtc 2021-05-17 13:54:12 +02:00
88fd3c03c3 ptme access wip 2021-05-17 13:47:10 +02:00
9d6c511f91 save before endianess change 2021-05-16 21:53:07 +02:00
486ca36cbc uio implementation 2021-05-16 19:22:04 +02:00
b0c2606e6a updated fsfw_hal 2021-05-13 13:42:47 +02:00
5b2e226bdc updated submodules 2021-05-13 13:35:24 +02:00
33c229d08a all sus initialized 2021-05-13 13:17:12 +02:00
44bde15a46 solved merge conflicts 2021-05-12 17:01:11 +02:00
65d0c1fabf Sus handler complete 2021-05-12 16:38:20 +02:00
2d170a1f61 sus delay implementation 2021-05-12 13:06:56 +02:00
e1e69539ca changed SusHandler MAX1227 to internal clock mode 2021-05-10 11:13:39 +02:00
a6465c42ba save before changing to internally clocked mode 2021-05-09 18:18:27 +02:00
fab28904de working SUS in externally clocked mode 2021-05-09 16:48:55 +02:00
261f16f15b write setup byte and conversions 2021-05-09 14:46:42 +02:00
98387a6d24 this works with q7s and new sus 2021-05-09 14:39:56 +02:00
950eab2373 this works with the old SUS 2021-05-09 12:09:39 +02:00
eeb8167cdc this worked with the prototype SUS 2021-05-09 10:06:36 +02:00
be29d0e71f some tries to get data from max1227 in externally clocked mode 2021-05-08 22:49:21 +02:00
1eb9909377 save before making change in spicomif 2021-05-07 18:48:42 +02:00
5ce0a63ad6 save before implementing SusHandler with chip select 2021-05-06 18:00:58 +02:00
60a9358648 correct board output now 2021-05-05 22:51:29 +02:00
4b2d641a8a fsfw update 2021-05-05 22:48:35 +02:00
0250d53e57 fixes for bbb build 2021-05-05 22:47:24 +02:00
5ace0dd61f beagle bone build working 2021-05-05 22:43:17 +02:00
ad05d61a2e added BBB support 2021-05-05 20:25:52 +02:00
3c6ec68faa rad sensor working 2021-05-03 13:35:16 +02:00
fd9adee1ae rad sensor working 2021-05-03 12:49:14 +02:00
31b4246bca another try to read out the adc 2021-05-03 12:05:19 +02:00
f708a67fa8 rad sensor change wip 2021-05-03 11:59:33 +02:00
b873831645 spi decoder callbacks wip 2021-05-02 13:48:39 +02:00
f2caa84098 Merge branch 'meier/master' into meier/max1227Handler 2021-04-30 09:04:20 +02:00
bd63550efd Merge branch 'meier/master' into develop 2021-04-29 17:45:43 +02:00
8509e15736 integrated gyro and mgm handler 2021-04-29 17:45:19 +02:00
ed6eea82c5 max1227 wip 2021-04-29 10:40:11 +02:00
619058bf25 tmtc merge conflict 2021-04-27 17:39:14 +02:00
2473b2ef21 Merge branch 'develop' of https://egit.irs.uni-stuttgart.de/eive/eive_obsw into develop 2021-04-27 17:36:05 +02:00
ea2b1fbda4 basic structure for ILH PLOC control 2021-04-27 17:34:50 +02:00
255313d165 added PLOC sequence count. Not tested yet 2021-04-27 12:18:04 +02:00
bf1f2ae1b5 fixed conflicts 2021-04-26 17:59:26 +02:00
ac0cd39f86 fixed merge conflicts 2021-04-26 17:50:36 +02:00
4e8a6b65ec self test wip 2021-04-26 14:25:23 +02:00
cdde3e29a8 corrections in plocHandler, endianness 2021-04-26 11:28:19 +02:00
ad48d5888d imqt base functions 2021-04-26 07:56:02 +02:00
986ee97721 added wiretapping mode check in handleDeviceTm of PlocHandler 2021-04-25 15:54:48 +02:00
191f4b6d0c get commanded dipole wip 2021-04-25 15:53:44 +02:00
70ff6a06f7 Merge branch 'develop' into meier/mgtHandler 2021-04-25 12:47:45 +02:00
d877887826 imqt wip 2021-04-25 12:47:41 +02:00
Martin Zietz
e4a715e24c ploc build for q7s 2021-04-24 14:22:22 +02:00
2e28016281 readme update 2021-04-24 12:46:08 +02:00
a0a5c4c8aa tc mem write and tc mem read implemented 2021-04-22 17:32:39 +02:00
7c28b2a0bc changes in plocDefinitions and plocHandler 2021-04-19 17:17:22 +02:00
b0e8a8624a wip 2021-04-16 18:59:48 +02:00
0916ca87d9 plocHandler wip 2021-04-15 13:17:15 +02:00
5d4c2bd521 plocHandler wip 2021-04-12 10:16:59 +02:00
400f60c7be plocHandler wip 2021-04-11 12:04:13 +02:00
699b4a0eb9 ploc handler wip 2021-03-29 14:37:52 +02:00
a3ce747b94 Merge branch 'develop' of https://egit.irs.uni-stuttgart.de/eive/eive_obsw into develop 2021-03-21 17:35:28 +01:00
7f8720706e added etl 2021-03-04 18:31:10 +01:00