Update to v1.1.0 #29
muellerr
commented 2021-04-25 12:42:54 +02:00
Owner
- Adds iMQT (MGT). RTD device
- Update to PUS C Telemetry
- Adds iMQT (MGT). RTD device
- Update to PUS C Telemetry
muellerr
added 427 commits 2021-04-25 12:42:56 +02:00
failed approach
6c23b00c22
pdock 60 test task
9d092edda4
bring up can, readme
81ae5ea167
resolved merge conflicts
77970418d8
save failed integration state
17fc4b0de1
extended p60 dock test task
a8e9a6f0de
p60 dock test task get parameters incomplete
338857efc3
read temperature test
c68566a1e1
taken over source lis3mdl device
7edaba4d5d
device definition adaptions taken over
12d5db0ec0
parts of p60dock handler
2f4421b904
p60dock read config table compiling
47b6485e29
some changes for P60Dock cookie
a195f63acb
read module cfg and read hk from p60 dock, intermediate state
ed77c97432
timeout error in hk read
b8dd7b74cd
read module config and read hk working
fa0cdcf399
wip CspComIF
c502ee1172
wip CspComIF
551a8f021b
successful temperature reading
c88bc6508d
some fixes
bdc506a54c
fsfw update
9b990f86fd
hosted build working again
fd75183590
updated submodules
e539d63293
Merge branch 'master' into develop
45283131e3
tmtc update
7db8914c32
indentation
512cf58579
again, indentation..
20911a15a2
formatting
ccf9770172
Merge branch 'mueller/master' into develop
29c07461b3
stuff stored in local poo lnow
48386a8e3f
updated obsw config
e0c57f5d5d
working parameter getting and setting of p60dock
f778292d8e
successful change of endian swapping in p60dock param set
380543756d
fsfw update
f022504fe4
ping test
32bd57d6d1
p60 dock handler completed
5fac6424ca
updated tmtc
5f46e4ab6a
added tmtc
009850273b
Merge branch 'master' into meier_eiveobsw
d69e79ce07
tmtc p60dock
a9f2c98f8d
fsfw update
0ebd9e2c43
tmtc update
b19cfbfc2b
removed tmtc submodule, will be replaced
b2a460d77f
added new tmtc submodule
a59432f41f
tmtc update
2881d4e7b2
tmtc update
8d99dd6021
tmtc points to new commit
20fffd8b48
tmtc update
90c06122f2
tmtc update
c74405d4a8
tmtc update
688ada173e
c++ include used
4e11eafd28
updated gitignore file
2450d2240e
additional include for win compileation
26ffc5a470
deleted linux bsp arduino files
39ff3f6c9b
added eclipse project and launch files
208fd889f7
issue with makefile
23fd408e08
working pdu2handler
c9fbd2c048
p60dock, acu and pdu handler completed
f573d15830
cspcomif removed commented lines
f330650b55
resolved merge conflict
dce00e9b53
disabled LTO for host release build on windows
042d014148
makefile hosted update
2372ddef78
reparied arduino stuff
b0434a3d72
updated project file
bb1735d0fe
started rm3100 handler
1cf278e23e
type correction
1e33f810cf
rm3100 continued
24cf9a661f
rm3100 continued
8ecd0ec551
rm3100 finished, lis3 set normal datapool entries
f692993954
added gyro handler stub
88d357fe4d
added gps handler stub
de0f8f5c41
replaced last sent command with
e817a38f92
added top comment
421ac0e1fe
added top comment block
7aceb6a658
started gyro handler, renamed
2203b8ed53
started with l3dg20h definitions
76a6db18ab
gyro handler finished
7e0c56edcb
fsfw update
8421c5de0d
valid fsfw now
0a86fab520
Merge pull request 'TMTC updated' (#7) from mueller/tmtc-update into develop
fdf72f2fb3
tmtc p60dock
4636a809f4
Merge branch 'develop' into mueller/master
14ae300363
fixed merge conflict
6dbafec3ad
updated config
52a2973291
fsfwconfig fix
025337227c
another fix
d359222b45
Merge branch 'hotfix/fsfwconfig' into meier/pcduhandler
86b36352dc
another fix
3df7a6d23e
Merge branch 'hotfix/fsfwconfig' into meier/pcduhandler
c3833c4a4c
more fixes
64972f1e43
Merge remote-tracking branch 'origin/hotfix/fsfwconfig' into mueller/master
4737fc4f6e
tmtc update
9c42b40cc1
Merge branch 'hotfix/fsfwconfig' into meier/pcduhandler
cb01bcd97d
another fix
c60457cf57
fix
4e90612d34
Merge branch 'hotfix/fsfwconfig' into mueller/master
13a83a2f16
now compiling
de433e06a1
adapted GomspaceDeviceHandler to new DeviceHandlerBase
d97f0aaed0
added polling sequence table slot for PERFORM_OPERATION
aa33d23563
Merge pull request 'Device Handler Updates' (#9) from mueller/tmtc-dh-update into develop
abf53527b3
merged mueller/tmtc-dh-update
2b09baad4f
fixed merge conflict
647126863c
Merge branch 'mueller/master' of https://egit.irs.uni-stuttgart.de/eive/eive_obsw into mueller/master
5fe0ea5fc9
added cmake support
c1e9604977
bugfix
e2d7905334
added rpi support
be82cd472e
including taspbery pi bsp
4c30deb6cb
added q7s xcompile file
9ee2e4e1da
project name corrected
d4c4c6dd40
correction in factoryx
d0114d53c2
fsfw points to devel now
fe9364550d
fsfw update
33b48e97a3
small bugfix
6666ae0e3e
Merge pull request 'meier/pcduhandler' (#10) from meier/pcduhandler into develop
e7f34185f4
Merge remote-tracking branch 'origin/develop' into mueller/master
96ea535242
added cmake support for csp lib
9a6fbbaff6
fsfw points to eive/develop now
dd37efd34d
restructured build system support
df355652e0
updated project files
455ad12fec
renamed launch configs for clear distrinction
bc5f340e2b
added cmake launch config
dd211f23cb
include fix
3f41fc181c
includes formal correction
7afd80d0ab
some fixes, launch configs added
a8edb34931
deleted make luanch config
326c595bbe
added linux release launch config
9bedc302f4
added launch config
6995d52a9a
reamde update
d07294980a
Merge pull request 'CMake update' (#11) from mueller/cmake-update into develop
8f6afda279
suppressed warning flags
ffe22036c6
Merge branch 'mueller/master' of https://egit.irs.uni-stuttgart.de/eive/eive_obsw into mueller/master
3a9c0f7c9a
Merge pull request 'Update' (#12) from mueller/master into develop
ac01d54804
cmake lists update
db4e918649
updared readme, added scripts
af43722ee8
readme update
c4e57ec818
one pic not showing,.
9a2b2dd167
png capital
1ca24ae6e0
typo
78b17fdb45
README update
6687a913fe
added readme and user manual
43e986de90
readme update
58ab8996bf
reamde update
e216e03897
updated readme
8d0b87524e
added project files
d387c1ce69
readme update
40238caee4
tmtc update
700a7ec2e6
Merge branch 'mueller/master' of https://egit.irs.uni-stuttgart.de/eive/eive_obsw into mueller/master
7eba60ba29
submodule update
f8f0226a13
Merge branch 'mueller/master' of https://egit.irs.uni-stuttgart.de/eive/eive_obsw into mueller/master
d426699cc3
updated to new fsfw branch
78d097e965
updated fsfw config
35d6d47bd0
tmp1075 handler, wip
64c3aa5e9d
fixed merge conflicts
c73c41b03a
temperature reading successul, but i2c sometimes hanging up
adef6eb188
tmp1075handler and I2cComIF complete
fd41c3b4db
added second tmp1075
677979c2c1
little fix in gs device handler class
50a214e6ff
updated tmtc
9eaebd22c0
added gpio sysfs if
0f6395b460
deprecated wiringPi
df67887926
fsfw update
f6b13546bc
implemented api change
88959f2208
fsfw update
f965b783f9
updated cproject f ile
7d32303f29
updated fsfwconfig files
5f59a2792f
important fsfw bugfix
84c802baec
updated fsfw, moved file
fa4e442eac
bugfix
d66ac9e4a6
old approach gpio lib
d913fbb416
updated cmakelists
3345f08c31
Merge branch 'mueller/master' of https://egit.irs.uni-stuttgart.de/eive/eive_obsw into mueller/master
1b44fe3840
improved cmake lists
5d354f3526
heater wip
0a36325371
Merge pull request 'Updated FSFW' (#14) from mueller/master into develop
712b9c83cf
heater handler wip
b9a7a30919
commanding of HeaterHandler and GpioIF working
26f16995e0
save structs for datasets
38d4b28a90
updated eive repo
86df9a9e30
fsfw update
75a1db70f4
fsfw update
19fb5535f6
tmtc update
8e0b38f8db
tmtc update
9b8c4fadb1
Merge branch 'develop' into mueller/master
e33769e654
pcdu handler pdu2 dataset wip
3d734117e1
save before changing pdu hk table dataset
00cabbb8e9
fsfw update
015251dab1
pdu2 dataset update snapshot
c3665cbd65
pdu2 hk table periodic request
5a70df7bd7
issue with PDU Handler
f4249e82e3
fixed PCDU memory leak
d602912364
p60 dock init local pool
64a7532f3f
fsfw update
1c3d0488e8
heater main switch commanding
5ccb3d1488
init local pool for hktable, wip
95e549e313
added p60 dock hk table local pool
78086ebbc7
improved debug messages
9c02809e10
enabled gpio switching in heater again
7b4949583b
added heater 1
b82e1d72ea
acu hk tabel local pool, wip
aa70d04730
added all heater switches
b908393b79
improved linux libgpiod interface
76e59e3593
compilation successful of acu hk table dataset
5783dfdd06
fsfw and tmtc update
6cd9d439bc
Merge pull request 'Small update, Submodule updates' (#15) from mueller/master into develop
1f5504b7f7
added gpio read function
bdc4b1cec5
fixed merge conflicts
df0e1aa869
restructured objectfactory and init_mission for libgpio test on te0720
88f62c5a11
little issue with acu hk reply
f042572429
Merge branch 'meier_eiveobsw' into meier/acuHkTable
29fb3cb9b8
fixed bug with hk table reply size
9d87b368fb
deleted doubled cmake debug folder
217c1a6c2a
fsfw and tmtc update
f2b1255b39
moved gpiod test to bsp folder
ae47acdbbb
added new linux folder
56c89a0751
moved some files
f006188814
updated project files
00fa7fd67e
compile check succesfull
38402eac45
readme update
be5b189ba0
small detail added
96a620ccc7
readme update
539eb91719
updated project files
b022822113
readme update
8e9af49574
readme update
37eed4182c
new section for sysroot
b4e6edce80
moved stuff to linux folder
f64d707f4c
repaired q7s build/includes
313f7f6ec1
tabs/spaces
c6e145f17d
corrected p60dock max reply size
95ab220f6e
Merge pull request 'Improved structure' (#17) from mueller/master into develop
e116e0dc64
reference returned now
9a995a9b5c
some minor improvements
fc0337af04
moved heater handler
6d2d7ad620
corrected include guards, changed GpioIF prototype
101a7696c3
simplified i2c code
0045cd2062
added back member iter
a8d2557545
removed newlines
83f080abe9
small form stuff
aa5690687a
new linux boardtest folder
967618f687
deployment handler
c9947bbccc
read acu hk table complete
4d64897640
fixed merge conflicts
4d4cf3f694
syrlinks handler wip
5179f165da
improved s/a deployment handler
32d17b9f03
Merge branch 'develop' into meier/syrlinksHkHandler
3bc5d1abce
syrlinks handler wip
effb703d14
syrlinks handler wip
d8c1ad7f71
included crc for syrlinks
6e0e840c3a
save before removing approach with rememberCommandId
13c75ed9c2
syrlinks handler ready for testing
9bdc2096b0
separate folder for RPi builds
7c71e2b067
added loopback test mode
86e527882c
updated cmake lists
ab1b4271ec
added link library gpiod
400d5710d4
Merge remote-tracking branch 'origin/develop' into mueller/master
1ffcc8e5f6
heater handler moved
7f05285803
explicit cast so it compiles
e6c75c54ea
bugfix
ac250cb4cb
added service 20
b03420c706
better missed deadline handling
e9ffa930de
fsfw update
a2e6634208
spi com if almost finished
3550fb6ca7
spi com if finished
e1e0c07746
source file for utility now
c042bbea63
refactored GPIO to support callbacks
434d0586b3
bugfix
ed40ed70cc
printf supportt
c406133ae6
cleaned up includes
dfe2c81ecd
deleted unused code
46495dd123
small fixes for Q7S
06173eeb03
redordered includes
bbd6a36332
fsfw update
e25e473c32
fsfw update
f65e28d33b
libgpiod test
09ff131133
fsfw update
4248657680
gpio bugfix
673cfc8747
more bugfixes
178c3e2540
continued test task
a47c8d91a0
continued test class
cb0fa384ca
spi bugfixes
84ebc71b23
removed obsolete printout
02c4cae12f
added stopwatch include
aa69b2f492
disabled tests by default
d7f8e11563
testing mgm handler
c5552bbc32
version is 1.0 now (i think were post alpha state..)
93aafb4344
lis 3 basic test code
6b982ce5cd
added some testcode, zero init spi struct
2cc22b2233
spi com if basic verification complete
1416a56ae7
who am i reg is now checked
e7d4d7b4ee
printf support added
b108c73d35
tab replacements
8b0ce0c5ec
small form improvements
561893a6b9
tab replacements
8243db74ce
adapter size of rx registers reply
5d24627c91
hex to int wip
4c09e973be
added hex string to int functions
1ef873098f
readme update
c076ec5487
added readout of some tx registers
e4f3eb0172
tmtc update
705a6d880a
added lwgps library
581aa689ed
moved etl to thirdparty folder
b5650033d8
moved all third-party lib to separate folder
6518a7f244
solar array depl moved to bsp folder
30c9d2dc0f
added lwgps config
da30b270c4
updated init mission of hosted bsp
02ac9b1fa5
lwgps update
3cff08f644
lwgps update
f435238699
syrlinks hk handler complete
be4977df68
commented out setting pcdu to normal mode
189c35eb8d
Merge pull request 'SPI update, Version bump' (#22) from mueller/spi-com-if-tested into develop
12f0c91342
Merge pull request 'lwgps library integrated' (#23) from mueller/lwgps-integrated into develop
94ad41abb4
moved some files
93636426b6
fixed merge conflict and copied max13865 code
b75eef7c51
fsfw update
fcda3bd2ea
removed make launch configs and updated shell scripts
6cc071f8ee
adaptions for fsfw api changes
a6504e941d
fsfw update
57d46ca612
lwgps
602097f1ed
made shell scripts executable
271c7ce7ec
Merge branch 'mueller/master' of https://egit.irs.uni-stuttgart.de/eive/eive_obsw into mueller/master
7ed19866b0
updated project files
9bf581a528
added additional build config RPI flag
bf56ac90ad
started rm3100 testing
5f3d2b1516
simple rm3100 test working now
32670f4a81
rm3100 tested now as well
88f84c4393
both magnetic sensors working at once now
9ddbdbe19e
added l3g handler
a581ce8bd6
using big endian now for gyro
b1dc0122b7
doc added
5c04ddea1d
L3DG20H device handler tested
dfec824222
disabled acs board test
cdcb049736
lowered transition times and changed pst to 1sec
cbe55a605d
rtd handler compiled
e048d6d7ec
IMQT wip
c3a3394c8a
IMTQ dipole actuation command, wip
6ec4d22a14
fsfw update
703eb5a1e1
Merge branch 'mueller/master' of https://egit.irs.uni-stuttgart.de/eive/eive_obsw into mueller/master
f140eb4154
Merge pull request 'Update package' (#25) from mueller/update-package into develop
9404346722
fixed for fsfw update
b33c38941e
Merge remote-tracking branch 'origin/develop' into mueller/fsfw-update
52a9807f4d
Merge pull request 'FSFW Update' (#26) from mueller/fsfw-update into develop
88537fabc7
submodule update
1fed42e3dc
corrected project files for host build
66375ab0cd
updated fsfw and obj factory
cb2a3636df
Merge branch 'mueller/master' into develop
4e6fa7f5ac
readem update
682cdb3ce9
IMTQHandler wip
19abeadf74
added fsfw
5439305b8c
deleted polling sequence file
862a546637
solved all merge conflicts
e44773fee3
minor changes in object factory
af3231f405
fixed merge conflicts
5bdd4dad28
updated tmtc submodule
8331b76ea8
added fsfw hal
8d30c83d42
integrating fsfw_hal
f6fb7f4c4b
using new fsfw_hal now
4bf1206fbd
updated project files again
ced80ce4d0
fixed q7s
1ad03cef9e
rtd handler improvements
df723b26a1
added all max handler
04d0beac4c
transition delay set to 5000 again
515d56e423
Merge branch 'meier/max13865pt1000Handler' of https://egit.irs.uni-stuttgart.de/eive/eive_obsw into meier/max13865pt1000Handler
fed2d56e20
imtq instantiation
887a47f7f5
fixed merge conflicts
1492d168d8
imqt handler compiled
be9d11afff
submodules add
0e614aa163
merged origin mgtHandler
77bd1ea50d
added way to supply definesto cmake
ebfda75e34
fsfw updated
25b5734186
corrections ofr updated common udp code
103c12052c
fixes in imqt
eee73f46c5
Merge branch 'meier/mgtHandler' of https://egit.irs.uni-stuttgart.de/eive/eive_obsw into meier/mgtHandler
b062be78db
fsfw update
93daabab73
Merge remote-tracking branch 'origin/develop' into mueller/master
c5406951ad
updated to new fsfw
f13b86379f
Merge remote-tracking branch 'origin/mueller/added-fsfw-hal' into mueller/master
1eb487a84b
added unix path helper
5f6479d193
updated host osal
4e2d8bdc5c
moved spi code to fsfw_hal
2b3d531e5d
moved i2c to fsfw_hal as well
fb7abbc82b
deleted folder which was moved
1a4830aea9
updated default Q7S sysroot
e86106615a
added rpi acs board code to q7s
12be9bf7e4
polling sequence table entries for acs devices
0027a43315
compiling
af48c6528d
one missing zeros
29d8c8c0c8
Merge branch 'mueller/master' into meier/max13865pt1000Handler
248c381ade
some adaptions
e1454db4b9
fixes
aa606b031a
Merge branch 'meier/max13865pt1000Handler' into mueller/master
bcc2f89f12
now its compiling
e79a8e0926
small form improvements
62834bebcc
pushed stuff
ffa11ce253
added device handler
2dbe893197
added more spi test code, preprocessor defines
437f4573b5
hal update
1647b8a98e
minor formatting stuff
14b69ed7e9
non block almostr eworking
5fbaca9b9f
fsfw and fsfw_hal update
c4a6a680c8
resolved merge conflicts
3046b62ddb
Merge branch 'develop' into mueller/added-fsfw-hal
0677852cfc
common versioning file
0b9ae5e4ec
spi chipselects changes
97e5eb7319
merged origin
c6171a6c2a
cs gyro 1 change
0c892982ae
mgt debugging
fa2c9344d6
typo fix
cbbc501039
updated fsfw and tmtc submodule
c276c11e21
issue with poolManager.subscribe in max handler
1e1446c40e
adaptions for new fsfw, using pus c now
5cf2338f09
added dns name
962b267454
everything seems to work now
24a3b11d62
fsfw update
b3054baccf
Merge branch 'mueller/master' into meier/mgtHandler
3902951a70
deleted faulty header includes
076c00717c
merged mueller master
053e5f6e92
fixed merge conflicts
c2a366e449
added modgen submodule
4ec2454542
tmtc and obj factory update
132acf0dd3
tmtc update
4580a4ef37
fsfw update
1472c3754d
tmtc update
9fd7943e2e
Merge remote-tracking branch 'origin/meier/mgtHandler' into mueller/master
b042335ed1
Merge pull request 'Added FSFW HAL, some GPIO modules moved, FSFW update' (#27) from mueller/added-fsfw-hal into develop
76c31a4d13
OBSW VERsion
e1c7ed419f
obsw version update
38ea091a7f
Merge remote-tracking branch 'origin/develop' into mueller/mgt-rtd-pusc
89dbe078c9
Merge pull request 'Update v1.2 - MGT - RTD - PUSC' (#28) from mueller/mgt-rtd-pusc into develop
c19cdaaa16
muellerr
merged commit c4b348c97f into master 2021-04-25 12:43:23 +02:00
muellerr
referenced this issue from a commit 2021-04-25 12:43:24 +02:00
Merge pull request 'Update to v1.1.0' (#29) from develop into master
muellerr
referenced this issue from a commit 2021-07-22 15:22:53 +02:00
Merge pull request 'Update to v1.1.0' (#29) from develop into master
Loading…
x
Reference in New Issue
Block a user
No description provided.
Delete Branch "develop"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?