v1.9.0 #175

Merged

muellerr merged 623 commits from develop into main 2022-03-08 10:32:41 +01:00

Conversation 0 Commits 623 Files Changed 417 +42511 -26430

muellerr commented 2022-03-08 10:22:25 +01:00

Owner

Copy Link

For all related PRs see: https://egit.irs.uni-stuttgart.de/eive/eive-obsw/milestone/17 .

There are a lot of changes because there has not been an intermediate release for a longer period of time.

This is the release with most/all GPIO pins, SPI, I2C and UART peripherals designated and named, the FPGA configuration becoming more stable, and most basic device handlers implemented.

It will be the last release before system components are added.

For all related PRs see: https://egit.irs.uni-stuttgart.de/eive/eive-obsw/milestone/17 . There are a lot of changes because there has not been an intermediate release for a longer period of time. This is the release with most/all GPIO pins, SPI, I2C and UART peripherals designated and named, the FPGA configuration becoming more stable, and most basic device handlers implemented. It will be the last release before system components are added.

muellerr added 619 commits 2022-03-08 10:22:27 +01:00

ptme handling wip ddd8ff2180

Merge branch 'meier/gpioNaming' into meier/ptme e2c26efe4a

ccsds handler wip d54e2276d6

gpio open by line name test on te0720 c035a26051

open mgm 2 lis3 chip select by name 0e68dbd86c

Merge branch 'develop' into meier/openGpioByName d6164971df

updated subversion ebb575d490

dont start empty PST 0e43969b63

fsfw update 5348f059b0

mgm 2 lis3 chip select opened by name 11537f9988

changed all gpio configurations to open by line name 9fd4c477f0

removed unused gpio definitions in busConf.h f0885fcb2e

fixed merge conflicts 773627dc3d

define renamed c0dde1a005

fsfw update 8dd58ed4fe

ptme ip core packet insertion 5b26564058

class IDs and subsystem IDs moved to framework 04d791824d

Merge remote-tracking branch 'origin/develop' into meier/openGpioByName 3a606fdfc4

