Irini Kosmidou
|
35f2d2cb9c
|
solve merge comflioct
EIVE/eive-obsw/pipeline/head There was a failure building this commit
|
2022-04-08 15:25:07 +02:00 |
|
Irini Kosmidou
|
188f8863d0
|
Merge remote-tracking branch 'origin/develop' into irini
EIVE/eive-obsw/pipeline/head There was a failure building this commit
|
2022-04-08 15:21:31 +02:00 |
|
|
c83efd149e
|
small tweak
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
|
2022-04-08 11:41:17 +02:00 |
|
|
6ae9e539a6
|
more useful printout
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
|
2022-04-08 11:40:35 +02:00 |
|
|
351920aa7b
|
some tweaks
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-04-08 11:31:29 +02:00 |
|
|
4a6840f098
|
bugfixes and improvements
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
- Tests finished
|
2022-04-08 11:22:16 +02:00 |
|
|
45007d726d
|
update translation files
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-04-07 17:28:58 +02:00 |
|
|
5801c17509
|
Merge remote-tracking branch 'origin/develop' into mueller/gps-time-update
EIVE/eive-obsw/pipeline/head This commit looks good
|
2022-04-07 17:24:05 +02:00 |
|
|
796b814b49
|
Add time file handling
|
2022-04-07 17:23:50 +02:00 |
|
|
bf849b24e6
|
Merge remote-tracking branch 'origin/develop' into mueller/hk-check
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
|
2022-04-07 11:59:02 +02:00 |
|
|
64dce75e09
|
hk update for gps
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-04-07 11:56:01 +02:00 |
|
|
ca92b85864
|
enable periodic HK by default
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
|
2022-04-07 11:22:29 +02:00 |
|
|
8f4f271331
|
longer HK intervals
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-04-07 11:15:28 +02:00 |
|
|
1876bbe449
|
Merge remote-tracking branch 'origin/develop' into mueller/gps-update
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-04-07 11:12:52 +02:00 |
|
|
5c4ae861b1
|
exclude gps changes
EIVE/eive-obsw/pipeline/pr-develop Build started...
EIVE/eive-obsw/pipeline/head Build queued...
|
2022-04-07 11:11:37 +02:00 |
|
|
1a5196f9d2
|
Merge remote-tracking branch 'origin/develop' into mueller/pl-pcdu-update-mode-handling
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-04-07 11:03:24 +02:00 |
|
|
8f391d3a68
|
Merge branch 'develop' into mueller/gps-update
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-04-07 11:00:22 +02:00 |
|
|
c3aa9fb908
|
update for gps
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
- GPSD/NTPD finally seem to work now. Still keep code to set it manually for now
|
2022-04-07 10:55:29 +02:00 |
|
|
a6d20de0a5
|
GPS linux controller update
EIVE/eive-obsw/pipeline/head This commit looks good
|
2022-04-07 10:02:56 +02:00 |
|
|
042a6b2960
|
Merge remote-tracking branch 'origin/develop' into mueller/pl-pcdu-update-mode-handling
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
|
2022-04-07 09:50:21 +02:00 |
|
|
d7e899e113
|
Merge remote-tracking branch 'origin/develop' into mueller/improve-pcdu-hk-handling
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-04-06 12:10:50 +02:00 |
|
Jakob Meier
|
d48ec92d09
|
fixed conflicts
EIVE/eive-obsw/pipeline/head This commit looks good
|
2022-04-05 13:57:16 +02:00 |
|
|
6020b20fc9
|
hk handling
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-04-04 18:47:09 +02:00 |
|
|
65ce25ec7a
|
improved P60 HK handling
EIVE/eive-obsw/pipeline/head This commit looks good
|
2022-04-04 17:16:52 +02:00 |
|
|
ec880d4232
|
apply auto-formatter
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
|
2022-04-04 13:40:45 +02:00 |
|
|
b12ffb6f44
|
PL PCDU switch states like mode bitmask now
EIVE/eive-obsw/pipeline/head This commit looks good
|
2022-04-04 13:39:35 +02:00 |
|
|
36666f214c
|
Merge remote-tracking branch 'origin/develop' into mueller/master
EIVE/eive-obsw/pipeline/head There was a failure building this commit
|
2022-04-03 20:15:41 +02:00 |
|
|
189674a9bb
|
re-enable all suses
EIVE/eive-obsw/pipeline/head This commit looks good
|
2022-04-03 20:12:14 +02:00 |
|
|
04de6c7136
|
Merge pull request 'move GNSS NReset handling to assembly' (#194) from mueller/move-gnss-nreset-handling into develop
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #194
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
|
2022-04-01 14:55:49 +02:00 |
|
|
afb1d22f76
|
Merge pull request 'activate all suses again' (#193) from mueller/rpi-sus-port into develop
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #193
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
|
2022-04-01 14:52:10 +02:00 |
|
|
07c242282d
|
syrlinks test
EIVE/eive-obsw/pipeline/head This commit looks good
|
2022-04-01 14:15:42 +02:00 |
|
|
c231a775b3
|
Merge remote-tracking branch 'origin/develop' into mueller/move-gnss-nreset-handling
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
|
2022-04-01 14:05:32 +02:00 |
|
|
1eb5a428cb
|
move GNSS NReset handling to assembly
EIVE/eive-obsw/pipeline/head Build queued...
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
- Also update fsfwgen dependency
|
2022-04-01 14:01:12 +02:00 |
|
|
0fba9cbf7e
|
Merge remote-tracking branch 'origin/develop' into mueller/master
EIVE/eive-obsw/pipeline/head This commit looks good
|
2022-04-01 13:44:47 +02:00 |
|
|
d769d3ce22
|
Merge remote-tracking branch 'origin/develop' into meier/deviceHandlerUpdate
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-04-01 13:41:04 +02:00 |
|
|
61769de4bf
|
activate all suses again
EIVE/eive-obsw/pipeline/head This commit looks good
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-03-31 19:12:40 +02:00 |
|
|
33ec092998
|
ported RTD code as well
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-03-31 17:58:16 +02:00 |
|
|
053c65b6cd
|
Merge remote-tracking branch 'origin/develop' into mueller/rpi-sus-port
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-03-31 16:42:52 +02:00 |
|
|
413f552639
|
improvements from sus test
EIVE/eive-obsw/pipeline/head This commit looks good
|
2022-03-31 16:16:01 +02:00 |
|
Jakob Meier
|
222f17edcc
|
Merge branch 'develop' into meier/deviceHandlerUpdate
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-03-31 15:48:58 +02:00 |
|
|
637941e089
|
important bugfixes
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-03-31 14:40:42 +02:00 |
|
|
e9b2def10e
|
mpsoc sending action command during startup to supervisor
EIVE/eive-obsw/pipeline/head This commit looks good
|
2022-03-31 11:50:33 +02:00 |
|
|
2c8b691ca4
|
continued rpi sus port
|
2022-03-30 17:44:07 +02:00 |
|
|
53aca633b8
|
write lcl config register
|
2022-03-30 16:29:58 +02:00 |
|
|
f427d372a7
|
Merge remote-tracking branch 'origin/develop' into mueller/master
EIVE/eive-obsw/pipeline/head There was a failure building this commit
|
2022-03-30 13:11:11 +02:00 |
|
Jakob Meier
|
2dca9d598d
|
mpsoc startup command
|
2022-03-30 09:19:30 +02:00 |
|
|
9cfb2bad51
|
only set time every 60 seconds
EIVE/eive-obsw/pipeline/head This commit looks good
|
2022-03-29 17:47:40 +02:00 |
|
|
a8457d7966
|
small safety mechanism for time
EIVE/eive-obsw/pipeline/head This commit looks good
|
2022-03-29 16:59:48 +02:00 |
|
|
0ba2caaf61
|
set the time in the code directly now
EIVE/eive-obsw/pipeline/head This commit looks good
|
2022-03-29 16:53:05 +02:00 |
|
|
9f937781b7
|
Merge remote-tracking branch 'origin/develop' into mueller/rpi-sus-port
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-03-29 15:43:35 +02:00 |
|