Merge pull request 'meier/openGpioByName' (#101) from meier/openGpioByName into develop ... 3e5ef61d5f

Reviewed-on: #101
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>

Merge remote-tracking branch 'origin/develop' into mueller/master 71bf98794d

Merge remote-tracking branch 'origin/develop' into mueller/master 7fd5b6b39e

fsfw update a5f9d0c0d5

have to user proper types now 3af5b8560d

fsfw update 2fd4687108

Merge pull request 'Update FSFW and minor improvements' (#102) from mueller/update-gpio into develop ... 90bd6b1fc1

Reviewed-on: #102
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>

fsfw and tmtc update 55a274a6e3

fsfw update 8acb0c3c02

tcpip components refactoring e5d0dac65e

fsfw update 14dcd9eb5f

fsfw update 699ffd75df

fsfw update 4db5944514

fsfw update and call fix 6a00fd3099

fsfw update d903df55ce

function in namespace now 5b6f091859

renaming options c1fe5325ed

EIVE prefixes added cf04b83cdf

added Catch2 repo 74fa4835e2

adding unittests for EIVE ababb5c062

only use unique name for EIVE OBSW e4286d18d4

refactoring for added unittests f61d0e83f0

unittests working 825682c36d

updated README 8e23be665b

tmtc update 0499fd03da

ccsds handler 55d31d0dc2

live tm variable 3ca18a42ad

tmtc update 82b72e66ee

added preprocessor defines to exclude CCSDS Handler 7ae02d43a7

Merge branch 'develop' into meier/ptme 7f70673625

fsfw and tmtc update 47733a5648

update tmtc 350e494930

fsfw update 448ca372a9

tmtc update a2a6bf1b45

update fsfw and tmtc 1463bcae52

Merge pull request 'Added Unittests' (#103) from mueller/added-unittests into develop ... bea4b7629b

Reviewed-on: #103
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>

tm now sent over PTME 18f7d3e3c9

fixed merge conflicts c5c7a895a4

gpios to enable rs485 tx clock and tx data 5da2a45881

readme update 2b609a413d

Merge pull request 'meier/ptme' (#104) from meier/ptme into develop ... 823decde5c

Reviewed-on: #104
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>

tmtc update 1f981e7a60

Merge remote-tracking branch 'origin/develop' into mueller/master 65ed862c9b

updated comment 271d133053

more information about systemd service 10f2a7a7b7

another helpful command added 7d6022ab09

another minor update f3f96e02a2

README update 2e0606ff0c

Merge pull request 'Minor updates for README' (#106) from mueller/readme-tweaks into develop ... 8a6b4a14bd

Reviewed-on: #106
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>

fsfw and tmtc update c85a7d6b9c

Merge branch 'mueller/master' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into mueller/master c51d9b437e

tmtc update 8d10dcbe18

hosted build compiling again 221012f790

unittests were refactored 1bef032260

removed references to removed module 5e42618dfd

moved command executor 01e9ef64c9

fsfw update 667a893d01

bugfixes in max31685, indexing adapted 7c673d6e7f

updated object translation file dcdf0c9843

ADIS devices working now 30cf0c7aad

tmtc update ccb3a23602

using old names again 0237a22ae9

fsfw update c56fc09da7

updated object translations dac3068437

Merge branch 'develop' into mueller/max31685-bugfix 9f681275b4

Merge pull request 'Updates for OBSW' (#107) from mueller/max31685-bugfix into develop ... b7cd192185

Reviewed-on: #107
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>

rw spi callback removed wrong continue f8d5546a03

updated build scripts 9ddea586ea

updated constants 46dcc18ddb

changes applied during flatsat debugging 017e02e513

improved chip select decoding ca8e3f685a

changed spi of of RTDs b71ac25a77

pdec handler 556a3986c1

save before changing configuration writing 9191d1ec33

class to generate pdec config words 3e2f4e7a10

Merge pull request 'meier/rtdDebug' (#109) from meier/rtdDebug into develop ... c7cd4afa01

Reviewed-on: #109
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>

pdec handler print tc 709661ff67

clcw readout 6f85968f3c

fix in pdec tc reading 08b369f667

adaptions to q7s design f75e7b2002

Merge branch 'develop' into meier/pdec 0f3e9de2b0

changed ptme uio on te0720 9e9a19ebb0

Merge branch 'meier/pdec' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into meier/pdec 8891cda1d4

fsfw and tmtc update a2d5f872ad

Merge pull request 'meier/pdec' (#110) from meier/pdec into develop ... 9ec653075d

Reviewed-on: #110
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>

changes for updated fsfw c1be4a1e83

fsfw and tmtc update 4a01ff3537

physical ram base adress for q7s 67ac4060d7

enabled rx lines of syrlinks rs485 transceiver chips 63965e2f68

bit rate setter dc0f435dbd

print clcw command 283921cba1

run event parser 15b2f9a13e

run object parser cb6db97fc1

gen events c2dbebe56b

object parser ec7568337c

transmit enable and timeout 345ccf5392

link state now detected by bit and carrier lock flags 542aa994b7

tmtc update 34897aceae

ccsds handler class id b4479d6a7d

Merge pull request 'meier/txRateSetting' (#111) from meier/txRateSetting into develop ... 395fbb7704

Reviewed-on: #111
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>

tmtc and fsfw update 1be7208f47

star tracker startup immediately 23d9f56308

Merge remote-tracking branch 'origin/develop' into mueller/master 1886c69e0b

update event list be75332be7

update event list fa89da4438

adapted event name 14ba11738b

event name correction 0f89282dae

implemented rename function 5b412bf072

Merge pull request 'SW tweaks' (#112) from mueller/sw-tweaks into develop ... 25b53d55ce

Reviewed-on: #112
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>

star tracker ping command 0b7e8fa38b

Merge branch 'develop' into meier/StarTracker 007126feff

star tracker ping and reboot command 8b97528afb

request version command eb0e9c2a41

star tracker solution telemetry 5ea129d252

moved print set of temperature set and time set to dataset class b84bdcc0fc

star tracker image helper 077913400f

str image helper, step failure handling 1affc1e1d3

Merge remote-tracking branch 'origin/develop' into mueller/master ac3790b659

make some debug output optional 667bbc918f

using warning insted of debug 8d284b3d2a

increase max number of stored packets in tmtcbridge d287aa80c1

str image loader wip 8c649b3e70

some reaction wheel fixes 77f6ac57e9

Merge pull request 'SW Update' (#113) from mueller/utility-updates into develop ... a2b9484db3

Reviewed-on: #113
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>

str img loader wip a7ab2bb93a

Merge branch 'develop' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into develop 5c1c0dc515

pdec monitor register 7cc0fc640f

Merge branch 'meier/syrlinks' into meier/StarTracker ed8399ef9a

star tracker limits setting fac6996a15

star tracker commands, tracking, mounting, camera, blob 58c40695ae

parsing of arcsec json file complete b691a1e75d

fix in validation command 99c450933e

enabled ACS board A side 11704ea908

compiling for windows again 52d8ae5ffb

update to updated fsfw 54e5fef8fd

rerun generators e64a3fb645

fix in image upload function 1895d7c3db

command to reset error signal f9581f3100

ADIS device handler can now handle multiple types ... af32941352

- Added handling for ADIS16507 and ADIS16505 type

timestamp for file creation 9c42b861f4

interpretation of empty value strings in json 86581d81c9

wrong object ID 985ef0f6bc

moved heater handler 5fadb8f86d

moved heater handler 1f6dbd181c

Merge pull request 'Update EIVE OBSW' (#114) from mueller/update-sw into develop ... 9983acf98b

Reviewed-on: #114

increased frequency of pst tasks 74f52632f6

star tracker improvements 717f2e21a0

tmtc update 58074f9bfd

fixed merge conflicts 5067519b8a

update fsfw and tmtc 774ffa8359

fixes for gyro adis handler 5ae6a61ec0

clear fault bit for max31865 devies 9e6ad8807a

reverted pst freq 5a0563a7e8

Merge branch 'develop' into mueller/max31865-clear-fault-bit a3b6c7e8c8

fix script, experiment with timing 481756b014

initialize values 64ab445f4e

Merge pull request 'MAX31865 clear fault byte' (#116) from mueller/max31865-clear-fault-bit into develop ... 1bd1e25629

Reviewed-on: #116

fsfw update 50154c944a

histogram and contrast telemetry set 4dee8658fd

update submodules 6346da658a

acu print stats 2ed0bdf132

ACS and TCS board working together now e442a8c968

Merge remote-tracking branch 'origin/develop' into mueller/master ffa8a37b04

Merge pull request 'ACS & TCS Board and Reaction Wheels working together now' (#117) from mueller/acs-tcs-rwheel-working-together into develop ... 79859090f8

Reviewed-on: #117
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>

acu command to print current and voltage of ACU channels 2dd8fb4f45

improvements of printout 3163995d06

histogram tm disabled validity buffer for deserialization 654e75fec8

changed deserialization method for star tracker datasets 72c0503ac1

Merge branch 'meier/startrackerActions' into meier/startracker 428d2562ac

tmtc update 8694a20c63

merged develop e3841d180e

added GNSS enable pin handling 636c1fdf26

flash write command 36d33711a7

Merge branch 'develop' into meier/startracker bed70c6fb5

rerun generators 337a485fc1

str write command fix 421866b739

tmtc update 1b38d34951

update uart device names 861d92f3c2

removed spi mux switching, not necessary anymore 433947824a

added new GNSS mux select pin 433b218227

arcsec lib update d12027126c

flash read wip 38ad9f0da2

fixed header names 72cc081098

fixed header name c31ae5073b

Merge branch 'meier/startrackerFlashread' into meier/startracker 8a104c4af2

Merge pull request 'meier/startracker' (#118) from meier/startracker into develop ... db82350d53

Reviewed-on: #118
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>

Merge remote-tracking branch 'origin/develop' into mueller/master 940c770b44

fsfw update 27c011413a

tmtc update cdddc76a59

flash read request 1331c9e7e9

Merge branch 'develop' into meier/startracker 76f840f137

flash read command 8cddbf86d9

changed star tracker uart fa8cdb3241

checksum command 14dec1d700

erase command 2ea75d2a05

tmtc update 8d160572c7

fpga download image command e26ffb6afd

tmtc update 3833b7a875

upload fpga image command 29e7ac210a

some improvements ac51ad7a4f

typo 1aca0b4499

tmtc update 3bbc7820c8

header fix issue with case sensitivity 8b8a1554a5

fixed device file number for mpsoc uart b59abb55fe

adapted uart device files 7e0510115a

Merge remote-tracking branch 'origin/develop' into mueller/master 20f4baa84f

Merge branch 'mueller/master' into mueller/gnss-update 7a28cba71b

tmtc update 24ee4cb7f5

Merge pull request 'GNSS Update' (#121) from mueller/gnss-update into develop ... 09db06e8b2

Reviewed-on: #121
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>

merged develop f6a0fcbe0b

performing remote reset of Q7S 1f7ff062c1

Merge branch 'develop' into meier/startracker 17615a5a2d

Merge pull request 'meier/startracker' (#120) from meier/startracker into develop ... 470e834b80

Reviewed-on: #120
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>

README update 1bed87bc20

justfile update 7201fdf152

Merge branch 'mueller/master' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into mueller/master 2e0d747a0d

Merge remote-tracking branch 'origin/develop' into mueller/master 372dca87ad

convert gps handler base class ... 1f5553b571

- Is ExtendedControllerBase now

stuff d8ec051e13

initialize variable 64ac41d1fe

fixes for RPi 9d48438fae

added rpi port script 2323fd0506

Merge branch 'develop' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into develop d0807ed262

tmtc update a9824b71b7

crc fixes in syrlinks register write commands e1ddd19e31

adapted to develop 3421c6fcbf

gps test worked e73dc2f191

using test booleans a706f6d9bd

fsfw update 806280ee4a

repoint fsfw 9b0906c068

tmtc update 1aa8befe50

tmtc update 2fa8de4103

removed GPS flags 70ab486081

removed gps from pst 3b9959b8b3

Merge branch 'mueller/master' into mueller/gps-tests 858fd07c4a

bug fixes in star tracker handler 952dfde5b7

finished GPS handler refactoring 37ae508af5

new ACS ctrl task 969251d9fa

added .clang format script 2207d06058

moved clang format script 0d03f66e9d

command to request camera parameters abfc120633

Merge pull request 'meier/syrlinks' (#122) from meier/syrlinks into develop ... 41ad4099e3

Reviewed-on: #122
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>

applied clang formatting e6d8d24cd5

forward declaration fixes 9438ba8dcc

added missing include 71c5aa4df0

started BPX handler 384122f811

request limits, camera and blob parameters 5a210e19e1

apply clang format 3a274e7a9b

rerun generator scripts 643584e1c5

add battery definitions file a9cd072acd

Merge remote-tracking branch 'origin/develop' into mueller/gps-tests ce6c9d4613

small fix c657264832

Merge pull request 'GPS Refactoring' (#123) from mueller/gps-tests into develop ... 7138d29041

Reviewed-on: #123
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>

tmtc update 870dd717e4

added clang script and forward declarations 975b3cd294

applied formatting 77c45c0de9

added HK deserializer 1d6f999ab6

added BPX HK set fab259a2b5

added cfg HK d5a09dc280

Merge branch 'mueller/master' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into mueller/master a85800d86c

updated shell script helpers c32ca422fc

readme update 0ed4691113

fsfw update 76adea6bd5

applied clang formatting 5cc7331e90

Merge remote-tracking branch 'origin/develop' into mueller/master c9fe3294ac

Merge branch 'mueller/master' into mueller/gps-tests d4bb5e3f18

assign dataset 2fe645375c

added missing pool entries c1e04b286e

disabled acs task, crashes.. 50e17bc160

fsfw update 3ab6494c28

change dockerfile to trigger container rebuild 0724215b6a

removed dummy change 890d28fb7f

cleanDocker bd7958f6c5

cleanDocker bb2f5bbb03

cleanDocker 29b795252e

cleanDocker 4a20306a83

Merge remote-tracking branch 'origin/develop' into meier/startracker 2f153fe23c

Merge remote-tracking branch 'origin/develop' into mueller/clang-formatting f49e5fbd5f

Merge remote-tracking branch 'origin/develop' into mueller/clang-formatting-applied 77d8f2fc54

Merge pull request 'meier/startracker' (#125) from meier/startracker into develop ... cf92707ee3

Reviewed-on: #125
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>

Merge remote-tracking branch 'origin/develop' into mueller/clang-formatting-applied a50f852b9d

Merge pull request 'clang formatting' (#124) from mueller/clang-formatting into develop ... df3b729baa

Reviewed-on: #124
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>

Merge remote-tracking branch 'origin/develop' into mueller/clang-formatting-applied a74ce78c6f

minor ADIS updates dc6a2ffe56

flipped preproc defines 5bd4f56bc6

better names eb23dc1b0f

and another name 32236f9864

reordered 947134bfd1

implemented first switch callback f948905aa2

callbacks are now allowed 79fac2adcb

callback working 1eb6017a9d

Merge pull request 'clang formatting applied' (#126) from mueller/clang-formatting-applied into develop ... 328b9d95af

Reviewed-on: #126

Merge remote-tracking branch 'origin/develop' into flipped-tmtctest-preproc-define c88371b37a

removed clang script in root 68eb7c9271

Merge remote-tracking branch 'origin/develop' into mueller/pcdu-switch-callback 262837bf0b

removed unrelated changes 4913ffa6d4

Merge remote-tracking branch 'origin/develop' into mueller/master c9787f8e47

Merge branch 'mueller/master' into mueller/bpx-handler c35c94f22b

Merge remote-tracking branch 'origin/mueller/pcdu-switch-callback' into mueller/master b3ca5ac6f2

Merge pull request 'flipped preproc defines' (#127) from flipped-tmtctest-preproc-define into develop ... 7f4f241841

Reviewed-on: #127
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>

call param callback twice ded92fdf7a

Merge branch 'mueller/pcdu-switch-callback' into mueller/master b1667770fe

Merge pull request 'PCDU switch callback' (#128) from mueller/pcdu-switch-callback into develop ... 745526ce8a

Reviewed-on: #128
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>

Merge remote-tracking branch 'origin/develop' into mueller/master 34a4904738

ptme axi interface a56224c339

clang formatter setup eclipse 512d339803

introduced uio mapper class a07468f7b7

tmtc update 7a57043df8

initialize map num 93e84fde29

papb interface no longer a system object 38a1b496e7

introduced axi configuration interface for ptme ip core 102385a707

removed unsued code 03707f2d6a

fsfw update 8ad2114d4b

update fsfw 90b65d4d8a

submodule updates 49bbfb7b7d

Merge pull request 'meier/ptme' (#129) from meier/ptme into develop ... 71ada855c7

Reviewed-on: #129
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>

Merge remote-tracking branch 'origin/develop' into mueller/master 604424c7ed

hyperion handler working now 9998b54f89

increased the stack size for the GPS controller bf73a2e442

added back old GPS handler 5c535784e9

repoint fsfw e8cd2207cf

update project file b4505e5305

updated tmtc, IMTQ switch cmd added a9c93db790

issues with IMTQ 26d66d2a36

decoupled IMTQ handler from OBSWConfig.h 521b47d9fc

still need config include c6f7281bc4

weird errors when going to normal mode 3207d25bd3

correction for i2c device ef48c8c6ad

tmtc update 9231f47641

try new symlink for eive-i2c 0b9b24ca08

updatre q7s-cp utility 8ee3e18327

renamed some deivces 0a315f203b

renamed GPS controller b1e716788a

replaced all names 3bd4c57b85

Merge pull request 'GPS Update' (#130) from mueller/gps-update into develop ... 239e1f9f9f

Reviewed-on: #130
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>

Merge pull request 'I2C and IMTQ updates' (#131) from mueller/i2c-imtq-updates into develop ... e56c538518

Reviewed-on: #131
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>

some adaptions to new firmware 6be7cb4d0c

removed blob command 6043a827ed

some fixed after blob set was removed ab4b397918

dynamic switching of cadu data sample time and clock manipulation c1726f897b

applied clanf formatting 1651926efa

str helper progress print bae1ea7c97

added GNSS select pin 4050521e5a

firmware update wip 4edbbf223c

idented preprocessor define d91ceb6fa7

Merge pull request 'meier/ptme' (#132) from meier/ptme into develop ... 9d5345c5de

Reviewed-on: #132
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>

Merge remote-tracking branch 'origin/develop' into mueller/master 9cdc67ad6c

submodule update 0374262176

fsfw update 9d80e73925

small fsfw fix 866450f1ae

Merge branch 'mueller/master' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into mueller/master 3bd5db2352

Merge branch 'mueller/master' into mueller/bpx-handler d6e256a5d2

apply clang script dd822f9c44

continued BPX handler 89bbf98b4a

created all pool entries for bpx handler 0067cac94d

battery handler not created 988a5e6b31

add bpx handler in I2C PST 7d5b4325e2

added debug printouts fea0b2bfe9

fsfw update f47101c388

bugfixes 344390da14

update event list 6440567585

bpx handler now working e142408bb8

tested some commands 9bf3e46e3c

tested cfg set request a77d5f3669

minor improvement, bugfix for reboot cmd 3250a9f489

applied auto-formatter 9456dc1a00

tmtc update 339b8e8ecc

fix decode error with imtq defintions 2cdd192eeb

added back some events 39471d8261

added back more events 4000c35299

added back more events 5aa800af6e

fix which adds back descriptions b8011717f7

fsfw update ec01edc535

and another fsfw update e1d506926f

Merge pull request 'BPX Handler and a lot more' (#133) from mueller/bpx-handler into develop ... 6781b6debe

Reviewed-on: #133
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>

firmware update wip 18d018b7d7

tmtc update a56b80ec55

applied clang-format c42b3f56c3

manually preparing sysroots for cross compiling gpsd lib 6543264691

setup egse project e67bcd4e26

improved naming of tmtc bridge and tmtc polling task 19c97546b6

obsw configuration running on egse b4d1046928

arcsec lib update abeb4cdbb1

fixed conflicts bb8ccd2842

cmake libgpiod define name changed 814f6caa43

update fsfw 3c4033f83c

clean up egse build 27e3e446e9

star tracker files moved to linux directory 68d56c4cd3

run clang format script 83d99a6662

added bsp_egse to clang format script e222be0534

fsfw update 21593a4696

moved toolchain path print out 191f3c3deb

update config.h.in 826cb13c3e

Merge branch 'mueller/master' into mueller/scex-test 470f0c05bf

submodule updates 632b8c7355

Merge branch 'mueller/master' into mueller/scex-test 0c086f9f15

fixed conflicts 4823496b58

debugging c3e20d6a11

egse define fiX 92eb403e35

define fix 328a3b2d02

q7s-cp can now copy to flatsat as well 90da51ed5a

Merge remote-tracking branch 'origin/develop' into mueller/scex-test 1fa0e3f9c2

Merge remote-tracking branch 'origin/mueller/update-q7s-script' into mueller/scex-test acfd6bfd5e

some fixes for updates q7s-cp script 00eeeade3f

bugfixes for test code fb6b5b9e46

change default name of json file cfce44ca3a

readme running obsw on egse a3092e57e4

ping test working 0108a913e6

apply clang-format 7005314d4b

link to egse sysroots 60d43246d4

Merge pull request 'SCEX test code' (#135) from mueller/scex-test-code into develop ... 20f091d54e

Reviewed-on: #135
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>

wip parameter requests 3035aea885

changed egse default config to ground a65072b743

param request wip 07e68bd05b

reworked cmake, unfortunately a big one due to interdependence ... 4d154b7cee

- /mission is a library now, in preparation of unittests (which bring their own main)
- eive-simple is now only available in bsp=arm/q7s (but is still not compiling)
- watchdog and simple are their own executables, not configurations any more
- moved some q7s specific code into /bsp-q7s to flatten if-hierarchy in main CMakeLists.txt
- compiler and linker options are not globally applied to all targets
- linux is the default fsfw osal now, as current code does not compile on hosted

Merge branch 'meier/startrackerRoofTest' into meier/startrackeregse ac49f3f72b

updated README to cmake changes 00042af77c

removed q7s/watchdog and q7s/simple configurations scripts, as there is no special configuration needed any more e59a98f11c

Merge branch 'develop' into mohr/cmake 50cf01376f

catch2 running d9badee18f

unittesting a skeleton controller, still withouth fsfw f9721eb1ae

all parameter requests implemented c9e5fbc361

Merge branch 'meier/startrackeregse' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into meier/startrackeregse 3c17ba5cc7

skeleton controller now unittested including fsfw. Still dirty WIP f1249392cf

arcsec lib update 1e40013210

integrated log level, log suscription and debug camera parameter setting in startup routine b1973f77f7

tmtc update e3f36ddcfb

fixed conflicts 685b9cd1fb

some more fsfw objects and stubs for unittesting 587e9451ea

more mocking an such in unittests 0f42790aa1

firmware update wip 7adff2c9a8

working on thermal controller unit test. e95647c572

introduced current program check 88a9f8f8de

tmtc update 583ab285d8

Merge pull request 'Reworked cmake' (#136) from mohr/cmake into develop ... 3a6dcdc78e

Reviewed-on: #136
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>

minor gps fixes 208f417d17

Merge pull request 'minor gps fixes' (#139) from mueller/minor-gps-fixes into develop ... 6ddd2e4759

Reviewed-on: #139
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>

changed target name for egse bsp b722b15b26

Merge branch 'develop' into mohr/startracker ... 91e0e9f233

Conflicts:
	CMakeLists.txt
	cmake/PreProjectConfig.cmake
	linux/fsfwconfig/events/translateEvents.cpp

added EventManagerMock, to be extended and moved into fsfw some day 3400c538b3

continued work on event manager mock, slightly usable now 334ba6d4bf

I like my debug output really pretty 090979e5a9

cleanup 4ea8ff9876

reworked test setup bcac56a65c

Updated Dockerfile and Jenkinsfile 57280167a2

Merge branch 'mohr/automation' into mohr/catch2 62531a710f

what kind of language is this? 29efde6cbb

Merge branch 'mohr/automation' into mohr/catch2 4704e6deb8

tweaked build of catch2 ... 52e420b0be

-only built when needed
-no more warnings as catch2 is compiled with default compiler flags

enable unittests in Jenkinsfile 54e3b99708

added libgps to docker to be able to build for linux 6a8c9e14e9

Merge branch 'mohr/automation' into mohr/catch2 5bd613fb57

c'mon... 15bab6ae33

argh c37e7022d1

important bugfix for ADIS handler 8498a84354

create unique bin name again 23ba1a997d

introduced bootloader and firmware submodes b10bf2c68d

Merge branch 'mohr/startracker' into meier/startracker 7d01aa463b

make unique name optional 9c7a203930

Merge pull request 'important bugfix for ADIS handler' (#141) from mueller/adis-hotfix into develop ... 8394f6226a

Reviewed-on: #141
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>

Merge branch 'develop' into mueller/create-unique-bin-name 7c1dcb5f11

watchdog updates 0f9690f6c2

update project file 56a57fadc8

add max1227 module 63ec6d3eae

fix in config file 7427d93c1d

REAMDE fix f5c525699e

fixes for RPi build 27ee6bfffc

Merge pull request 'create unique bin name again' (#143) from mueller/create-unique-bin-name into develop ... 7a97471ed9

Reviewed-on: #143
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>

Merge pull request 'watchdog updates' (#144) from mueller/watchdog-tweaks into develop ... b9e8346e82

Reviewed-on: #144
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>

Merge pull request 'add max1227 module' (#145) from mueller/max1227-module into develop ... 3f35dbfad8

Reviewed-on: #145
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>

Merge pull request 'fixes for RPi build' (#146) from mueller/rpi-fixes into develop ... 6c988ecf50

Reviewed-on: #146
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>

this fixes SCEX ping for RPi 398277ca08

ctor fix for srv5 9387fdce1c

update rad sensor bf9f40aad3

adaptions to updated fsfw d27a57ab28

moved and refactored sus handler e58c375cb9

cmakelists.txt fix 9c625a5743

fsfw update 940115b588

update dev conf ee53485d4e

now it compiles f5c1263dd3

small fix in obj factory d5b22ca636

star tracker firmware update b822ee77bc

Merge pull request 'moved and refactored sus handler' (#151) from mueller/sus-update into develop ... 4ad3339331

Reviewed-on: #151
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>

Merge pull request 'adaptions to updated fsfw' (#150) from mueller/pass-mq-args into develop ... 2551e673d8

Reviewed-on: #150
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>

Merge pull request 'ctor fix for srv5' (#148) from mueller/srv5-ctor-fix into develop ... fd85ab3122

Reviewed-on: #148
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>

Merge pull request 'this fixes SCEX ping for RPi' (#147) from mueller/uart-test-task-update into develop ... c83020d2c1

Reviewed-on: #147
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>

Merge branch 'develop' into mueller/rad-sensor-update a067014116

moved gps handler and deployment handler 10e2600415

deleted former file ,inc fix 7ae2d7117e

intermediate PR 9f60c82725

use radfet enable pin now 0b215bf7e0

check returnvalue e56532367f

minor tweaks 768bb14842

order 3edf7572b6

clean up includes 5bf4e50849

commands to disable and enable star tracker filename timestamping 2419e9fcc6

Merge pull request 'Use RADFET Enable Pin' (#149) from mueller/rad-sensor-update into develop ... 9eb990b3a2

Reviewed-on: #149
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>

corrected output 3593f5ab8c

Merge branch 'develop' into mueller/move-deply-handler e01f2a8947

Merge remote-tracking branch 'origin/develop' into mueller/pl-pcdu-prep 33ff05c558

Merge pull request 'PL PCDU Preparation + Update for new Devicetree' (#153) from mueller/pl-pcdu-prep into develop ... 9010f58636

Reviewed-on: #153
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>

Merge remote-tracking branch 'origin/develop' into mueller/move-deply-handler cca0d5735e

remove faulty include 39f4ef6ccb

Merge pull request 'moved gps handler and deployment handler' (#152) from mueller/move-deply-handler into develop ... 486fa9cae2

Reviewed-on: #152
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>

fsfw and tmtc update 00bd6e260a

separate branch for reboot file handling 3a6c7e3183

update README 55618e381c

cleanDocker dfaaae5512

cleanDocker da78e57dd3

star tracker flash read e082f3973a

fixed conflicts e61dfc0401

refactored star tracker handler dfd817d27b

applied clang formatting f88674ed59

tmtc update c88ed9616d

Merge pull request 'meier/startracker' (#155) from meier/startracker into develop ... 6b88c525b2

Reviewed-on: #155
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>

Merge remote-tracking branch 'origin/develop' into mueller/reboot-file-handling ba68c80d6b

reboot logic unittest init 042acc1a23

GPIO hal update 54640147c1

fsfw update 1684c28e0f

fsfw update ff35986a16

use catch2 main 8e6d8a6fa8

improved mount logic, create conf folder is missing a2bc72a798

continued tests, first fixes 8c2c402821

some more fixes 8e8fe3d0c9

added missing command d4dcd8c03f

various bugfixes from unittest 0d1ff8585c

bugfix by inspection 165e6e829e

added last unittests 1c17aac544

small README 65961695de

extended reboot file handling daa3b0084a

update gitignore b279434ef0

updated OBSW code 4a5ad4fb4d

repoint fsfw 684d9b8059

extension for additional safety e1112f1903

small tweak 84367f8424

small but important bugfix be122038ed

apply clang format to unittest folder as well 9e03f9babe

Merge pull request 'GPIO HAL Update' (#156) from mueller/gpio-hal-update into develop ... 7f71ee82ec

Reviewed-on: #156
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>

Merge remote-tracking branch 'origin/develop' into mueller/reboot-file-handling 66ece6544e

repoint fsfw 23e2c5ffc8

progress printer 57b815c8ee

fixed conflict 033bdb93ad

Merge pull request 'Reboot File Handling' (#154) from mueller/reboot-file-handling into develop ... 81915f1772

Reviewed-on: #154
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>

Merge branch 'develop' into meier/startracker f8942cd6c6

Udated for memory management 711732ccd6

repoint fsfw db75f6d3bf

use new cmake option 27f9c0223c

Merge pull request 'progress printer' (#158) from meier/startracker into develop ... dae901a45e

Reviewed-on: #158
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>

Merge remote-tracking branch 'origin/develop' into mueller/small-rpi-fix 54fb646ea1

Merge remote-tracking branch 'origin/develop' into mueller/sdcman-mg c23c36535c

updated API to take reference instead of pointer b8bd211d8e

update Q7S test task for API change e0e0554fea

Merge pull request 'updated API to take reference instead of pointer' (#161) from mueller/nvm-json-base-update into develop ... 6faea8a33b

Reviewed-on: #161
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>

Merge pull request 'use new cmake option' (#160) from mueller/small-rpi-fix into develop ... b8a4384c91

Reviewed-on: #160
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>

use OSAL define instead of dedicated define 3b1f088596

Merge branch 'develop' into mueller/adis-optimization 193e2bb0f9

update generator scripts 2a730df2a8

update generator scripts 33483b81a6

changing fs.mqueue.msg_max for docker to be able to run unit tests 606da48861

small fixes 182b90ee6d

Merge branch 'develop' into mohr/catch2 2f51f58c7e

forgot one 05bd1cc8c6

Merge branch 'mohr/buildfix' into mohr/catch2 f413ed6f7d

using new docker container name 221d7b408a

submodule updates 458b33e5fd

submodule updates 3f7fb259c9

submodule updates 97a0662adc

submodule updates fd368343c4

Merge pull request 'Adding Catch2 for unittests, reworked CI' (#165) from mohr/catch2 into develop ... e07713a6f7

Reviewed-on: #165
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>

Merge remote-tracking branch 'origin/develop' into mueller/generators-update 0f60d82c06

Merge remote-tracking branch 'origin/develop' into mueller/adis-optimization 5ce46beebf

Merge remote-tracking branch 'origin/develop' into mueller/sdcman-mg 714167f112

building with -j4 instead of -j to limit strain on buildserver bb20b470ec

added try catch for more safety ebdd3914f4

doge 74c1bba814

Merge pull request 'added try catch for more safety' (#168) from mueller/catch-nlohmann-json into develop ... f6a69e2eca

Reviewed-on: #168
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>

Merge pull request 'Update for memory management' (#159) from mueller/sdcman-mg into develop ... b6de685ea2

Reviewed-on: #159
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>

Merge pull request 'ADIS Gyro Handler: Use OSAL define instead of dedicated define' (#162) from mueller/adis-optimization into develop ... 6c51553f71

Reviewed-on: #162
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>

Merge pull request 'Update for generator scripts' (#163) from mueller/generators-update into develop ... 7b9023cb6f

Reviewed-on: #163
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>

Merge branch 'develop' into mueller/doge e2d6202d56

Merge pull request 'doge' (#169) from mueller/doge into develop ... 535a2eea84

Reviewed-on: #169

Merge branch 'develop' into mohr/slowbuild f39a755815

move archive folder b71ea7c4c7

Merge pull request 'building with -j4 instead of -j to limit load on buildserver' (#167) from mohr/slowbuild into develop ... 392faa6664

Reviewed-on: #167

Merge branch 'develop' into mueller/move-archive-folder f419ac8fd7

update for generator scripts ... 8054694763

- Generators will now copy csv files into tmtc folder
- Bump fsfwgen dependency, some bugfixes
- Rerun formatter
- Rerun generator scripts

added PL PCDU code 7f42de1c82

added last small fixes for successfull compilation e7c0066d5d

Merge branch 'develop' into mueller/plpcdu 926888308d

Merge pull request 'Payload PCDU' (#172) from mueller/plpcdu into develop ... 909a0e1c16

Reviewed-on: #172
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>

Merge pull request 'update for generator scripts' (#171) from mueller/gen-update-formatter into develop ... e1e6657b48

Reviewed-on: #171
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>

keeping unittests running 4e8ce4eb0a

common gpioIds.h file 2ef1befb9c

fsfw update afb1c875da

Merge pull request 'keeping unittests running' (#173) from mohr/unittests into develop ... 21d7d5b6f9

Reviewed-on: #173
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>

Merge branch 'develop' into mueller/move-archive-folder 7134401570

Merge pull request 'move archive folder' (#170) from mueller/move-archive-folder into develop ... a145a868dc

Reviewed-on: #170
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>

enabled more GCC warnings 6ccf16f56d

minor update in fsfw 10a2973dc7

repoint tmtc d799e3768d

Merge pull request 'enabled more GCC warnings' (#174) from mueller/additional-gcc-warnings into develop ... 7b4f45b082

Reviewed-on: #174
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>

muellerr changed title from v1.9 to v1.9.0 2022-03-08 10:22:47 +01:00

muellerr added 1 commit 2022-03-08 10:24:43 +01:00

fsfw update 6b2d6609a3

muellerr added 1 commit 2022-03-08 10:25:08 +01:00

Merge branch 'main' into develop 3dad3f311b

muellerr added 2 commits 2022-03-08 10:26:10 +01:00

bump minor version a73710088d

Merge branch 'develop' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into develop b6c34d11d2

muellerr added this to the v1.9.0 milestone 2022-03-08 10:26:21 +01:00

muellerr merged commit 48f972f7a2 into main 2022-03-08 10:32:41 +01:00

muellerr referenced this issue from a commit 2022-03-08 10:32:42 +01:00

Merge pull request 'v1.9.0' (#175) from develop into main

Sign in to join this conversation.

Reviewers

No Reviewers

Labels

Clear labels

OPS TODO

Issues identified by OPS

api change

API change

breaking api change

API change which can break existing code

bug

Something is not working

documentation

Documentation

duplicate

This issue or pull request already exists

feature

New feature

help wanted

Need some help

invalid

Something is wrong

question

More information is needed

wontfix

This won't be fixed

No Label

Milestone

No items

No Milestone v1.9.0

Assignees

Clear assignees

No Assignees

1 Participants

Notifications

Subscribe

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: eive/eive-obsw#175

No description provided.