Home
My Posts

Archive
Login
Signup

Recent Posts

Free subdomains

Want your own xyz.kpaste.net sub-domain for your community? Just type the address into your browser address bar (foo.xyz.kpaste.net is also supported).

Suggestions/Bugs?

Email us at . Try to include as much info as possible.

About

Pastebin is a tool for collaborative debugging or editing.

 

JNCG-import to development/ merge diff
Posted by Anonymous on Tue 21st Jan 2020 18:51
raw | new post

Submit a correction or amendment below (click here to make a fresh posting)
After submitting an amendment, you'll be able to view the differences between the old and new posts easily.

Syntax highlighting: None Bash C C++ CSS Diff HTML mIRC Script Perl PHP Python Smarty XML ---------------------------- ABAP Actionscript ADA Apache Log AppleScript APT sources.list ASM ASP AutoIT Bash C C# C++ C++ (with QT) CSS Diff HTML INI (Config Files) Java Javascript Lua Make mIRC Script MySQL NSIS Perl PHP Python Q(uick)BASIC robots Ruby Ruby on Rails SDLBasic Smarty SQL TCL Text VB.NET Visual BASIC Visual Fox Pro Visual Prolog Windows Registry Files XML Xorg.conf

To highlight particular lines, prefix each line with {%HIGHLIGHT}
diff --cc .dockerignore index 1d3dbea,1d3dbea..0000000 mode 100644,100755..100644 --- a/.dockerignore +++ b/.dockerignore diff --cc .gitignore index a18e747,d4f524c..0000000 mode 100644,100755..100644 --- a/.gitignore +++ b/.gitignore @@@ -1,6 -1,6 +1,10 @@@ ptxdist/qtcreator *.so ++<<<<<<< HEAD +*.so.* ++======= + *.d ++>>>>>>> rauch/jobrechner-import-20190607 *.o *.err ptxdist/p @@@ -8,18 -8,9 +12,26 @@@ ptxdist/selected_ptxconfi ptxdist/selected_platformconfig ptxdist/selected_toolchain ptxdist/platform-ecu02/** ++<<<<<<< HEAD +ptxdist/platform-ecu01/** +ptxdist/platform-jncg/** !ptxdist/platform-ecu02 +!ptxdist/platform-ecu01 +!ptxdist/platform-jncg **/*.map +**/*Itf.h ++======= ++!ptxdist/platform-ecu02 ++**/*.map ++>>>>>>> rauch/jobrechner-import-20190607 **/*.user* **/*Dep.h **/*.old* **/*Dep.cpp ++<<<<<<< HEAD +*.config +*.creator +*.files +*.includes ++======= ++>>>>>>> rauch/jobrechner-import-20190607 diff --cc Jenkinsfile index 3ac4c77,47d35b9..0000000 mode 100644,100755..100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@@ -3,7 -3,7 +3,11 @@@ properties( buildDiscarder(logRotator(artifactDaysToKeepStr: '', artifactNumToKeepStr: '', daysToKeepStr: '', numToKeepStr: '14')) ]) ++<<<<<<< HEAD +node("docker && linux && mnt.package-pool") { ++======= + node("docker && linux") { ++>>>>>>> rauch/jobrechner-import-20190607 stage("Prebuild") { gitlabCommitStatus(name: "Prebuild") { cleanWs() checkout scm @@@ -12,16 -12,10 +16,23 @@@ customImage.inside("-v /mnt/package-pool:${WORKSPACE}/ptxdist/src") { ++<<<<<<< HEAD + stage("Setup") { gitlabCommitStatus(name: "Setup") { + sh "integration/build-setup" + }} + + stage("Build") { gitlabCommitStatus(name: "Build") { + sh "integration/build-images" + }} + + stage("Archive") { gitlabCommitStatus(name: "Archive") { + archiveArtifacts 'ptxdist/platform-ecu01/images/quantron-a-*.zip' ++======= + stage("Build") { gitlabCommitStatus(name: "Build") { + sh "integration/build-setup" + sh "integration/build-images" + archiveArtifacts 'ptxdist/platform-ecu02/images/ecu02-*.zip' ++>>>>>>> rauch/jobrechner-import-20190607 }} cleanWs() diff --cc README.md index 80cc284,5f97b47..0000000 mode 100644,100755..100644 --- a/README.md +++ b/README.md @@@ -1,37 -1,25 +1,64 @@@ ++<<<<<<< HEAD + +Build ohne Docker +================= + +Ein lokaler build ohne docker benoetigt eine Installation von Ptxdist und der OSELAS toolchain in einer passenden version. +Passende Links fuer toolchain, platformconfig und ptxconfig muessen manuell erzeugt werden. + +2019-06-26: +Ptxdist 2012.10.0 ist auf modernrn Linux Distributionen nicht mehr ohne weiteres nutzbar. + +Build mit Docker +================ + +Das Dockerfile in integration/ beschreibt ein Debian-System in dem Ptxdist und eine OSELAS toolchain in einer passenden Version installiert sind. +Das Script integration/build-setup erzeugt alle notwendigen Links fuer einen Build. +Das Script integration/build-images fuehrt den eigentlichen Build aus. + +Es existiert ein zusammenfassendes Utility integration/ptxdist welches von einem Entwicklungsrechner aus genutzt werden kann. Es erzeugt einen Docker Container mit einem fuer den Build passenden Setup. +Durch den aufruf von "./integration/ptxdist images" kann so ein Systemimage erzeugt werden. + +Build durch Jenkins +=================== + +Das Jenkinsfile im root des Repository beschreibt die von der CI ausgefuehrten Schritte fuer einen automatischen build. + + +Packagepool +=========== + +Zum build is es notwendig einen Packagepool mit lokalen Kopien der zu verwendenden Sourcen zu nutzen, da nicht mehr alle Archive an ihren originalen URLs verfuegbar sind. + +TODO +==== + +Anpassungen der Buildscripte zum automatischen Setup/Wechsel zwischen ecu01 und ecu02 builds. + ++======= + Build mit Docker + ================ + + Ein build mit dem Dockerfile ist mit folgendem Setup moeglich: + + Verzeichnisstruktur: + ~/docker + - EAG.PTX.PackagePool : Verzeichnis mit sourcen + - jncg : Ausgechecktes Repository + - output : Welt-schreibbares output Verzeichnis + + Docker build: + cd ~/docker + docker build -t quantron -f jncg/Dockerfile quantron + + Build: + docker run -it -v ~/docker/output:/home/user/jncg/ptxdist/platform-ecu01 quantron + + Das gegenwaertige Dockerfile sieht vor, dass Kopien des Packagepools und des jncg Repositories in der Docker-maschine angelegt werden. + In der Docker Maschine wird ein ptxdist-2012 eingerichtet und der build im jncg Repository vorbereitet. + Beim ausfuehren der Maschine wird ein host-Verzeichnis (~/docker/output) als Volume in die Maschine eingebunden, so dass der Output des Builds verfuegbar ist. + + Dieses Setup ist auf einen Proof-of-Concept ausgelegt. + Fuer eine Einbindung in ein automatisiertes Buildsystem ist es sinnvoll die ~/docker Verzeichnisse nicht fest in die Maschine zu kopieren und das setup des builds im jncg-Repository durch ein externes Script zu erledigen. ++>>>>>>> rauch/jobrechner-import-20190607 diff --cc integration/Dockerfile index 1bef7e8,2613715..0000000 mode 100644,100755..100644 --- a/integration/Dockerfile +++ b/integration/Dockerfile @@@ -17,7 -17,7 +17,11 @@@ RUN apt-get update && apt -y install bu # needed for ptxdist RUN apt-get update && apt -y install automake autoconf libncurses-dev gawk flex bison texinfo wget file gettext python-distutils-extra python-dev dialog # needed for build ++<<<<<<< HEAD +RUN apt-get update && apt -y install bc ksh unzip lzop zip fakeroot tofrodos ++======= + RUN apt-get update && apt -y install bc unzip lzop zip fakeroot tofrodos ++>>>>>>> rauch/jobrechner-import-20190607 # system setup end here @@@ -25,7 -25,7 +29,11 @@@ RUN git config --global user.email "you@example.com" && git config --global user.name "Your Name" # get and build ptxdist ++<<<<<<< HEAD +RUN git clone https://git.pengutronix.de/git/ptxdist ++======= + RUN git clone https://git.pengutronix.de/git/ptxdist ++>>>>>>> rauch/jobrechner-import-20190607 # cherry-pick patches from modern ptxdist to support modern debian environment RUN cd ptxdist && git checkout ptxdist-2012.10.0 && git cherry-pick 2a89985c97 c498184eac && git tag -f ptxdist-2012.10.0 -a -m "declare patched version of ptxdist compatible with ptxdist-2012.10.0" RUN cd ptxdist && ./autogen.sh && ./configure && make diff --cc integration/build-images index 0289056,660bc50..0000000 --- a/integration/build-images +++ b/integration/build-images @@@ -2,12 -2,4 +2,16 @@@ cd ptxdist -./p images ++<<<<<<< HEAD +./p images + +DEVPKGDIR=$(./p print PTXCONF_PROJECT_DEVPKGDIR) + +if [ -d /opt/OSELAS.BSP ] +then + mkdir -p ${DEVPKGDIR} + find . -name "*-dev.tar.gz" -exec cp {} ${DEVPKGDIR} \; +fi ++======= ++./p images ++>>>>>>> rauch/jobrechner-import-20190607 diff --cc integration/build-setup index 7071eb5,7c46ce7..0000000 --- a/integration/build-setup +++ b/integration/build-setup @@@ -6,5 -6,5 +6,10 @@@ if [ ! -f p ]; the ln -s /usr/local/bin/ptxdist p fi ./p toolchain /opt/OSELAS.Toolchain-2012.12.0/arm-v5te-linux-gnueabi/gcc-4.7.2-glibc-2.16.0-binutils-2.22-kernel-3.6-sanitized/bin/ ++<<<<<<< HEAD +./p platform configs/ecu01/platformconfig +./p select configs/ecu01/ptxconfig ++======= + ./p platform configs/ecu02/platformconfig + ./p select configs/ecu02/ptxconfig ++>>>>>>> rauch/jobrechner-import-20190607 diff --cc integration/ptxdist index efcb73c,cb25e69..0000000 --- a/integration/ptxdist +++ b/integration/ptxdist @@@ -2,29 -2,22 +2,48 @@@ if [ -z "$PACKAGE_POOL_DIR" ] then ++<<<<<<< HEAD + echo "environment variable \$PACKAGE_POOL_DIR is not set" + echo "try 'export PACKAGE_POOL_DIR=<absolute path to package pool>'" + DOCKEROPTS+=" -v /mnt/package-pool:/home/user/ptxdist/src " +else + DOCKEROPTS+=" -v ${PACKAGE_POOL_DIR}:/home/user/ptxdist/src " +fi + +if [ -d /opt/OSELAS.BSP ] +then + DOCKEROPTS+=" -v /opt/OSELAS.BSP:/opt/OSELAS.BSP " +fi + +DOCKEROPTS+=" -v ${PWD}:/home/user " + +docker build -t quantron-builder integration/ + +docker run --rm -it \ + ${DOCKEROPTS} \ + quantron-builder \ + integration/build-setup + +docker run --rm -e TERM -it \ + ${DOCKEROPTS} \ ++======= + echo "environment variable \$PACKAGE_POOL_DIR is not set" + echo "try 'export PACKAGE_POOL_DIR=<absolute path to package pool>'" + exit 1 + fi + + docker build -t quantron-builder integration/ + + docker run --rm -it \ + -v ${PWD}:/home/user \ + -v ${PACKAGE_POOL_DIR}:/home/user/ptxdist/src \ + quantron-builder \ + integration/build-setup + + docker run --rm -it \ + -v ${PWD}:/home/user \ + -v ${PACKAGE_POOL_DIR}:/home/user/ptxdist/src \ ++>>>>>>> rauch/jobrechner-import-20190607 -w /home/user/ptxdist \ quantron-builder \ ./p $@ diff --cc ptxdist/configs/common/barebox-defaultenv-2/init/automount index 4011ce3,4011ce3..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/common/barebox-defaultenv-2/init/automount +++ b/ptxdist/configs/common/barebox-defaultenv-2/init/automount diff --cc ptxdist/configs/ecu02/barebox-defaultenv-2/boot/nand index 109c2f8,2dea043..0000000 --- a/ptxdist/configs/ecu02/barebox-defaultenv-2/boot/nand +++ b/ptxdist/configs/ecu02/barebox-defaultenv-2/boot/nand @@@ -1,18 -1,16 +1,33 @@@ #!/bin/sh ++<<<<<<< HEAD +PARAM_SKIP=$global.eag.skipupdate + +oftree -f + +global bootm.image="/mnt/nand0-root/boot/zImage" +global linux.bootargs.root="console=null ro root=ubi0_0" ++======= + path="/mnt/nand0-root" + + oftree -f + + global bootm.image="${path}/boot/zImage" + + global linux.bootargs.base="console=ttymxc0,115200" + global linux.bootargs.root="ro root=ubi0_0" ++>>>>>>> rauch/jobrechner-import-20190607 global linux.bootargs.rootfstype="rootfstype=ubifs" global linux.bootargs.ubi_mtd="ubi.mtd=3" global linux.bootargs.lpj="lpj=995328" global linux.bootargs.mtdparts="mtdparts=mxc_nand:1024k(barebox),1024k(bareboxenv),2432k(history),80M(root),-(var)" ++<<<<<<< HEAD +if [ "$PARAM_SKIP" = "true" ]; then + echo "=================> Update skipped! <=================" +else + usb_update_rootfs +fi ++======= + usb_update_rootfs ++>>>>>>> rauch/jobrechner-import-20190607 diff --cc ptxdist/configs/ecu02/barebox-defaultenv-2/boot/net index c87c4e5,69f3591..0000000 --- a/ptxdist/configs/ecu02/barebox-defaultenv-2/boot/net +++ b/ptxdist/configs/ecu02/barebox-defaultenv-2/boot/net @@@ -1,8 -1,9 +1,14 @@@ #!/bin/sh path="/mnt/tftp" ++<<<<<<< HEAD +nfsroot="/var/projects/${global.eag.project}/ptxdist/platform-${global.eag.platform}/root-debug" + ++======= + nfsroot="/var/projects/${global.eag.project}/ptxdist//platform-${global.eag.platform}/root-debug" + + global linux.bootargs.base="console=ttymxc0,115200" ++>>>>>>> rauch/jobrechner-import-20190607 global linux.bootargs.root="root=/dev/nfs nfsroot=$nfsroot,v3,tcp" global linux.bootargs.rootfstype="" global linux.bootargs.ubi_mtd="" @@@ -10,10 -11,12 +16,19 @@@ global linux.bootargs.lpj=" global linux.bootargs.mtdparts="" global.bootm.image="${path}/${global.eag.project}/ptxdist/platform-${global.eag.platform}/images/linuximage" ++<<<<<<< HEAD +#oftree="${path}/${global.eag.project}/platform-${global.eag.platform}/images/${global.eag.oftree}" +#if [ ! -f "${global.bootm.oftree}" ]; then + oftree -f +#fi ++======= + oftree="${path}/${global.eag.project}/platform-${global.eag.platform}/images/${global.eag.oftree}" + if [ -f "${oftree}" ]; then + global.bootm.oftree="$oftree" + else + oftree -f + fi ++>>>>>>> rauch/jobrechner-import-20190607 bootargs-ip #global.linux.bootargs.dyn.root="root=/dev/nfs nfsroot=$nfsroot,v3,tcp" diff --cc ptxdist/configs/ecu02/barebox-defaultenv-2/config-board index a0f25ae,a0f25ae..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/ecu02/barebox-defaultenv-2/config-board +++ b/ptxdist/configs/ecu02/barebox-defaultenv-2/config-board diff --cc ptxdist/configs/ecu02/barebox-defaultenv-2/init/check_env index 6b4b00f,6b4b00f..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/ecu02/barebox-defaultenv-2/init/check_env +++ b/ptxdist/configs/ecu02/barebox-defaultenv-2/init/check_env diff --cc ptxdist/configs/ecu02/barebox-defaultenv-2/init/check_updates index 07cded4,c2bf3be..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/ecu02/barebox-defaultenv-2/init/check_updates +++ b/ptxdist/configs/ecu02/barebox-defaultenv-2/init/check_updates @@@ -8,7 -8,8 +8,12 @@@ if [ -e /env/nv/update_bl ]; the barebox_update -y -d /dev/nand0.barebox /mnt/nand0-root/usr/bl/barebox-image # Stelle Defaultenv wieder her. # Nur damit bekommt man die Datei update_bl entfernt!!! ++<<<<<<< HEAD + erase /dev/nand0.environment ++======= + defaultenv -rs + saveenv ++>>>>>>> rauch/jobrechner-import-20190607 reset fi diff --cc ptxdist/configs/ecu02/barebox-defaultenv-2/menu/60-Update/barebox/tftp/action index aeb7c9e,aeb7c9e..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/ecu02/barebox-defaultenv-2/menu/60-Update/barebox/tftp/action +++ b/ptxdist/configs/ecu02/barebox-defaultenv-2/menu/60-Update/barebox/tftp/action diff --cc ptxdist/configs/ecu02/barebox-defaultenv-2/menu/60-Update/barebox/tftp/title index aae55da,aae55da..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/ecu02/barebox-defaultenv-2/menu/60-Update/barebox/tftp/title +++ b/ptxdist/configs/ecu02/barebox-defaultenv-2/menu/60-Update/barebox/tftp/title diff --cc ptxdist/configs/ecu02/barebox-defaultenv-2/menu/60-Update/barebox/title index 22bf9dc,22bf9dc..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/ecu02/barebox-defaultenv-2/menu/60-Update/barebox/title +++ b/ptxdist/configs/ecu02/barebox-defaultenv-2/menu/60-Update/barebox/title diff --cc ptxdist/configs/ecu02/barebox-defaultenv-2/menu/60-Update/barebox/usb/action index e6b3c72,e6b3c72..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/ecu02/barebox-defaultenv-2/menu/60-Update/barebox/usb/action +++ b/ptxdist/configs/ecu02/barebox-defaultenv-2/menu/60-Update/barebox/usb/action diff --cc ptxdist/configs/ecu02/barebox-defaultenv-2/menu/60-Update/barebox/usb/title index 7de0763,7de0763..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/ecu02/barebox-defaultenv-2/menu/60-Update/barebox/usb/title +++ b/ptxdist/configs/ecu02/barebox-defaultenv-2/menu/60-Update/barebox/usb/title diff --cc ptxdist/configs/ecu02/barebox-defaultenv-2/menu/60-Update/rootfs/tftp/action index be58c36,be58c36..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/ecu02/barebox-defaultenv-2/menu/60-Update/rootfs/tftp/action +++ b/ptxdist/configs/ecu02/barebox-defaultenv-2/menu/60-Update/rootfs/tftp/action diff --cc ptxdist/configs/ecu02/barebox-defaultenv-2/menu/60-Update/rootfs/tftp/title index aae55da,aae55da..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/ecu02/barebox-defaultenv-2/menu/60-Update/rootfs/tftp/title +++ b/ptxdist/configs/ecu02/barebox-defaultenv-2/menu/60-Update/rootfs/tftp/title diff --cc ptxdist/configs/ecu02/barebox-defaultenv-2/menu/60-Update/rootfs/title index 70b9c19,70b9c19..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/ecu02/barebox-defaultenv-2/menu/60-Update/rootfs/title +++ b/ptxdist/configs/ecu02/barebox-defaultenv-2/menu/60-Update/rootfs/title diff --cc ptxdist/configs/ecu02/barebox-defaultenv-2/menu/60-Update/rootfs/usb/action index f91b3b4,f91b3b4..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/ecu02/barebox-defaultenv-2/menu/60-Update/rootfs/usb/action +++ b/ptxdist/configs/ecu02/barebox-defaultenv-2/menu/60-Update/rootfs/usb/action diff --cc ptxdist/configs/ecu02/barebox-defaultenv-2/menu/60-Update/rootfs/usb/title index 7de0763,7de0763..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/ecu02/barebox-defaultenv-2/menu/60-Update/rootfs/usb/title +++ b/ptxdist/configs/ecu02/barebox-defaultenv-2/menu/60-Update/rootfs/usb/title diff --cc ptxdist/configs/ecu02/barebox-defaultenv-2/menu/60-Update/title index 8b6a84b,8b6a84b..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/ecu02/barebox-defaultenv-2/menu/60-Update/title +++ b/ptxdist/configs/ecu02/barebox-defaultenv-2/menu/60-Update/title diff --cc ptxdist/configs/ecu02/barebox-defaultenv-2/network/eth1-discover index 42cf43a,42cf43a..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/ecu02/barebox-defaultenv-2/network/eth1-discover +++ b/ptxdist/configs/ecu02/barebox-defaultenv-2/network/eth1-discover diff --cc ptxdist/configs/ecu02/barebox-defaultenv-2/nv/autoboot_timeout index d00491f,d00491f..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/ecu02/barebox-defaultenv-2/nv/autoboot_timeout +++ b/ptxdist/configs/ecu02/barebox-defaultenv-2/nv/autoboot_timeout diff --cc ptxdist/configs/ecu02/barebox-defaultenv-2/nv/bb_env_version index 1455ab5,ef56b31..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/ecu02/barebox-defaultenv-2/nv/bb_env_version +++ b/ptxdist/configs/ecu02/barebox-defaultenv-2/nv/bb_env_version @@@ -1,1 -1,1 +1,5 @@@ ++<<<<<<< HEAD +V2.03 ++======= + V2.00 ++>>>>>>> rauch/jobrechner-import-20190607 diff --cc ptxdist/configs/ecu02/barebox-defaultenv-2/nv/bb_version index 1455ab5,ef56b31..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/ecu02/barebox-defaultenv-2/nv/bb_version +++ b/ptxdist/configs/ecu02/barebox-defaultenv-2/nv/bb_version @@@ -1,1 -1,1 +1,5 @@@ ++<<<<<<< HEAD +V2.03 ++======= + V2.00 ++>>>>>>> rauch/jobrechner-import-20190607 diff --cc ptxdist/configs/ecu02/barebox-defaultenv-2/nv/boot.default index d287b22,d287b22..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/ecu02/barebox-defaultenv-2/nv/boot.default +++ b/ptxdist/configs/ecu02/barebox-defaultenv-2/nv/boot.default diff --cc ptxdist/configs/ecu02/barebox-defaultenv-2/nv/eag.defaultenv index 27ba77d,27ba77d..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/ecu02/barebox-defaultenv-2/nv/eag.defaultenv +++ b/ptxdist/configs/ecu02/barebox-defaultenv-2/nv/eag.defaultenv diff --cc ptxdist/configs/ecu02/barebox-defaultenv-2/nv/eag.oftree index e69de29,e69de29..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/ecu02/barebox-defaultenv-2/nv/eag.oftree +++ b/ptxdist/configs/ecu02/barebox-defaultenv-2/nv/eag.oftree diff --cc ptxdist/configs/ecu02/barebox-minienv-2/bin/bbt-update-bootloader index f425c2e,f194dfa..0000000 --- a/ptxdist/configs/ecu02/barebox-minienv-2/bin/bbt-update-bootloader +++ b/ptxdist/configs/ecu02/barebox-minienv-2/bin/bbt-update-bootloader @@@ -62,13 -62,7 +62,17 @@@ if [ $? -eq 0 ]; the echo "BBT is not flashbased, creating one" # ensure to convert vendors BBT informations into imx specific format # step1: Erase this mini bootloader (2 blocks)to make sure that 0xff is in the first 2 blocks ++<<<<<<< HEAD + + if [ $eag.dirtyflash = "true" ]; then + # erasebad=0, BBs nicht löschen. Was passiert bei Retourware ohne BBT? + erase /dev/nand0 + else + erase /dev/nand0 0+0x40000 + fi ++======= + erase /dev/nand0 0+0x40000 ++>>>>>>> rauch/jobrechner-import-20190607 # step2: Now create the bad block table from vendors flash informations imx_nand_bbm -y else @@@ -78,14 -72,9 +82,20 @@@ #still there? ok do it ... barebox_update -y $TEMPFILE if [ $? -eq 0 ] ; then ++<<<<<<< HEAD + # Update done, clear the environment + clearenv -q + echo "------------->Barebox Update SUCCESS<---------------" + + # Now Update system! + usb_update_rootfs + echo "------------->RootFS Update SUCCESS<---------------" + ++======= + # Update done, clear the environment and exit + clearenv -q + echo "------------->Update SUCCESS<---------------" ++>>>>>>> rauch/jobrechner-import-20190607 RESULT=0 else echo "------------->Update FAIL<------------------" diff --cc ptxdist/configs/ecu02/barebox-minienv-2/bin/init index 0271905,15467b2..0000000 --- a/ptxdist/configs/ecu02/barebox-minienv-2/bin/init +++ b/ptxdist/configs/ecu02/barebox-minienv-2/bin/init @@@ -14,19 -14,9 +14,25 @@@ us /env/init/automount # Defaultenvironment wiederherstellen ++<<<<<<< HEAD +# Retourware mit 2016 Environment. +bb_env_version_new="/env/nv/bb_env_version" +# Retourware mit 2015 Environment. +bb_env_version_old="/env/bb_env_version" + +if [ -e $bb_env_version_new -o -e $bb_env_version_old ]; then + nv eag.dirtyflash=true +fi + +# Eigenes Environment herstellen/laden! Nichts löschen noch speichern +defaultenv -rs + +# generate bad block table if USB-Stick and reboot ++======= + defaultenv -rs + + # generate bad block table and reboot ++>>>>>>> rauch/jobrechner-import-20190607 bbt-update-bootloader reset diff --cc ptxdist/configs/ecu02/barebox-minienv-2/init/automount index fd8c06a,fd8c06a..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/ecu02/barebox-minienv-2/init/automount +++ b/ptxdist/configs/ecu02/barebox-minienv-2/init/automount diff --cc ptxdist/configs/ecu02/barebox-minienv-2/init/check_env index 52fe502,341d8e4..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/ecu02/barebox-minienv-2/init/check_env +++ b/ptxdist/configs/ecu02/barebox-minienv-2/init/check_env @@@ -2,13 -2,7 +2,19 @@@ # Datei wird nur ausgeführt von einer init-Datei aus einem alten Environment, eines barebox 2015 oder älter. # LÃ?SCHEN!! ++<<<<<<< HEAD +# Warum? Die init-Datei des Prebox führt nur explizit automount aus. Sonst nichts. +# reset ist wichtig, weil sonst der Prebox in ein undefiniertes Verhalten steuert. (andere init-Datei) echo "==> Dirty Environment ... " clearenv +# speichere eigenes environment, flash ist eh verschmutzt. Alter Barebox kann kein BBT. +defaultenv -rs +nv eag.dirtyflash=true +saveenv ++======= ++ ++echo "==> Dirty Environment ... " ++clearenv ++>>>>>>> rauch/jobrechner-import-20190607 reset diff --cc ptxdist/configs/ecu02/barebox-minienv-2/network/eth1-discover index 42cf43a,42cf43a..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/ecu02/barebox-minienv-2/network/eth1-discover +++ b/ptxdist/configs/ecu02/barebox-minienv-2/network/eth1-discover diff --cc ptxdist/configs/ecu02/barebox-minienv-2/nv/filename.bootloader index 309c1cf,309c1cf..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/ecu02/barebox-minienv-2/nv/filename.bootloader +++ b/ptxdist/configs/ecu02/barebox-minienv-2/nv/filename.bootloader diff --cc ptxdist/configs/ecu02/barebox-minienv-2/nv/filename.bootloader.crc index 6ec7407,6ec7407..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/ecu02/barebox-minienv-2/nv/filename.bootloader.crc +++ b/ptxdist/configs/ecu02/barebox-minienv-2/nv/filename.bootloader.crc diff --cc ptxdist/configs/ecu02/barebox-minienv-2/nv/switches.crc.bootloader.enabled index 573541a,573541a..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/ecu02/barebox-minienv-2/nv/switches.crc.bootloader.enabled +++ b/ptxdist/configs/ecu02/barebox-minienv-2/nv/switches.crc.bootloader.enabled diff --cc ptxdist/configs/ecu02/barebox-minienv-2/nv/update.source.default index ff0e0e1,ff0e0e1..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/ecu02/barebox-minienv-2/nv/update.source.default +++ b/ptxdist/configs/ecu02/barebox-minienv-2/nv/update.source.default diff --cc ptxdist/configs/ecu02/barebox.config index 77604f0,77604f0..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/ecu02/barebox.config +++ b/ptxdist/configs/ecu02/barebox.config diff --cc ptxdist/configs/ecu02/bareboxconfig-2016.06.0 index afac6e9,a12cc93..0000000 --- a/ptxdist/configs/ecu02/bareboxconfig-2016.06.0 +++ b/ptxdist/configs/ecu02/bareboxconfig-2016.06.0 @@@ -134,7 -134,7 +134,11 @@@ CONFIG_UBIFORMAT= # # General Settings # ++<<<<<<< HEAD +CONFIG_LOCALVERSION="-EAG_2.02" ++======= + CONFIG_LOCALVERSION="-EAG_2.0.0" ++>>>>>>> rauch/jobrechner-import-20190607 CONFIG_LOCALVERSION_AUTO=y CONFIG_BANNER=y CONFIG_MEMINFO=y @@@ -196,8 -196,8 +200,13 @@@ CONFIG_KERNEL_INSTALL_TARGET= CONFIG_CONSOLE_FULL=y # CONFIG_CONSOLE_SIMPLE is not set # CONFIG_CONSOLE_NONE is not set ++<<<<<<< HEAD +CONFIG_CONSOLE_ACTIVATE_FIRST=y +# CONFIG_CONSOLE_ACTIVATE_ALL is not set ++======= + # CONFIG_CONSOLE_ACTIVATE_FIRST is not set + CONFIG_CONSOLE_ACTIVATE_ALL=y ++>>>>>>> rauch/jobrechner-import-20190607 # CONFIG_CONSOLE_ACTIVATE_NONE is not set # CONFIG_PBL_CONSOLE is not set # CONFIG_CONSOLE_RATP is not set diff --cc ptxdist/configs/ecu02/bareboxconfig-mini-2016.06.0 index abae1d2,5ecb71e..0000000 --- a/ptxdist/configs/ecu02/bareboxconfig-mini-2016.06.0 +++ b/ptxdist/configs/ecu02/bareboxconfig-mini-2016.06.0 @@@ -124,12 -124,11 +124,19 @@@ CONFIG_BINFMT= CONFIG_UIMAGE=y CONFIG_STDDEV=y CONFIG_BAREBOX_UPDATE=y ++<<<<<<< HEAD +CONFIG_UBIFORMAT=y ++======= ++>>>>>>> rauch/jobrechner-import-20190607 # # General Settings # ++<<<<<<< HEAD +CONFIG_LOCALVERSION="-EAG_2.0.2_MINI_EAG" ++======= + CONFIG_LOCALVERSION="-EAG_2.0.6_MINI_GAE" ++>>>>>>> rauch/jobrechner-import-20190607 CONFIG_LOCALVERSION_AUTO=y # CONFIG_BANNER is not set # CONFIG_MEMINFO is not set @@@ -263,9 -262,7 +270,13 @@@ CONFIG_CMD_RESET= # CONFIG_CMD_PARTITION is not set CONFIG_CMD_AUTOMOUNT=y CONFIG_CMD_MOUNT=y ++<<<<<<< HEAD +CONFIG_CMD_UBI=y +CONFIG_CMD_UBIFORMAT=y +CONFIG_CMD_UMOUNT=y ++======= + # CONFIG_CMD_UMOUNT is not set ++>>>>>>> rauch/jobrechner-import-20190607 # # Environment @@@ -491,16 -488,7 +502,20 @@@ CONFIG_NAND_IMX_BBM= CONFIG_MTD_NAND_IDS=y # CONFIG_MTD_NAND_DENALI is not set # CONFIG_MTD_SPI_NOR is not set ++<<<<<<< HEAD +CONFIG_MTD_UBI=y +CONFIG_MTD_UBI_WL_THRESHOLD=4096 +CONFIG_MTD_UBI_BEB_LIMIT=20 +# CONFIG_MTD_UBI_FASTMAP is not set + +# +# UBI debugging options +# +# CONFIG_MTD_UBI_CHECK_IO is not set +# CONFIG_MTD_UBI_GENERAL_EXTRA_CHECKS is not set ++======= + # CONFIG_MTD_UBI is not set ++>>>>>>> rauch/jobrechner-import-20190607 CONFIG_DISK=y # CONFIG_DISK_WRITE is not set @@@ -620,7 -608,6 +635,10 @@@ CONFIG_FS_TFTP= CONFIG_FS_FAT=y CONFIG_FS_FAT_WRITE=y CONFIG_FS_FAT_LFN=y ++<<<<<<< HEAD +# CONFIG_FS_UBIFS is not set ++======= ++>>>>>>> rauch/jobrechner-import-20190607 # CONFIG_FS_BPKFS is not set # CONFIG_FS_UIMAGEFS is not set # CONFIG_FS_PSTORE is not set @@@ -639,8 -626,6 +657,11 @@@ CONFIG_ZLIB= CONFIG_PROCESS_ESCAPE_SEQUENCE=y # CONFIG_LZO_DECOMPRESS is not set CONFIG_QSORT=y ++<<<<<<< HEAD +CONFIG_LIBSCAN=y +CONFIG_LIBUBIGEN=y ++======= ++>>>>>>> rauch/jobrechner-import-20190607 # # Library gui routines diff --cc ptxdist/configs/ecu02/kernelconfig-3.10.22 index 8d68e0d,2f55155..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/ecu02/kernelconfig-3.10.22 +++ b/ptxdist/configs/ecu02/kernelconfig-3.10.22 @@@ -36,7 -36,7 +36,11 @@@ CONFIG_KERNEL_GZIP= # CONFIG_KERNEL_XZ is not set # CONFIG_KERNEL_LZO is not set CONFIG_DEFAULT_HOSTNAME="ECU02" ++<<<<<<< HEAD +CONFIG_SWAP=y ++======= + # CONFIG_SWAP is not set ++>>>>>>> rauch/jobrechner-import-20190607 CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y CONFIG_POSIX_MQUEUE=y @@@ -426,7 -426,6 +430,10 @@@ CONFIG_DEFAULT_MMAP_MIN_ADDR=409 CONFIG_CROSS_MEMORY_ATTACH=y CONFIG_NEED_PER_CPU_KM=y CONFIG_CLEANCACHE=y ++<<<<<<< HEAD +# CONFIG_FRONTSWAP is not set ++======= ++>>>>>>> rauch/jobrechner-import-20190607 CONFIG_FORCE_MAX_ZONEORDER=11 CONFIG_ALIGNMENT_TRAP=y # CONFIG_UACCESS_WITH_MEMCPY is not set @@@ -446,8 -445,7 +453,12 @@@ CONFIG_CMDLINE="noinitrd console=ttymxc CONFIG_CMDLINE_FROM_BOOTLOADER=y # CONFIG_CMDLINE_EXTEND is not set # CONFIG_CMDLINE_FORCE is not set ++<<<<<<< HEAD +CONFIG_KEXEC=y +CONFIG_ATAGS_PROC=y ++======= + # CONFIG_KEXEC is not set ++>>>>>>> rauch/jobrechner-import-20190607 # CONFIG_CRASH_DUMP is not set CONFIG_AUTO_ZRELADDR=y @@@ -705,7 -703,6 +716,10 @@@ CONFIG_MTD_BLOCK= # CONFIG_SSFDC is not set # CONFIG_SM_FTL is not set # CONFIG_MTD_OOPS is not set ++<<<<<<< HEAD +# CONFIG_MTD_SWAP is not set ++======= ++>>>>>>> rauch/jobrechner-import-20190607 # # RAM/ROM/Flash chip drivers @@@ -2013,15 -2010,21 +2027,33 @@@ CONFIG_IRQCHIP= # File systems # # CONFIG_EXT2_FS is not set ++<<<<<<< HEAD +# CONFIG_EXT3_FS is not set +CONFIG_EXT4_FS=y +# CONFIG_EXT4_USE_FOR_EXT23 is not set +# CONFIG_EXT4_FS_POSIX_ACL is not set +# CONFIG_EXT4_FS_SECURITY is not set +# CONFIG_EXT4_DEBUG is not set +CONFIG_JBD2=y +# CONFIG_JBD2_DEBUG is not set +CONFIG_FS_MBCACHE=y ++======= + CONFIG_EXT3_FS=m + CONFIG_EXT3_DEFAULTS_TO_ORDERED=y + CONFIG_EXT3_FS_XATTR=y + # CONFIG_EXT3_FS_POSIX_ACL is not set + # CONFIG_EXT3_FS_SECURITY is not set + CONFIG_EXT4_FS=m + CONFIG_EXT4_USE_FOR_EXT23=y + # CONFIG_EXT4_FS_POSIX_ACL is not set + # CONFIG_EXT4_FS_SECURITY is not set + # CONFIG_EXT4_DEBUG is not set + CONFIG_JBD=m + # CONFIG_JBD_DEBUG is not set + CONFIG_JBD2=m + # CONFIG_JBD2_DEBUG is not set + CONFIG_FS_MBCACHE=m ++>>>>>>> rauch/jobrechner-import-20190607 # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set # CONFIG_XFS_FS is not set @@@ -2085,7 -2088,17 +2117,21 @@@ CONFIG_MISC_FILESYSTEMS= # CONFIG_BEFS_FS is not set # CONFIG_BFS_FS is not set # CONFIG_EFS_FS is not set ++<<<<<<< HEAD +# CONFIG_JFFS2_FS is not set ++======= + CONFIG_JFFS2_FS=y + CONFIG_JFFS2_FS_DEBUG=0 + CONFIG_JFFS2_FS_WRITEBUFFER=y + # CONFIG_JFFS2_FS_WBUF_VERIFY is not set + # CONFIG_JFFS2_SUMMARY is not set + # CONFIG_JFFS2_FS_XATTR is not set + # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set + CONFIG_JFFS2_ZLIB=y + # CONFIG_JFFS2_LZO is not set + CONFIG_JFFS2_RTIME=y + # CONFIG_JFFS2_RUBIN is not set ++>>>>>>> rauch/jobrechner-import-20190607 CONFIG_UBIFS_FS=y CONFIG_UBIFS_FS_ADVANCED_COMPR=y CONFIG_UBIFS_FS_LZO=y @@@ -2108,24 -2121,19 +2154,37 @@@ CONFIG_NETWORK_FILESYSTEMS= CONFIG_NFS_FS=y CONFIG_NFS_V2=y CONFIG_NFS_V3=y ++<<<<<<< HEAD +CONFIG_NFS_V3_ACL=y +CONFIG_NFS_V4=y +CONFIG_NFS_SWAP=y +CONFIG_NFS_V4_1=y +CONFIG_PNFS_FILE_LAYOUT=m +CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org" ++======= + # CONFIG_NFS_V3_ACL is not set + CONFIG_NFS_V4=y + # CONFIG_NFS_SWAP is not set + # CONFIG_NFS_V4_1 is not set ++>>>>>>> rauch/jobrechner-import-20190607 CONFIG_ROOT_NFS=y # CONFIG_NFS_USE_LEGACY_DNS is not set CONFIG_NFS_USE_KERNEL_DNS=y # CONFIG_NFSD is not set CONFIG_LOCKD=y CONFIG_LOCKD_V4=y ++<<<<<<< HEAD +CONFIG_NFS_ACL_SUPPORT=y +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=y +CONFIG_SUNRPC_GSS=y +CONFIG_SUNRPC_BACKCHANNEL=y +CONFIG_SUNRPC_SWAP=y ++======= + CONFIG_NFS_COMMON=y + CONFIG_SUNRPC=y + CONFIG_SUNRPC_GSS=y ++>>>>>>> rauch/jobrechner-import-20190607 # CONFIG_SUNRPC_DEBUG is not set # CONFIG_CEPH_FS is not set # CONFIG_CIFS is not set @@@ -2332,7 -2340,7 +2391,11 @@@ CONFIG_CRYPTO_AEAD= CONFIG_CRYPTO_AEAD2=y CONFIG_CRYPTO_BLKCIPHER=y CONFIG_CRYPTO_BLKCIPHER2=y ++<<<<<<< HEAD +CONFIG_CRYPTO_HASH=y ++======= + CONFIG_CRYPTO_HASH=m ++>>>>>>> rauch/jobrechner-import-20190607 CONFIG_CRYPTO_HASH2=y CONFIG_CRYPTO_RNG2=y CONFIG_CRYPTO_PCOMP2=y @@@ -2376,7 -2384,7 +2439,11 @@@ CONFIG_CRYPTO_HMAC= # # Digest # ++<<<<<<< HEAD +CONFIG_CRYPTO_CRC32C=y ++======= + CONFIG_CRYPTO_CRC32C=m ++>>>>>>> rauch/jobrechner-import-20190607 # CONFIG_CRYPTO_CRC32 is not set # CONFIG_CRYPTO_GHASH is not set # CONFIG_CRYPTO_MD4 is not set diff --cc ptxdist/configs/ecu02/kernelconfig-3.10.22-debug index 1407c00,1407c00..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/ecu02/kernelconfig-3.10.22-debug +++ b/ptxdist/configs/ecu02/kernelconfig-3.10.22-debug diff --cc ptxdist/configs/ecu02/kernelconfig-3.14 index 78746d1,78746d1..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/ecu02/kernelconfig-3.14 +++ b/ptxdist/configs/ecu02/kernelconfig-3.14 diff --cc ptxdist/configs/ecu02/patches/barebox-2012.03.0/0001-EAG-Jobrechener-Initial-Patch.patch index 943b4b8,943b4b8..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/ecu02/patches/barebox-2012.03.0/0001-EAG-Jobrechener-Initial-Patch.patch +++ b/ptxdist/configs/ecu02/patches/barebox-2012.03.0/0001-EAG-Jobrechener-Initial-Patch.patch diff --cc ptxdist/configs/ecu02/patches/barebox-2012.03.0/0002-Patch-fuer-eigenes-IOMUX-Headerfile.patch index f9e6186,f9e6186..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/ecu02/patches/barebox-2012.03.0/0002-Patch-fuer-eigenes-IOMUX-Headerfile.patch +++ b/ptxdist/configs/ecu02/patches/barebox-2012.03.0/0002-Patch-fuer-eigenes-IOMUX-Headerfile.patch diff --cc ptxdist/configs/ecu02/patches/barebox-2012.03.0/0003-Fix-fuer-Problem-mit-Verify-NAND-page-writes.patch index 10c1c71,10c1c71..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/ecu02/patches/barebox-2012.03.0/0003-Fix-fuer-Problem-mit-Verify-NAND-page-writes.patch +++ b/ptxdist/configs/ecu02/patches/barebox-2012.03.0/0003-Fix-fuer-Problem-mit-Verify-NAND-page-writes.patch diff --cc ptxdist/configs/ecu02/patches/barebox-2012.03.0/0004-et-default-config-to-gs-environment.patch index f876581,f876581..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/ecu02/patches/barebox-2012.03.0/0004-et-default-config-to-gs-environment.patch +++ b/ptxdist/configs/ecu02/patches/barebox-2012.03.0/0004-et-default-config-to-gs-environment.patch diff --cc ptxdist/configs/ecu02/patches/barebox-2012.03.0/0005-fixed-gs-boot-env.patch index bc3cee1,bc3cee1..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/ecu02/patches/barebox-2012.03.0/0005-fixed-gs-boot-env.patch +++ b/ptxdist/configs/ecu02/patches/barebox-2012.03.0/0005-fixed-gs-boot-env.patch diff --cc ptxdist/configs/ecu02/patches/barebox-2012.03.0/0006-adjust-default-setttings-to-new-svn-project-ecu01.patch index c592fe6,c592fe6..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/ecu02/patches/barebox-2012.03.0/0006-adjust-default-setttings-to-new-svn-project-ecu01.patch +++ b/ptxdist/configs/ecu02/patches/barebox-2012.03.0/0006-adjust-default-setttings-to-new-svn-project-ecu01.patch diff --cc ptxdist/configs/ecu02/patches/barebox-2012.03.0/0007-first_port_env_kgl.patch index 48123c8,48123c8..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/ecu02/patches/barebox-2012.03.0/0007-first_port_env_kgl.patch +++ b/ptxdist/configs/ecu02/patches/barebox-2012.03.0/0007-first_port_env_kgl.patch diff --cc ptxdist/configs/ecu02/patches/barebox-2012.03.0/0008-adapt-to-our-build-environment.patch index 1ca949f,1ca949f..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/ecu02/patches/barebox-2012.03.0/0008-adapt-to-our-build-environment.patch +++ b/ptxdist/configs/ecu02/patches/barebox-2012.03.0/0008-adapt-to-our-build-environment.patch diff --cc ptxdist/configs/ecu02/patches/barebox-2012.03.0/0009-added-bootargs-for-ubi.patch index 5a9d253,5a9d253..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/ecu02/patches/barebox-2012.03.0/0009-added-bootargs-for-ubi.patch +++ b/ptxdist/configs/ecu02/patches/barebox-2012.03.0/0009-added-bootargs-for-ubi.patch diff --cc ptxdist/configs/ecu02/patches/barebox-2012.03.0/0010-Only-one-Datapartition.patch index 07c13a4,07c13a4..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/ecu02/patches/barebox-2012.03.0/0010-Only-one-Datapartition.patch +++ b/ptxdist/configs/ecu02/patches/barebox-2012.03.0/0010-Only-one-Datapartition.patch diff --cc ptxdist/configs/ecu02/patches/barebox-2012.03.0/0011-usb-host2-init-fix.patch index cee16b2,cee16b2..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/ecu02/patches/barebox-2012.03.0/0011-usb-host2-init-fix.patch +++ b/ptxdist/configs/ecu02/patches/barebox-2012.03.0/0011-usb-host2-init-fix.patch diff --cc ptxdist/configs/ecu02/patches/barebox-2012.03.0/0012-update-bootloader-kernel-rootfs-via-usb-scripts.patch index 3ca30ae,3ca30ae..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/ecu02/patches/barebox-2012.03.0/0012-update-bootloader-kernel-rootfs-via-usb-scripts.patch +++ b/ptxdist/configs/ecu02/patches/barebox-2012.03.0/0012-update-bootloader-kernel-rootfs-via-usb-scripts.patch diff --cc ptxdist/configs/ecu02/patches/barebox-2012.03.0/0013-automatically-update-kernel-and-rootfs-via-usb-on-po.patch index 15acf2d,15acf2d..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/ecu02/patches/barebox-2012.03.0/0013-automatically-update-kernel-and-rootfs-via-usb-on-po.patch +++ b/ptxdist/configs/ecu02/patches/barebox-2012.03.0/0013-automatically-update-kernel-and-rootfs-via-usb-on-po.patch diff --cc ptxdist/configs/ecu02/patches/barebox-2012.03.0/0014-fix-bootscript-for-boting-from-network.patch index 0cd350c,0cd350c..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/ecu02/patches/barebox-2012.03.0/0014-fix-bootscript-for-boting-from-network.patch +++ b/ptxdist/configs/ecu02/patches/barebox-2012.03.0/0014-fix-bootscript-for-boting-from-network.patch diff --cc ptxdist/configs/ecu02/patches/barebox-2012.03.0/0015-build-bareboxenv-for-the-target-as-well.patch index b98baa1,b98baa1..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/ecu02/patches/barebox-2012.03.0/0015-build-bareboxenv-for-the-target-as-well.patch +++ b/ptxdist/configs/ecu02/patches/barebox-2012.03.0/0015-build-bareboxenv-for-the-target-as-well.patch diff --cc ptxdist/configs/ecu02/patches/barebox-2012.03.0/0016-switched-from-uImage-to-more-generic-linuximage.patch index dec99f1,dec99f1..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/ecu02/patches/barebox-2012.03.0/0016-switched-from-uImage-to-more-generic-linuximage.patch +++ b/ptxdist/configs/ecu02/patches/barebox-2012.03.0/0016-switched-from-uImage-to-more-generic-linuximage.patch diff --cc ptxdist/configs/ecu02/patches/barebox-2012.03.0/0017-initial-patches-for-ecu02.patch index 1902997,1902997..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/ecu02/patches/barebox-2012.03.0/0017-initial-patches-for-ecu02.patch +++ b/ptxdist/configs/ecu02/patches/barebox-2012.03.0/0017-initial-patches-for-ecu02.patch diff --cc ptxdist/configs/ecu02/patches/barebox-2012.03.0/0018-initial-patches-for-ecu02-part2.patch index b65c5d3,b65c5d3..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/ecu02/patches/barebox-2012.03.0/0018-initial-patches-for-ecu02-part2.patch +++ b/ptxdist/configs/ecu02/patches/barebox-2012.03.0/0018-initial-patches-for-ecu02-part2.patch diff --cc ptxdist/configs/ecu02/patches/barebox-2012.03.0/0019-Bugfix-hwid-8015-to-8016.patch index 05a4df0,05a4df0..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/ecu02/patches/barebox-2012.03.0/0019-Bugfix-hwid-8015-to-8016.patch +++ b/ptxdist/configs/ecu02/patches/barebox-2012.03.0/0019-Bugfix-hwid-8015-to-8016.patch diff --cc ptxdist/configs/ecu02/patches/barebox-2012.03.0/0020-New-RAM-initialization.-See-https-intranet.eckelmann.patch index b8d1e1c,b8d1e1c..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/ecu02/patches/barebox-2012.03.0/0020-New-RAM-initialization.-See-https-intranet.eckelmann.patch +++ b/ptxdist/configs/ecu02/patches/barebox-2012.03.0/0020-New-RAM-initialization.-See-https-intranet.eckelmann.patch diff --cc ptxdist/configs/ecu02/patches/barebox-2012.03.0/0021-EAG-Jobrechner-Debug-and-Release-support.patch index 72eed65,72eed65..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/ecu02/patches/barebox-2012.03.0/0021-EAG-Jobrechner-Debug-and-Release-support.patch +++ b/ptxdist/configs/ecu02/patches/barebox-2012.03.0/0021-EAG-Jobrechner-Debug-and-Release-support.patch diff --cc ptxdist/configs/ecu02/patches/barebox-2012.03.0/0022-EAG-ECU02_Debug-and-Release-support.patch index 380a45e,380a45e..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/ecu02/patches/barebox-2012.03.0/0022-EAG-ECU02_Debug-and-Release-support.patch +++ b/ptxdist/configs/ecu02/patches/barebox-2012.03.0/0022-EAG-ECU02_Debug-and-Release-support.patch diff --cc ptxdist/configs/ecu02/patches/barebox-2012.03.0/0023-ecu02-support-console-on-uart2.patch index bb7e0cb,bb7e0cb..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/ecu02/patches/barebox-2012.03.0/0023-ecu02-support-console-on-uart2.patch +++ b/ptxdist/configs/ecu02/patches/barebox-2012.03.0/0023-ecu02-support-console-on-uart2.patch diff --cc ptxdist/configs/ecu02/patches/barebox-2012.03.0/series index a66e1b6,a66e1b6..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/ecu02/patches/barebox-2012.03.0/series +++ b/ptxdist/configs/ecu02/patches/barebox-2012.03.0/series diff --cc ptxdist/configs/ecu02/patches/barebox-2014.07.0/0001-usb-chipidea-Add-DT-vbus-supply-parsing.patch index 8bf7df5,8bf7df5..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/ecu02/patches/barebox-2014.07.0/0001-usb-chipidea-Add-DT-vbus-supply-parsing.patch +++ b/ptxdist/configs/ecu02/patches/barebox-2014.07.0/0001-usb-chipidea-Add-DT-vbus-supply-parsing.patch diff --cc ptxdist/configs/ecu02/patches/barebox-2014.07.0/0002-usb-imx-usb-misc-Use-reasonable-defaults-to-setup-th.patch index 3d94783,3d94783..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/ecu02/patches/barebox-2014.07.0/0002-usb-imx-usb-misc-Use-reasonable-defaults-to-setup-th.patch +++ b/ptxdist/configs/ecu02/patches/barebox-2014.07.0/0002-usb-imx-usb-misc-Use-reasonable-defaults-to-setup-th.patch diff --cc ptxdist/configs/ecu02/patches/barebox-2014.07.0/0003-mfd-mc34704-Add-DT-support.patch index a24795a,a24795a..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/ecu02/patches/barebox-2014.07.0/0003-mfd-mc34704-Add-DT-support.patch +++ b/ptxdist/configs/ecu02/patches/barebox-2014.07.0/0003-mfd-mc34704-Add-DT-support.patch diff --cc ptxdist/configs/ecu02/patches/barebox-2014.07.0/0004-include-bbu-Add-missing-include-errno.h.patch index ed34ca7,ed34ca7..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/ecu02/patches/barebox-2014.07.0/0004-include-bbu-Add-missing-include-errno.h.patch +++ b/ptxdist/configs/ecu02/patches/barebox-2014.07.0/0004-include-bbu-Add-missing-include-errno.h.patch diff --cc ptxdist/configs/ecu02/patches/barebox-2014.07.0/0005-ARM-dts-imx25-pinfunc-Add-necessary-pinfunctions.patch index a16b9ad,a16b9ad..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/ecu02/patches/barebox-2014.07.0/0005-ARM-dts-imx25-pinfunc-Add-necessary-pinfunctions.patch +++ b/ptxdist/configs/ecu02/patches/barebox-2014.07.0/0005-ARM-dts-imx25-pinfunc-Add-necessary-pinfunctions.patch diff --cc ptxdist/configs/ecu02/patches/barebox-2014.07.0/0006-board-Add-eag-ecu02-board.patch index 574d3ad,574d3ad..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/ecu02/patches/barebox-2014.07.0/0006-board-Add-eag-ecu02-board.patch +++ b/ptxdist/configs/ecu02/patches/barebox-2014.07.0/0006-board-Add-eag-ecu02-board.patch diff --cc ptxdist/configs/ecu02/patches/barebox-2014.07.0/0007-set_dcd_register_defaults.patch index f85a1db,f85a1db..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/ecu02/patches/barebox-2014.07.0/0007-set_dcd_register_defaults.patch +++ b/ptxdist/configs/ecu02/patches/barebox-2014.07.0/0007-set_dcd_register_defaults.patch diff --cc ptxdist/configs/ecu02/patches/barebox-2014.07.0/0008-usb-set-2-second-delay.patch index aa5171d,aa5171d..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/ecu02/patches/barebox-2014.07.0/0008-usb-set-2-second-delay.patch +++ b/ptxdist/configs/ecu02/patches/barebox-2014.07.0/0008-usb-set-2-second-delay.patch diff --cc ptxdist/configs/ecu02/patches/barebox-2014.07.0/0009-board-eag-ci4000-add-global-var-environment.valid.patch index 41a8d83,41a8d83..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/ecu02/patches/barebox-2014.07.0/0009-board-eag-ci4000-add-global-var-environment.valid.patch +++ b/ptxdist/configs/ecu02/patches/barebox-2014.07.0/0009-board-eag-ci4000-add-global-var-environment.valid.patch diff --cc ptxdist/configs/ecu02/patches/barebox-2014.07.0/series index 8d71971,8d71971..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/ecu02/patches/barebox-2014.07.0/series +++ b/ptxdist/configs/ecu02/patches/barebox-2014.07.0/series diff --cc ptxdist/configs/ecu02/patches/barebox-2016.06.0/0014-add-support-for-eag-ecu02.patch index ee45ceb,2dae41c..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/ecu02/patches/barebox-2016.06.0/0014-add-support-for-eag-ecu02.patch +++ b/ptxdist/configs/ecu02/patches/barebox-2016.06.0/0014-add-support-for-eag-ecu02.patch @@@ -1,30 -1,11 +1,39 @@@ Index: barebox-2016.06.0/arch/arm/boards/eag-mx25/lowlevel.c =================================================================== ++<<<<<<< HEAD +--- barebox-2016.06.0.orig/arch/arm/boards/eag-mx25/lowlevel.c 2016-09-08 10:21:51.855022706 +0200 ++++ barebox-2016.06.0/arch/arm/boards/eag-mx25/lowlevel.c 2016-09-08 10:21:51.851022706 +0200 +@@ -5,6 +5,16 @@ + #include <asm/io.h> + #include <mach/esdctl.h> + ++#include <init.h> ++#include <mach/imx25-regs.h> ++#include <mach/esdctl.h> ++#include <mach/imx-nand.h> ++#include <mach/esdctl.h> ++#include <asm/system.h> ++#include <asm/sections.h> ++#include <asm-generic/memory_layout.h> ++#include <debug_ll.h> ++ + void __naked __noreturn eag_mx25_init(void *fdt) + { + arm_cpu_lowlevel_init(); +@@ -53,5 +63,96 @@ + + eag_mx25_init(fdt); + } ++ ++#endif ++======= + --- barebox-2016.06.0.orig/arch/arm/boards/eag-mx25/lowlevel.c 2016-08-03 10:16:30.412006699 +0200 + +++ barebox-2016.06.0/arch/arm/boards/eag-mx25/lowlevel.c 2016-08-03 10:16:30.412006699 +0200 + @@ -55,3 +55,18 @@ + } + + #endif ++>>>>>>> rauch/jobrechner-import-20190607 + +#ifdef CONFIG_MACH_EAG_MX25_ECU02 + @@@ -33,93 -14,17 +42,105 @@@ +ENTRY_FUNCTION(start_imx25_eag_ecu02, r0, r1, r2) +{ + void *fdt; ++<<<<<<< HEAD ++ void __iomem *uartbase = (void *)MX25_UART1_BASE_ADDR; //0x43F90000 ++ void __iomem *iomuxbase = (void *)MX25_IOMUXC_BASE_ADDR; //0x43F00000+0xAC000 = 0x43FAC000 ++ ++ /* AIPS setup - Only setup MPROTx registers. The PACR default values are good. ++ * Set all MPROTx to be non-bufferable, trusted for R/W, ++ * not forced to user-mode. ++ */ ++ writel(0x77777777, 0x43f00000); // 0x43f00000 = AIPS A control registers ++ writel(0x77777777, 0x43f00004); ++ writel(0x77777777, 0x53f00000); ++ writel(0x77777777, 0x53f00004); ++ ++ /* MAX (Multi-Layer AHB Crossbar Switch) setup ++ * MPR - priority for MX25 is (SDHC2/SDMA)>USBOTG>RTIC>IAHB>DAHB ++ */ ++ writel(0x00043210, 0x43f04000); ++ writel(0x00043210, 0x43f04100); ++ writel(0x00043210, 0x43f04200); ++ writel(0x00043210, 0x43f04300); ++ writel(0x00043210, 0x43f04400); ++ /* SGPCR - always park on last master */ ++ writel(0x10, 0x43f04010); ++ writel(0x10, 0x43f04110); ++ writel(0x10, 0x43f04210); ++ writel(0x10, 0x43f04310); ++ writel(0x10, 0x43f04410); ++ /* MGPCR - restore default values */ ++ writel(0x0, 0x43f04800); ++ writel(0x0, 0x43f04900); ++ writel(0x0, 0x43f04a00); ++ writel(0x0, 0x43f04b00); ++ writel(0x0, 0x43f04c00); ++ ++ /* Configure M3IF registers ++ * M3IF Control Register (M3IFCTL) for MX25 ++ * MRRP[0] = LCDC on priority list (1 << 0) = 0x00000001 ++ * MRRP[1] = MAX1 not on priority list (0 << 1) = 0x00000000 ++ * MRRP[2] = MAX0 not on priority list (0 << 2) = 0x00000000 ++ * MRRP[3] = USB HOST not on priority list (0 << 3) = 0x00000000 ++ * MRRP[4] = SDMA not on priority list (0 << 4) = 0x00000000 ++ * MRRP[5] = SD/ATA/FEC not on priority list (0 << 5) = 0x00000000 ++ * MRRP[6] = SCMFBC not on priority list (0 << 6) = 0x00000000 ++ * MRRP[7] = CSI not on priority list (0 << 7) = 0x00000000 ++ * ---------- ++ * 0x00000001 ++ */ ++ writel(0x1, 0xb8003000); ++ ++ /* configure ARM clk */ ++ writel(0x20034000, MX25_CCM_BASE_ADDR + MX25_CCM_CCTL); ++ ++ /* enable all the clocks */ ++ writel(0x1fffffff, MX25_CCM_BASE_ADDR + MX25_CCM_CGCR0); ++ writel(0xffffffff, MX25_CCM_BASE_ADDR + MX25_CCM_CGCR1); ++ writel(0x000fdfff, MX25_CCM_BASE_ADDR + MX25_CCM_CGCR2); ++ ++ /* Setup UART */ ++ writel(0x0, iomuxbase + 0x174); ++ ++ writel(0x00000000, uartbase + 0x80); //UCR1 ++ writel(0x00004027, uartbase + 0x84); //UCR2 ++ writel(0x00000704, uartbase + 0x88); ++ writel(0x00000a81, uartbase + 0x90); //UFCR, RFDIV=Divide clock by 1 ++ writel(0x0000002b, uartbase + 0x9c); ++ writel(0x00013880, uartbase + 0xb0); //ONEMS = 80000, internal ref_freq divide by 1000. 66,5MHz => 103c4 ++ writel(0x0000047f, uartbase + 0xa4); //UBIR = 1151 ++ writel(0x0000a259, uartbase + 0xa8); //UBMR = 41561 ++ writel(0x00004000, 0x5000808C); //UCR4, CTLSTL auf 16 Charakters ++ writel(0x00000001, uartbase + 0x80); ++ ++ /* Baudrate ++ Baudrate = ref_freq / (16 * (UBMR+1)/(UBIR+1)) ++ ref_freq = module_clock / RFDIV */ ++ ++ putc_ll('>'); ++ ++======= ++>>>>>>> rauch/jobrechner-import-20190607 + + fdt = __dtb_imx25_eag_ecu02_start - get_runtime_offset(); + + eag_mx25_init(fdt); +} ++<<<<<<< HEAD + + #endif +Index: barebox-2016.06.0/arch/arm/boards/eag-mx25/board.c +=================================================================== +--- barebox-2016.06.0.orig/arch/arm/boards/eag-mx25/board.c 2016-09-08 10:21:51.855022706 +0200 ++++ barebox-2016.06.0/arch/arm/boards/eag-mx25/board.c 2016-09-08 10:21:51.851022706 +0200 ++======= + + + +#endif + Index: barebox-2016.06.0/arch/arm/boards/eag-mx25/board.c + =================================================================== + --- barebox-2016.06.0.orig/arch/arm/boards/eag-mx25/board.c 2016-08-03 10:16:30.412006699 +0200 + +++ barebox-2016.06.0/arch/arm/boards/eag-mx25/board.c 2016-08-03 10:16:30.412006699 +0200 ++>>>>>>> rauch/jobrechner-import-20190607 @@ -6,6 +6,7 @@ #include <asm/armlinux.h> #include <mach/bbu.h> @@@ -141,8 -46,8 +162,13 @@@ Index: barebox-2016.06.0/arch/arm/dts/Makefile =================================================================== ++<<<<<<< HEAD +--- barebox-2016.06.0.orig/arch/arm/dts/Makefile 2016-09-08 10:21:51.855022706 +0200 ++++ barebox-2016.06.0/arch/arm/dts/Makefile 2016-09-08 10:21:51.851022706 +0200 ++======= + --- barebox-2016.06.0.orig/arch/arm/dts/Makefile 2016-08-03 10:16:30.412006699 +0200 + +++ barebox-2016.06.0/arch/arm/dts/Makefile 2016-08-03 10:16:30.412006699 +0200 ++>>>>>>> rauch/jobrechner-import-20190607 @@ -12,6 +12,7 @@ pbl-dtb-$(CONFIG_MACH_CM_FX6) += imx6dl-cm-fx6.dtb.o imx6q-cm-fx6.dtb.o imx6q-utilite.dtb.o pbl-dtb-$(CONFIG_MACH_DFI_FS700_M60) += imx6q-dfi-fs700-m60-6q.dtb.o imx6dl-dfi-fs700-m60-6s.dtb.o @@@ -153,8 -58,8 +179,13 @@@ pbl-dtb-$(CONFIG_MACH_EFIKA_MX_SMARTBOOK) += imx51-genesi-efika-sb.dtb.o Index: barebox-2016.06.0/arch/arm/mach-imx/Kconfig =================================================================== ++<<<<<<< HEAD +--- barebox-2016.06.0.orig/arch/arm/mach-imx/Kconfig 2016-09-08 10:21:51.855022706 +0200 ++++ barebox-2016.06.0/arch/arm/mach-imx/Kconfig 2016-09-08 10:21:51.851022706 +0200 ++======= + --- barebox-2016.06.0.orig/arch/arm/mach-imx/Kconfig 2016-08-03 10:16:30.412006699 +0200 + +++ barebox-2016.06.0/arch/arm/mach-imx/Kconfig 2016-08-03 10:16:30.412006699 +0200 ++>>>>>>> rauch/jobrechner-import-20190607 @@ -166,6 +166,9 @@ config MACH_EAG_MX25_UGW400 bool "Universal Gateway 400" @@@ -167,8 -72,8 +198,13 @@@ config MACH_TX25 Index: barebox-2016.06.0/arch/arm/tools/mach-types =================================================================== ++<<<<<<< HEAD +--- barebox-2016.06.0.orig/arch/arm/tools/mach-types 2016-09-08 10:21:51.855022706 +0200 ++++ barebox-2016.06.0/arch/arm/tools/mach-types 2016-09-08 10:21:51.851022706 +0200 ++======= + --- barebox-2016.06.0.orig/arch/arm/tools/mach-types 2016-08-03 10:16:30.412006699 +0200 + +++ barebox-2016.06.0/arch/arm/tools/mach-types 2016-08-03 10:16:30.412006699 +0200 ++>>>>>>> rauch/jobrechner-import-20190607 @@ -3374,6 +3374,7 @@ hjsdu MACH_HJSDU HJSDU 3415 td3_rev1 MACH_TD3_REV1 TD3_REV1 3416 @@@ -179,8 -84,8 +215,13 @@@ net2big_nand_v2 MACH_NET2BIG_NAND_V2 NET2BIG_NAND_V2 3420 Index: barebox-2016.06.0/images/Makefile.imx =================================================================== ++<<<<<<< HEAD +--- barebox-2016.06.0.orig/images/Makefile.imx 2016-09-08 10:21:51.855022706 +0200 ++++ barebox-2016.06.0/images/Makefile.imx 2016-09-08 10:21:51.851022706 +0200 ++======= + --- barebox-2016.06.0.orig/images/Makefile.imx 2016-08-03 10:16:30.412006699 +0200 + +++ barebox-2016.06.0/images/Makefile.imx 2016-08-03 10:16:30.412006699 +0200 ++>>>>>>> rauch/jobrechner-import-20190607 @@ -44,7 +44,13 @@ FILE_barebox-eag-ugw400.img = start_imx25_eag_ugw400.pblx.imximg image-$(CONFIG_MACH_EAG_MX25_UGW400) += barebox-eag-ugw400.img @@@ -199,8 -104,8 +240,13 @@@ Index: barebox-2016.06.0/arch/arm/dts/imx25-eag-ecu02.dts =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++<<<<<<< HEAD ++++ barebox-2016.06.0/arch/arm/dts/imx25-eag-ecu02.dts 2016-09-08 12:26:54.419032956 +0200 +@@ -0,0 +1,387 @@ ++======= + +++ barebox-2016.06.0/arch/arm/dts/imx25-eag-ecu02.dts 2016-08-03 11:31:49.391996860 +0200 + @@ -0,0 +1,302 @@ ++>>>>>>> rauch/jobrechner-import-20190607 +/* + * Copyright 2013 Freescale Semiconductor, Inc. + * @@@ -240,86 -145,11 +286,94 @@@ + +&iomuxc { + eagimx25 { ++<<<<<<< HEAD ++ pinctrl_can1: can1 { ++ fsl,pins = < ++ MX25_PAD_GPIO_A__CAN1_TX 0x80000000 ++ MX25_PAD_GPIO_B__CAN1_RX 0x80000000 ++ >; ++ }; ++ ++ pinctrl_can2: can2 { ++ fsl,pins = < ++ MX25_PAD_GPIO_C__CAN2_TX 0x80000000 ++ MX25_PAD_GPIO_D__CAN2_RX 0x80000000 ++ >; ++ }; ++ + pinctrl_fec: fec { + fsl,pins = < ++ MX25_PAD_FEC_MDC__FEC_MDC 0x80000000 ++ MX25_PAD_FEC_MDIO__FEC_MDIO 0x80000000 ++ MX25_PAD_FEC_TDATA0__FEC_TDATA0 0x80000000 ++ MX25_PAD_FEC_TDATA1__FEC_TDATA1 0x80000000 ++ MX25_PAD_FEC_TX_EN__FEC_TX_EN 0x80000000 ++ MX25_PAD_FEC_RDATA0__FEC_RDATA0 0x80000000 ++ MX25_PAD_FEC_RDATA1__FEC_RDATA1 0x80000000 ++ MX25_PAD_FEC_RX_DV__FEC_RX_DV 0x80000000 ++ MX25_PAD_FEC_TX_CLK__FEC_TX_CLK 0x80000000 + MX25_PAD_A19__FEC_RX_ERR 0x80000000 + >; + }; ++ ++ pinctrl_i2c1: i2c1 { ++ fsl,pins = < ++ MX25_PAD_I2C1_CLK__I2C1_CLK 0x80000000 ++ MX25_PAD_I2C1_DAT__I2C1_DAT 0x80000000 ++ >; ++ }; ++ ++ pinctrl_nfc: nfc { ++ fsl,pins = < ++ MX25_PAD_NFRB__NFRB 0x80000000 ++ MX25_PAD_NFWP_B__NFWP_B 0x80000000 ++ MX25_PAD_NFRE_B__NFRE_B 0x80000000 ++ MX25_PAD_NFWE_B__NFWE_B 0x80000000 ++ MX25_PAD_NFALE__NFALE 0x80000000 ++ MX25_PAD_NFCLE__NFCLE 0x80000000 ++ MX25_PAD_NF_CE0__NF_CE0 0x80000000 ++ MX25_PAD_D0__D0 0x80000000 ++ MX25_PAD_D1__D1 0x80000000 ++ MX25_PAD_D2__D2 0x80000000 ++ MX25_PAD_D3__D3 0x80000000 ++ MX25_PAD_D4__D4 0x80000000 ++ MX25_PAD_D5__D5 0x80000000 ++ MX25_PAD_D6__D6 0x80000000 ++ MX25_PAD_D7__D7 0x80000000 ++ MX25_PAD_D8__D8 0x80000000 ++ MX25_PAD_D9__D9 0x80000000 ++ MX25_PAD_D10__D10 0x80000000 ++ MX25_PAD_D11__D11 0x80000000 ++ MX25_PAD_D12__D12 0x80000000 ++ MX25_PAD_D13__D13 0x80000000 ++ MX25_PAD_D14__D14 0x80000000 ++ MX25_PAD_D15__D15 0x80000000 ++ >; ++ }; ++ ++ pinctrl_spi3: spi3 { ++ fsl,pins = < ++ MX25_PAD_CSI_D2__CSPI3_MOSI 0x80000000 ++ MX25_PAD_CSI_D3__CSPI3_MISO 0x80000000 ++ MX25_PAD_CSI_D4__CSPI3_SCLK 0x80000000 ++ MX25_PAD_CSI_D6__GPIO_1_31 0x80000000 ++ >; ++ }; ++ ++ pinctrl_uart3: uart3 { ++ fsl,pins = < ++ MX25_PAD_CSPI1_MISO__UART3_TXD 0x80000000 ++ MX25_PAD_CSPI1_MOSI__UART3_RXD 0x80000000 ++ MX25_PAD_CSPI1_SCLK__UART3_CTS 0x80000000 ++ >; ++ }; ++======= +++ pinctrl_fec: fec { +++ fsl,pins = < +++ MX25_PAD_A19__FEC_RX_ERR 0x80000000 +++ >; +++ }; ++>>>>>>> rauch/jobrechner-import-20190607 + }; +}; + @@@ -390,32 -220,28 +444,48 @@@ + MX25_PAD_SD1_DATA3__GPIO_2_28 0x80000000 + MX25_PAD_CSPI1_RDY__GPIO_2_22 0x80000000 + MX25_PAD_CSI_D5__GPIO_1_30 0x80000000 ++<<<<<<< HEAD ++ //MX25_PAD_UART2_CTS__GPIO_4_29 0x80000000 ++ //MX25_PAD_UART1_CTS__GPIO_4_25 0x80000000 /* !SPI2_CS_HS_PWM */ ++ //MX25_PAD_ECB__GPIO_3_23 0x80000000 /* !INT_IO_EXP */ ++ //MX25_PAD_LBA__GPIO_3_24 0x80000000 /* A0 von AVC8T245S */ ++======= ++>>>>>>> rauch/jobrechner-import-20190607 + >; + }; + + pinctrl_uart1: uart1 { + fsl,pins = < + MX25_PAD_UART1_TXD__UART1_TXD 0x00000020 /* TXD */ ++<<<<<<< HEAD ++ MX25_PAD_UART1_RXD__UART1_RXD 0x000000A0 /* RXD */ ++======= + + MX25_PAD_UART1_RXD__UART1_RXD 0x000000a0 /* RXD */ ++>>>>>>> rauch/jobrechner-import-20190607 + >; + }; + + pinctrl_uart2: uart2 { + fsl,pins = < + MX25_PAD_UART2_TXD__UART2_TXD 0x00000060 /* TXD */ ++<<<<<<< HEAD ++ MX25_PAD_UART2_RXD__UART2_RXD 0x000000E0 /* RXD */ ++======= + + MX25_PAD_UART2_RXD__UART2_RXD 0x000000e0 /* RXD */ ++>>>>>>> rauch/jobrechner-import-20190607 + >; + }; + + // UART#4 + pinctrl_uart4: uart4 { + fsl,pins = < ++<<<<<<< HEAD ++ MX25_PAD_KPP_COL0__UART4_RXD 0x000000A8 ++ MX25_PAD_KPP_COL1__UART4_TXD 0x000000A8 ++======= + + MX25_PAD_LD8__UART4_RXD 0x80000000 + + MX25_PAD_LD9__UART4_TXD 0x80000000 ++>>>>>>> rauch/jobrechner-import-20190607 + >; + }; + @@@ -437,13 -263,6 +507,16 @@@ + >; + }; + ++<<<<<<< HEAD ++ pinctrl_ci: ci { ++ fsl,pins = < ++ MX25_PAD_UART2_RTS__CC1 0x80000000 ++ MX25_PAD_UART1_RTS__CC3 0x80000000 ++ MX25_PAD_CONTRAST__CC4 0x80000000 ++ >; ++ }; ++======= ++>>>>>>> rauch/jobrechner-import-20190607 + }; +}; + @@@ -478,6 -297,7 +551,10 @@@ + }; +}; + ++<<<<<<< HEAD ++======= + + ++>>>>>>> rauch/jobrechner-import-20190607 +&uart1 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_uart1>; @@@ -497,9 -317,9 +574,15 @@@ +&uart4 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_uart4>; ++<<<<<<< HEAD ++ status = "okay"; ++ ++ fsl,uart-has-rtscts; ++======= + + fsl,uart-has-rtscts; + + + + status = "okay"; ++>>>>>>> rauch/jobrechner-import-20190607 +}; + +&usbphy1 { @@@ -588,15 -408,3 +671,18 @@@ +}; + + ++<<<<<<< HEAD +Index: barebox-2016.06.0/arch/arm/boards/eag-mx25/flash-header.imxcfg +=================================================================== +--- barebox-2016.06.0.orig/arch/arm/boards/eag-mx25/flash-header.imxcfg 2016-09-08 10:21:51.855022706 +0200 ++++ barebox-2016.06.0/arch/arm/boards/eag-mx25/flash-header.imxcfg 2016-09-08 10:21:51.851022706 +0200 +@@ -25,6 +25,6 @@ + wm 8 0x82000782 0xda + wm 8 0x82000402 0xda + wm 32 0xb8001000 0x83216080 +-wm 32 0x43FAC430 0x00000000 ++wm 32 0x43FAC430 0x00000002 + wm 32 0x43FAC454 0x00000000 + wm 32 0x53f80008 0x20034000 ++======= ++>>>>>>> rauch/jobrechner-import-20190607 diff --cc ptxdist/configs/ecu02/patches/barebox-2016.06.0/series index ca6f030,5ccf73a..0000000 --- a/ptxdist/configs/ecu02/patches/barebox-2016.06.0/series +++ b/ptxdist/configs/ecu02/patches/barebox-2016.06.0/series @@@ -12,8 -12,6 +12,14 @@@ #0010-HACK-ci4000-don-t-specify-wake-pin-for-touch-device.patch 0011-HACK-ARM-dts-imx6-set-barebox-environment-to-eMMC.patch 0012-HACK-ARM-work-around-broken-location-calculation-for.patch ++<<<<<<< HEAD +0013-usb-set-2-second-delay +0014-add-support-for-eag-ecu02.patch +0015-adapt-Muxing.patch +0016-pmic-retry-for-i2c-communication.patch +0017-pmic-retry-for-i2c-communication_print_error.patch ++======= + #0013-Added-everspin-mr25h256-spi-mram-to-imx6qdl-sabresd-.patch + 0014-add-support-for-eag-ecu02.patch + # df24f5dc37961d90de9df8879a315e00 - git-ptx-patches magic ++>>>>>>> rauch/jobrechner-import-20190607 diff --cc ptxdist/configs/ecu02/patches/linux-3.10.22/0001-ecu-boards-initial-patch.patch index 9f3b1f7,9f3b1f7..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/ecu02/patches/linux-3.10.22/0001-ecu-boards-initial-patch.patch +++ b/ptxdist/configs/ecu02/patches/linux-3.10.22/0001-ecu-boards-initial-patch.patch diff --cc ptxdist/configs/ecu02/patches/linux-3.10.22/0002-extending-flags-for-hwinit.patch index ce2fa51,ce2fa51..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/ecu02/patches/linux-3.10.22/0002-extending-flags-for-hwinit.patch +++ b/ptxdist/configs/ecu02/patches/linux-3.10.22/0002-extending-flags-for-hwinit.patch diff --cc ptxdist/configs/ecu02/patches/linux-3.10.22/0003-adding-support-options-in-mxc_ehci.h.patch index ac97aea,ac97aea..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/ecu02/patches/linux-3.10.22/0003-adding-support-options-in-mxc_ehci.h.patch +++ b/ptxdist/configs/ecu02/patches/linux-3.10.22/0003-adding-support-options-in-mxc_ehci.h.patch diff --cc ptxdist/configs/ecu02/patches/linux-3.10.22/0004-switched-system-timer-to-GPT3.patch index fdca8ac,fdca8ac..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/ecu02/patches/linux-3.10.22/0004-switched-system-timer-to-GPT3.patch +++ b/ptxdist/configs/ecu02/patches/linux-3.10.22/0004-switched-system-timer-to-GPT3.patch diff --cc ptxdist/configs/ecu02/patches/linux-3.10.22/0005-register-missing-clockdefinitions.patch index 5f22481,5f22481..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/ecu02/patches/linux-3.10.22/0005-register-missing-clockdefinitions.patch +++ b/ptxdist/configs/ecu02/patches/linux-3.10.22/0005-register-missing-clockdefinitions.patch diff --cc ptxdist/configs/ecu02/patches/linux-3.10.22/0006-imx_adc_touch-implementation.patch index 655acfa,655acfa..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/ecu02/patches/linux-3.10.22/0006-imx_adc_touch-implementation.patch +++ b/ptxdist/configs/ecu02/patches/linux-3.10.22/0006-imx_adc_touch-implementation.patch diff --cc ptxdist/configs/ecu02/patches/linux-3.10.22/0007-imx_adc_touch-adding-touch-interrupt-and-baseaddr.patch index 4cdbf17,4cdbf17..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/ecu02/patches/linux-3.10.22/0007-imx_adc_touch-adding-touch-interrupt-and-baseaddr.patch +++ b/ptxdist/configs/ecu02/patches/linux-3.10.22/0007-imx_adc_touch-adding-touch-interrupt-and-baseaddr.patch diff --cc ptxdist/configs/ecu02/patches/linux-3.10.22/0008-imx_adc_touch-kernel-adopt.patch index 085a4c6,085a4c6..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/ecu02/patches/linux-3.10.22/0008-imx_adc_touch-kernel-adopt.patch +++ b/ptxdist/configs/ecu02/patches/linux-3.10.22/0008-imx_adc_touch-kernel-adopt.patch diff --cc ptxdist/configs/ecu02/patches/linux-3.10.22/0009-adding-adc-header.patch index 4e9189e,4e9189e..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/ecu02/patches/linux-3.10.22/0009-adding-adc-header.patch +++ b/ptxdist/configs/ecu02/patches/linux-3.10.22/0009-adding-adc-header.patch diff --cc ptxdist/configs/ecu02/patches/linux-3.10.22/0010-gpio-pca953x-get-value-offset-patch.patch index 01044a0,01044a0..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/ecu02/patches/linux-3.10.22/0010-gpio-pca953x-get-value-offset-patch.patch +++ b/ptxdist/configs/ecu02/patches/linux-3.10.22/0010-gpio-pca953x-get-value-offset-patch.patch diff --cc ptxdist/configs/ecu02/patches/linux-3.10.22/0011-ugly-fb-clock-workaround.patch index 2ea9ea2,2ea9ea2..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/ecu02/patches/linux-3.10.22/0011-ugly-fb-clock-workaround.patch +++ b/ptxdist/configs/ecu02/patches/linux-3.10.22/0011-ugly-fb-clock-workaround.patch diff --cc ptxdist/configs/ecu02/patches/linux-3.10.22/0012-backport-gpio-watchdog.patch index 7f27bd3,7f27bd3..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/ecu02/patches/linux-3.10.22/0012-backport-gpio-watchdog.patch +++ b/ptxdist/configs/ecu02/patches/linux-3.10.22/0012-backport-gpio-watchdog.patch diff --cc ptxdist/configs/ecu02/patches/linux-3.10.22/0013-add-platformdata-support-to-gpio-watchdog.patch index 47bb654,47bb654..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/ecu02/patches/linux-3.10.22/0013-add-platformdata-support-to-gpio-watchdog.patch +++ b/ptxdist/configs/ecu02/patches/linux-3.10.22/0013-add-platformdata-support-to-gpio-watchdog.patch diff --cc ptxdist/configs/ecu02/patches/linux-3.10.22/0014-added-platformdata-for-gpio-watchdog.patch index 607e589,607e589..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/ecu02/patches/linux-3.10.22/0014-added-platformdata-for-gpio-watchdog.patch +++ b/ptxdist/configs/ecu02/patches/linux-3.10.22/0014-added-platformdata-for-gpio-watchdog.patch diff --cc ptxdist/configs/ecu02/patches/linux-3.10.22/0015-changed-hw-margin-of-gpio-wd-from-500-to-300.patch index 42999c7,42999c7..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/ecu02/patches/linux-3.10.22/0015-changed-hw-margin-of-gpio-wd-from-500-to-300.patch +++ b/ptxdist/configs/ecu02/patches/linux-3.10.22/0015-changed-hw-margin-of-gpio-wd-from-500-to-300.patch diff --cc ptxdist/configs/ecu02/patches/linux-3.10.22/0016-can-fix-multiple-delivery-of-a-single-CAN-frame-for-.patch index fe9b596,fe9b596..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/ecu02/patches/linux-3.10.22/0016-can-fix-multiple-delivery-of-a-single-CAN-frame-for-.patch +++ b/ptxdist/configs/ecu02/patches/linux-3.10.22/0016-can-fix-multiple-delivery-of-a-single-CAN-frame-for-.patch diff --cc ptxdist/configs/ecu02/patches/linux-3.10.22/0017-can-introduce-new-raw-socket-option-to-join-the-give.patch index 4a74caa,4a74caa..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/ecu02/patches/linux-3.10.22/0017-can-introduce-new-raw-socket-option-to-join-the-give.patch +++ b/ptxdist/configs/ecu02/patches/linux-3.10.22/0017-can-introduce-new-raw-socket-option-to-join-the-give.patch diff --cc ptxdist/configs/ecu02/patches/linux-3.10.22/0018-Quickfix-foe-ADC-issues.patch index 36bfcb6,36bfcb6..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/ecu02/patches/linux-3.10.22/0018-Quickfix-foe-ADC-issues.patch +++ b/ptxdist/configs/ecu02/patches/linux-3.10.22/0018-Quickfix-foe-ADC-issues.patch diff --cc ptxdist/configs/ecu02/patches/linux-3.10.22/0019-Add-HZ-200.patch index ba58254,ba58254..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/ecu02/patches/linux-3.10.22/0019-Add-HZ-200.patch +++ b/ptxdist/configs/ecu02/patches/linux-3.10.22/0019-Add-HZ-200.patch diff --cc ptxdist/configs/ecu02/patches/linux-3.10.22/0020-PCA9505-removed.patch index 94d2375,94d2375..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/ecu02/patches/linux-3.10.22/0020-PCA9505-removed.patch +++ b/ptxdist/configs/ecu02/patches/linux-3.10.22/0020-PCA9505-removed.patch diff --cc ptxdist/configs/ecu02/patches/linux-3.10.22/series index 02e66dc,c078e2b..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/ecu02/patches/linux-3.10.22/series +++ b/ptxdist/configs/ecu02/patches/linux-3.10.22/series @@@ -18,4 -18,3 +18,7 @@@ 0018-Quickfix-foe-ADC-issues.patch 0019-Add-HZ-200.patch 0020-PCA9505-removed.patch ++<<<<<<< HEAD +0021-sync-ro-remount-after-blocking-writers.patch ++======= ++>>>>>>> rauch/jobrechner-import-20190607 diff --cc ptxdist/configs/ecu02/patches/linux-3.10.22/series.ecu02 index a824240,68dbac9..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/ecu02/patches/linux-3.10.22/series.ecu02 +++ b/ptxdist/configs/ecu02/patches/linux-3.10.22/series.ecu02 @@@ -21,4 -21,3 +21,7 @@@ # 2cd1ee4e3f47d6b7e2737cda3a21af9b - git-ptx-patches magic 0019-Add-HZ-200.patch 0020-PCA9505-removed.patch ++<<<<<<< HEAD +0021-sync-ro-remount-after-blocking-writers.patch ++======= ++>>>>>>> rauch/jobrechner-import-20190607 diff --cc ptxdist/configs/ecu02/platformconfig index 5bac1f4,5bac1f4..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/ecu02/platformconfig +++ b/ptxdist/configs/ecu02/platformconfig diff --cc ptxdist/configs/ecu02/platformconfig_bb index 589c3e8,589c3e8..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/ecu02/platformconfig_bb +++ b/ptxdist/configs/ecu02/platformconfig_bb diff --cc ptxdist/configs/ecu02/platformconfig_bb.old index 589c3e8,589c3e8..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/ecu02/platformconfig_bb.old +++ b/ptxdist/configs/ecu02/platformconfig_bb.old diff --cc ptxdist/configs/ecu02/ptxconfig index 80a1ef5,a5a1a7c..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/ecu02/ptxconfig +++ b/ptxdist/configs/ecu02/ptxconfig @@@ -3,6 -3,38 +3,41 @@@ # PTXdist 2012.10.0 # PTXCONF_MODULES=y ++<<<<<<< HEAD ++======= + # PTXCONF_ADC_TEST is not set + PTXCONF_BACKUP_ETC=y + PTXCONF_COMMON=y + # PTXCONF_DBUS_MECH is not set + # PTXCONF_DISPLAY_TEST is not set + PTXCONF_EBASHLIB=y + # PTXCONF_ECONFIGURE is not set + PTXCONF_ECU_BASICSYS=y + # PTXCONF_ECU_PLATFORM_ECU01 is not set + PTXCONF_ECU_PLATFORM_ECU02=y + PTXCONF_ECU_COMP_CAP=m + PTXCONF_ECU_CONTROL=y + PTXCONF_ECU_EXPLORE=y + PTXCONF_ECU_EXPLORE_DEBUG=y + PTXCONF_ECU_JOBCTL=y + # PTXCONF_ECU_JOBCTL_AXENT is not set + # PTXCONF_ECU_JOBCTL_AXIS is not set + PTXCONF_ECU_JOBCTL_DEMO=y + PTXCONF_ECU_MOTOR_CTL=m + # PTXCONF_ENETCONFIG is not set + # PTXCONF_EUPDATE is not set + PTXCONF_FLUSH_MODULE=y + PTXCONF_HOST_WORKAROUND_HOST_LIBUSB=y + # PTXCONF_LIBMBUS is not set + # PTXCONF_LIBQRENCODE is not set + # PTXCONF_LIBQUAZIP is not set + # PTXCONF_NETCONFIG is not set + # PTXCONF_PWM is not set + # PTXCONF_SER2NET is not set + PTXCONF_SOCKETCAN_TEST=y + # PTXCONF_SOCKETCAN_TEST_TRUNK is not set + # PTXCONF_SYSTEMTEST is not set ++>>>>>>> rauch/jobrechner-import-20190607 # # ------------------------------------ @@@ -17,7 -49,7 +52,11 @@@ # PTXCONF_PROJECT_VENDOR="EAG" PTXCONF_PROJECT="ecu02" ++<<<<<<< HEAD +PTXCONF_PROJECT_VERSION="-V2.4.6" ++======= + PTXCONF_PROJECT_VERSION="-V2.5.1" ++>>>>>>> rauch/jobrechner-import-20190607 # # ------------------------------------ @@@ -78,7 -110,6 +117,10 @@@ PTXCONF_HOST_ELF_H_COMPAT= PTXCONF_HOST_EXPAT=y PTXCONF_HOST_FAKEROOT=y PTXCONF_HOST_FIGLET=y ++<<<<<<< HEAD +PTXCONF_HOST_FILE=y ++======= ++>>>>>>> rauch/jobrechner-import-20190607 # PTXCONF_HOST_FLEX is not set # PTXCONF_HOST_FONTCONFIG is not set # PTXCONF_HOST_FREETYPE is not set @@@ -179,12 -210,11 +221,20 @@@ PTXCONF_CROSS_PKG_CONFIG_WRAPPER= # PTXCONF_GDB_VERSION="7.5" PTXCONF_GDB_MD5="24a6779a9fe0260667710de1b082ef61" ++<<<<<<< HEAD +PTXCONF_GDB=y +PTXCONF_GDB_SHARED=y +PTXCONF_GDBSERVER=y +PTXCONF_GDBSERVER_SHARED=y +PTXCONF_LDD=y +PTXCONF_LTRACE=y ++======= + # PTXCONF_GDB is not set + PTXCONF_GDBSERVER=y + PTXCONF_GDBSERVER_SHARED=y + # PTXCONF_LDD is not set + # PTXCONF_LTRACE is not set ++>>>>>>> rauch/jobrechner-import-20190607 # PTXCONF_LTT_CONTROL is not set # PTXCONF_MEMTEST is not set # PTXCONF_MEMTEST86P is not set @@@ -241,7 -271,7 +291,11 @@@ PTXCONF_ROOTFS_VAR_RUN= PTXCONF_ROOTFS_VAR_LOG=y PTXCONF_ROOTFS_VAR_LOCK=y PTXCONF_ROOTFS_VAR_LIB=y ++<<<<<<< HEAD +PTXCONF_ROOTFS_VAR_CACHE=y ++======= + # PTXCONF_ROOTFS_VAR_CACHE is not set ++>>>>>>> rauch/jobrechner-import-20190607 # PTXCONF_ROOTFS_VAR_SPOOL is not set # PTXCONF_ROOTFS_VAR_SPOOL_CRON is not set PTXCONF_ROOTFS_VAR_TMP=y @@@ -254,9 -284,9 +308,15 @@@ PTXCONF_ROOTFS_SHADOW= PTXCONF_ROOTFS_GROUP=y # PTXCONF_ROOTFS_GSHADOW is not set PTXCONF_ROOTFS_FSTAB=y ++<<<<<<< HEAD +# PTXCONF_ROOTFS_MTAB_FILE is not set +# PTXCONF_ROOTFS_MTAB_LINK_MOUNTS is not set +PTXCONF_ROOTFS_MTAB_LINK_SELF_MOUNTS=y ++======= + PTXCONF_ROOTFS_MTAB_FILE=y + # PTXCONF_ROOTFS_MTAB_LINK_MOUNTS is not set + # PTXCONF_ROOTFS_MTAB_LINK_SELF_MOUNTS is not set ++>>>>>>> rauch/jobrechner-import-20190607 # PTXCONF_ROOTFS_MTAB_LINK_VAR is not set PTXCONF_ROOTFS_HOSTNAME=y PTXCONF_ROOTFS_ETC_HOSTNAME="ecu02" @@@ -285,7 -315,7 +345,11 @@@ PTXCONF_GCCLIBS_GCC_S= PTXCONF_GCCLIBS_CXX=y # PTXCONF_GCCLIBS_GCJ is not set PTXCONF_ICONV=y ++<<<<<<< HEAD +PTXCONF_GLOBAL_IPV6=y ++======= + # PTXCONF_GLOBAL_IPV6 is not set ++>>>>>>> rauch/jobrechner-import-20190607 PTXCONF_KERNEL_HEADER=y PTXCONF_KERNEL_HEADER_VERSION="3.10.22" PTXCONF_KERNEL_HEADER_MD5="d2b030e809d0f03d2d6ddfcc5108d641" @@@ -363,35 -393,21 +427,52 @@@ PTXCONF_BASH_ARITHMETIC_FOR= PTXCONF_BASH_ARRAY=y PTXCONF_BASH_HISTORY=y PTXCONF_BASH_BRACE=y ++<<<<<<< HEAD +PTXCONF_BASH_CASEMODATTR=y +PTXCONF_BASH_CASEMODEXP=y +PTXCONF_BASH_CMDTIMING=y +PTXCONF_BASH_CONDITIONAL=y +PTXCONF_BASH_CONDITIONAL_REGEX=y +PTXCONF_BASH_COPROCESSES=y +# PTXCONF_BASH_DEBUGGER is not set +# PTXCONF_BASH_DIREXPDEFLT is not set +PTXCONF_BASH_DIRSTACK=y +PTXCONF_BASH_DISABLED_BUILDINS=y +PTXCONF_BASH_DPARAN_ARITH=y +PTXCONF_BASH_EXTPATTERN=y +PTXCONF_BASH_EXTPATTERN_DEFLT=y +# PTXCONF_BASH_GLOB_ASCIIRANGE_DEFLT is not set +PTXCONF_BASH_HELP=y +PTXCONF_BASH_CMDHISTORY=y +PTXCONF_BASH_JOBS=y +PTXCONF_BASH_MULTIBYTE=y +PTXCONF_BASH_PROCSUBST=y +# PTXCONF_BASH_BASHCOMPLETION is not set ++======= + PTXCONF_BASH_CONDITIONAL=y + PTXCONF_BASH_DIRSTACK=y + PTXCONF_BASH_EXTPATTERN=y + PTXCONF_BASH_HELP=y + PTXCONF_BASH_CMDHISTORY=y + PTXCONF_BASH_JOBS=y + PTXCONF_BASH_PROCSUBST=y + PTXCONF_BASH_COMPLETION=y ++>>>>>>> rauch/jobrechner-import-20190607 PTXCONF_BASH_ESC=y PTXCONF_BASH_EDIT=y # PTXCONF_BASH_RESTRICTED is not set # PTXCONF_BASH_SELECT is not set ++<<<<<<< HEAD +# PTXCONF_BASH_SINGLE_HELPLINE is not set # PTXCONF_BASH_GPROF is not set PTXCONF_BASH_STATIC=y # PTXCONF_BASH_CURSES is not set +# PTXCONF_BASH_SH is not set ++======= ++# PTXCONF_BASH_GPROF is not set ++PTXCONF_BASH_STATIC=y ++# PTXCONF_BASH_CURSES is not set ++>>>>>>> rauch/jobrechner-import-20190607 # PTXCONF_BC is not set PTXCONF_BUSYBOX=y PTXCONF_BUSYBOX_HWCLOCK_STARTSCRIPT=y @@@ -440,7 -456,7 +521,11 @@@ PTXCONF_BUSYBOX_FEATURE_SUID_CONFIG_QUI # PTXCONF_BUSYBOX_FEATURE_PREFER_APPLETS is not set PTXCONF_BUSYBOX_BUSYBOX_EXEC_PATH="/proc/self/exe" PTXCONF_BUSYBOX_FEATURE_SYSLOG=y ++<<<<<<< HEAD +# PTXCONF_BUSYBOX_FEATURE_HAVE_RPC is not set ++======= + PTXCONF_BUSYBOX_FEATURE_HAVE_RPC=y ++>>>>>>> rauch/jobrechner-import-20190607 # # Build Options @@@ -449,7 -465,7 +534,11 @@@ # PTXCONF_BUSYBOX_PIE is not set # PTXCONF_BUSYBOX_NOMMU is not set # PTXCONF_BUSYBOX_BUILD_LIBBUSYBOX is not set ++<<<<<<< HEAD +PTXCONF_BUSYBOX_LFS=y ++======= + # PTXCONF_BUSYBOX_LFS is not set ++>>>>>>> rauch/jobrechner-import-20190607 PTXCONF_BUSYBOX_CROSS_COMPILER_PREFIX="" PTXCONF_BUSYBOX_SYSROOT="" PTXCONF_BUSYBOX_EXTRA_CFLAGS="" @@@ -481,8 -497,8 +570,13 @@@ PTXCONF_BUSYBOX_FEATURE_SYSTEMD= PTXCONF_BUSYBOX_FEATURE_RTMINMAX=y PTXCONF_BUSYBOX_PASSWORD_MINLEN=6 PTXCONF_BUSYBOX_MD5_SMALL=1 ++<<<<<<< HEAD +PTXCONF_BUSYBOX_FEATURE_FAST_TOP=y +PTXCONF_BUSYBOX_FEATURE_ETC_NETWORKS=y ++======= + # PTXCONF_BUSYBOX_FEATURE_FAST_TOP is not set + # PTXCONF_BUSYBOX_FEATURE_ETC_NETWORKS is not set ++>>>>>>> rauch/jobrechner-import-20190607 PTXCONF_BUSYBOX_FEATURE_USE_TERMIOS=y PTXCONF_BUSYBOX_FEATURE_EDITING=y PTXCONF_BUSYBOX_FEATURE_EDITING_MAX_LEN=1024 @@@ -494,14 -510,14 +588,22 @@@ PTXCONF_BUSYBOX_FEATURE_REVERSE_SEARCH= PTXCONF_BUSYBOX_FEATURE_TAB_COMPLETION=y PTXCONF_BUSYBOX_FEATURE_USERNAME_COMPLETION=y PTXCONF_BUSYBOX_FEATURE_EDITING_FANCY_PROMPT=y ++<<<<<<< HEAD +PTXCONF_BUSYBOX_FEATURE_EDITING_ASK_TERMINAL=y ++======= + # PTXCONF_BUSYBOX_FEATURE_EDITING_ASK_TERMINAL is not set ++>>>>>>> rauch/jobrechner-import-20190607 PTXCONF_BUSYBOX_FEATURE_NON_POSIX_CP=y PTXCONF_BUSYBOX_FEATURE_VERBOSE_CP_MESSAGE=y PTXCONF_BUSYBOX_FEATURE_COPYBUF_KB=4 PTXCONF_BUSYBOX_FEATURE_SKIP_ROOTFS=y PTXCONF_BUSYBOX_MONOTONIC_SYSCALL=y PTXCONF_BUSYBOX_IOCTL_HEX2STR_ERROR=y ++<<<<<<< HEAD +# PTXCONF_BUSYBOX_FEATURE_HWIB is not set ++======= + PTXCONF_BUSYBOX_FEATURE_HWIB=y ++>>>>>>> rauch/jobrechner-import-20190607 # # Applets @@@ -519,7 -535,7 +621,11 @@@ PTXCONF_BUSYBOX_AR= PTXCONF_BUSYBOX_FEATURE_AR_LONG_FILENAMES=y PTXCONF_BUSYBOX_FEATURE_AR_CREATE=y PTXCONF_BUSYBOX_BUNZIP2=y ++<<<<<<< HEAD +PTXCONF_BUSYBOX_BZIP2=y ++======= + # PTXCONF_BUSYBOX_BZIP2 is not set ++>>>>>>> rauch/jobrechner-import-20190607 PTXCONF_BUSYBOX_CPIO=y # PTXCONF_BUSYBOX_FEATURE_CPIO_O is not set # PTXCONF_BUSYBOX_DPKG is not set @@@ -555,18 -571,16 +661,31 @@@ PTXCONF_BUSYBOX_BASENAME= PTXCONF_BUSYBOX_CAT=y PTXCONF_BUSYBOX_DATE=y PTXCONF_BUSYBOX_FEATURE_DATE_ISOFMT=y ++<<<<<<< HEAD +PTXCONF_BUSYBOX_FEATURE_DATE_NANO=y +PTXCONF_BUSYBOX_FEATURE_DATE_COMPAT=y +# PTXCONF_BUSYBOX_HOSTID is not set +PTXCONF_BUSYBOX_ID=y +PTXCONF_BUSYBOX_GROUPS=y +PTXCONF_BUSYBOX_TEST=y +PTXCONF_BUSYBOX_FEATURE_TEST_64=y +PTXCONF_BUSYBOX_TOUCH=y +PTXCONF_BUSYBOX_FEATURE_TOUCH_SUSV3=y +PTXCONF_BUSYBOX_TR=y +PTXCONF_BUSYBOX_FEATURE_TR_CLASSES=y +PTXCONF_BUSYBOX_FEATURE_TR_EQUIV=y ++======= + # PTXCONF_BUSYBOX_FEATURE_DATE_NANO is not set + PTXCONF_BUSYBOX_FEATURE_DATE_COMPAT=y + # PTXCONF_BUSYBOX_HOSTID is not set + # PTXCONF_BUSYBOX_ID is not set + PTXCONF_BUSYBOX_GROUPS=y + PTXCONF_BUSYBOX_TEST=y + # PTXCONF_BUSYBOX_FEATURE_TEST_64 is not set + PTXCONF_BUSYBOX_TOUCH=y + PTXCONF_BUSYBOX_FEATURE_TOUCH_SUSV3=y + # PTXCONF_BUSYBOX_TR is not set ++>>>>>>> rauch/jobrechner-import-20190607 PTXCONF_BUSYBOX_BASE64=y PTXCONF_BUSYBOX_WHO=y PTXCONF_BUSYBOX_USERS=y @@@ -577,17 -591,17 +696,28 @@@ PTXCONF_BUSYBOX_CHMOD= PTXCONF_BUSYBOX_CHOWN=y # PTXCONF_BUSYBOX_FEATURE_CHOWN_LONG_OPTIONS is not set PTXCONF_BUSYBOX_CHROOT=y ++<<<<<<< HEAD +PTXCONF_BUSYBOX_CKSUM=y ++======= + # PTXCONF_BUSYBOX_CKSUM is not set ++>>>>>>> rauch/jobrechner-import-20190607 # PTXCONF_BUSYBOX_COMM is not set PTXCONF_BUSYBOX_CP=y # PTXCONF_BUSYBOX_FEATURE_CP_LONG_OPTIONS is not set PTXCONF_BUSYBOX_CUT=y PTXCONF_BUSYBOX_DD=y PTXCONF_BUSYBOX_FEATURE_DD_SIGNAL_HANDLING=y ++<<<<<<< HEAD +PTXCONF_BUSYBOX_FEATURE_DD_THIRD_STATUS_LINE=y +PTXCONF_BUSYBOX_FEATURE_DD_IBS_OBS=y +PTXCONF_BUSYBOX_DF=y +PTXCONF_BUSYBOX_FEATURE_DF_FANCY=y ++======= + # PTXCONF_BUSYBOX_FEATURE_DD_THIRD_STATUS_LINE is not set + # PTXCONF_BUSYBOX_FEATURE_DD_IBS_OBS is not set + PTXCONF_BUSYBOX_DF=y + # PTXCONF_BUSYBOX_FEATURE_DF_FANCY is not set ++>>>>>>> rauch/jobrechner-import-20190607 PTXCONF_BUSYBOX_DIRNAME=y # PTXCONF_BUSYBOX_DOS2UNIX is not set PTXCONF_BUSYBOX_DU=y @@@ -598,15 -612,14 +728,26 @@@ PTXCONF_BUSYBOX_ENV= # PTXCONF_BUSYBOX_FEATURE_ENV_LONG_OPTIONS is not set # PTXCONF_BUSYBOX_EXPAND is not set PTXCONF_BUSYBOX_EXPR=y ++<<<<<<< HEAD +PTXCONF_BUSYBOX_EXPR_MATH_SUPPORT_64=y +PTXCONF_BUSYBOX_FALSE=y +# PTXCONF_BUSYBOX_FOLD is not set +# PTXCONF_BUSYBOX_FSYNC is not set +PTXCONF_BUSYBOX_HEAD=y +PTXCONF_BUSYBOX_FEATURE_FANCY_HEAD=y +# PTXCONF_BUSYBOX_INSTALL is not set +PTXCONF_BUSYBOX_LN=y +PTXCONF_BUSYBOX_LOGNAME=y ++======= + # PTXCONF_BUSYBOX_EXPR_MATH_SUPPORT_64 is not set + PTXCONF_BUSYBOX_FALSE=y + # PTXCONF_BUSYBOX_FOLD is not set + # PTXCONF_BUSYBOX_FSYNC is not set + # PTXCONF_BUSYBOX_HEAD is not set + # PTXCONF_BUSYBOX_INSTALL is not set + PTXCONF_BUSYBOX_LN=y + # PTXCONF_BUSYBOX_LOGNAME is not set ++>>>>>>> rauch/jobrechner-import-20190607 PTXCONF_BUSYBOX_LS=y PTXCONF_BUSYBOX_FEATURE_LS_FILETYPES=y PTXCONF_BUSYBOX_FEATURE_LS_FOLLOWLINKS=y @@@ -640,8 -653,7 +781,12 @@@ PTXCONF_BUSYBOX_SEQ= # PTXCONF_BUSYBOX_SHA256SUM is not set # PTXCONF_BUSYBOX_SHA512SUM is not set PTXCONF_BUSYBOX_SLEEP=y ++<<<<<<< HEAD +PTXCONF_BUSYBOX_FEATURE_FANCY_SLEEP=y +PTXCONF_BUSYBOX_FEATURE_FLOAT_SLEEP=y ++======= + # PTXCONF_BUSYBOX_FEATURE_FANCY_SLEEP is not set ++>>>>>>> rauch/jobrechner-import-20190607 PTXCONF_BUSYBOX_SORT=y PTXCONF_BUSYBOX_FEATURE_SORT_BIG=y # PTXCONF_BUSYBOX_SPLIT is not set @@@ -654,7 -666,7 +799,11 @@@ PTXCONF_BUSYBOX_SYNC= PTXCONF_BUSYBOX_TAIL=y PTXCONF_BUSYBOX_FEATURE_FANCY_TAIL=y PTXCONF_BUSYBOX_TEE=y ++<<<<<<< HEAD +PTXCONF_BUSYBOX_FEATURE_TEE_USE_BLOCK_IO=y ++======= + # PTXCONF_BUSYBOX_FEATURE_TEE_USE_BLOCK_IO is not set ++>>>>>>> rauch/jobrechner-import-20190607 PTXCONF_BUSYBOX_TRUE=y PTXCONF_BUSYBOX_TTY=y PTXCONF_BUSYBOX_UNAME=y @@@ -664,7 -676,7 +813,11 @@@ PTXCONF_BUSYBOX_USLEEP= PTXCONF_BUSYBOX_UUDECODE=y PTXCONF_BUSYBOX_UUENCODE=y PTXCONF_BUSYBOX_WC=y ++<<<<<<< HEAD +PTXCONF_BUSYBOX_FEATURE_WC_LARGE=y ++======= + # PTXCONF_BUSYBOX_FEATURE_WC_LARGE is not set ++>>>>>>> rauch/jobrechner-import-20190607 PTXCONF_BUSYBOX_WHOAMI=y PTXCONF_BUSYBOX_YES=y @@@ -738,7 -750,7 +891,11 @@@ PTXCONF_BUSYBOX_FEATURE_VI_8BIT= PTXCONF_BUSYBOX_FEATURE_VI_COLON=y PTXCONF_BUSYBOX_FEATURE_VI_YANKMARK=y PTXCONF_BUSYBOX_FEATURE_VI_SEARCH=y ++<<<<<<< HEAD +PTXCONF_BUSYBOX_FEATURE_VI_REGEX_SEARCH=y ++======= + # PTXCONF_BUSYBOX_FEATURE_VI_REGEX_SEARCH is not set ++>>>>>>> rauch/jobrechner-import-20190607 PTXCONF_BUSYBOX_FEATURE_VI_USE_SIGNALS=y PTXCONF_BUSYBOX_FEATURE_VI_DOT_CMD=y PTXCONF_BUSYBOX_FEATURE_VI_READONLY=y @@@ -749,7 -761,7 +906,11 @@@ PTXCONF_BUSYBOX_FEATURE_VI_ASK_TERMINAL PTXCONF_BUSYBOX_FEATURE_VI_OPTIMIZE_CURSOR=y PTXCONF_BUSYBOX_AWK=y PTXCONF_BUSYBOX_FEATURE_AWK_LIBM=y ++<<<<<<< HEAD +PTXCONF_BUSYBOX_CMP=y ++======= + # PTXCONF_BUSYBOX_CMP is not set ++>>>>>>> rauch/jobrechner-import-20190607 # PTXCONF_BUSYBOX_DIFF is not set # PTXCONF_BUSYBOX_ED is not set # PTXCONF_BUSYBOX_SED is not set @@@ -831,15 -843,15 +992,25 @@@ PTXCONF_BUSYBOX_SULOGIN= # # Linux Ext2 FS Progs # ++<<<<<<< HEAD +PTXCONF_BUSYBOX_CHATTR=y +PTXCONF_BUSYBOX_FSCK=y +PTXCONF_BUSYBOX_LSATTR=y ++======= + # PTXCONF_BUSYBOX_CHATTR is not set + PTXCONF_BUSYBOX_FSCK=y + # PTXCONF_BUSYBOX_LSATTR is not set ++>>>>>>> rauch/jobrechner-import-20190607 # PTXCONF_BUSYBOX_TUNE2FS is not set # # Linux Module Utilities # ++<<<<<<< HEAD +PTXCONF_BUSYBOX_MODINFO=y ++======= + # PTXCONF_BUSYBOX_MODINFO is not set ++>>>>>>> rauch/jobrechner-import-20190607 # PTXCONF_BUSYBOX_MODPROBE_SMALL is not set PTXCONF_BUSYBOX_INSMOD=y PTXCONF_BUSYBOX_RMMOD=y @@@ -874,6 -886,7 +1045,10 @@@ PTXCONF_BUSYBOX_FEATURE_DMESG_PRETTY= # PTXCONF_BUSYBOX_FDFLUSH is not set # PTXCONF_BUSYBOX_FDFORMAT is not set PTXCONF_BUSYBOX_FDISK=y ++<<<<<<< HEAD ++======= + PTXCONF_BUSYBOX_FDISK_SUPPORT_LARGE_DISKS=y ++>>>>>>> rauch/jobrechner-import-20190607 PTXCONF_BUSYBOX_FEATURE_FDISK_WRITABLE=y # PTXCONF_BUSYBOX_FEATURE_AIX_LABEL is not set # PTXCONF_BUSYBOX_FEATURE_SGI_LABEL is not set @@@ -909,7 -922,7 +1084,11 @@@ PTXCONF_BUSYBOX_MOUNT= # PTXCONF_BUSYBOX_FEATURE_MOUNT_VERBOSE is not set PTXCONF_BUSYBOX_FEATURE_MOUNT_HELPERS=y # PTXCONF_BUSYBOX_FEATURE_MOUNT_LABEL is not set ++<<<<<<< HEAD +# PTXCONF_BUSYBOX_FEATURE_MOUNT_NFS is not set ++======= + PTXCONF_BUSYBOX_FEATURE_MOUNT_NFS=y ++>>>>>>> rauch/jobrechner-import-20190607 # PTXCONF_BUSYBOX_FEATURE_MOUNT_CIFS is not set PTXCONF_BUSYBOX_FEATURE_MOUNT_FLAGS=y PTXCONF_BUSYBOX_FEATURE_MOUNT_FSTAB=y @@@ -921,8 -934,7 +1100,12 @@@ # PTXCONF_BUSYBOX_SCRIPT is not set # PTXCONF_BUSYBOX_SCRIPTREPLAY is not set # PTXCONF_BUSYBOX_SETARCH is not set ++<<<<<<< HEAD +PTXCONF_BUSYBOX_SWAPONOFF=y +PTXCONF_BUSYBOX_FEATURE_SWAPON_PRI=y ++======= + # PTXCONF_BUSYBOX_SWAPONOFF is not set ++>>>>>>> rauch/jobrechner-import-20190607 # PTXCONF_BUSYBOX_SWITCH_ROOT is not set PTXCONF_BUSYBOX_UMOUNT=y PTXCONF_BUSYBOX_FEATURE_UMOUNT_ALL=y @@@ -943,12 -955,10 +1126,19 @@@ PTXCONF_BUSYBOX_LESS= PTXCONF_BUSYBOX_FEATURE_LESS_MAXLINES=9999999 PTXCONF_BUSYBOX_FEATURE_LESS_BRACKETS=y PTXCONF_BUSYBOX_FEATURE_LESS_FLAGS=y ++<<<<<<< HEAD +PTXCONF_BUSYBOX_FEATURE_LESS_MARKS=y +PTXCONF_BUSYBOX_FEATURE_LESS_REGEXP=y +PTXCONF_BUSYBOX_FEATURE_LESS_WINCH=y +PTXCONF_BUSYBOX_FEATURE_LESS_ASK_TERMINAL=y +PTXCONF_BUSYBOX_FEATURE_LESS_DASHCMD=y +PTXCONF_BUSYBOX_FEATURE_LESS_LINENUMS=y ++======= + # PTXCONF_BUSYBOX_FEATURE_LESS_MARKS is not set + # PTXCONF_BUSYBOX_FEATURE_LESS_REGEXP is not set + # PTXCONF_BUSYBOX_FEATURE_LESS_WINCH is not set + # PTXCONF_BUSYBOX_FEATURE_LESS_DASHCMD is not set ++>>>>>>> rauch/jobrechner-import-20190607 # PTXCONF_BUSYBOX_NANDWRITE is not set # PTXCONF_BUSYBOX_NANDDUMP is not set PTXCONF_BUSYBOX_SETSERIAL=y @@@ -965,8 -975,7 +1155,12 @@@ PTXCONF_BUSYBOX_UBIUPDATEVOL= PTXCONF_BUSYBOX_CHRT=y # PTXCONF_BUSYBOX_CROND is not set # PTXCONF_BUSYBOX_CRONTAB is not set ++<<<<<<< HEAD +PTXCONF_BUSYBOX_DC=y +PTXCONF_BUSYBOX_FEATURE_DC_LIBM=y ++======= + # PTXCONF_BUSYBOX_DC is not set ++>>>>>>> rauch/jobrechner-import-20190607 # PTXCONF_BUSYBOX_DEVFSD is not set # PTXCONF_BUSYBOX_FEATURE_DEVFS is not set # PTXCONF_BUSYBOX_DEVMEM is not set @@@ -985,14 -994,13 +1179,23 @@@ PTXCONF_BUSYBOX_INOTIFYD= # PTXCONF_BUSYBOX_MOUNTPOINT is not set # PTXCONF_BUSYBOX_MT is not set # PTXCONF_BUSYBOX_RAIDAUTORUN is not set ++<<<<<<< HEAD +PTXCONF_BUSYBOX_READAHEAD=y ++======= ++>>>>>>> rauch/jobrechner-import-20190607 # PTXCONF_BUSYBOX_RFKILL is not set # PTXCONF_BUSYBOX_RUNLEVEL is not set # PTXCONF_BUSYBOX_RX is not set # PTXCONF_BUSYBOX_SETSID is not set ++<<<<<<< HEAD +PTXCONF_BUSYBOX_STRINGS=y +# PTXCONF_BUSYBOX_TASKSET is not set +PTXCONF_BUSYBOX_TIME=y ++======= + # PTXCONF_BUSYBOX_STRINGS is not set + # PTXCONF_BUSYBOX_TASKSET is not set + # PTXCONF_BUSYBOX_TIME is not set ++>>>>>>> rauch/jobrechner-import-20190607 # PTXCONF_BUSYBOX_TIMEOUT is not set # PTXCONF_BUSYBOX_TTYSIZE is not set # PTXCONF_BUSYBOX_VOLNAME is not set @@@ -1006,14 -1014,12 +1209,23 @@@ PTXCONF_BUSYBOX_WATCHDOG= # PTXCONF_BUSYBOX_NBDCLIENT is not set # PTXCONF_BUSYBOX_NC is not set PTXCONF_BUSYBOX_PING=y ++<<<<<<< HEAD +PTXCONF_BUSYBOX_PING6=y +PTXCONF_BUSYBOX_FEATURE_FANCY_PING=y +PTXCONF_BUSYBOX_WHOIS=y +PTXCONF_BUSYBOX_FEATURE_IPV6=y +# PTXCONF_BUSYBOX_FEATURE_UNIX_LOCAL is not set +# PTXCONF_BUSYBOX_FEATURE_PREFER_IPV4_ADDRESS is not set +# PTXCONF_BUSYBOX_VERBOSE_RESOLUTION_ERRORS is not set +PTXCONF_BUSYBOX_ARP=y ++======= + PTXCONF_BUSYBOX_FEATURE_FANCY_PING=y + PTXCONF_BUSYBOX_WHOIS=y + # PTXCONF_BUSYBOX_FEATURE_IPV6 is not set + # PTXCONF_BUSYBOX_FEATURE_UNIX_LOCAL is not set + # PTXCONF_BUSYBOX_VERBOSE_RESOLUTION_ERRORS is not set + # PTXCONF_BUSYBOX_ARP is not set ++>>>>>>> rauch/jobrechner-import-20190607 # PTXCONF_BUSYBOX_ARPING is not set # PTXCONF_BUSYBOX_BRCTL is not set # PTXCONF_BUSYBOX_DNSD is not set @@@ -1037,7 -1043,6 +1249,10 @@@ PTXCONF_BUSYBOX_IFUPDOWN_IFSTATE_PATH=" PTXCONF_BUSYBOX_FEATURE_IFUPDOWN_IP=y PTXCONF_BUSYBOX_FEATURE_IFUPDOWN_IP_BUILTIN=y PTXCONF_BUSYBOX_FEATURE_IFUPDOWN_IPV4=y ++<<<<<<< HEAD +PTXCONF_BUSYBOX_FEATURE_IFUPDOWN_IPV6=y ++======= ++>>>>>>> rauch/jobrechner-import-20190607 PTXCONF_BUSYBOX_FEATURE_IFUPDOWN_MAPPING=y # PTXCONF_BUSYBOX_FEATURE_IFUPDOWN_EXTERNAL_DHCP is not set # PTXCONF_BUSYBOX_INETD is not set @@@ -1064,7 -1069,6 +1279,10 @@@ PTXCONF_BUSYBOX_ROUTE= # PTXCONF_BUSYBOX_TFTP is not set # PTXCONF_BUSYBOX_TFTPD is not set PTXCONF_BUSYBOX_TRACEROUTE=y ++<<<<<<< HEAD +PTXCONF_BUSYBOX_TRACEROUTE6=y ++======= ++>>>>>>> rauch/jobrechner-import-20190607 PTXCONF_BUSYBOX_FEATURE_TRACEROUTE_VERBOSE=y PTXCONF_BUSYBOX_FEATURE_TRACEROUTE_SOURCE_ROUTE=y PTXCONF_BUSYBOX_FEATURE_TRACEROUTE_USE_ICMP=y @@@ -1074,11 -1078,7 +1292,15 @@@ # PTXCONF_BUSYBOX_UDHCPC is not set PTXCONF_BUSYBOX_UDPSVD=y # PTXCONF_BUSYBOX_VCONFIG is not set ++<<<<<<< HEAD +PTXCONF_BUSYBOX_WGET=y +PTXCONF_BUSYBOX_FEATURE_WGET_STATUSBAR=y +PTXCONF_BUSYBOX_FEATURE_WGET_AUTHENTICATION=y +PTXCONF_BUSYBOX_FEATURE_WGET_LONG_OPTIONS=y +PTXCONF_BUSYBOX_FEATURE_WGET_TIMEOUT=y ++======= + # PTXCONF_BUSYBOX_WGET is not set ++>>>>>>> rauch/jobrechner-import-20190607 # PTXCONF_BUSYBOX_ZCIP is not set # @@@ -1099,11 -1099,11 +1321,19 @@@ # # Process Utilities # ++<<<<<<< HEAD +PTXCONF_BUSYBOX_IOSTAT=y +PTXCONF_BUSYBOX_LSOF=y +# PTXCONF_BUSYBOX_MPSTAT is not set +# PTXCONF_BUSYBOX_NMETER is not set +PTXCONF_BUSYBOX_PMAP=y ++======= + # PTXCONF_BUSYBOX_IOSTAT is not set + PTXCONF_BUSYBOX_LSOF=y + # PTXCONF_BUSYBOX_MPSTAT is not set + # PTXCONF_BUSYBOX_NMETER is not set + # PTXCONF_BUSYBOX_PMAP is not set ++>>>>>>> rauch/jobrechner-import-20190607 # PTXCONF_BUSYBOX_POWERTOP is not set PTXCONF_BUSYBOX_PSTREE=y PTXCONF_BUSYBOX_PWDX=y @@@ -1111,15 -1111,15 +1341,27 @@@ PTXCONF_BUSYBOX_UPTIME=y PTXCONF_BUSYBOX_FEATURE_UPTIME_UTMP_SUPPORT=y PTXCONF_BUSYBOX_FREE=y ++<<<<<<< HEAD +PTXCONF_BUSYBOX_FUSER=y +PTXCONF_BUSYBOX_KILL=y +PTXCONF_BUSYBOX_KILLALL=y +# PTXCONF_BUSYBOX_KILLALL5 is not set +PTXCONF_BUSYBOX_PGREP=y +PTXCONF_BUSYBOX_PIDOF=y +PTXCONF_BUSYBOX_FEATURE_PIDOF_SINGLE=y +PTXCONF_BUSYBOX_FEATURE_PIDOF_OMIT=y +PTXCONF_BUSYBOX_PKILL=y ++======= + # PTXCONF_BUSYBOX_FUSER is not set + PTXCONF_BUSYBOX_KILL=y + PTXCONF_BUSYBOX_KILLALL=y + # PTXCONF_BUSYBOX_KILLALL5 is not set + # PTXCONF_BUSYBOX_PGREP is not set + PTXCONF_BUSYBOX_PIDOF=y + # PTXCONF_BUSYBOX_FEATURE_PIDOF_SINGLE is not set + # PTXCONF_BUSYBOX_FEATURE_PIDOF_OMIT is not set + # PTXCONF_BUSYBOX_PKILL is not set ++>>>>>>> rauch/jobrechner-import-20190607 PTXCONF_BUSYBOX_PS=y PTXCONF_BUSYBOX_FEATURE_PS_WIDE=y PTXCONF_BUSYBOX_FEATURE_PS_LONG=y @@@ -1165,7 -1165,10 +1407,14 @@@ PTXCONF_BUSYBOX_FEATURE_BASH_IS_NONE= PTXCONF_BUSYBOX_KLOGD=y # PTXCONF_BUSYBOX_FEATURE_KLOGD_KLOGCTL is not set PTXCONF_BUSYBOX_LOGGER=y ++<<<<<<< HEAD +# PTXCONF_BZIP2 is not set ++======= + PTXCONF_BZIP2=y + # PTXCONF_BZIP2_BZIP2 is not set + # PTXCONF_BZIP2_BZIP2RECOVER is not set + PTXCONF_BZIP2_LIBBZ2=y ++>>>>>>> rauch/jobrechner-import-20190607 # PTXCONF_CONSOLEKIT is not set # PTXCONF_COREUTILS is not set # PTXCONF_CPUFREQUTILS is not set @@@ -1174,17 -1177,9 +1423,23 @@@ # PTXCONF_DEVICEKIT_DISKS is not set # PTXCONF_DFU_UTIL is not set # PTXCONF_DIALOG is not set ++<<<<<<< HEAD +PTXCONF_DIFFUTILS=y +PTXCONF_DIFFUTILS_DIFF=y +PTXCONF_DIFFUTILS_DIFF3=y +PTXCONF_DIFFUTILS_SDIFF=y + +# +# BusyBox' cmp selected +# +# PTXCONF_DT_UTILS is not set +PTXCONF_FIGLET=y +PTXCONF_FILE=y ++======= + # PTXCONF_DIFFUTILS is not set + PTXCONF_FIGLET=y + # PTXCONF_FILE is not set ++>>>>>>> rauch/jobrechner-import-20190607 # PTXCONF_FINDUTILS is not set # PTXCONF_GAWK is not set @@@ -1216,10 -1211,7 +1471,14 @@@ PTXCONF_KBD_INSTALL_KEYMAPS_QWERTY= PTXCONF_KBD_INSTALL_KEYMAPS_QWERTZ=y # PTXCONF_KBD_INSTALL_KEYMAPS_MAC is not set # PTXCONF_KBD_INSTALL_KEYMAPS_SUN is not set ++<<<<<<< HEAD +PTXCONF_KEXEC_TOOLS=y +PTXCONF_KEXEC_TOOLS_ZLIB=y +PTXCONF_KEXEC_TOOLS_KEXEC=y +PTXCONF_KEXEC_TOOLS_KDUMP=y ++======= + # PTXCONF_KEXEC_TOOLS is not set ++>>>>>>> rauch/jobrechner-import-20190607 # PTXCONF_KILLPROC is not set # PTXCONF_LATENCYTOP is not set @@@ -1251,10 -1243,7 +1510,14 @@@ PTXCONF_MODULE_INIT_TOOLS= # # BusyBox' lsmod is selected! # ++<<<<<<< HEAD + +# +# BusyBox' modinfo is selected! +# ++======= + PTXCONF_MODULE_INIT_TOOLS_MODINFO=y ++>>>>>>> rauch/jobrechner-import-20190607 # # BusyBox' modprobe is selected! @@@ -1334,6 -1323,7 +1597,10 @@@ PTXCONF_SYSTEMD_TCPWRAP= # PTXCONF_SYSTEMD_VCONSOLE is not set # PTXCONF_SYSTEMD_XZ is not set PTXCONF_SYSTEMD_DISABLE_RANDOM_SEED=y ++<<<<<<< HEAD ++======= + PTXCONF_SYSTEMD_ANALYZE=y ++>>>>>>> rauch/jobrechner-import-20190607 # PTXCONF_TIMEOUT is not set # PTXCONF_TMUX is not set # PTXCONF_U_BOOT_TOOLS is not set @@@ -1390,10 -1380,7 +1657,14 @@@ PTXCONF_UTIL_LINUX_NG_AGETTY= # PTXCONF_UTIL_LINUX_NG_SFDISK is not set # PTXCONF_UTIL_LINUX_NG_CFDISK is not set # PTXCONF_UTIL_LINUX_NG_MKSWAP is not set ++<<<<<<< HEAD + +# +# BusyBox' swapon is selected! +# ++======= + # PTXCONF_UTIL_LINUX_NG_SWAPON is not set ++>>>>>>> rauch/jobrechner-import-20190607 # # BusyBox' mount is selected! @@@ -1579,7 -1566,7 +1850,11 @@@ PTXCONF_IPROUTE2_IP= # PTXCONF_IPROUTE2_SS is not set # PTXCONF_IPROUTE2_TC is not set # PTXCONF_IPTABLES is not set ++<<<<<<< HEAD +PTXCONF_IW=y ++======= + # PTXCONF_IW is not set ++>>>>>>> rauch/jobrechner-import-20190607 # PTXCONF_JSON_DBUS_BRIDGE is not set # PTXCONF_LIBCGI is not set # PTXCONF_LIBCGIC is not set @@@ -1605,94 -1592,11 +1880,102 @@@ # PTXCONF_NETCAT is not set # PTXCONF_NETKIT_FTP is not set # PTXCONF_NETWORKMANAGER is not set ++<<<<<<< HEAD +PTXCONF_NFSUTILS=y + +# +# build options +# +PTXCONF_NFSUTILS_V3=y +PTXCONF_NFSUTILS_WITH_TCPWRAPPERS=y +PTXCONF_NFSUTILS_RPCUSER_UID=y +# PTXCONF_NFSUTILS_NOBODY_UID is not set + +# +# install options +# +PTXCONF_NFSUTILS_INSTALL_EXPORTFS=y +PTXCONF_NFSUTILS_INSTALL_MOUNTD=y +PTXCONF_NFSUTILS_INSTALL_MOUNT=y +PTXCONF_NFSUTILS_INSTALL_NFSD=y +PTXCONF_NFSUTILS_INSTALL_NFSSTAT=y +PTXCONF_NFSUTILS_INSTALL_SHOWMOUNT=y +PTXCONF_NFSUTILS_INSTALL_STATD=y + +# +# runtime options +# +PTXCONF_NFSUTILS_NFSD_STARTSCRIPT=y +# PTXCONF_NFSUTILS_INSTALL_USER_EXPORTS is not set +# PTXCONF_NMAP is not set +# PTXCONF_NSS_MDNS is not set +PTXCONF_NTP=y + +# +# Compile Options +# +# PTXCONF_NTP_CLOCKCTL is not set +# PTXCONF_NTP_DEBUGGING is not set +PTXCONF_NTP_DST_MINUTES=60 +# PTXCONF_NTP_BANCOMM is not set +# PTXCONF_NTP_GPSVME is not set +# PTXCONF_NTP_KMEM is not set +# PTXCONF_NTP_ACCURATE_ADJTIME is not set +# PTXCONF_NTP_TICK_FORCE is not set +# PTXCONF_NTP_TICKADJ_FORCE is not set +# PTXCONF_NTP_SIMULATOR is not set +# PTXCONF_NTP_UDP_WILDCARD is not set +# PTXCONF_NTP_SLEW_ALWAYS is not set +# PTXCONF_NTP_STEP_SLEW is not set +# PTXCONF_NTP_NTPDATE_STEP is not set +# PTXCONF_NTP_HOURLY_TODR_SYNC is not set +# PTXCONF_NTP_KERNEL_FLL_BUG is not set +# PTXCONF_NTP_IRIG_SAWTOOTH is not set +# PTXCONF_NTP_NIST is not set +# PTXCONF_NTP_CRYPTO is not set +# PTXCONF_NTP_SNTP is not set +# PTXCONF_NTP_ARLIB is not set + +# +# Clock drivers +# +PTXCONF_NTP_ALL_CLOCK_DRIVERS=y + +# +# Install Options +# +PTXCONF_NTP_NTPDATE=y +PTXCONF_NTP_NTPD=y +# PTXCONF_NTP_NTPD_STARTSCRIPT is not set +PTXCONF_NTP_NTPDC=y +PTXCONF_NTP_NTPC_STARTSCRIPT=y +PTXCONF_NTP_NTPQ=y +PTXCONF_NTPCLIENT=y + +# +# build options --- +# +# PTXCONF_NTPCLIENT_BUILD_DEBUG is not set +# PTXCONF_NTPCLIENT_BUILD_REPLAY_OPTION is not set + +# +# install options --- +# +PTXCONF_NTPCLIENT_BUILD_NTPCLIENT=y +PTXCONF_NTPCLIENT_BUILD_ADJTIMEX=y + +# +# runtime options --- +# +PTXCONF_NTPCLIENT_STARTSCRIPT=y +PTXCONF_NTPCLIENT_NTPSERVER_NAME="2.de.pool.ntp.org" ++======= + # PTXCONF_NFSUTILS is not set + # PTXCONF_NMAP is not set + # PTXCONF_NSS_MDNS is not set + # PTXCONF_NTP is not set + # PTXCONF_NTPCLIENT is not set ++>>>>>>> rauch/jobrechner-import-20190607 # PTXCONF_OPENLDAP is not set # PTXCONF_OPENNTPD is not set PTXCONF_OPENSSH=y @@@ -1720,18 -1624,14 +2003,27 @@@ PTXCONF_OPENSSL_SHARED= # PTXCONF_SYSLOGNG is not set # PTXCONF_TCPDUMP is not set PTXCONF_TCPWRAPPER=y ++<<<<<<< HEAD +PTXCONF_TCPWRAPPER_INSTALL_TCPD=y ++======= + # PTXCONF_TCPWRAPPER_INSTALL_TCPD is not set ++>>>>>>> rauch/jobrechner-import-20190607 # PTXCONF_TCPWRAPPER_INSTALL_HOSTS_ACCESS_CONFIGS is not set # PTXCONF_THTTPD is not set # PTXCONF_TOMCAT is not set # PTXCONF_URSHD is not set # PTXCONF_UTELNETD is not set ++<<<<<<< HEAD + +# +# BusyBox's wget is selected! +# +PTXCONF_WIRELESS=y +PTXCONF_WIRELESS_SHARED=y ++======= + # PTXCONF_WGET is not set + # PTXCONF_WIRELESS is not set ++>>>>>>> rauch/jobrechner-import-20190607 # PTXCONF_WIRESHARK is not set # PTXCONF_WPA_SUPPLICANT is not set # PTXCONF_ZSYNC is not set @@@ -1750,55 -1650,14 +2042,66 @@@ # PTXCONF_CIFS_UTILS is not set # PTXCONF_DDRESCUE is not set PTXCONF_DOSFSTOOLS=y ++<<<<<<< HEAD +PTXCONF_DOSFSTOOLS_UDEV=y +PTXCONF_DOSFSTOOLS_MKFS_FAT=y +PTXCONF_DOSFSTOOLS_MKFS_FAT_MSDOS=y +PTXCONF_DOSFSTOOLS_MKFS_FAT_VFAT=y +PTXCONF_DOSFSTOOLS_FSCK_FAT=y +PTXCONF_DOSFSTOOLS_FSCK_FAT_MSDOS=y +PTXCONF_DOSFSTOOLS_FSCK_FAT_VFAT=y +PTXCONF_DOSFSTOOLS_FATLABEL=y +PTXCONF_E2FSPROGS=y + +# +# build options +# +# PTXCONF_E2FSPROGS_COMPRESSION is not set +PTXCONF_E2FSPROGS_RESIZER=y + +# +# libraries +# +PTXCONF_E2FSPROGS_LIBCOM_ERR=y +PTXCONF_E2FSPROGS_LIBE2P=y +PTXCONF_E2FSPROGS_LIBEXT2FS=y +# PTXCONF_E2FSPROGS_LIBSS is not set + +# +# binaries +# +# PTXCONF_E2FSPROGS_INSTALL_CHATTR is not set +# PTXCONF_E2FSPROGS_INSTALL_LSATTR is not set +# PTXCONF_E2FSPROGS_INSTALL_BADBLOCKS is not set +# PTXCONF_E2FSPROGS_INSTALL_DUMPE2FS is not set +PTXCONF_E2FSPROGS_INSTALL_E2FSCK=y +# PTXCONF_E2FSPROGS_INSTALL_FSCK_EXT2 is not set +# PTXCONF_E2FSPROGS_INSTALL_FSCK_EXT3 is not set +PTXCONF_E2FSPROGS_INSTALL_FSCK_EXT4=y +PTXCONF_E2FSPROGS_INSTALL_FSCK_EXT4DEV=y +# PTXCONF_E2FSPROGS_INSTALL_E2IMAGE is not set +# PTXCONF_E2FSPROGS_INSTALL_E2LABEL is not set +# PTXCONF_E2FSPROGS_INSTALL_E2UNDO is not set +# PTXCONF_E2FSPROGS_INSTALL_FILEFRAG is not set +# PTXCONF_E2FSPROGS_INSTALL_LOGSAVE is not set +PTXCONF_E2FSPROGS_INSTALL_MKE2FS=y +# PTXCONF_E2FSPROGS_INSTALL_MKFS_EXT2 is not set +# PTXCONF_E2FSPROGS_INSTALL_MKFS_EXT3 is not set +PTXCONF_E2FSPROGS_INSTALL_MKFS_EXT4=y +PTXCONF_E2FSPROGS_INSTALL_MKFS_EXT4DEV=y +# PTXCONF_E2FSPROGS_INSTALL_MKLOSTANDFOUND is not set +PTXCONF_E2FSPROGS_INSTALL_RESIZE2FS=y +PTXCONF_E2FSPROGS_INSTALL_TUNE2FS=y ++======= + PTXCONF_DOSFSTOOLS_MKDOSFS=y + PTXCONF_DOSFSTOOLS_MKDOSFS_MSDOS=y + PTXCONF_DOSFSTOOLS_MKDOSFS_VFAT=y + PTXCONF_DOSFSTOOLS_DOSFSCK=y + PTXCONF_DOSFSTOOLS_DOSFSCK_MSDOS=y + PTXCONF_DOSFSTOOLS_DOSFSCK_VFAT=y + PTXCONF_DOSFSTOOLS_DOSFSLABEL=y + # PTXCONF_E2FSPROGS is not set ++>>>>>>> rauch/jobrechner-import-20190607 # PTXCONF_FAM is not set # PTXCONF_FUSE is not set # PTXCONF_HDPARM is not set @@@ -1813,7 -1672,8 +2116,12 @@@ PTXCONF_LOGROTATE= # PTXCONF_SQUASHFS_TOOLS is not set # PTXCONF_UNZIP is not set # PTXCONF_XFSPROGS is not set ++<<<<<<< HEAD +# PTXCONF_XZ is not set ++======= + PTXCONF_XZ=y + # PTXCONF_XZ_TOOLS is not set ++>>>>>>> rauch/jobrechner-import-20190607 # PTXCONF_ZIP is not set # @@@ -1842,6 -1702,7 +2150,10 @@@ PTXCONF_LIBSOCKETCAN= # PTXCONF_SJINN is not set # PTXCONF_SMTPCLIENT is not set # PTXCONF_SSMTP is not set ++<<<<<<< HEAD ++======= + PTXCONF_RTL8188EU=y ++>>>>>>> rauch/jobrechner-import-20190607 # # Applications @@@ -1864,7 -1725,48 +2176,52 @@@ # # PTXCONF_ALSA_LIB is not set # PTXCONF_ARGTABLE2 is not set ++<<<<<<< HEAD +# PTXCONF_BOOST is not set ++======= + PTXCONF_BOOST=y + + # + # Targetinstall Options + # + # PTXCONF_BOOST_INST_NOMT_DBG is not set + PTXCONF_BOOST_INST_NOMT_RED=y + # PTXCONF_BOOST_INST_MT_DBG is not set + PTXCONF_BOOST_INST_MT_RED=y + + # + # Boost Libraries + # + PTXCONF_BOOST_ATOMIC=y + PTXCONF_BOOST_CHRONO=y + PTXCONF_BOOST_CONTAINER=y + PTXCONF_BOOST_CONTEXT=y + PTXCONF_BOOST_COROUTINE=y + # PTXCONF_BOOST_COROUTINE2 is not set + PTXCONF_BOOST_DATE_TIME=y + PTXCONF_BOOST_EXCEPTION=y + PTXCONF_BOOST_FILESYSTEM=y + PTXCONF_BOOST_GRAPH=y + # PTXCONF_BOOST_GRAPH_PARALLEL is not set + PTXCONF_BOOST_IOSTREAMS=y + PTXCONF_BOOST_LOCALE=y + PTXCONF_BOOST_LOG=y + PTXCONF_BOOST_MATH=y + PTXCONF_BOOST_MPI=y + PTXCONF_BOOST_PROGRAM_OPTIONS=y + PTXCONF_BOOST_RANDOM=y + PTXCONF_BOOST_REGEX=y + PTXCONF_BOOST_SERIALIZATION=y + PTXCONF_BOOST_SIGNALS=y + PTXCONF_BOOST_SYSTEM=y + PTXCONF_BOOST_TEST=y + PTXCONF_BOOST_THREAD=y + PTXCONF_BOOST_TIMER=y + PTXCONF_BOOST_WAVE=y + PTXCONF_BOOST_NOPYTHON=y + # PTXCONF_BOOST_PYTHON2 is not set + # PTXCONF_BOOST_PYTHON3 is not set ++>>>>>>> rauch/jobrechner-import-20190607 # PTXCONF_COMMONCPP2 is not set # PTXCONF_DB is not set # PTXCONF_DCONF is not set @@@ -1910,10 -1812,7 +2267,14 @@@ PTXCONF_LIBKMOD= # # BusyBox' lsmod is selected! # ++<<<<<<< HEAD + +# +# BusyBox' modinfo is selected! +# ++======= + # PTXCONF_LIBKMOD_MODINFO is not set ++>>>>>>> rauch/jobrechner-import-20190607 # # BusyBox' modprobe is selected! @@@ -1926,9 -1825,7 +2287,13 @@@ # PTXCONF_LIBLIST is not set # PTXCONF_LIBLTDL is not set # PTXCONF_LIBLZO is not set ++<<<<<<< HEAD +PTXCONF_LIBMD=y +# PTXCONF_LIBMD_STATIC is not set +# PTXCONF_LIBMD_DEBUG is not set ++======= + # PTXCONF_LIBMD is not set ++>>>>>>> rauch/jobrechner-import-20190607 # PTXCONF_LIBMEMCACHE is not set # PTXCONF_LIBMEMCACHED is not set # PTXCONF_LIBMNG is not set @@@ -1986,8 -1883,7 +2351,12 @@@ PTXCONF_NCURSES_TERMCAP= # PTXCONF_SLANG is not set # PTXCONF_SPARSEHASH is not set # PTXCONF_SQLITE is not set ++<<<<<<< HEAD +PTXCONF_TERMCAP=y +PTXCONF_TERMCAP_TERMCAP=y ++======= + # PTXCONF_TERMCAP is not set ++>>>>>>> rauch/jobrechner-import-20190607 # PTXCONF_XERCES is not set PTXCONF_ZLIB=y # PTXCONF_ZLIB_STATIC is not set @@@ -2038,7 -1934,7 +2407,11 @@@ PTXCONF_DBUS_SYSTEMD_UNIT= PTXCONF_HACKBENCH=y # PTXCONF_HOST_PELTS is not set # PTXCONF_IOZONE is not set ++<<<<<<< HEAD +PTXCONF_IPERF=y ++======= + # PTXCONF_IPERF is not set ++>>>>>>> rauch/jobrechner-import-20190607 # PTXCONF_LMBENCH is not set # PTXCONF_LTP is not set # PTXCONF_MBW is not set @@@ -2320,115 -2216,3 +2693,118 @@@ PTXCONF_FREETYPE= # Bare Metal # # PTXCONF_STELLARIS is not set ++<<<<<<< HEAD + +# +# ------ Eckelmann AG commons -------- +# + +# +# Test/Benchmark Tools +# +# PTXCONF_EMICROBENCH is not set +# PTXCONF_RT_MECH is not set +# PTXCONF_DBUS_MECH is not set + +# +# System extension +# +PTXCONF_USBMOUNT=y +PTXCONF_USBMOUNT_SYSTEMD_UNIT=y +# PTXCONF_USBMOUNT_DISABLED is not set +# PTXCONF_USBMOUNT_STORAGE_USB is not set +# PTXCONF_VPNC is not set +# PTXCONF_SMSTOOLS3 is not set +# PTXCONF_EUPDATE is not set +PTXCONF_CODESYS3_RT=y +PTXCONF_CODESYS3_RT_ARM=y +# PTXCONF_CODESYS3_RT_X86 is not set +# PTXCONF_CODESYS3_RT_TARGETVISU is not set +# PTXCONF_CODESYS3_RT_DEBUG_VERSION is not set +PTXCONF_CODESYS3_RT_BIN_PATH="/usr/bin" +PTXCONF_CODESYS3_RT_LIB_PATH="/usr/lib" +PTXCONF_CODESYS3_RT_EXECUTABLE="codesyscontrol" +PTXCONF_CODESYS3_RT_HOME="/home" +PTXCONF_CODESYS3_RT_APP="Application.app" +PTXCONF_CODESYS3_RT_OUTPUT="/dev/console" +PTXCONF_CODESYS3_RT_SYSTEMD_UNIT=y +# PTXCONF_CODESYS3_RT_SYSTEMD_MULTIUSER_TARGET is not set + +# +# System Tools +# +# PTXCONF_ECONFIGURE is not set +# PTXCONF_ENETCONFIG is not set +# PTXCONF_NETCONFIG is not set +# PTXCONF_SER2NET is not set + +# +# Third Party Librarys +# +# PTXCONF_LIBFCGI is not set +# PTXCONF_LIBQUAZIP is not set +# PTXCONF_LIBMBUS is not set +# PTXCONF_LIBQRENCODE is not set +# PTXCONF_LIBCTEMPLATE is not set + +# +# Qt Common Librarys +# +# PTXCONF_QEXTSERIALPORT is not set +# PTXCONF_QEXTSERIALPORT12 is not set +# PTXCONF_QEXTSERIALPORT12RC is not set + +# +# ------------------------------------ +# + +# +# --- Eckelmann AG project specific--- +# + +# +# JNCG(ecu02) Applications +# +PTXCONF_ECU_BASICSYS=y +# PTXCONF_ECU_EXPLORE is not set +PTXCONF_ECU_CODESYS=y +# PTXCONF_ECU_JOBCTL is not set +# PTXCONF_ECU_JOBCTL_AXENT is not set +# PTXCONF_ECU_JOBCTL_AXIS is not set +PTXCONF_ECU_JOBCTL_DEMO=y +PTXCONF_ECU_MOTOR_CTL=m +PTXCONF_ECU_COMP_CAP=m +PTXCONF_ECU_CONTROL=y + +# +# QA(ecu01) Applications +# +# PTXCONF_ECU01_BASICSYS is not set +# PTXCONF_ECU01_CODESYS is not set +# PTXCONF_ECU01_MOTOR_CTL is not set +# PTXCONF_ECU01_COMP_CAP is not set +# PTXCONF_LIBVT is not set +# PTXCONF_QADRIVER is not set +# PTXCONF_POWER_BUTTON is not set +# PTXCONF_ADS7953 is not set +# PTXCONF_TESTSTAND is not set +# PTXCONF_ECU01_CONTROL is not set + +# +# EAG(common) Applications +# +PTXCONF_COMMON=y +PTXCONF_BACKUP_ETC=y +PTXCONF_FLUSH_MODULE=y +PTXCONF_EBASHLIB=y +PTXCONF_SOCKETCAN_TEST=y +# PTXCONF_SOCKETCAN_TEST_TRUNK is not set +# PTXCONF_DISPLAY_TEST is not set +PTXCONF_HOST_WORKAROUND_HOST_LIBUSB=y +# PTXCONF_RTL8188EU is not set + +# +# ------------------------------------ +# ++======= ++>>>>>>> rauch/jobrechner-import-20190607 diff --cc ptxdist/configs/ecu02/ptxconfig_minimal index ff05000,fc3eb36..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/ecu02/ptxconfig_minimal +++ b/ptxdist/configs/ecu02/ptxconfig_minimal @@@ -2136,6 -2136,7 +2136,10 @@@ PTXCONF_USBMOUNT_SYSTEMD_UNIT= PTXCONF_NETCONFIG=y PTXCONF_NETCONFIG_SHELL="/bin/bash" PTXCONF_NETCONFIG_CONFIG_FILEPATH="/etc/enet.conf" ++<<<<<<< HEAD ++======= + # PTXCONF_NETCONFIG_TRUNK is not set ++>>>>>>> rauch/jobrechner-import-20190607 PTXCONF_NETCONFIG_BIN_DIR="/sbin" # PTXCONF_SER2NET is not set diff --cc ptxdist/configs/ecu02/ptxconfig_with_vt index feae9dc,36140e4..0000000 mode 100644,100755..100644 --- a/ptxdist/configs/ecu02/ptxconfig_with_vt +++ b/ptxdist/configs/ecu02/ptxconfig_with_vt @@@ -2255,6 -2255,7 +2255,10 @@@ PTXCONF_CODESYS3_RT_SYSTEMD_MULTIUSER_T PTXCONF_NETCONFIG=y PTXCONF_NETCONFIG_SHELL="/bin/bash" PTXCONF_NETCONFIG_CONFIG_FILEPATH="/etc/enet.conf" ++<<<<<<< HEAD ++======= + # PTXCONF_NETCONFIG_TRUNK is not set ++>>>>>>> rauch/jobrechner-import-20190607 PTXCONF_NETCONFIG_BIN_DIR="/sbin" # PTXCONF_SER2NET is not set diff --cc ptxdist/local_src/backup-etc/etc/backup-etc.conf index 8ba736f,8ba736f..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/backup-etc/etc/backup-etc.conf +++ b/ptxdist/local_src/backup-etc/etc/backup-etc.conf diff --cc ptxdist/local_src/backup-etc/lib/systemd/system/backup-etc.service index a7d8644,78a6128..0000000 --- a/ptxdist/local_src/backup-etc/lib/systemd/system/backup-etc.service +++ b/ptxdist/local_src/backup-etc/lib/systemd/system/backup-etc.service @@@ -1,8 -1,6 +1,12 @@@ [Unit] Description=Backup service for configuration in /etc ++<<<<<<< HEAD +# /etc/backup-etc.conf requires /var/dyn +Requires=local-fs.target var-dyn.mount var-stat.mount +After=local-fs.target var-dyn.mount var-stat.mount ++======= + Requires=local-fs.target ++>>>>>>> rauch/jobrechner-import-20190607 [Service] Restart=always diff --cc ptxdist/local_src/common/common.pro index f0a84ad,815917b..0000000 --- a/ptxdist/local_src/common/common.pro +++ b/ptxdist/local_src/common/common.pro @@@ -14,28 -14,19 +14,43 @@@ LIBS += -lr HEADERS += io/cppgpio.h \ ecu_motor_ctl.h \ ++<<<<<<< HEAD + ecu_comp_cap.h \ + qadev.h \ + powerbutton.h \ + io/cppgpio_cwrapper.h \ + hw/ads7953.h \ + hw/max6966.h \ + hw/max116xx.h \ + hw/tle82353sa.h \ + hw/pca9505.h \ + hw/i2c-dev.h \ + debug.h \ + log.h \ + HAL_Datentypen.h ++======= + ecu_comp_cap.h \ + io/cppgpio_cwrapper.h \ + hw/ads7953.h \ + hw/max116xx.h \ + hw/tle82353sa.h \ + hw/pca9505.h \ + hw/i2c-dev.h ++>>>>>>> rauch/jobrechner-import-20190607 # Input SOURCES += io/cppgpio.cpp \ hw/tle82353sa.cpp \ io/cppgpio_cwrapper.cpp \ hw/ads7953.cpp \ ++<<<<<<< HEAD + hw/max6966.cpp \ + hw/max116xx.cpp \ + hw/pca9505.cpp \ + debug.c \ + log.c \ ++======= + hw/max116xx.cpp \ + hw/pca9505.cpp ++>>>>>>> rauch/jobrechner-import-20190607 diff --cc ptxdist/local_src/common/ecu_comp_cap.h index c9d7477,aacb114..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/common/ecu_comp_cap.h +++ b/ptxdist/local_src/common/ecu_comp_cap.h @@@ -35,10 -35,8 +35,15 @@@ #define COMP_CAP_MAJOR 261 #endif ++<<<<<<< HEAD +#define MAX_VALUE_CNT_QA 32 + +# ifdef __KERNEL__ +#define MAX_VALUE_CNT 64 ++======= + # ifdef __KERNEL__ + #define MAX_VALUE_CNT 64 ++>>>>>>> rauch/jobrechner-import-20190607 struct comp_cap_dev { int compCapIndex; char* NAME; @@@ -49,9 -47,7 +54,13 @@@ unsigned long PHY_CC_LEN; int IRQ; void* virt_cc_adr; ++<<<<<<< HEAD + unsigned int offset; // Werden bei JNCG ignoriert. + unsigned int* value_aui; // Werden bei JNCG ignoriert. + unsigned long value_aul[MAX_VALUE_CNT]; // Werden bei QA ignoriert. ++======= + unsigned long value_aul[MAX_VALUE_CNT]; ++>>>>>>> rauch/jobrechner-import-20190607 unsigned long value; unsigned long last_value; unsigned long last_good_value; @@@ -64,6 -60,7 +73,10 @@@ int tfb_value; /*Toleranzfensterbreite*/ int tfb_error; /*Toleranzfensterbreite Fehler*/ }; ++<<<<<<< HEAD ++======= + ++>>>>>>> rauch/jobrechner-import-20190607 /* * The different configurable parameters */ @@@ -96,9 -93,7 +109,13 @@@ long comp_cap_ioctl(struct file *filp, #define COMP_CAP_IOCGVALUE _IOR(COMP_CAP_IOC_MAGIC, 1, int) #define COMP_CAP_IOCGERR _IOR(COMP_CAP_IOC_MAGIC, 2, int) #define COMP_CAP_IOCGTFB _IOW(COMP_CAP_IOC_MAGIC, 3, int) ++<<<<<<< HEAD +#define COMP_CAP_IOCGCOUNTER _IOR(COMP_CAP_IOC_MAGIC, 4, int) +#define COMP_CAP_IOCGGPTCNT _IOR(COMP_CAP_IOC_MAGIC, 5, int) // Werden bei JNCG ignoriert. +#define COMP_CAP_IOC_MAXNR 5 ++======= + #define COMP_CAP_IOC_MAXNR 3 ++>>>>>>> rauch/jobrechner-import-20190607 #endif /* _ECU_COMP_CAP_H_ */ diff --cc ptxdist/local_src/common/ecu_motor_ctl.h index f52480e,79f530c..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/common/ecu_motor_ctl.h +++ b/ptxdist/local_src/common/ecu_motor_ctl.h @@@ -23,10 -23,6 +23,13 @@@ (C) ECKELMANN INDUSTRIEAUTOMATION, WIESBADEN *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-**-*-*-*/ ++<<<<<<< HEAD +/* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!ATTENTION!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/ +/* File is used from JNCG and QA-V3.*/ +/* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!ATTENTION!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/ + ++======= ++>>>>>>> rauch/jobrechner-import-20190607 #ifndef _ECU_MOTOR_CTL_H_ #define _ECU_MOTOR_CTL_H_ @@@ -48,11 -44,8 +51,16 @@@ #define MOTOR_SPEED_MIN ((int)(0)) #define MOTOR_SPEED_MAX ((int)(1000)) ++<<<<<<< HEAD +#define MOTOR_PWM_MIN ((int)(0)) //Feature 1857, Min 0Hz, Max 5kHz, hier 10000Hz +#define MOTOR_PWM_MAX ((int)(10000)) + +#define PWM_DEFAULT_PRESCALER ((unsigned short) 416 ) +#define PWM_DEFAULT_PERIOD ((unsigned short) 14) //(war 1000) //pwm-frquency = 66,5Mhz/416*(1/(PWM_DEFAULT_PERIOD+2)) , PWM_HBx 14 -> ca. 10kHz, PWM_HBx 1000 -> ca. 150Hz ++======= + #define PWM_DEFAULT_PRESCALER ((unsigned short) 416 ) + #define PWM_DEFAULT_PERIOD ((unsigned short) 1000) ++>>>>>>> rauch/jobrechner-import-20190607 #define PWM_DEFAULT_SAMPLE ((unsigned short) 0 ) @@@ -62,10 -55,10 +70,17 @@@ struct motor_ctl_dev int motorIndex; struct semaphore sem; /* mutual exclusion semaphore */ struct cdev cdev; /* Char device structure */ ++<<<<<<< HEAD + int gpio_clockwise; // Werden bei JNCG ignoriert. Ansteuerung separat über I2C, PCA + int gpio_counter_clockwise; // Werden bei JNCG ignoriert. Ansteuerung separat über I2C, PCA + int gpio_enable_A; // Werden bei JNCG ignoriert. Ansteuerung separat über I2C, PCA + int gpio_enable_B; // Werden bei JNCG ignoriert. Ansteuerung separat über I2C, PCA ++======= + int gpio_clockwise; + int gpio_counter_clockwise; + int gpio_enable_A; + int gpio_enable_B; ++>>>>>>> rauch/jobrechner-import-20190607 unsigned long PHY_PWM_ADR; unsigned long PHY_PWM_LEN; void* virt_pwm_adr; @@@ -111,14 -104,10 +126,21 @@@ long motor_ctl_ioctl(struct file *filp #define MOTOR_CTL_IOCSDIRECTION _IOW(MOTOR_CTL_IOC_MAGIC, 1, int) #define MOTOR_CTL_IOCSSPEED _IOW(MOTOR_CTL_IOC_MAGIC, 2, int) #define MOTOR_CTL_IOCSENABLE _IOW(MOTOR_CTL_IOC_MAGIC, 3, int) ++<<<<<<< HEAD +#define MOTOR_CTL_IOCSPWM _IOW(MOTOR_CTL_IOC_MAGIC, 4, int) // Feature 1857 + +#define MOTOR_CTL_IOC_MAXNR 4 + +/* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!ATTENTION!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/ +/* File is used from JNCG and QA-V3.*/ +/* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!ATTENTION!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/ + ++======= + #define MOTOR_CTL_IOCSPWM _IOW(MOTOR_CTL_IOC_MAGIC, 4, int) // Feature 1857 + + #define MOTOR_CTL_IOC_MAXNR 4 + ++>>>>>>> rauch/jobrechner-import-20190607 #endif /* _ECU_MOTOR_CTL_H_ */ diff --cc ptxdist/local_src/common/hw/ads7953.cpp index 58060ff,eb28e11..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/common/hw/ads7953.cpp +++ b/ptxdist/local_src/common/hw/ads7953.cpp @@@ -40,15 -40,12 +40,22 @@@ #include <linux/types.h> #include <linux/spi/spidev.h> ++<<<<<<< HEAD +#include <iostream> +#include <iomanip> + ++======= ++>>>>>>> rauch/jobrechner-import-20190607 #include "ads7953.h" /*****************************************************************************/ /* here: Defines */ /*****************************************************************************/ ++<<<<<<< HEAD +using namespace std; ++======= + ++>>>>>>> rauch/jobrechner-import-20190607 /*****************************************************************************/ /* here: Classes */ /*****************************************************************************/ @@@ -63,6 -60,7 +70,10 @@@ ADS7953::ADS7953(int filehandle) _hdl(filehandle) { init(); ++<<<<<<< HEAD ++======= + setMode( MANUAL ); ++>>>>>>> rauch/jobrechner-import-20190607 } ADS7953::ADS7953(const char *fullFilePath) : @@@ -90,20 -88,10 +101,27 @@@ ADS7953::~ADS7953( } } ++<<<<<<< HEAD +void ADS7953::setAuto0MaxChannel(unsigned int maxChannel) +{ + if( maxChannel > MAX_NUMBER_OF_CHANNELS ){ + _numChannels = MAX_NUMBER_OF_CHANNELS; + } + else if( maxChannel < MIN_NUMBER_OF_CHANNELS){ + _numChannels = MIN_NUMBER_OF_CHANNELS; + + } + else{ + _numChannels = maxChannel; + } + + setMode( ADS7953::MANUAL ); ++======= + void ADS7953::setMode(ADS7953::ADS7953_MODE mode) + { + _mode = mode; + powerUpDeviceSequence(); ++>>>>>>> rauch/jobrechner-import-20190607 } void ADS7953::setAuto1Mask(unsigned short mask) @@@ -130,7 -118,7 +148,11 @@@ unsigned short ADS7953::channelMask() c return _readChannelMask; } ++<<<<<<< HEAD +void ADS7953::setAuto2MaxChannel(unsigned int maxChannel) ++======= + void ADS7953::setAuto2MaxChannel(unsigned char maxChannel) ++>>>>>>> rauch/jobrechner-import-20190607 { if( maxChannel > MAX_NUMBER_OF_CHANNELS ){ _numChannels = MAX_NUMBER_OF_CHANNELS; @@@ -146,12 -134,6 +168,15 @@@ setMode( ADS7953::MODE2 ); } ++<<<<<<< HEAD +void ADS7953::setMode(ADS7953::ADS7953_MODE mode) +{ + _mode = mode; + powerUpDeviceSequence(); +} + ++======= ++>>>>>>> rauch/jobrechner-import-20190607 void ADS7953::powerUpDeviceSequence() { int numBytes; @@@ -168,18 -150,18 +193,33 @@@ switch ( _mode ){ case ADS7953::MANUAL: ++<<<<<<< HEAD + /* Mode0 */ + + numBytes = (_numChannels*32); + + for ( int i = 0; i < numBytes; i++ ) { + send[i] = ((i & 0xf) << AUTO_MODE0_CHANNEL_OUT_SHIFT ) | AUTO_MODE0; + } + if( _ipRange == V5_0 ){ + (*send) |= IP_RANGE_5V; + } + + _powerUpDone = true; ++======= + /* set next channel to 0 */ + (*send) = 0; + (*send) |= MANUAL_MODE; + (*send) |= ENABLE_PROGRAMMING; + if( _ipRange == V5_0 ){ + (*send) |= IP_RANGE_5V; + } + /* D5 0 normal operation + * D4 0 map channel id into DO15-12 + */ + numBytes = transfer(1); + if( numBytes == 2 ) _powerUpDone = true; ++>>>>>>> rauch/jobrechner-import-20190607 break; case ADS7953::MODE1: @@@ -257,8 -239,7 +297,12 @@@ bool ADS7953::readChannels(ADS7953::ADS if( NULL != data ){ switch ( _mode ){ ++<<<<<<< HEAD + case MANUAL: //MODE0 genannt + bRet = readChannelsMode0(data); ++======= + case MANUAL: ++>>>>>>> rauch/jobrechner-import-20190607 break; case MODE1: @@@ -271,56 -252,6 +315,59 @@@ return bRet; } ++<<<<<<< HEAD +bool ADS7953::readChannelsMode0(ADS7953::ADS_CHANNEL_DATA *data) +{ + /* V2: + * Alle 10ms werden in einem SPI-Zugriff pro Kanal 32 Werte angefragt. + * Dies ergibt bei 16 Kanälen, 16*32=512 Werte. + * AnschlieÃ?end wird der Mittelwert über diese 32 Werte gebildet. Der Mittelwert wird an die Applikation zurückgegeben. + * Der SPI-Bus läuft mit 16,625MHz / 0,0602us/Bit. + * 512Byte * 8Bit/Byte * 0,0602us/Bit = 247us. => Funktion kann alle 5ms aufgerufen werden. */ + + // Funktion fragt alle 32 Werte pro Kanal ab, + // Funktion berechnet Mittelwert aus den empfangen Daten. + + bool bRet(true); + unsigned short aus_RawValues[_numChannels][32]; //Jeder Wert 2 Byte + unsigned short *receive = (unsigned short*)&_rd_buf[0]; + unsigned long aul_SumValues[16]; + unsigned char cnt[16]; + unsigned int numBytes = 0; + + + + // kein resetBuffers() da der wr_buf stets die Befehle beinhalten muss. + numBytes = transfer( _numChannels*32 ); + + /* Write values to zero */ + for( int i=0; i<_numChannels; i++){ + data->data[i] = 0; + } + + numBytes = (_numChannels*32); + for ( int i = 0; i < numBytes; i++ ) { + aus_RawValues[ receive[i] >> 12 ][(cnt[receive[i] >> 12]++)&0x1f] = receive[i]; + } + + /* Building sum of value array */ + for ( int i = 0; i<_numChannels; i++) + { + aul_SumValues[i] = 0; + for (int k=0; k<32; k++) + { + aul_SumValues[i] += (aus_RawValues[i][k] & 0xfff); + } + data->data[i] = aul_SumValues[i] >> 5; + } + + return bRet; +} + + + ++======= ++>>>>>>> rauch/jobrechner-import-20190607 bool ADS7953::readChannelsMode1Mode2(ADS7953::ADS_CHANNEL_DATA *data, int num) { @@@ -368,7 -299,7 +415,11 @@@ return bRet; } ++<<<<<<< HEAD +int ADS7953::transfer( unsigned int numMessages ) ++======= + int ADS7953::transfer( unsigned short numMessages ) ++>>>>>>> rauch/jobrechner-import-20190607 { int numBytes = -1; diff --cc ptxdist/local_src/common/hw/ads7953.h index aba4852,0753bc2..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/common/hw/ads7953.h +++ b/ptxdist/local_src/common/hw/ads7953.h @@@ -54,14 -54,10 +54,21 @@@ #define MANUAL_CHANNEL_14 ( 0xe << 7 ) #define MANUAL_CHANNEL_15 ( 0xf << 7 ) ++<<<<<<< HEAD +#define AUTO_MODE0 MANUAL_MODE +#define AUTO_MODE0_CHANNEL_OUT_SHIFT 7 +#define AUTO_MODE0_CHANNEL_IN_SHIFT 12 + +#define AUTO_MODE1 ( 0x2 << 12 ) +#define AUTO_MODE1_RESET_COUNTER ( 0x1 << 10 ) + +#define AUTO_MODE2 ( 0x4 << 12 ) //?? war 3...warum? ++======= + #define AUTO_MODE1 ( 0x2 << 12 ) + #define AUTO_MODE1_RESET_COUNTER ( 0x1 << 10 ) + + #define AUTO_MODE2 ( 0x3 << 12 ) ++>>>>>>> rauch/jobrechner-import-20190607 #define AUTO_MODE2_RESET_TO_CHANNEL_0 ( 0x1 << 10 ) #define CONTINUE_MODE ( 0x0 ) @@@ -92,17 -88,6 +99,20 @@@ #define ADS_BUFFER_SIZE 4096 ++<<<<<<< HEAD + +/* Use 'e' as magic number */ +#define ADS_CTL_IOC_MAGIC 'a' +/* Please use a different 8-bit number in your code */ + +#define ADS_CTL_IOCRESET _IO(ADS_CTL_IOC_MAGIC, 0) + +#define ADS_CTL_IOCSENABLE _IOW(ADS_CTL_IOC_MAGIC, 1, int) +#define ADS_CTL_IOC_MAXNR 1 + +# ifndef __KERNEL__ ++======= ++>>>>>>> rauch/jobrechner-import-20190607 /*****************************************************************************/ /* here: Classes */ /*****************************************************************************/ @@@ -129,7 -114,13 +139,17 @@@ public ADS7953(int filehandle ); ADS7953( const char* fullFilePath ); virtual ~ADS7953(); ++<<<<<<< HEAD + ++======= + + /** + * @brief setMode + * must be called before powerUpDeviceSequence + * @param mode + */ + void setMode( ADS7953_MODE mode ); ++>>>>>>> rauch/jobrechner-import-20190607 /** * @brief setAuto1Mask @@@ -149,14 -140,20 +169,31 @@@ * must be called before powerUpDeviceSequence * @param maxChannel */ ++<<<<<<< HEAD + void setAuto2MaxChannel( unsigned int maxChannel ); + + /** + * @brief setAuto2MaxChannel + * must be called before powerUpDeviceSequence + * @param maxChannel + */ + void setAuto0MaxChannel(unsigned int maxChannel); ++======= + void setAuto2MaxChannel( unsigned char maxChannel ); + + /** + * @brief powerUpDeviceSequence + */ + void powerUpDeviceSequence(); + + /** + * @brief readChannel reads one channel in manual mode + * @param channel + * @param ulValue + * @return true on success + */ + bool readChannel( int channel, unsigned long &ulValue ); ++>>>>>>> rauch/jobrechner-import-20190607 /** * @brief readAll reads all channel and sorts them into data @@@ -171,27 -168,15 +208,36 @@@ bool readChannels( struct ADS_CHANNEL_DATA *data, int times = 1 ); private: ++<<<<<<< HEAD + /** + * @brief setMode + * must be called before powerUpDeviceSequence + * @param mode + */ + void setMode( ADS7953_MODE mode ); + + /** + * @brief powerUpDeviceSequence + */ + void powerUpDeviceSequence(); + ++======= + ++>>>>>>> rauch/jobrechner-import-20190607 /** * @brief readChannelsMode1Mode2 reads all configured channel in mode1 ore mode2 * @param data * @return */ bool readChannelsMode1Mode2( struct ADS_CHANNEL_DATA *data , int num=1); ++<<<<<<< HEAD + bool readChannelsMode0(struct ADS_CHANNEL_DATA *data); + + int transfer( unsigned int numMessages ); ++======= + + int transfer( unsigned short numMessages ); ++>>>>>>> rauch/jobrechner-import-20190607 void init(); void resetBuffers(); @@@ -199,7 -184,7 +245,11 @@@ /* chip configuration */ ADS7953_MODE _mode; ADS7953_IP_RANGE _ipRange; ++<<<<<<< HEAD + unsigned int _numChannels; ++======= + unsigned char _numChannels; ++>>>>>>> rauch/jobrechner-import-20190607 unsigned short _readChannelMask; bool _powerUpDone; bool _manageFileHandle; @@@ -209,7 -194,7 +259,11 @@@ struct spi_ioc_transfer _xfer; }; ++<<<<<<< HEAD +#endif ++======= + ++>>>>>>> rauch/jobrechner-import-20190607 /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-**-*-* ADS7953 *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-**-*-*/ diff --cc ptxdist/local_src/common/hw/i2c-dev.h index 2e504af,2e504af..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/common/hw/i2c-dev.h +++ b/ptxdist/local_src/common/hw/i2c-dev.h diff --cc ptxdist/local_src/common/hw/max116xx.cpp index 823bf7f,823bf7f..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/common/hw/max116xx.cpp +++ b/ptxdist/local_src/common/hw/max116xx.cpp diff --cc ptxdist/local_src/common/hw/max116xx.h index 467b1d9,467b1d9..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/common/hw/max116xx.h +++ b/ptxdist/local_src/common/hw/max116xx.h diff --cc ptxdist/local_src/common/hw/pca9505.cpp index 753e46a,753e46a..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/common/hw/pca9505.cpp +++ b/ptxdist/local_src/common/hw/pca9505.cpp diff --cc ptxdist/local_src/common/hw/pca9505.h index f263c75,f263c75..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/common/hw/pca9505.h +++ b/ptxdist/local_src/common/hw/pca9505.h diff --cc ptxdist/local_src/common/hw/tle82353sa.cpp index 44ba8d9,08d2537..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/common/hw/tle82353sa.cpp +++ b/ptxdist/local_src/common/hw/tle82353sa.cpp @@@ -2,8 -2,8 +2,13 @@@ $Id: $ ++<<<<<<< HEAD + AUTHOR: gschenk,rmainz + DATE: 2018-09-27 ++======= + AUTHOR: gschenk + DATE: 02.05.2014 ++>>>>>>> rauch/jobrechner-import-20190607 PROJECT: <PROJECTNAME> @@@ -82,8 -82,8 +87,13 @@@ bool TLE82353SA::writeRegister(int hdl bRet = false; } else{ ++<<<<<<< HEAD + /* on error the chip responses with its "Reset Value" */ + if(TLE82353SA_RESET_VALUE_OK(value)){ ++======= + /* on error the chip responses with TLE82353SA_ICVID_CONTENT */ + if( value == TLE82353SA_ICVID_CONTENT ){ ++>>>>>>> rauch/jobrechner-import-20190607 bRet = false; } else{ @@@ -127,7 -127,7 +137,11 @@@ bool TLE82353SA::readRegister(int hdl, * and Manufacturer ID register (ICVID). */ if( adr == REGISTER_ICVID ){ ++<<<<<<< HEAD + if(TLE82353SA_RESET_VALUE_OK(value)){ ++======= + if( value == TLE82353SA_ICVID_CONTENT ){ ++>>>>>>> rauch/jobrechner-import-20190607 bRet = true; } else{ @@@ -136,8 -136,8 +150,13 @@@ } } else{ ++<<<<<<< HEAD + /* on error the chip responses with its "Reset Value" */ + if(TLE82353SA_RESET_VALUE_OK(value)){ ++======= + /* on error the chip responses with TLE82353SA_ICVID_CONTENT */ + if( value == TLE82353SA_ICVID_CONTENT ){ ++>>>>>>> rauch/jobrechner-import-20190607 bRet = false; } else{ @@@ -151,55 -151,31 +170,80 @@@ return bRet; } ++<<<<<<< HEAD +bool TLE82353SA::readICVersion(int hdl, unsigned long &value) +{ + bool bRet; + unsigned long regvalue; + + bRet = readRegister(hdl, REGISTER_ICVID, regvalue); + if (bRet) + { + value = TLE82353SA_GET_IC_VERSION(regvalue); + } + return bRet; +} + +bool TLE82353SA::initTLE( int hdl, unsigned long clkDividervalue, bool includeClkDivider, bool resetDiagRegister ) +{ + + bool bRet; + unsigned long registerValue; ++======= + bool TLE82353SA::initTLE( int hdl, unsigned long clkDividervalue, bool includeClkDivider, bool resetDiagRegister ) + { + + bool bRet(false); + unsigned long registerValue(0); ++>>>>>>> rauch/jobrechner-import-20190607 /* try to read a register from the chip * Use the ICVID register here */ ++<<<<<<< HEAD + registerValue = 0UL; + bRet = TLE82353SA::readRegister( hdl, REGISTER_ICVID, registerValue ); + + if( (!bRet) || (!TLE82353SA_RESET_VALUE_OK(registerValue)) ){ ++======= + bRet = TLE82353SA::readRegister( hdl, REGISTER_ICVID, registerValue ); + if( !bRet || registerValue != TLE82353SA_ICVID_CONTENT ){ ++>>>>>>> rauch/jobrechner-import-20190607 //I2CFeature /* the chip did not respond, maybe its in reset state. * release the reset pin */ PCA9505::getInst().setOutput(PCA9505::RESET_HS_PWM, true, true); ++<<<<<<< HEAD + + /* wait 3ms */ + //TODO: minimal granularity of system timers, CONFIG_HZ=200Hz => 5ms + //FIXME: |EINTR| can abort |usleep()| long before the 3ms are over + (void)usleep(3000) ; + + /* try again reading register */ + registerValue = 0UL; + bRet = TLE82353SA::readRegister( hdl, REGISTER_ICVID, registerValue ); + + if( bRet && TLE82353SA_RESET_VALUE_OK(registerValue) ){ + /* chip alive and responding! */ + bRet = true; + } + else + { + bRet = false; + } ++======= + /* wait 3ms */ + //TODO: minimal granularity of system timers, CONFIG_HZ=200Hz => 5ms + usleep( 3000) ; + /* try again reading register */ + bRet = TLE82353SA::readRegister( hdl, REGISTER_ICVID, registerValue ); + if( bRet && registerValue == TLE82353SA_ICVID_CONTENT ){ + /* chip alive and responding! */ + bRet = true; + } ++>>>>>>> rauch/jobrechner-import-20190607 } if( resetDiagRegister ){ diff --cc ptxdist/local_src/common/hw/tle82353sa.h index 1da9929,db1e950..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/common/hw/tle82353sa.h +++ b/ptxdist/local_src/common/hw/tle82353sa.h @@@ -2,8 -2,8 +2,13 @@@ $Id: $ ++<<<<<<< HEAD + AUTHOR: gschenk,rmainz + DATE: 2018-09-27 ++======= + AUTHOR: gschenk + DATE: 02.05.2014 ++>>>>>>> rauch/jobrechner-import-20190607 PROJECT: <PROJECTNAME> @@@ -49,23 -49,7 +54,27 @@@ TLE82353S #define CHANNEL_LOAD1 0x01 #define CHANNEL_LOAD2 0x02 ++<<<<<<< HEAD +/* + * TLE82453 Data Sheet (Rev 1.0, 2015-03-27) defines a "Reset Value" on + * page 53 as hex 00C1xx00) where "xx" is the version field. + * If you read the chip register use |TLE82353SA_IC_VERSION_MASK| to remove + * the IC version bits (15:8) contents from the value and then compare this + * to |TLE82353SA_MASKED_RESET_VALUE| to see whether the chip reset has been + * successful. + */ +#define TLE82353SA_MASKED_RESET_VALUE 0x00C10000 +#define TLE82353SA_IC_VERSION_MASK 0x0000FF00 +#define TLE82353SA_IC_VERSION_SHIFT (8) + +#define TLE82353SA_GET_IC_VERSION(regval) \ + (((regval) & TLE82353SA_IC_VERSION_MASK) >> TLE82353SA_IC_VERSION_SHIFT) +#define TLE82353SA_RESET_VALUE_OK(regval) \ + (((regval) & ~TLE82353SA_IC_VERSION_MASK) == TLE82353SA_MASKED_RESET_VALUE) + ++======= + #define TLE82353SA_ICVID_CONTENT 0x00C10400 ++>>>>>>> rauch/jobrechner-import-20190607 /* global registers */ #define REGISTER_ICVID 0x00 @@@ -127,14 -111,6 +136,17 @@@ public static bool readRegister( int hdl, unsigned char adr, unsigned long &value ); /** ++<<<<<<< HEAD + * @brief readICVersion get IC version (see TLE82453 Data Sheet (Rev 1.0, 2015-03-27), page 53) from hardware + * @param hdl ready opened filehandle to SPIDEV file + * @param value Reference to where the result should be stored + * @return true on sucess + */ + static bool readICVersion( int hdl, unsigned long &value ); + + /** ++======= ++>>>>>>> rauch/jobrechner-import-20190607 * @brief initTLE initialize the tle * @param hdl ready opened filehandle to SPIDEV file * @return true on success diff --cc ptxdist/local_src/common/io/cppgpio.cpp index 8bff635,7fe634f..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/common/io/cppgpio.cpp +++ b/ptxdist/local_src/common/io/cppgpio.cpp @@@ -32,7 -32,6 +32,10 @@@ #include <string.h> #include <stdio.h> #include <poll.h> ++<<<<<<< HEAD +#include <sys/prctl.h> ++======= ++>>>>>>> rauch/jobrechner-import-20190607 #else #include <sstream> #endif @@@ -527,11 -526,13 +530,21 @@@ void *cppgpio::gpio::gpioGuardThreadHan tp.tv_sec = -1; tp.tv_nsec = -1; ++<<<<<<< HEAD + prctl(PR_SET_NAME,"SW-CC-Thread",0,0,0); + + if( NULL != pContext ){ + + struct pollfd watched_fd = { pContext->_fs_value, POLLPRI|POLLERR, 0 }; ++======= + if( NULL != pContext ){ + + int secs = pContext->_guardTimeout / 1000; + int nsecs = pContext->_guardTimeout % 1000 * 1000 * 1000; + + struct pollfd watched_fd = { pContext->_fs_value, POLLPRI|POLLERR, 0 }; + struct timespec timeout2 = { secs, nsecs }; ++>>>>>>> rauch/jobrechner-import-20190607 /* initial read */ cppgpio::VALUE val = pContext->getValue(&ok); @@@ -584,7 -585,7 +597,11 @@@ bool cppgpio::gpio::guardGpioChange( gp pthread_attr_t attr; pthread_attr_init(&attr); pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_JOINABLE); ++<<<<<<< HEAD + ++======= + ++>>>>>>> rauch/jobrechner-import-20190607 /* normalize the timeout */ if( timeout > 0 ){ _guardTimeout = timeout; diff --cc ptxdist/local_src/common/io/cppgpio.h index f813dae,b6d696b..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/common/io/cppgpio.h +++ b/ptxdist/local_src/common/io/cppgpio.h @@@ -49,8 -49,6 +49,11 @@@ /* here: Classes */ /*****************************************************************************/ ++<<<<<<< HEAD + + ++======= ++>>>>>>> rauch/jobrechner-import-20190607 /** * This is the namespace of the cppgpio framework */ diff --cc ptxdist/local_src/common/io/cppgpio_cwrapper.cpp index 0392c3a,0392c3a..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/common/io/cppgpio_cwrapper.cpp +++ b/ptxdist/local_src/common/io/cppgpio_cwrapper.cpp diff --cc ptxdist/local_src/common/io/cppgpio_cwrapper.h index 01b78ca,01b78ca..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/common/io/cppgpio_cwrapper.h +++ b/ptxdist/local_src/common/io/cppgpio_cwrapper.h diff --cc ptxdist/local_src/documentation/src/barebox.h index ef9e674,ef9e674..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/documentation/src/barebox.h +++ b/ptxdist/local_src/documentation/src/barebox.h diff --cc ptxdist/local_src/documentation/src/memorymap.h index 36d9fb4,36d9fb4..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/documentation/src/memorymap.h +++ b/ptxdist/local_src/documentation/src/memorymap.h diff --cc ptxdist/local_src/documentation/src/troubleshooting.h index bdaed0e,bdaed0e..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/documentation/src/troubleshooting.h +++ b/ptxdist/local_src/documentation/src/troubleshooting.h diff --cc ptxdist/local_src/ecu-basicsys/etc/hostapd/hostapd.conf index b1a615d,b1a615d..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-basicsys/etc/hostapd/hostapd.conf +++ b/ptxdist/local_src/ecu-basicsys/etc/hostapd/hostapd.conf diff --cc ptxdist/local_src/ecu-basicsys/etc/rc.once.d/check_bl_version index 5575665,ffe9905..0000000 --- a/ptxdist/local_src/ecu-basicsys/etc/rc.once.d/check_bl_version +++ b/ptxdist/local_src/ecu-basicsys/etc/rc.once.d/check_bl_version @@@ -81,33 -81,24 +81,54 @@@ if [ $tmp == "V1.05" ] ; the exit 0 fi ++<<<<<<< HEAD +#Wenn der Bootloader die Version V2.00 hat dann updaten (Barebox 2016) +#Im Barebox 2016 liegt bb_version in nv +if [ $tmp == "V2.00" ] ; then + echo Go!! + touch /mnt/nv/update_bl + /sbin/bareboxenv -s /mnt/ /dev/mtdblock1 + rm -rf /mnt/* + sync + exit 0 +fi + +#Wenn der Bootloader die Version V2.01 hat dann updaten +if [ $tmp == "V2.01" ] ; then + echo Go!! + touch /mnt/nv/update_bl ++======= + #Wenn der Bootloader die Version V1.05 hat dann updaten + if [ $tmp == "V1.05" ] ; then + echo Go!! + touch /mnt/update_bl ++>>>>>>> rauch/jobrechner-import-20190607 /sbin/bareboxenv -s /mnt/ /dev/mtdblock1 rm -rf /mnt/* sync exit 0 fi ++<<<<<<< HEAD +#Wenn der Bootloader die Version V2.02 hat dann updaten +if [ $tmp == "V2.02" ] ; then + echo Go!! + touch /mnt/nv/update_bl + /sbin/bareboxenv -s /mnt/ /dev/mtdblock1 + rm -rf /mnt/* + sync + exit 0 +fi ++======= + #Erst verwenden bei Bootloader Version V2.01 + #Wenn der Bootloader die Version V2.00 hat dann updaten (Barebox 2016) + # Im Barebox 2016 liegt bb_version in nv + #if [ $tmp == "V2.00" ] ; then + #echo Go!! + #touch /mnt/nv/update_bl + #/sbin/bareboxenv -s /mnt/ /dev/mtdblock1 + #rm -rf /mnt/* + #sync + #exit 0 + #fi ++>>>>>>> rauch/jobrechner-import-20190607 diff --cc ptxdist/local_src/ecu-basicsys/etc/rc.once.d/device-id index 679e98a,28477b7..0000000 --- a/ptxdist/local_src/ecu-basicsys/etc/rc.once.d/device-id +++ b/ptxdist/local_src/ecu-basicsys/etc/rc.once.d/device-id @@@ -8,15 -8,18 +8,30 @@@ ARTICELNUMBER="zzzzzzzzzz ID="xyz" # Get out of FRAM Devicenumer ++<<<<<<< HEAD +DEVICENUMBER=`ecu-control --fram rs 1` +#echo "$DEVICENUMBER" + +# Get out of FRAM Serialnumber +SERIALNUMBER=`ecu-control --fram rs 2` +#echo "$SERIALNUMBER" + +# Get out of FRAM Articelnumber +ARTICELNUMBER=`ecu-control --fram rs 3` ++======= + # TODO: read the device number from the flash + # DEVICENUMBER=`ecu-control --fram rs 1` + #echo "$DEVICENUMBER" + + # Get out of FRAM Serialnumber + # TODO: read the serial number from the flash + # SERIALNUMBER=`ecu-control --fram rs 2` + #echo "$SERIALNUMBER" + + # Get out of FRAM Articlenumber + # TODO: read the article number from the flash + # ARTICELNUMBER=`ecu-control --fram rs 3` ++>>>>>>> rauch/jobrechner-import-20190607 #echo "$ARTICELNUMBER" if [ ! -s "${DEVICE_ID}" ]; then diff --cc ptxdist/local_src/ecu-basicsys/etc/systemd/system/getty-udev-trigger-devices.service index 2e26548,2e26548..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-basicsys/etc/systemd/system/getty-udev-trigger-devices.service +++ b/ptxdist/local_src/ecu-basicsys/etc/systemd/system/getty-udev-trigger-devices.service diff --cc ptxdist/local_src/ecu-basicsys/etc/systemd/system/sshd@.service index 7b3eb14,7b3eb14..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-basicsys/etc/systemd/system/sshd@.service +++ b/ptxdist/local_src/ecu-basicsys/etc/systemd/system/sshd@.service diff --cc ptxdist/local_src/ecu-basicsys/etc/udev/rules.d/10-udev.rules index a375202,a375202..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-basicsys/etc/udev/rules.d/10-udev.rules +++ b/ptxdist/local_src/ecu-basicsys/etc/udev/rules.d/10-udev.rules diff --cc ptxdist/local_src/ecu-basicsys/etc/udev/rules.d/70-netinterface-reconfig.rules index 24a08f2,e79f8de..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-basicsys/etc/udev/rules.d/70-netinterface-reconfig.rules +++ b/ptxdist/local_src/ecu-basicsys/etc/udev/rules.d/70-netinterface-reconfig.rules @@@ -3,6 -3,4 +3,10 @@@ KERNEL=="eth1", SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", RUN+="/sbin/ifup eth1 -f" # Add WLAN Interface to Systemd ++<<<<<<< HEAD +KERNEL=="phy?", SUBSYSTEM=="ieee80211", ACTION=="remove", RUN+="/bin/systemctl stop wlan.target" +KERNEL=="phy?", SUBSYSTEM=="ieee80211", ACTION=="add", TAG+="systemd", ENV{SYSTEMD_WANTS}="wlan.target" +KERNEL=="phy?", SUBSYSTEM=="ieee80211", ACTION=="add", DRIVERS=="?*", RUN+="/sbin/ifup wlan0 152.21.0.31 -f" ++======= + KERNEL=="phy?", SUBSYSTEM=="ieee80211", ACTION=="add", TAG+="systemd", ENV{SYSTEMD_WANTS}="reconfig-wlan.service" ++>>>>>>> rauch/jobrechner-import-20190607 diff --cc ptxdist/local_src/ecu-basicsys/etc/udev/rules.d/80-codesys3-rt-restart.rules index ae63ffe,ae63ffe..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-basicsys/etc/udev/rules.d/80-codesys3-rt-restart.rules +++ b/ptxdist/local_src/ecu-basicsys/etc/udev/rules.d/80-codesys3-rt-restart.rules diff --cc ptxdist/local_src/ecu-basicsys/home/version.txt index 81f3cc7,764bb08..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-basicsys/home/version.txt +++ b/ptxdist/local_src/ecu-basicsys/home/version.txt @@@ -1,18 -1,18 +1,37 @@@ ++<<<<<<< HEAD +08.06.2017 Prototyp ecu02@ECU02_PROJECT_VERSION@ @ECU02_PROJECT_VERSION@ +12.10.2015 Linux Kernel linuximage V1.0.5 +17.11.2017 Linux System root.ubi V1.0.11 +11.02.2016 CoDeSys Runtime codesyscontrol V3.5.8.0 +11.10.2016 ECU library libECU.so V3.5.0.3 +17.03.2016 Isobus library libIsobus.so V3.5.2.4 +16.09.2016 IO-Driver libIODriver.so V3.6.0.2 +21.04.2015 PID Control library libPIDControl.so V3.5.0.1 +21.04.2015 OptiPoint library libOptiPoint.so V3.5.0.0 +21.04.2015 VariSpread library libVariSpread.so V3.5.0.0 +25.10.2016 Linbus library libLinbus.so V3.5.0.3 +13.02.2015 SLC library libSLC.so V3.5.0.0 +11.02.2016 CoDeSys Configuration CODESYSControl.cfg V1.0.5 +12.11.2015 Update-Skript run_update.sh V1.0.4 +01.08.2016 Barebox 2016.06.0 Barebox V2.0.2 +01.08.2016 Barebox Env 2 Barebox Env V2.0.2 ++======= + 01.08.2016 Nullserie ecu02-V2.4.3 V2.4.3 + 12.10.2015 Linux Kernel linuximage V1.0.5 + 01.08.2016 Linux System root.ubi V1.0.8 + 11.02.2016 CoDeSys Runtime codesyscontrol V3.5.8.0 + 12.10.2015 ECU library libECU.so V3.5.1.0 + 17.03.2016 Isobus library libIsobus.so V3.5.2.4 + 02.08.2016 IO-Driver libIODriver.so V3.6.0.2 + 21.04.2015 PID Control library libPIDControl.so V3.5.0.1 + 21.04.2015 OptiPoint library libOptiPoint.so V3.5.0.0 + 21.04.2015 VariSpread library libVariSpread.so V3.5.0.0 + 01.07.2015 Linbus library libLinbus.so V3.5.0.2 + 13.02.2015 SLC library libSLC.so V3.5.0.0 + 11.02.2016 CoDeSys Configuration CODESYSControl.cfg V1.0.5 + 12.11.2015 Update-Skript run_update.sh V1.0.4 + 01.08.2016 Barebox 2016.06.0 Barebox V2.0.0 + 01.08.2016 Barebox Env 2 Barebox Env V2.0.0 ++>>>>>>> rauch/jobrechner-import-20190607 diff --cc ptxdist/local_src/ecu-basicsys/lib/firmware/rt2870.bin index 9ddac4a,f1535d1..0000000 Binary files differ diff --cc ptxdist/local_src/ecu-basicsys/lib/firmware/rtlwifi/rtl8192cufw.bin index 3aa7506,b231e1d..0000000 Binary files differ diff --cc ptxdist/local_src/ecu-basicsys/lib/systemd/system/application.target index 780efb0,780efb0..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-basicsys/lib/systemd/system/application.target +++ b/ptxdist/local_src/ecu-basicsys/lib/systemd/system/application.target diff --cc ptxdist/local_src/ecu-basicsys/lib/systemd/system/dhcpd.service index 8cc2724,b69370d..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-basicsys/lib/systemd/system/dhcpd.service +++ b/ptxdist/local_src/ecu-basicsys/lib/systemd/system/dhcpd.service @@@ -1,14 -1,14 +1,30 @@@ [Unit] ++<<<<<<< HEAD +Description=DHCP-Server for WLAN Subnet +Wants=udp.socket +BindsTo=wlan.target +After=hostapd.service + +[Service] +Type=forking +ExecStartPre=/bin/touch /var/tmp/dhcpd.leases +ExecStart=/sbin/dhcpd -lf /var/tmp/dhcpd.leases +ExecStop=/usr/bin/killall dhcpd + +[Install] +WantedBy=wlan.target ++======= + Description=DHCP server for WLAN + Wants=udp.socket + BindsTo=sys-subsystem-net-devices-wlan0.device + + + [Service] + Type=forking + ExecStartPre=/bin/touch /var/db/dhcpd.leases + PIDFile=/var/tmp/dhcpd.pid + ExecStart=/sbin/dhcpd -pf /var/tmp/dhcpd.pid -cf /etc/dhcpd.conf wlan0 + KillSignal=SIGINT + + [Install] ++>>>>>>> rauch/jobrechner-import-20190607 diff --cc ptxdist/local_src/ecu-basicsys/lib/systemd/system/emvtest.service index 89abcb8,89abcb8..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-basicsys/lib/systemd/system/emvtest.service +++ b/ptxdist/local_src/ecu-basicsys/lib/systemd/system/emvtest.service diff --cc ptxdist/local_src/ecu-basicsys/lib/systemd/system/emvtest.target index 4e26807,4e26807..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-basicsys/lib/systemd/system/emvtest.target +++ b/ptxdist/local_src/ecu-basicsys/lib/systemd/system/emvtest.target diff --cc ptxdist/local_src/ecu-basicsys/lib/systemd/system/hostapd.service index 0eb2811,b8fb423..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-basicsys/lib/systemd/system/hostapd.service +++ b/ptxdist/local_src/ecu-basicsys/lib/systemd/system/hostapd.service @@@ -1,12 -1,11 +1,23 @@@ [Unit] Description=Hostapd Access Point for WLAN Wants=udp.socket ++<<<<<<< HEAD +BindsTo=wlan.target + +[Service] +Type=forking +ExecStart=/usr/bin/hostapd -B /etc/hostapd/hostapd-device.conf +ExecStop=/usr/bin/killall hostapd + +[Install] +WantedBy=wlan.target ++======= + BindsTo=sys-subsystem-net-devices-wlan0.device + + [Service] + Type=forking + PIDFile=/var/tmp/hostapd.pid + ExecStart=/usr/bin/hostapd -B /etc/hostapd/hostapd-device.conf -P /var/tmp/hostapd.pid + + [Install] ++>>>>>>> rauch/jobrechner-import-20190607 diff --cc ptxdist/local_src/ecu-basicsys/lib/systemd/system/loadenv.service index 9756b8b,9756b8b..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-basicsys/lib/systemd/system/loadenv.service +++ b/ptxdist/local_src/ecu-basicsys/lib/systemd/system/loadenv.service diff --cc ptxdist/local_src/ecu-basicsys/lib/systemd/system/maintenance.target index 4e002de,4e002de..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-basicsys/lib/systemd/system/maintenance.target +++ b/ptxdist/local_src/ecu-basicsys/lib/systemd/system/maintenance.target diff --cc ptxdist/local_src/ecu-basicsys/lib/systemd/system/testing.target index 411d2bc,411d2bc..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-basicsys/lib/systemd/system/testing.target +++ b/ptxdist/local_src/ecu-basicsys/lib/systemd/system/testing.target diff --cc ptxdist/local_src/ecu-basicsys/lib/systemd/system/ubi-attach.service index 106a914,106a914..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-basicsys/lib/systemd/system/ubi-attach.service +++ b/ptxdist/local_src/ecu-basicsys/lib/systemd/system/ubi-attach.service diff --cc ptxdist/local_src/ecu-basicsys/lib/systemd/system/ubi-check-partitions.service index b95cf54,b95cf54..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-basicsys/lib/systemd/system/ubi-check-partitions.service +++ b/ptxdist/local_src/ecu-basicsys/lib/systemd/system/ubi-check-partitions.service diff --cc ptxdist/local_src/ecu-basicsys/lib/systemd/system/udp.socket index 94704ec,94704ec..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-basicsys/lib/systemd/system/udp.socket +++ b/ptxdist/local_src/ecu-basicsys/lib/systemd/system/udp.socket diff --cc ptxdist/local_src/ecu-basicsys/lib/systemd/system/var-dyn.mount index ec9bab6,ec9bab6..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-basicsys/lib/systemd/system/var-dyn.mount +++ b/ptxdist/local_src/ecu-basicsys/lib/systemd/system/var-dyn.mount diff --cc ptxdist/local_src/ecu-basicsys/lib/systemd/system/var-stat.mount index 84f6e81,84f6e81..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-basicsys/lib/systemd/system/var-stat.mount +++ b/ptxdist/local_src/ecu-basicsys/lib/systemd/system/var-stat.mount diff --cc ptxdist/local_src/ecu-basicsys/usr/lib/tmpfiles.d/ubi.conf index 2b0fc40,2b0fc40..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-basicsys/usr/lib/tmpfiles.d/ubi.conf +++ b/ptxdist/local_src/ecu-basicsys/usr/lib/tmpfiles.d/ubi.conf diff --cc ptxdist/local_src/ecu-codesys/ECU/.gitignore index 6bc4f98,6bc4f98..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/ECU/.gitignore +++ b/ptxdist/local_src/ecu-codesys/ECU/.gitignore diff --cc ptxdist/local_src/ecu-codesys/ECU/ECU.c index 5ba885f,d8eac1c..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/ECU/ECU.c +++ b/ptxdist/local_src/ecu-codesys/ECU/ECU.c @@@ -477,59 -477,6 +477,62 @@@ void CDECL CDECL_EXT swversionnumber(sw } } ++<<<<<<< HEAD +void CDECL CDECL_EXT blversion(blversion_struct *p) +{ + FILE * pFile; + long lSize; + size_t result; + + pFile = fopen ( "/mnt/nv/bb_version","ro" ); + + if (pFile == NULL ){ + pFile = fopen ( "/mnt/bb_version","ro" ); + } + + if (pFile != NULL ){ + + // obtain file size: + fseek (pFile , 0 , SEEK_END); + lSize = ftell (pFile); + rewind (pFile); + + // copy the file into the Codesys-buffer: + result = fread ((char *)p->psBlVersion,1,lSize,pFile); + + fclose(pFile); + } + +} + +void CDECL CDECL_EXT blenvversion(blenvversion_struct *p) +{ + FILE * pFile; + long lSize; + size_t result; + + pFile = fopen ( "/mnt/nv/bb_env_version","ro" ); + + if (pFile == NULL ){ + pFile = fopen ( "/mnt/bb_env_version","ro" ); + } + + if (pFile !=NULL ){ + + // obtain file size: + fseek (pFile , 0 , SEEK_END); + lSize = ftell (pFile); + rewind (pFile); + + // copy the file into the Codesys-buffer: + result = fread ((char *)p->psBlEnvVersion,1,lSize,pFile); + + fclose(pFile); + } +} + ++======= ++>>>>>>> rauch/jobrechner-import-20190607 /*! * \brief disableWriteProtection */ diff --cc ptxdist/local_src/ecu-codesys/ECU/ECUDep.m4 index b1ad757,2de6498..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/ECU/ECUDep.m4 +++ b/ptxdist/local_src/ecu-codesys/ECU/ECUDep.m4 @@@ -27,7 -27,7 +27,11 @@@ $History: SET_COMPONENT_NAME(`ECU') COMPONENT_SOURCES(`ECU.c') ++<<<<<<< HEAD +COMPONENT_VERSION(`0x03050003') ++======= + COMPONENT_VERSION(`0x03050100') ++>>>>>>> rauch/jobrechner-import-20190607 COMPONENT_VENDORID(`0x103A') diff --cc ptxdist/local_src/ecu-codesys/ECU/ECUItf.m4 index 14b862f,00d6b4a..0000000 --- a/ptxdist/local_src/ecu-codesys/ECU/ECUItf.m4 +++ b/ptxdist/local_src/ecu-codesys/ECU/ECUItf.m4 @@@ -1,144 -1,122 +1,269 @@@ ++<<<<<<< HEAD +/** + * <interfacename>ECU01</interfacename> + * <description></description> + * + * <copyright></copyright> + */ + +SET_INTERFACE_NAME(`ECU01') + +/** EXTERN LIB SECTION BEGIN **/ +/* Comments are ignored for m4 compiler so restructured text can be used. changecom(`/*', `*/') */ + +#ifdef __cplusplus +extern "C" { +#endif + +/** + * Bootloader Environment Version + */ +typedef struct tagblenvversion_struct +{ + RTS_IEC_STRING *psBlEnvVersion; /* VAR_INPUT */ + RTS_IEC_DINT BlEnvVersion; /* VAR_OUTPUT */ +} blenvversion_struct; + +DEF_API(`void',`CDECL',`blenvversion',`(blenvversion_struct *p)',1,RTSITF_GET_SIGNATURE(0xC7C59A94, 0),0x03050003) + +/** + * Bootloader Version + */ +typedef struct tagblversion_struct +{ + RTS_IEC_STRING *psBlVersion; /* VAR_INPUT */ + RTS_IEC_DINT BlVersion; /* VAR_OUTPUT */ +} blversion_struct; + +DEF_API(`void',`CDECL',`blversion',`(blversion_struct *p)',1,RTSITF_GET_SIGNATURE(0xC8A7F293, 0),0x03050003) + +/** + * Number of the Device + */ +typedef struct tagdevicenumber_struct +{ + RTS_IEC_STRING *psDeviceNumber; /* VAR_INPUT */ + RTS_IEC_DINT DeviceNumber; /* VAR_OUTPUT */ +} devicenumber_struct; + +DEF_API(`void',`CDECL',`devicenumber',`(devicenumber_struct *p)',1,RTSITF_GET_SIGNATURE(0x639B6C3D, 0),0x03050003) + +/** + * Read from the novolatile Storage Device + */ +typedef struct tagnvstorage_read_struct +{ + RTS_IEC_DWORD dwDestAddr; /* VAR_INPUT */ /* Applikation Destination Addr */ + RTS_IEC_DWORD dwSrcAddr; /* VAR_INPUT */ /* Storage Source Addr */ + RTS_IEC_DWORD dwSize; /* VAR_INPUT */ /* Nummber of Bytes */ + RTS_IEC_DINT NVStorage_Read; /* VAR_OUTPUT */ +} nvstorage_read_struct; + +DEF_API(`void',`CDECL',`nvstorage_read',`(nvstorage_read_struct *p)',1,RTSITF_GET_SIGNATURE(0xB1EB0C85, 0),0x03050003) + +/** + * Write to the novolatile storage device + */ +typedef struct tagnvstorage_write_struct +{ + RTS_IEC_DWORD dwDestAddr; /* VAR_INPUT */ /* Storage Destination Addr */ + RTS_IEC_DWORD dwSrcAddr; /* VAR_INPUT */ /* Applikation Source Addr */ + RTS_IEC_DWORD dwSize; /* VAR_INPUT */ /* Nummber of Bytes */ + RTS_IEC_DINT NVStorage_Write; /* VAR_OUTPUT */ +} nvstorage_write_struct; + +DEF_API(`void',`CDECL',`nvstorage_write',`(nvstorage_write_struct *p)',1,RTSITF_GET_SIGNATURE(0x76196A58, 0),0x03050003) + +/** + * Number of the Device Software-Version + */ +typedef struct tagswversionnumber_struct +{ + RTS_IEC_STRING *psSwVersionNumber; /* VAR_INPUT */ + RTS_IEC_DINT SwVersionNumber; /* VAR_OUTPUT */ +} swversionnumber_struct; + +DEF_API(`void',`CDECL',`swversionnumber',`(swversionnumber_struct *p)',1,RTSITF_GET_SIGNATURE(0x60FA9AB6, 0),0x03050003) + +/** + * Number of the Device + */ +typedef struct tagupdatebl_struct +{ + RTS_IEC_DINT UpdateBl; /* VAR_OUTPUT */ +} updatebl_struct; + +DEF_API(`void',`CDECL',`updatebl',`(updatebl_struct *p)',1,RTSITF_GET_SIGNATURE(0x2E83AAA8, 0),0x03050003) + +/** + * Number of the Device + */ +typedef struct tagupdateblenv_struct +{ + RTS_IEC_DINT UpdateBlEnv; /* VAR_OUTPUT */ +} updateblenv_struct; + +DEF_API(`void',`CDECL',`updateblenv',`(updateblenv_struct *p)',1,RTSITF_GET_SIGNATURE(0x29B50504, 0),0x03050003) + +/** + * Number of the Device + */ +typedef struct tagupdatesys_struct +{ + RTS_IEC_DINT UpdateSys; /* VAR_OUTPUT */ +} updatesys_struct; + +DEF_API(`void',`CDECL',`updatesys',`(updatesys_struct *p)',1,RTSITF_GET_SIGNATURE(0xB9457703, 0),0x03050003) + +/** + * USB-Stick mount + */ +typedef struct tagusbstick_getmountcnt_struct +{ + RTS_IEC_DINT USBStick_GetMountCnt; /* VAR_OUTPUT */ +} usbstick_getmountcnt_struct; + +DEF_API(`void',`CDECL',`usbstick_getmountcnt',`(usbstick_getmountcnt_struct *p)',1,RTSITF_GET_SIGNATURE(0x02F9D9AA, 0),0x03050003) + +/** + * USB-Stick mount status + */ +typedef struct tagusbstick_getmountpath_struct +{ + RTS_IEC_INT iUSBDev_Cnt; /* VAR_INPUT */ /* Number of USB-Stick -> MAX=10 */ + RTS_IEC_BYTE *psPath; /* VAR_INPUT */ /* USB Mount Path - If no Stick ist mounted psPath = NULL */ + RTS_IEC_DINT USBStick_GetMountPath; /* VAR_OUTPUT */ +} usbstick_getmountpath_struct; + +DEF_API(`void',`CDECL',`usbstick_getmountpath',`(usbstick_getmountpath_struct *p)',1,RTSITF_GET_SIGNATURE(0xF2C3CF1A, 0),0x03050003) + +#ifdef __cplusplus +} +#endif + +/** EXTERN LIB SECTION END **/ + ++======= + /** + * <interfacename>ECU01</interfacename> + * <description></description> + * + * <copyright></copyright> + */ + + SET_INTERFACE_NAME(`ECU01') + + /** EXTERN LIB SECTION BEGIN **/ + /* Comments are ignored for m4 compiler so restructured text can be used. changecom(`/*', `*/') */ + + #ifdef __cplusplus + extern "C" { + #endif + + /** + * Number of the Device + */ + typedef struct tagdevicenumber_struct + { + RTS_IEC_STRING *psDeviceNumber; /* VAR_INPUT */ + RTS_IEC_DINT DeviceNumber; /* VAR_OUTPUT */ + } devicenumber_struct; + + DEF_API(`void',`CDECL',`devicenumber',`(devicenumber_struct *p)',1,RTSITF_GET_SIGNATURE(0x639B6C3D, 0),0x03050002) + + /** + * Read from the novolatile Storage Device + */ + typedef struct tagnvstorage_read_struct + { + RTS_IEC_DWORD dwDestAddr; /* VAR_INPUT */ /* Applikation Destination Addr */ + RTS_IEC_DWORD dwSrcAddr; /* VAR_INPUT */ /* Storage Source Addr */ + RTS_IEC_DWORD dwSize; /* VAR_INPUT */ /* Nummber of Bytes */ + RTS_IEC_DINT NVStorage_Read; /* VAR_OUTPUT */ + } nvstorage_read_struct; + + DEF_API(`void',`CDECL',`nvstorage_read',`(nvstorage_read_struct *p)',1,RTSITF_GET_SIGNATURE(0xB1EB0C85, 0),0x03050002) + + /** + * Write to the novolatile storage device + */ + typedef struct tagnvstorage_write_struct + { + RTS_IEC_DWORD dwDestAddr; /* VAR_INPUT */ /* Storage Destination Addr */ + RTS_IEC_DWORD dwSrcAddr; /* VAR_INPUT */ /* Applikation Source Addr */ + RTS_IEC_DWORD dwSize; /* VAR_INPUT */ /* Nummber of Bytes */ + RTS_IEC_DINT NVStorage_Write; /* VAR_OUTPUT */ + } nvstorage_write_struct; + + DEF_API(`void',`CDECL',`nvstorage_write',`(nvstorage_write_struct *p)',1,RTSITF_GET_SIGNATURE(0x76196A58, 0),0x03050002) + + /** + * Number of the Device Software-Version + */ + typedef struct tagswversionnumber_struct + { + RTS_IEC_STRING *psSwVersionNumber; /* VAR_INPUT */ + RTS_IEC_DINT SwVersionNumber; /* VAR_OUTPUT */ + } swversionnumber_struct; + + DEF_API(`void',`CDECL',`swversionnumber',`(swversionnumber_struct *p)',1,RTSITF_GET_SIGNATURE(0x60FA9AB6, 0),0x03050002) + + /** + * Number of the Device + */ + typedef struct tagupdatebl_struct + { + RTS_IEC_DINT UpdateBl; /* VAR_OUTPUT */ + } updatebl_struct; + + DEF_API(`void',`CDECL',`updatebl',`(updatebl_struct *p)',1,RTSITF_GET_SIGNATURE(0x2E83AAA8, 0),0x03050002) + + /** + * Number of the Device + */ + typedef struct tagupdateblenv_struct + { + RTS_IEC_DINT UpdateBlEnv; /* VAR_OUTPUT */ + } updateblenv_struct; + + DEF_API(`void',`CDECL',`updateblenv',`(updateblenv_struct *p)',1,RTSITF_GET_SIGNATURE(0x29B50504, 0),0x03050002) + + /** + * Number of the Device + */ + typedef struct tagupdatesys_struct + { + RTS_IEC_DINT UpdateSys; /* VAR_OUTPUT */ + } updatesys_struct; + + DEF_API(`void',`CDECL',`updatesys',`(updatesys_struct *p)',1,RTSITF_GET_SIGNATURE(0xB9457703, 0),0x03050002) + + /** + * USB-Stick mount + */ + typedef struct tagusbstick_getmountcnt_struct + { + RTS_IEC_DINT USBStick_GetMountCnt; /* VAR_OUTPUT */ + } usbstick_getmountcnt_struct; + + DEF_API(`void',`CDECL',`usbstick_getmountcnt',`(usbstick_getmountcnt_struct *p)',1,RTSITF_GET_SIGNATURE(0x02F9D9AA, 0),0x03050002) + + /** + * USB-Stick mount status + */ + typedef struct tagusbstick_getmountpath_struct + { + RTS_IEC_INT iUSBDev_Cnt; /* VAR_INPUT */ /* Number of USB-Stick -> MAX=10 */ + RTS_IEC_BYTE *psPath; /* VAR_INPUT */ /* USB Mount Path - If no Stick ist mounted psPath = NULL */ + RTS_IEC_DINT USBStick_GetMountPath; /* VAR_OUTPUT */ + } usbstick_getmountpath_struct; + + DEF_API(`void',`CDECL',`usbstick_getmountpath',`(usbstick_getmountpath_struct *p)',1,RTSITF_GET_SIGNATURE(0xF2C3CF1A, 0),0x03050002) + + #ifdef __cplusplus + } + #endif + + /** EXTERN LIB SECTION END **/ + ++>>>>>>> rauch/jobrechner-import-20190607 diff --cc ptxdist/local_src/ecu-codesys/ECU/Makefile index afe2033,afe2033..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/ECU/Makefile +++ b/ptxdist/local_src/ecu-codesys/ECU/Makefile diff --cc ptxdist/local_src/ecu-codesys/Makefile index 93d9048,93d9048..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/Makefile +++ b/ptxdist/local_src/ecu-codesys/Makefile diff --cc ptxdist/local_src/ecu-codesys/io_driver/.gitignore index dd1f5bb,dd1f5bb..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/io_driver/.gitignore +++ b/ptxdist/local_src/ecu-codesys/io_driver/.gitignore diff --cc ptxdist/local_src/ecu-codesys/io_driver/IODriver.c index 4a40ede,518da95..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/io_driver/IODriver.c +++ b/ptxdist/local_src/ecu-codesys/io_driver/IODriver.c @@@ -25,7 -25,14 +25,18 @@@ #include <fcntl.h> #include <unistd.h> ++<<<<<<< HEAD +#include "IODriverECU02.h" ++======= + #ifdef ECU_PLATFORM_ECU01 + #include "IODriverECU01.h" + + #endif + + #ifdef ECU_PLATFORM_ECU02 + #include "IODriverECU02.h" + #endif ++>>>>>>> rauch/jobrechner-import-20190607 USE_STMT USE_SysEventCreate @@@ -61,6 -68,7 +72,10 @@@ typedef struc /* static modul private data */ static IBase *s_pIBase; ++<<<<<<< HEAD ++======= + static void CDECL EWorkerSPI2andI2C ( EventParam* pEventParam ); ++>>>>>>> rauch/jobrechner-import-20190607 #ifndef CPLUSPLUS @@@ -241,11 -249,19 +256,27 @@@ static RTS_RESULT CDECL HookFunction(RT break; case CH_INIT2: ++<<<<<<< HEAD + break; + case CH_INIT_TASKS: + break; + case CH_INIT_COMM: + ++======= + + // SPI-Interface arbeitet mit Systemcalls (open, ioctl). Dass heiÃ?t kthreadd (kthread-daemon) erzeugt kworker, + // die ihm beim Abarbeiten von Anfragen helfen. Diese kworker laufen im SCHED_OTHER, Prio 20. Wir wollen aber, + // dass die SPI-Anfragen zügig abgearbeitet werden. Also setzen wir hier, - einmalig - die Priorität aller kworker u2 + // Kworker für den SPI auf die gleiche Priorität wie der SPI-Thread 1. + EcuReinitKworker(); + + + break; + + case CH_INIT_TASKS: + break; + case CH_INIT_COMM: ++>>>>>>> rauch/jobrechner-import-20190607 break; /* Cyclic */ @@@ -283,6 -299,17 +314,20 @@@ return rtsResult; } ++<<<<<<< HEAD ++======= + static void CDECL EWorkerSPI2andI2C ( EventParam* pEventParam ) + { + switch ( pEventParam->EventId ) { + case EVT_AfterWritingOutputs : + break; + default: + break; + } + + + } ++>>>>>>> rauch/jobrechner-import-20190607 /** * Implementation of the IoDrv Interface @@@ -588,20 -615,8 +633,25 @@@ STATICITF RTS_RESULT CDECL IoDrvUpdateC EcuSetCoDeSysParameter(CC3_TFB, pParameter ); } ++<<<<<<< HEAD + // Feature 1857: PWM Frequenz der Motorbrücken parametrierbar + pParameter = CAL_IoMgrConfigGetParameter(pConnector, 393248); + if (pParameter != NULL) + { + EcuSetCoDeSysParameter(PWM_HB1, pParameter ); + } + + pParameter = CAL_IoMgrConfigGetParameter(pConnector, 393249); + if (pParameter != NULL) + { + EcuSetCoDeSysParameter(PWM_HB2, pParameter ); + } + + pParameter = CAL_IoMgrConfigGetParameter(pConnector, 393250); ++======= + + pParameter = CAL_IoMgrConfigGetParameter(pConnector, 393248); ++>>>>>>> rauch/jobrechner-import-20190607 if (pParameter != NULL ) { pFile = fopen ( "/mnt/nv/bb_version","ro" ); @@@ -613,7 -628,7 +663,11 @@@ } } ++<<<<<<< HEAD + pParameter = CAL_IoMgrConfigGetParameter(pConnector, 393251); ++======= + pParameter = CAL_IoMgrConfigGetParameter(pConnector, 393249); ++>>>>>>> rauch/jobrechner-import-20190607 if (pParameter != NULL ) { pFile = fopen ( "/mnt/nv/bb_env_version","ro" ); @@@ -625,25 -640,25 +679,41 @@@ } } ++<<<<<<< HEAD + pParameter = CAL_IoMgrConfigGetParameter(pConnector, 393252); ++======= + pParameter = CAL_IoMgrConfigGetParameter(pConnector, 393250); ++>>>>>>> rauch/jobrechner-import-20190607 if (pParameter != NULL ) { readStringFromMR25(1, (char *)pParameter->dwValue ); } ++<<<<<<< HEAD + pParameter = CAL_IoMgrConfigGetParameter(pConnector, 393253); ++======= + pParameter = CAL_IoMgrConfigGetParameter(pConnector, 393251); ++>>>>>>> rauch/jobrechner-import-20190607 if (pParameter != NULL ) { readStringFromMR25(2, (char *)pParameter->dwValue ); } ++<<<<<<< HEAD + pParameter = CAL_IoMgrConfigGetParameter(pConnector, 393254); ++======= + pParameter = CAL_IoMgrConfigGetParameter(pConnector, 393252); ++>>>>>>> rauch/jobrechner-import-20190607 if (pParameter != NULL ) { readStringFromMR25(3, (char *)pParameter->dwValue ); } ++<<<<<<< HEAD + pParameter = CAL_IoMgrConfigGetParameter(pConnector, 393255); ++======= + pParameter = CAL_IoMgrConfigGetParameter(pConnector, 393253); ++>>>>>>> rauch/jobrechner-import-20190607 if (pParameter != NULL ) { readStringFromMR25(4, (char *)pParameter->dwValue ); diff --cc ptxdist/local_src/ecu-codesys/io_driver/IODriverDep.m4 index d764942,d764942..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/io_driver/IODriverDep.m4 +++ b/ptxdist/local_src/ecu-codesys/io_driver/IODriverDep.m4 diff --cc ptxdist/local_src/ecu-codesys/io_driver/IODriverECU02.cpp index 23a7d78,fb91ce1..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/io_driver/IODriverECU02.cpp +++ b/ptxdist/local_src/ecu-codesys/io_driver/IODriverECU02.cpp @@@ -22,7 -22,7 +22,11 @@@ -------------------------------------------------------------------- (C) ECKELMANN INDUSTRIEAUTOMATION, WIESBADEN *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-**-*-*-*/ ++<<<<<<< HEAD + ++======= + #ifdef ECU_PLATFORM_ECU02 ++>>>>>>> rauch/jobrechner-import-20190607 /*****************************************************************************/ /* here: Includes */ @@@ -781,13 -781,6 +785,16 @@@ static void threadSPI1(SYS_TASK_PARAM * /* this implizit sets mode1 */ ads1.setAuto2MaxChannel( 16 ); ++<<<<<<< HEAD + // SPI-Interface arbeitet mit Systemcalls (open, ioctl). Dass heiÃ?t kthreadd (kthread-daemon) erzeugt kworker, + // die ihm beim Abarbeiten von Anfragen helfen. Diese kworker laufen im SCHED_OTHER, Prio 20. Wir wollen aber, + // dass die SPI-Anfragen zügig abgearbeitet werden. Also setzen wir hier, - einmalig - die Priorität aller kworker u2 + // Kworker für den SPI auf die gleiche Priorität wie der SPI-Thread 1. + // 16.10.2016 => Aufruf in CH_INIT2 der Hook(): kworker u2:3 war noch nicht erzeugt worden, somit konnte Prio nicht verändert werden. + EcuReinitKworker(); + ++======= ++>>>>>>> rauch/jobrechner-import-20190607 while(!ptp->bExit) { // Beide AD-Bausteine mit je 16 Kanälen 1x einlesen. Jeder Kanal hat 2 Byte Daten @@@ -904,58 -897,47 +911,102 @@@ void copyMaxToProcessImage( Ecu02Max116 ECU02_INS->FB_HB_2 = max_data->data[15]; } ++<<<<<<< HEAD +/* + * This functionality is duplicated in: + * - ptxdist/local_src/ecu-jobctl/platform/iodriver/IODriver.cpp, function IODriver::readFeedbackHSPwm() + * - ptxdist/local_src/ecu-codesys/io_driver/IODriverECU02.cpp, function readFeedbackHSPwm() + */ +void readFeedbackHSPwm(void) +{ + unsigned long currentFeedback0; + unsigned long periodFeedback0; + unsigned long currentFeedback1; + unsigned long periodFeedback1; + unsigned long currentFeedback2; + unsigned long periodFeedback2; + bool ok0, + ok1, + ok2; + unsigned short powerMa0 = 0; + unsigned short powerMa1 = 0; + unsigned short powerMa2 = 0; + + ok0 = Ecu02Tle::getInst().readFeedbackRegister(REGISTER_FEEDBACK_CH0, currentFeedback0, periodFeedback0); + ok1 = Ecu02Tle::getInst().readFeedbackRegister(REGISTER_FEEDBACK_CH1, currentFeedback1, periodFeedback1); + ok2 = Ecu02Tle::getInst().readFeedbackRegister(REGISTER_FEEDBACK_CH2, currentFeedback2, periodFeedback2); + if (!(ok0 && ok1 && ok2)) + return; + + /* + * Average load current = 0.75 * CurrentFB / PeriodFB + * 1000 ~ A -> mA + * 3 / 4 ~ 0,75 + */ +#define AVERAGE_LOAD_CURRENT(currentFeedback, periodFeedback) \ + (((currentFeedback) * 3000UL) / ((periodFeedback) * 4UL)) + + if (periodFeedback0 != 0) + { + powerMa0 = AVERAGE_LOAD_CURRENT(currentFeedback0, periodFeedback0); + } + + if (periodFeedback1 != 0) + { + powerMa1 = AVERAGE_LOAD_CURRENT(currentFeedback1, periodFeedback1); + } + + if (periodFeedback2 != 0) + { + powerMa2 = AVERAGE_LOAD_CURRENT(currentFeedback2, periodFeedback2); + } + + ECU02_INS->FB_HS_PWM1 = powerMa0; + ECU02_INS->FB_HS_PWM2 = powerMa1; + ECU02_INS->FB_HS_PWM3 = powerMa2; ++======= + void readFeedbackHSPwm( void ) + { + unsigned long tleFeedbackCh0; + unsigned long tleFeedbackCh1; + unsigned long tleFeedbackCh2; + bool ok1,ok2,ok3; + + ok1 = Ecu02Tle::getInst().readRegister(REGISTER_FEEDBACK_CH0,tleFeedbackCh0 ); + ok2 = Ecu02Tle::getInst().readRegister(REGISTER_FEEDBACK_CH1,tleFeedbackCh1 ); + ok3 = Ecu02Tle::getInst().readRegister(REGISTER_FEEDBACK_CH2,tleFeedbackCh2 ); + if ( ok1 && ok2 && ok3 ){ + + unsigned long currentFeedback0 = (tleFeedbackCh0 & 0x00fff000) >> 12; + unsigned long periodFeedback0 = (tleFeedbackCh0 & 0x00000fff); + unsigned short powerMa0 = 0; + unsigned long currentFeedback1 = (tleFeedbackCh1 & 0x00fff000) >> 12; + unsigned long periodFeedback1 = (tleFeedbackCh1 & 0x00000fff); + unsigned short powerMa1 = 0; + unsigned long currentFeedback2 = (tleFeedbackCh2 & 0x00fff000) >> 12; + unsigned long periodFeedback2 = (tleFeedbackCh2 & 0x00000fff); + unsigned short powerMa2 = 0; + + /* Average load current = 0.75 * CurrentFB / PeriodFB + * 1000 ~ A -> mA + * 3 / 4 ~ 0,75 + */ + if( periodFeedback0 != 0 ){ + powerMa0 = (currentFeedback0 * 3000) / (periodFeedback0 * 4); + } + + if( periodFeedback1 != 0 ){ + powerMa1 = (currentFeedback1 * 3000) / (periodFeedback1 * 4); + } + + if( periodFeedback2 != 0 ){ + powerMa2 = (currentFeedback2 * 3000) / (periodFeedback2 * 4); + } + ECU02_INS->FB_HS_PWM1 = powerMa0; + ECU02_INS->FB_HS_PWM2 = powerMa1; + ECU02_INS->FB_HS_PWM3 = powerMa2; + } ++>>>>>>> rauch/jobrechner-import-20190607 } static void threadIO(SYS_TASK_PARAM *ptp) @@@ -1201,6 -1183,8 +1252,11 @@@ void EcuReinitKworker(void __init_kworker = true; } ++<<<<<<< HEAD ++======= + + #endif ++>>>>>>> rauch/jobrechner-import-20190607 /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-**-*-* *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-**-*-*/ diff --cc ptxdist/local_src/ecu-codesys/io_driver/IODriverECU02.h index bb269fa,b246790..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/io_driver/IODriverECU02.h +++ b/ptxdist/local_src/ecu-codesys/io_driver/IODriverECU02.h @@@ -82,8 -82,6 +82,11 @@@ enum ECU02_CODESYS_PARAMETERS CC1_TFB, CC2_TFB, CC3_TFB, ++<<<<<<< HEAD + PWM_HB1, + PWM_HB2 ++======= ++>>>>>>> rauch/jobrechner-import-20190607 }; #define ECU02_PACKED __attribute((aligned(1))) diff --cc ptxdist/local_src/ecu-codesys/io_driver/IODriverItf.m4 index 1e6e416,1e6e416..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/io_driver/IODriverItf.m4 +++ b/ptxdist/local_src/ecu-codesys/io_driver/IODriverItf.m4 diff --cc ptxdist/local_src/ecu-codesys/io_driver/Makefile index 8ed5f26,8ed5f26..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/io_driver/Makefile +++ b/ptxdist/local_src/ecu-codesys/io_driver/Makefile diff --cc ptxdist/local_src/ecu-codesys/io_driver/ecu02compcap.cpp index fd728ae,fd728ae..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/io_driver/ecu02compcap.cpp +++ b/ptxdist/local_src/ecu-codesys/io_driver/ecu02compcap.cpp diff --cc ptxdist/local_src/ecu-codesys/io_driver/ecu02compcap.h index dbe5348,dbe5348..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/io_driver/ecu02compcap.h +++ b/ptxdist/local_src/ecu-codesys/io_driver/ecu02compcap.h diff --cc ptxdist/local_src/ecu-codesys/io_driver/ecu02config.cpp index 5a7f9cb,7f58c84..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/io_driver/ecu02config.cpp +++ b/ptxdist/local_src/ecu-codesys/io_driver/ecu02config.cpp @@@ -28,7 -28,6 +28,10 @@@ /* here: Includes */ /*****************************************************************************/ #include "ecu02config.h" ++<<<<<<< HEAD +#include "ecu02motorctl.h" ++======= ++>>>>>>> rauch/jobrechner-import-20190607 #include "IODriverECU02.h" #include "cppgpio.h" #include "pca9505.h" @@@ -215,16 -214,6 +218,19 @@@ void Ecu02CoDeSysConfig::setParameter16 return; } ++<<<<<<< HEAD + // Feature1857 + if(id == PWM_HB1){ + _pwmHB[0] = value; + return; + } + if(id == PWM_HB2){ + _pwmHB[1] = value; + return; + } + ++======= ++>>>>>>> rauch/jobrechner-import-20190607 return; } @@@ -281,9 -270,8 +287,14 @@@ void Ecu02CoDeSysConfig::activateConfig Ecu2CompCap::getInst().settfb(1, _tfb[2]); Ecu2CompCap::getInst().settfb(2, _tfb[1]); ++<<<<<<< HEAD + // Feature1857 + Ecu02MotorCtl::getInst().setPWMFrequency(0, _pwmHB[0]); + Ecu02MotorCtl::getInst().setPWMFrequency(1, _pwmHB[1]); ++======= + + ++>>>>>>> rauch/jobrechner-import-20190607 } diff --cc ptxdist/local_src/ecu-codesys/io_driver/ecu02config.h index eaff36b,42854e5..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/io_driver/ecu02config.h +++ b/ptxdist/local_src/ecu-codesys/io_driver/ecu02config.h @@@ -60,7 -60,6 +60,10 @@@ private Ecu02TlePeriodParameters _periodParams[3]; // for each channel Ecu02ClkDividerParameters* _pClkDividerParams; // there is only one clk divider register for all channels unsigned short _tfb[3]; ++<<<<<<< HEAD + unsigned short _pwmHB[2]; // Feature1857 ++======= ++>>>>>>> rauch/jobrechner-import-20190607 }; diff --cc ptxdist/local_src/ecu-codesys/io_driver/ecu02max116x.cpp index 3c18881,3c18881..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/io_driver/ecu02max116x.cpp +++ b/ptxdist/local_src/ecu-codesys/io_driver/ecu02max116x.cpp diff --cc ptxdist/local_src/ecu-codesys/io_driver/ecu02max116x.h index 31071d1,31071d1..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/io_driver/ecu02max116x.h +++ b/ptxdist/local_src/ecu-codesys/io_driver/ecu02max116x.h diff --cc ptxdist/local_src/ecu-codesys/io_driver/ecu02motorctl.cpp index 37e97e3,d7b4e9e..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/io_driver/ecu02motorctl.cpp +++ b/ptxdist/local_src/ecu-codesys/io_driver/ecu02motorctl.cpp @@@ -33,7 -33,6 +33,10 @@@ #include "ecu02motorctl.h" #include "ecu_motor_ctl.h" #include "pca9505.h" ++<<<<<<< HEAD +#include "cppgpio.h" ++======= ++>>>>>>> rauch/jobrechner-import-20190607 /*****************************************************************************/ /* here: Defines */ @@@ -158,16 -157,6 +161,19 @@@ void Ecu02MotorCtl::setSpeed(int index } } ++<<<<<<< HEAD +void Ecu02MotorCtl::setPWMFrequency(int index, int value) +{ + // In: Rohe Registerwerte Werte + if( index == 0 || index == 1 ){ + if( isOpen() ){ + ioctl(_hdls[index], MOTOR_CTL_IOCSPWM, &value); + } + } +} + ++======= ++>>>>>>> rauch/jobrechner-import-20190607 Ecu02MotorCtl& Ecu02MotorCtl::getInst() { static Ecu02MotorCtl inst; diff --cc ptxdist/local_src/ecu-codesys/io_driver/ecu02motorctl.h index 5cc510c,d0101d0..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/io_driver/ecu02motorctl.h +++ b/ptxdist/local_src/ecu-codesys/io_driver/ecu02motorctl.h @@@ -28,7 -28,7 +28,11 @@@ /*****************************************************************************/ /* here: Includes */ /*****************************************************************************/ ++<<<<<<< HEAD + ++======= + #include "cppgpio.h" ++>>>>>>> rauch/jobrechner-import-20190607 /*****************************************************************************/ /* here: Defines */ @@@ -48,7 -48,7 +52,11 @@@ public void setEnable(int index, int value, bool force ); void setDirection(int index, int value ); void setSpeed(int index, int value ); ++<<<<<<< HEAD + void setPWMFrequency(int index, int value); // Feature 1857 ++======= + ++>>>>>>> rauch/jobrechner-import-20190607 private: Ecu02MotorCtl(); int _hdls[2]; diff --cc ptxdist/local_src/ecu-codesys/io_driver/ecu02safety.cpp index f040ab4,f040ab4..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/io_driver/ecu02safety.cpp +++ b/ptxdist/local_src/ecu-codesys/io_driver/ecu02safety.cpp diff --cc ptxdist/local_src/ecu-codesys/io_driver/ecu02safety.h index 2d2c8d5,2d2c8d5..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/io_driver/ecu02safety.h +++ b/ptxdist/local_src/ecu-codesys/io_driver/ecu02safety.h diff --cc ptxdist/local_src/ecu-codesys/io_driver/ecu02softcompcap.cpp index 3200b31,3200b31..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/io_driver/ecu02softcompcap.cpp +++ b/ptxdist/local_src/ecu-codesys/io_driver/ecu02softcompcap.cpp diff --cc ptxdist/local_src/ecu-codesys/io_driver/ecu02softcompcap.h index bd26edc,bd26edc..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/io_driver/ecu02softcompcap.h +++ b/ptxdist/local_src/ecu-codesys/io_driver/ecu02softcompcap.h diff --cc ptxdist/local_src/ecu-codesys/io_driver/ecu02tle.cpp index d3c443f,d70b823..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/io_driver/ecu02tle.cpp +++ b/ptxdist/local_src/ecu-codesys/io_driver/ecu02tle.cpp @@@ -319,7 -319,6 +319,10 @@@ unsigned long Ecu02ClkDividerParameters Ecu02Tle::Ecu02Tle() : _hdl(-1), ++<<<<<<< HEAD + _icVersion(0xDEADBEEF), ++======= ++>>>>>>> rauch/jobrechner-import-20190607 _hdl_mutex() { @@@ -344,31 -343,17 +347,45 @@@ Ecu02Tle::~Ecu02Tle( void Ecu02Tle::init(unsigned long value) { ++<<<<<<< HEAD + /* value == rawValue of Clk Divider Regsiter */ + + (void)pthread_mutex_lock(&_hdl_mutex); + + _hdl = open( TLE82353SA_DEVICEPATH, O_RDWR ); + if (_hdl >= 0) + { + bool ok = false; + + if (TLE82353SA::initTLE(_hdl, value, true, true)) + { + if (TLE82353SA::readICVersion(_hdl, _icVersion)) + { + ok = true; + } + } + + if (!ok) + { + (void)close(_hdl); + _hdl = -1; + } + } + + (void)pthread_mutex_unlock(&_hdl_mutex); ++======= + /* value == rawValue of Clk Divider Regsiter */ + + pthread_mutex_lock(&_hdl_mutex); + _hdl = open( TLE82353SA_DEVICEPATH, O_RDWR ); + if( isOpen() ){ + if( ! TLE82353SA::initTLE( _hdl, value, true, true ) ){ + close(_hdl); + _hdl = -1; + } + } + pthread_mutex_unlock(&_hdl_mutex); ++>>>>>>> rauch/jobrechner-import-20190607 } bool Ecu02Tle::isOpen() const @@@ -490,52 -475,6 +507,55 @@@ bool Ecu02Tle::setChannelValue(int chan return bRet; } ++<<<<<<< HEAD + +bool Ecu02Tle::readFeedbackRegister(unsigned char adr, unsigned long &currentfb_value, unsigned long &periodfb_value) +{ + unsigned long fbrv; /* feedback register value */ + + /* + * Handle a functional change in the TLE82353SA between chip version + * B13 and chip version C11. + * + * In version C11 the "Current FB" value (bits 23:12) of registers 0x40, + * 0x41 and 0x41 needs to be multiplied by factor 2 compared to the older + * chip version B13. + * + * Fortunately the chip version can be used to distinguish between + * both versions via |_icVersion|. + */ + + /* + * |readFeedbackRegister()| is for currentFB registers only, so bail + * out if someone asks for something else we cannot handle + */ + if ((adr != 0x40) && (adr != 0x41) && (adr != 0x42)) + return false; + + if (!readRegister(adr, fbrv)) + return false; + + switch(_icVersion) + { + case 4: /* B13 step = 00000100 */ + currentfb_value = (fbrv & 0x00FFF000) >> 12; + periodfb_value = (fbrv & 0x00000FFF); + return true; + case 6: /* C11 step = 00000110 */ + currentfb_value = (fbrv & 0x00FFF000) >> 12; + periodfb_value = (fbrv & 0x00000FFF); + currentfb_value *= 2; + return true; + default: /* unknown chip version, we return |false| below */ + break; + } + + return false; +} + + ++======= ++>>>>>>> rauch/jobrechner-import-20190607 /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-**-*-* Ecu02Tle *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-**-*-*/ diff --cc ptxdist/local_src/ecu-codesys/io_driver/ecu02tle.h index 9fff6b6,224062c..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/io_driver/ecu02tle.h +++ b/ptxdist/local_src/ecu-codesys/io_driver/ecu02tle.h @@@ -148,10 -148,8 +148,15 @@@ public bool writeRegister( unsigned char adr, unsigned long value ); bool readRegister( unsigned char adr, unsigned long &value ); ++<<<<<<< HEAD + bool readFeedbackRegister(unsigned char adr, unsigned long &currentfb_value, unsigned long &periodfb_value); + + bool setChannelValue(int channel, int current_value, int pwm_value ); + ++======= + bool setChannelValue(int channel, int current_value, int pwm_value ); + ++>>>>>>> rauch/jobrechner-import-20190607 void init(unsigned long value); private: @@@ -159,7 -157,6 +164,10 @@@ Ecu02Tle(); int _hdl; ++<<<<<<< HEAD + unsigned long _icVersion; ++======= ++>>>>>>> rauch/jobrechner-import-20190607 pthread_mutex_t _hdl_mutex; }; diff --cc ptxdist/local_src/ecu-codesys/io_driver/emeasuretime.cpp index fe44ce3,fe44ce3..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/io_driver/emeasuretime.cpp +++ b/ptxdist/local_src/ecu-codesys/io_driver/emeasuretime.cpp diff --cc ptxdist/local_src/ecu-codesys/io_driver/emeasuretime.h index 504f045,504f045..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/io_driver/emeasuretime.h +++ b/ptxdist/local_src/ecu-codesys/io_driver/emeasuretime.h diff --cc ptxdist/local_src/ecu-codesys/io_driver/io_driver.pro index dfcf76a,dfcf76a..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/io_driver/io_driver.pro +++ b/ptxdist/local_src/ecu-codesys/io_driver/io_driver.pro diff --cc ptxdist/local_src/ecu-codesys/isobus/.gitignore index 6154fe0,6154fe0..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/.gitignore +++ b/ptxdist/local_src/ecu-codesys/isobus/.gitignore diff --cc ptxdist/local_src/ecu-codesys/isobus/IsoAlarm.c index 9901dfc,9901dfc..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/IsoAlarm.c +++ b/ptxdist/local_src/ecu-codesys/isobus/IsoAlarm.c diff --cc ptxdist/local_src/ecu-codesys/isobus/IsoAlarm.h index 8cc8282,8cc8282..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/IsoAlarm.h +++ b/ptxdist/local_src/ecu-codesys/isobus/IsoAlarm.h diff --cc ptxdist/local_src/ecu-codesys/isobus/IsoAliveCtrl.c index 16451f6,16451f6..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/IsoAliveCtrl.c +++ b/ptxdist/local_src/ecu-codesys/isobus/IsoAliveCtrl.c diff --cc ptxdist/local_src/ecu-codesys/isobus/IsoAliveCtrl.h index de65a3d,de65a3d..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/IsoAliveCtrl.h +++ b/ptxdist/local_src/ecu-codesys/isobus/IsoAliveCtrl.h diff --cc ptxdist/local_src/ecu-codesys/isobus/IsoAux.c index 9aa6395,9aa6395..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/IsoAux.c +++ b/ptxdist/local_src/ecu-codesys/isobus/IsoAux.c diff --cc ptxdist/local_src/ecu-codesys/isobus/IsoAuxOld.c index f43a905,f43a905..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/IsoAuxOld.c +++ b/ptxdist/local_src/ecu-codesys/isobus/IsoAuxOld.c diff --cc ptxdist/local_src/ecu-codesys/isobus/IsoBasicClientWrap.c index 49a51f4,49a51f4..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/IsoBasicClientWrap.c +++ b/ptxdist/local_src/ecu-codesys/isobus/IsoBasicClientWrap.c diff --cc ptxdist/local_src/ecu-codesys/isobus/IsoBasicClientWrap.h index 7b53359,7b53359..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/IsoBasicClientWrap.h +++ b/ptxdist/local_src/ecu-codesys/isobus/IsoBasicClientWrap.h diff --cc ptxdist/local_src/ecu-codesys/isobus/IsoClServ.c index e00e277,e00e277..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/IsoClServ.c +++ b/ptxdist/local_src/ecu-codesys/isobus/IsoClServ.c diff --cc ptxdist/local_src/ecu-codesys/isobus/IsoClServ.h index 85ba648,85ba648..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/IsoClServ.h +++ b/ptxdist/local_src/ecu-codesys/isobus/IsoClServ.h diff --cc ptxdist/local_src/ecu-codesys/isobus/IsoClShCtrl.c index 63b786f,63b786f..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/IsoClShCtrl.c +++ b/ptxdist/local_src/ecu-codesys/isobus/IsoClShCtrl.c diff --cc ptxdist/local_src/ecu-codesys/isobus/IsoClShCtrl.h index a153bc5,a153bc5..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/IsoClShCtrl.h +++ b/ptxdist/local_src/ecu-codesys/isobus/IsoClShCtrl.h diff --cc ptxdist/local_src/ecu-codesys/isobus/IsoClientWrap.c index 543a678,543a678..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/IsoClientWrap.c +++ b/ptxdist/local_src/ecu-codesys/isobus/IsoClientWrap.c diff --cc ptxdist/local_src/ecu-codesys/isobus/IsoClientWrap.h index cca8e3a,cca8e3a..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/IsoClientWrap.h +++ b/ptxdist/local_src/ecu-codesys/isobus/IsoClientWrap.h diff --cc ptxdist/local_src/ecu-codesys/isobus/IsoClients.c index 725b624,725b624..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/IsoClients.c +++ b/ptxdist/local_src/ecu-codesys/isobus/IsoClients.c diff --cc ptxdist/local_src/ecu-codesys/isobus/IsoClients.h index af7c1c4,af7c1c4..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/IsoClients.h +++ b/ptxdist/local_src/ecu-codesys/isobus/IsoClients.h diff --cc ptxdist/local_src/ecu-codesys/isobus/IsoClientsApi.h index 8d5c079,8d5c079..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/IsoClientsApi.h +++ b/ptxdist/local_src/ecu-codesys/isobus/IsoClientsApi.h diff --cc ptxdist/local_src/ecu-codesys/isobus/IsoColor.h index fc8bd87,fc8bd87..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/IsoColor.h +++ b/ptxdist/local_src/ecu-codesys/isobus/IsoColor.h diff --cc ptxdist/local_src/ecu-codesys/isobus/IsoConf.h index dc822e5,bfd7d0d..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/IsoConf.h +++ b/ptxdist/local_src/ecu-codesys/isobus/IsoConf.h @@@ -40,11 -40,11 +40,19 @@@ #define STRBUFFSIZE (50) /**< \brief Number of strings which can be stored */ /* ECU Driver typedef needed for application ( VS2008 sample ) */ ++<<<<<<< HEAD +#define PROCESSDATA_MAX (400) /**< Predefined number of process data ( -> more IsoConf.h) */ + +#define DEVICEDESCRIPTION_SIZE (20000u) /**< Predefined size of buffer for device description pool ( -> more IsoConf.h) */ + +#define TC_NUMNESTED_DE (200) /**< Predefined size of number of nested Device elements ( -> more IsoConf.h) */ ++======= + #define PROCESSDATA_MAX (200) /**< Predefined number of process data ( -> more IsoConf.h) */ + + #define DEVICEDESCRIPTION_SIZE (10000u) /**< Predefined size of buffer for device description pool ( -> more IsoConf.h) */ + + #define TC_NUMNESTED_DE (100) /**< Predefined size of number of nested Device elements ( -> more IsoConf.h) */ ++>>>>>>> rauch/jobrechner-import-20190607 #ifdef ENABLE_ISO_APP_TYPEDEFS diff --cc ptxdist/local_src/ecu-codesys/isobus/IsoDD.c index b81c247,b81c247..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/IsoDD.c +++ b/ptxdist/local_src/ecu-codesys/isobus/IsoDD.c diff --cc ptxdist/local_src/ecu-codesys/isobus/IsoDD.h index e7f40b7,e7f40b7..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/IsoDD.h +++ b/ptxdist/local_src/ecu-codesys/isobus/IsoDD.h diff --cc ptxdist/local_src/ecu-codesys/isobus/IsoData.c index 5be8e71,5be8e71..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/IsoData.c +++ b/ptxdist/local_src/ecu-codesys/isobus/IsoData.c diff --cc ptxdist/local_src/ecu-codesys/isobus/IsoData.h index 9621134,9621134..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/IsoData.h +++ b/ptxdist/local_src/ecu-codesys/isobus/IsoData.h diff --cc ptxdist/local_src/ecu-codesys/isobus/IsoDataM.c index f810ccd,f810ccd..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/IsoDataM.c +++ b/ptxdist/local_src/ecu-codesys/isobus/IsoDataM.c diff --cc ptxdist/local_src/ecu-codesys/isobus/IsoDataM.h index 8427320,8427320..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/IsoDataM.h +++ b/ptxdist/local_src/ecu-codesys/isobus/IsoDataM.h diff --cc ptxdist/local_src/ecu-codesys/isobus/IsoDef.h index 07ddcb9,07ddcb9..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/IsoDef.h +++ b/ptxdist/local_src/ecu-codesys/isobus/IsoDef.h diff --cc ptxdist/local_src/ecu-codesys/isobus/IsoDrv.h index b709ca9,b709ca9..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/IsoDrv.h +++ b/ptxdist/local_src/ecu-codesys/isobus/IsoDrv.h diff --cc ptxdist/local_src/ecu-codesys/isobus/IsoDrvN.c index 9d59ec4,9d59ec4..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/IsoDrvN.c +++ b/ptxdist/local_src/ecu-codesys/isobus/IsoDrvN.c diff --cc ptxdist/local_src/ecu-codesys/isobus/IsoFSC.c index a3bdda9,a3bdda9..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/IsoFSC.c +++ b/ptxdist/local_src/ecu-codesys/isobus/IsoFSC.c diff --cc ptxdist/local_src/ecu-codesys/isobus/IsoFSC.h index 55f896e,55f896e..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/IsoFSC.h +++ b/ptxdist/local_src/ecu-codesys/isobus/IsoFSC.h diff --cc ptxdist/local_src/ecu-codesys/isobus/IsoFscApi.h index ce51811,ce51811..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/IsoFscApi.h +++ b/ptxdist/local_src/ecu-codesys/isobus/IsoFscApi.h diff --cc ptxdist/local_src/ecu-codesys/isobus/IsoJ1939.c index 3440395,3440395..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/IsoJ1939.c +++ b/ptxdist/local_src/ecu-codesys/isobus/IsoJ1939.c diff --cc ptxdist/local_src/ecu-codesys/isobus/IsoJ1939.h index 12443ae,12443ae..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/IsoJ1939.h +++ b/ptxdist/local_src/ecu-codesys/isobus/IsoJ1939.h diff --cc ptxdist/local_src/ecu-codesys/isobus/IsoMnAl.c index ca8e4f5,ca8e4f5..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/IsoMnAl.c +++ b/ptxdist/local_src/ecu-codesys/isobus/IsoMnAl.c diff --cc ptxdist/local_src/ecu-codesys/isobus/IsoMnAl.h index 3a75ef5,3a75ef5..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/IsoMnAl.h +++ b/ptxdist/local_src/ecu-codesys/isobus/IsoMnAl.h diff --cc ptxdist/local_src/ecu-codesys/isobus/IsoMnApi.h index 489818f,489818f..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/IsoMnApi.h +++ b/ptxdist/local_src/ecu-codesys/isobus/IsoMnApi.h diff --cc ptxdist/local_src/ecu-codesys/isobus/IsoMnDl.c index 9dc22e7,9dc22e7..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/IsoMnDl.c +++ b/ptxdist/local_src/ecu-codesys/isobus/IsoMnDl.c diff --cc ptxdist/local_src/ecu-codesys/isobus/IsoMnDl.h index 7346afc,7346afc..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/IsoMnDl.h +++ b/ptxdist/local_src/ecu-codesys/isobus/IsoMnDl.h diff --cc ptxdist/local_src/ecu-codesys/isobus/IsoMnNiuApi.h index dc9cb14,dc9cb14..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/IsoMnNiuApi.h +++ b/ptxdist/local_src/ecu-codesys/isobus/IsoMnNiuApi.h diff --cc ptxdist/local_src/ecu-codesys/isobus/IsoMnNl.c index 313632d,313632d..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/IsoMnNl.c +++ b/ptxdist/local_src/ecu-codesys/isobus/IsoMnNl.c diff --cc ptxdist/local_src/ecu-codesys/isobus/IsoMnNl.h index 4f5e784,4f5e784..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/IsoMnNl.h +++ b/ptxdist/local_src/ecu-codesys/isobus/IsoMnNl.h diff --cc ptxdist/local_src/ecu-codesys/isobus/IsoMnNld.c index dd550d6,dd550d6..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/IsoMnNld.c +++ b/ptxdist/local_src/ecu-codesys/isobus/IsoMnNld.c diff --cc ptxdist/local_src/ecu-codesys/isobus/IsoMnNld.h index f296e55,f296e55..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/IsoMnNld.h +++ b/ptxdist/local_src/ecu-codesys/isobus/IsoMnNld.h diff --cc ptxdist/local_src/ecu-codesys/isobus/IsoMnNlm.c index d300fc9,d300fc9..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/IsoMnNlm.c +++ b/ptxdist/local_src/ecu-codesys/isobus/IsoMnNlm.c diff --cc ptxdist/local_src/ecu-codesys/isobus/IsoMnNlm.h index a3463af,a3463af..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/IsoMnNlm.h +++ b/ptxdist/local_src/ecu-codesys/isobus/IsoMnNlm.h diff --cc ptxdist/local_src/ecu-codesys/isobus/IsoMnNm.c index c3ac34d,c3ac34d..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/IsoMnNm.c +++ b/ptxdist/local_src/ecu-codesys/isobus/IsoMnNm.c diff --cc ptxdist/local_src/ecu-codesys/isobus/IsoMnSpn.c index 9cb54a7,9cb54a7..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/IsoMnSpn.c +++ b/ptxdist/local_src/ecu-codesys/isobus/IsoMnSpn.c diff --cc ptxdist/local_src/ecu-codesys/isobus/IsoNet.c index dbb7d83,dbb7d83..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/IsoNet.c +++ b/ptxdist/local_src/ecu-codesys/isobus/IsoNet.c diff --cc ptxdist/local_src/ecu-codesys/isobus/IsoNet.h index 2d4183a,2d4183a..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/IsoNet.h +++ b/ptxdist/local_src/ecu-codesys/isobus/IsoNet.h diff --cc ptxdist/local_src/ecu-codesys/isobus/IsoPgnDef.h index b8943b9,b8943b9..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/IsoPgnDef.h +++ b/ptxdist/local_src/ecu-codesys/isobus/IsoPgnDef.h diff --cc ptxdist/local_src/ecu-codesys/isobus/IsoPoObj.c index 0605a0b,0605a0b..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/IsoPoObj.c +++ b/ptxdist/local_src/ecu-codesys/isobus/IsoPoObj.c diff --cc ptxdist/local_src/ecu-codesys/isobus/IsoPoObj.h index b7822f2,b7822f2..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/IsoPoObj.h +++ b/ptxdist/local_src/ecu-codesys/isobus/IsoPoObj.h diff --cc ptxdist/local_src/ecu-codesys/isobus/IsoPool.c index a37805d,a37805d..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/IsoPool.c +++ b/ptxdist/local_src/ecu-codesys/isobus/IsoPool.c diff --cc ptxdist/local_src/ecu-codesys/isobus/IsoPool.h index 8a70a7d,8a70a7d..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/IsoPool.h +++ b/ptxdist/local_src/ecu-codesys/isobus/IsoPool.h diff --cc ptxdist/local_src/ecu-codesys/isobus/IsoSCCtrl.c index 4e3f3fc,4e3f3fc..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/IsoSCCtrl.c +++ b/ptxdist/local_src/ecu-codesys/isobus/IsoSCCtrl.c diff --cc ptxdist/local_src/ecu-codesys/isobus/IsoSCCtrl.h index b0b7be5,b0b7be5..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/IsoSCCtrl.h +++ b/ptxdist/local_src/ecu-codesys/isobus/IsoSCCtrl.h diff --cc ptxdist/local_src/ecu-codesys/isobus/IsoSCFund.c index f9b16ce,f9b16ce..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/IsoSCFund.c +++ b/ptxdist/local_src/ecu-codesys/isobus/IsoSCFund.c diff --cc ptxdist/local_src/ecu-codesys/isobus/IsoSCFund.h index 4d1739b,4d1739b..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/IsoSCFund.h +++ b/ptxdist/local_src/ecu-codesys/isobus/IsoSCFund.h diff --cc ptxdist/local_src/ecu-codesys/isobus/IsoSCLogin.c index 875c452,875c452..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/IsoSCLogin.c +++ b/ptxdist/local_src/ecu-codesys/isobus/IsoSCLogin.c diff --cc ptxdist/local_src/ecu-codesys/isobus/IsoSCLogin.h index 76904de,76904de..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/IsoSCLogin.h +++ b/ptxdist/local_src/ecu-codesys/isobus/IsoSCLogin.h diff --cc ptxdist/local_src/ecu-codesys/isobus/IsoSCWork.c index 33edc35,33edc35..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/IsoSCWork.c +++ b/ptxdist/local_src/ecu-codesys/isobus/IsoSCWork.c diff --cc ptxdist/local_src/ecu-codesys/isobus/IsoSCWork.h index 78b93d7,78b93d7..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/IsoSCWork.h +++ b/ptxdist/local_src/ecu-codesys/isobus/IsoSCWork.h diff --cc ptxdist/local_src/ecu-codesys/isobus/IsoSccApi.h index ac97f48,ac97f48..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/IsoSccApi.h +++ b/ptxdist/local_src/ecu-codesys/isobus/IsoSccApi.h diff --cc ptxdist/local_src/ecu-codesys/isobus/IsoSnApi.c index 32c64f6,32c64f6..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/IsoSnApi.c +++ b/ptxdist/local_src/ecu-codesys/isobus/IsoSnApi.c diff --cc ptxdist/local_src/ecu-codesys/isobus/IsoSnApi.h index 45b91d1,45b91d1..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/IsoSnApi.h +++ b/ptxdist/local_src/ecu-codesys/isobus/IsoSnApi.h diff --cc ptxdist/local_src/ecu-codesys/isobus/IsoTL.c index 58ec750,58ec750..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/IsoTL.c +++ b/ptxdist/local_src/ecu-codesys/isobus/IsoTL.c diff --cc ptxdist/local_src/ecu-codesys/isobus/IsoTL.h index 5c3289f,5c3289f..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/IsoTL.h +++ b/ptxdist/local_src/ecu-codesys/isobus/IsoTL.h diff --cc ptxdist/local_src/ecu-codesys/isobus/IsoTaskC.c index 7a8be59,df9702f..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/IsoTaskC.c +++ b/ptxdist/local_src/ecu-codesys/isobus/IsoTaskC.c @@@ -154,11 -154,11 +154,19 @@@ #define err_PdProcessDataNotSettable 16u #define err_PdInvalidInterOrThreshold 32u ++<<<<<<< HEAD +#define DEVICEMAXSIZE (2520u) +#define DEVELEMENTMAXSIZE (980u) +#define DEVPROZESSMAXSIZE (880u) +#define DEVPROPERTYMAXSIZE (920u) +#define DEVVALUEPRESMAXSIZE (940u) ++======= + #define DEVICEMAXSIZE (1260u) + #define DEVELEMENTMAXSIZE (490u) + #define DEVPROZESSMAXSIZE (440u) + #define DEVPROPERTYMAXSIZE (460u) + #define DEVVALUEPRESMAXSIZE (470u) ++>>>>>>> rauch/jobrechner-import-20190607 #define TIMEDELTA_PD (10L) /**< Timedifferenz between check of cyclic Pd-function */ diff --cc ptxdist/local_src/ecu-codesys/isobus/IsoTaskC.h index 572c9e3,572c9e3..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/IsoTaskC.h +++ b/ptxdist/local_src/ecu-codesys/isobus/IsoTaskC.h diff --cc ptxdist/local_src/ecu-codesys/isobus/IsoTccApi.h index a803c23,ba2d979..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/IsoTccApi.h +++ b/ptxdist/local_src/ecu-codesys/isobus/IsoTccApi.h @@@ -51,16 -51,16 +51,27 @@@ extern "C" /* ************************************************************************ */ #ifndef PROCESSDATA_MAX ++<<<<<<< HEAD + #define PROCESSDATA_MAX (400) /**< Predefined number of process data ( -> more IsoConf.h) */ + #endif /* PROCESSDATA_MAX */ + #ifndef DEVICEDESCRIPTION_SIZE + #define DEVICEDESCRIPTION_SIZE (20000u) /**< Predefined size of buffer for device description pool ( -> more IsoConf.h) */ ++======= + #define PROCESSDATA_MAX (200) /**< Predefined number of process data ( -> more IsoConf.h) */ + #endif /* PROCESSDATA_MAX */ + #ifndef DEVICEDESCRIPTION_SIZE + #define DEVICEDESCRIPTION_SIZE (10000u) /**< Predefined size of buffer for device description pool ( -> more IsoConf.h) */ ++>>>>>>> rauch/jobrechner-import-20190607 #endif /* DEVICEDESCRIPTION_SIZE */ #ifndef TC_NUMB_TCCLIENTS #define TC_NUMB_TCCLIENTS (1) /**< Predefined size of buffer for device description pool ( -> more IsoConf.h) */ #endif /* TC_NUMB_TCCLIENTS */ #ifndef TC_NUMNESTED_DE ++<<<<<<< HEAD + #define TC_NUMNESTED_DE (200) /**< Predefined size of number of nested Device elements ( -> more IsoConf.h) */ ++======= + #define TC_NUMNESTED_DE (100) /**< Predefined size of number of nested Device elements ( -> more IsoConf.h) */ ++>>>>>>> rauch/jobrechner-import-20190607 #endif /* TC_NUMNESTED_DE */ #ifndef TC_DEFTCM_BOOTTIME #define TC_DEFTCM_BOOTTIME (10u) /**< Predefined boottime for the preferred TC ( -> more IsoConf.h) */ diff --cc ptxdist/local_src/ecu-codesys/isobus/IsoUser.c index 3040ae5,3040ae5..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/IsoUser.c +++ b/ptxdist/local_src/ecu-codesys/isobus/IsoUser.c diff --cc ptxdist/local_src/ecu-codesys/isobus/IsoUserX.h index c526fa6,c526fa6..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/IsoUserX.h +++ b/ptxdist/local_src/ecu-codesys/isobus/IsoUserX.h diff --cc ptxdist/local_src/ecu-codesys/isobus/IsoUtil.c index 7173837,7173837..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/IsoUtil.c +++ b/ptxdist/local_src/ecu-codesys/isobus/IsoUtil.c diff --cc ptxdist/local_src/ecu-codesys/isobus/IsoUtil.h index ca6484b,ca6484b..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/IsoUtil.h +++ b/ptxdist/local_src/ecu-codesys/isobus/IsoUtil.h diff --cc ptxdist/local_src/ecu-codesys/isobus/IsoVTMsg.c index a34d7a0,a34d7a0..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/IsoVTMsg.c +++ b/ptxdist/local_src/ecu-codesys/isobus/IsoVTMsg.c diff --cc ptxdist/local_src/ecu-codesys/isobus/IsoVt.c index 83548f9,83548f9..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/IsoVt.c +++ b/ptxdist/local_src/ecu-codesys/isobus/IsoVt.c diff --cc ptxdist/local_src/ecu-codesys/isobus/IsoVt.h index 603611e,603611e..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/IsoVt.h +++ b/ptxdist/local_src/ecu-codesys/isobus/IsoVt.h diff --cc ptxdist/local_src/ecu-codesys/isobus/IsoVtUt.c index f47708d,f47708d..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/IsoVtUt.c +++ b/ptxdist/local_src/ecu-codesys/isobus/IsoVtUt.c diff --cc ptxdist/local_src/ecu-codesys/isobus/IsoVtUt.h index 2d235d6,2d235d6..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/IsoVtUt.h +++ b/ptxdist/local_src/ecu-codesys/isobus/IsoVtUt.h diff --cc ptxdist/local_src/ecu-codesys/isobus/IsoVtXcr.c index bd60f95,bd60f95..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/IsoVtXcr.c +++ b/ptxdist/local_src/ecu-codesys/isobus/IsoVtXcr.c diff --cc ptxdist/local_src/ecu-codesys/isobus/IsoVtXcr.h index fefe8e1,fefe8e1..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/IsoVtXcr.h +++ b/ptxdist/local_src/ecu-codesys/isobus/IsoVtXcr.h diff --cc ptxdist/local_src/ecu-codesys/isobus/IsoVtcApi.h index 172dcf6,172dcf6..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/IsoVtcApi.h +++ b/ptxdist/local_src/ecu-codesys/isobus/IsoVtcApi.h diff --cc ptxdist/local_src/ecu-codesys/isobus/IsoWoSe.c index df904ea,df904ea..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/IsoWoSe.c +++ b/ptxdist/local_src/ecu-codesys/isobus/IsoWoSe.c diff --cc ptxdist/local_src/ecu-codesys/isobus/IsoWoSe.h index 09a326a,09a326a..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/IsoWoSe.h +++ b/ptxdist/local_src/ecu-codesys/isobus/IsoWoSe.h diff --cc ptxdist/local_src/ecu-codesys/isobus/Isobus.vpj index 2029ecb,2029ecb..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/Isobus.vpj +++ b/ptxdist/local_src/ecu-codesys/isobus/Isobus.vpj diff --cc ptxdist/local_src/ecu-codesys/isobus/Isobus.vpw index eee75e8,eee75e8..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/Isobus.vpw +++ b/ptxdist/local_src/ecu-codesys/isobus/Isobus.vpw diff --cc ptxdist/local_src/ecu-codesys/isobus/Isobus.vtg index 01d21b2,01d21b2..0000000 mode 100644,100755..100644 Binary files differ diff --cc ptxdist/local_src/ecu-codesys/isobus/IsobusDep.m4 index 304db59,85eecd4..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/IsobusDep.m4 +++ b/ptxdist/local_src/ecu-codesys/isobus/IsobusDep.m4 @@@ -16,7 -16,7 +16,11 @@@ SET_COMPONENT_NAME(`Isobus') COMPONENT_SOURCES(`Isobus.c') ++<<<<<<< HEAD +COMPONENT_VERSION(`0x03050205') ++======= + COMPONENT_VERSION(`0x03050204') ++>>>>>>> rauch/jobrechner-import-20190607 COMPONENT_VENDORID(`0x103A') diff --cc ptxdist/local_src/ecu-codesys/isobus/Makefile index ca09c01,ca09c01..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/Makefile +++ b/ptxdist/local_src/ecu-codesys/isobus/Makefile diff --cc ptxdist/local_src/ecu-codesys/isobus/UtPoPict.c index fef0d44,fef0d44..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/UtPoPict.c +++ b/ptxdist/local_src/ecu-codesys/isobus/UtPoPict.c diff --cc ptxdist/local_src/ecu-codesys/isobus/UtPoPict.h index 4f40169,4f40169..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/UtPoPict.h +++ b/ptxdist/local_src/ecu-codesys/isobus/UtPoPict.h diff --cc ptxdist/local_src/ecu-codesys/isobus/UtST.c index 408a1b3,408a1b3..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/UtST.c +++ b/ptxdist/local_src/ecu-codesys/isobus/UtST.c diff --cc ptxdist/local_src/ecu-codesys/isobus/UtST.h index d2034b6,d2034b6..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/UtST.h +++ b/ptxdist/local_src/ecu-codesys/isobus/UtST.h diff --cc ptxdist/local_src/ecu-codesys/isobus/canbus.c index c1a5a0d,c1a5a0d..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/canbus.c +++ b/ptxdist/local_src/ecu-codesys/isobus/canbus.c diff --cc ptxdist/local_src/ecu-codesys/isobus/canbus.h index 41417f0,41417f0..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/canbus.h +++ b/ptxdist/local_src/ecu-codesys/isobus/canbus.h diff --cc ptxdist/local_src/ecu-codesys/isobus/iopfile.c index 94d1da1,94d1da1..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/iopfile.c +++ b/ptxdist/local_src/ecu-codesys/isobus/iopfile.c diff --cc ptxdist/local_src/ecu-codesys/isobus/iopfile.h index 30bdd7c,30bdd7c..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/iopfile.h +++ b/ptxdist/local_src/ecu-codesys/isobus/iopfile.h diff --cc ptxdist/local_src/ecu-codesys/isobus/isobus.pro index c8b5bb9,c8b5bb9..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/isobus.pro +++ b/ptxdist/local_src/ecu-codesys/isobus/isobus.pro diff --cc ptxdist/local_src/ecu-codesys/isobus/stdafx.h index a9ddfdc,a9ddfdc..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/stdafx.h +++ b/ptxdist/local_src/ecu-codesys/isobus/stdafx.h diff --cc ptxdist/local_src/ecu-codesys/isobus/typdef.h index 44726f9,44726f9..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/isobus/typdef.h +++ b/ptxdist/local_src/ecu-codesys/isobus/typdef.h diff --cc ptxdist/local_src/ecu-codesys/linbus/.gitignore index fdac65f,fdac65f..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/linbus/.gitignore +++ b/ptxdist/local_src/ecu-codesys/linbus/.gitignore diff --cc ptxdist/local_src/ecu-codesys/linbus/LinbusDep.m4 index 02247e2,66d9dd5..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/linbus/LinbusDep.m4 +++ b/ptxdist/local_src/ecu-codesys/linbus/LinbusDep.m4 @@@ -17,7 -17,7 +17,11 @@@ SET_COMPONENT_NAME(`linbus') COMPONENT_SOURCES(`linbus.c') ++<<<<<<< HEAD +COMPONENT_VERSION(`0x03050003') ++======= + COMPONENT_VERSION(`0x03050002') ++>>>>>>> rauch/jobrechner-import-20190607 COMPONENT_VENDORID(`0x103A') diff --cc ptxdist/local_src/ecu-codesys/linbus/Makefile index abe5086,abe5086..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/linbus/Makefile +++ b/ptxdist/local_src/ecu-codesys/linbus/Makefile diff --cc ptxdist/local_src/ecu-codesys/linbus/linbus.c index abec628,abec628..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/linbus/linbus.c +++ b/ptxdist/local_src/ecu-codesys/linbus/linbus.c diff --cc ptxdist/local_src/ecu-codesys/linbus/linbus.pro index a3d29a0,a3d29a0..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/linbus/linbus.pro +++ b/ptxdist/local_src/ecu-codesys/linbus/linbus.pro diff --cc ptxdist/local_src/ecu-codesys/linbus/linfunc.c index ae8fbc0,fe36548..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/linbus/linfunc.c +++ b/ptxdist/local_src/ecu-codesys/linbus/linfunc.c @@@ -147,9 -147,12 +147,18 @@@ typedef struct LIN_SLAVE_DATA_R /******************************************************************************* @Konstanten (modullokal) *******************************************************************************/ ++<<<<<<< HEAD + +static const char cacDeviceName[DRV_NAME_LEN] = { "/dev/ttymxc3"}; + ++======= + #ifdef ECU_PLATFORM_ECU01 + static const char cacDeviceName[DRV_NAME_LEN] = { "/dev/ttymxc1"}; + #endif + #ifdef ECU_PLATFORM_ECU02 + static const char cacDeviceName[DRV_NAME_LEN] = { "/dev/ttymxc3"}; + #endif ++>>>>>>> rauch/jobrechner-import-20190607 /******************************************************************************* @Variablen (modullokal) *******************************************************************************/ @@@ -236,7 -239,6 +245,10 @@@ USE_SysTaskEnte USE_SysTaskLeave USE_SysTaskEnd ++<<<<<<< HEAD + ++======= ++>>>>>>> rauch/jobrechner-import-20190607 /******************************************************************************/ /*! \fn lin_getslaveversion @@@ -482,16 -484,15 +494,25 @@@ static void lin_master_thread(SYS_TASK_ while(!ptp->bExit) { ++<<<<<<< HEAD + #ifdef _DEBUG + printf("Zustand Master : %i\n", iLinMasterState); + printf("\n"); + #endif ++======= + //printf("Zustand Master : %i\n", iLinMasterState); + //printf("\n"); ++>>>>>>> rauch/jobrechner-import-20190607 switch ( iLinMasterState ) { /*********************************************************************/ case LIN_MASTER_CHECK : { /*********************************************************************/ ++<<<<<<< HEAD ++======= + ++>>>>>>> rauch/jobrechner-import-20190607 /* Kommando Alive an alle Slaves senden */ lin_master_alive( 0, iLinSlaveCnt, 0 ); @@@ -608,21 -609,21 +629,39 @@@ iLinMasterState = LIN_MASTER_ADR_CLR; break; } ++<<<<<<< HEAD + /* Version der Slaves abfragen */ + iMissingSlaves = lin_getslaveversion(); + if ( iMissingSlaves == 1 ) { + + /* fehlenden Slave setzen */ + iLinAdrSlaveCnt = lin_missing_slave(); + + /* Timeout eines Slaves */ + iLinMasterState = LIN_MASTER_INIT; + break; + } + + + /* Slave haben sich gemeldet */ + iLinMasterState = LIN_MASTER_ONLINE; ++======= + /* Version der Slaves abfragen */ + iMissingSlaves = lin_getslaveversion(); + if ( iMissingSlaves == 1 ) { + + /* fehlenden Slave setzen */ + iLinAdrSlaveCnt = lin_missing_slave(); + + /* Timeout eines Slaves */ + iLinMasterState = LIN_MASTER_INIT; + break; + } + + + /* Slave haben sich gemeldet */ + iLinMasterState = LIN_MASTER_ONLINE; ++>>>>>>> rauch/jobrechner-import-20190607 } break; /***************************************************************/ @@@ -806,7 -807,6 +845,10 @@@ static int lin_recv( unsigned char *puc static int lin_recv_message( unsigned char *pucLinMsgData, int iLinMsgLen ) { unsigned char ucChecksum; ++<<<<<<< HEAD + int i = 0; ++======= ++>>>>>>> rauch/jobrechner-import-20190607 /************************************/ /* Response vom Client zuruecklesen */ @@@ -821,12 -821,7 +863,16 @@@ /* Traceausgabe */ /****************/ #ifdef _DEBUG ++<<<<<<< HEAD + printf ("REC: "); + for (i = 0; i < iLinMsgLen; i++) + { + printf ("%02x ", pucLinMsgData[i]); + } + printf ("\n"); ++======= + lin_trace_message( MSG_RX_TRACE_DATA, pucLinMsgData, iLinMsgLen ); ++>>>>>>> rauch/jobrechner-import-20190607 #endif /*******************************/ @@@ -837,12 -832,6 +883,15 @@@ /* Checksumme ist ungueltig */ printf("Checksumme ist ungueltig\n"); ++<<<<<<< HEAD + /* BUG 1898 - Clean Buffer */ + // Kein Mutex benötigt + iLinRxWrIndex = 0; /* Schreibzeiger Empfangspuffer */ + iLinRxRdIndex = 0; /* Lesezeiger Empfangspuffer */ + /* Clean Buffer */ + ++======= ++>>>>>>> rauch/jobrechner-import-20190607 return ERR_LIN_CHECKSUM; } @@@ -977,7 -966,6 +1026,10 @@@ static int lin_send_breakbyte( void static int lin_send_message( unsigned char *pucLinMsgData, int iLinMsgLen ) { int iRet = 0; ++<<<<<<< HEAD + int i = 0; ++======= ++>>>>>>> rauch/jobrechner-import-20190607 /******************************/ /* Breakbyte zunaechst senden */ @@@ -1011,12 -999,7 +1063,16 @@@ /* Traceausgabe */ /****************/ #ifdef _DEBUG ++<<<<<<< HEAD + printf ("SEND: "); + for (i = 0; i < iLinMsgLen; i++) + { + printf ("%02x ", pucLinMsgData[i]); + } + printf ("\n"); ++======= + lin_trace_message( MSG_TX_TRACE_DATA, pucLinMsgData, iLinMsgLen ); ++>>>>>>> rauch/jobrechner-import-20190607 #endif return 0; diff --cc ptxdist/local_src/ecu-codesys/linbus/linfunc.h index 4167cf9,005292b..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/linbus/linfunc.h +++ b/ptxdist/local_src/ecu-codesys/linbus/linfunc.h @@@ -10,7 -10,7 +10,11 @@@ \version $Rev: 1686 $ \b ECKELMANN INDUSTRIEAUTOMATION, WIESBADEN\n ++<<<<<<< HEAD + © Copyright 2010 ++======= + Copyright 2010 test ++>>>>>>> rauch/jobrechner-import-20190607 *******************************************************************************/ diff --cc ptxdist/local_src/ecu-codesys/optipoint/.gitignore index 030a7fa,030a7fa..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/optipoint/.gitignore +++ b/ptxdist/local_src/ecu-codesys/optipoint/.gitignore diff --cc ptxdist/local_src/ecu-codesys/optipoint/Makefile index 917a72c,917a72c..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/optipoint/Makefile +++ b/ptxdist/local_src/ecu-codesys/optipoint/Makefile diff --cc ptxdist/local_src/ecu-codesys/optipoint/OptiPoint.c index 341389c,341389c..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/optipoint/OptiPoint.c +++ b/ptxdist/local_src/ecu-codesys/optipoint/OptiPoint.c diff --cc ptxdist/local_src/ecu-codesys/optipoint/OptiPointDep.m4 index 5a80d4b,5a80d4b..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/optipoint/OptiPointDep.m4 +++ b/ptxdist/local_src/ecu-codesys/optipoint/OptiPointDep.m4 diff --cc ptxdist/local_src/ecu-codesys/optipoint/optipoint.pro index 3a47282,3a47282..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/optipoint/optipoint.pro +++ b/ptxdist/local_src/ecu-codesys/optipoint/optipoint.pro diff --cc ptxdist/local_src/ecu-codesys/pid_control/.gitignore index 49ad25b,49ad25b..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/pid_control/.gitignore +++ b/ptxdist/local_src/ecu-codesys/pid_control/.gitignore diff --cc ptxdist/local_src/ecu-codesys/pid_control/Controller.c index 6cd0d73,6cd0d73..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/pid_control/Controller.c +++ b/ptxdist/local_src/ecu-codesys/pid_control/Controller.c diff --cc ptxdist/local_src/ecu-codesys/pid_control/Controller.h index 2e2df98,2e2df98..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/pid_control/Controller.h +++ b/ptxdist/local_src/ecu-codesys/pid_control/Controller.h diff --cc ptxdist/local_src/ecu-codesys/pid_control/Makefile index bec37b8,bec37b8..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/pid_control/Makefile +++ b/ptxdist/local_src/ecu-codesys/pid_control/Makefile diff --cc ptxdist/local_src/ecu-codesys/pid_control/PIDControl.c index 92cb65e,92cb65e..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/pid_control/PIDControl.c +++ b/ptxdist/local_src/ecu-codesys/pid_control/PIDControl.c diff --cc ptxdist/local_src/ecu-codesys/pid_control/PIDControlDep.m4 index 6834742,6834742..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/pid_control/PIDControlDep.m4 +++ b/ptxdist/local_src/ecu-codesys/pid_control/PIDControlDep.m4 diff --cc ptxdist/local_src/ecu-codesys/pid_control/PIDControlItf.m4 index 85ac8e7,85ac8e7..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/pid_control/PIDControlItf.m4 +++ b/ptxdist/local_src/ecu-codesys/pid_control/PIDControlItf.m4 diff --cc ptxdist/local_src/ecu-codesys/pid_control/include/adv64.h index 5fcd1f5,5fcd1f5..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/pid_control/include/adv64.h +++ b/ptxdist/local_src/ecu-codesys/pid_control/include/adv64.h diff --cc ptxdist/local_src/ecu-codesys/pid_control/include/cmp.h index c6a10b3,c6a10b3..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/pid_control/include/cmp.h +++ b/ptxdist/local_src/ecu-codesys/pid_control/include/cmp.h diff --cc ptxdist/local_src/ecu-codesys/pid_control/include/copy.h index 1304eec,1304eec..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/pid_control/include/copy.h +++ b/ptxdist/local_src/ecu-codesys/pid_control/include/copy.h diff --cc ptxdist/local_src/ecu-codesys/pid_control/include/div.h index 61501c4,61501c4..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/pid_control/include/div.h +++ b/ptxdist/local_src/ecu-codesys/pid_control/include/div.h diff --cc ptxdist/local_src/ecu-codesys/pid_control/include/dsfxp.h index 6f2d008,6f2d008..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/pid_control/include/dsfxp.h +++ b/ptxdist/local_src/ecu-codesys/pid_control/include/dsfxp.h diff --cc ptxdist/local_src/ecu-codesys/pid_control/include/fir.h index 21408b2,21408b2..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/pid_control/include/fir.h +++ b/ptxdist/local_src/ecu-codesys/pid_control/include/fir.h diff --cc ptxdist/local_src/ecu-codesys/pid_control/include/fit.h index 9ffd11a,9ffd11a..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/pid_control/include/fit.h +++ b/ptxdist/local_src/ecu-codesys/pid_control/include/fit.h diff --cc ptxdist/local_src/ecu-codesys/pid_control/include/mul.h index 0932d79,0932d79..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/pid_control/include/mul.h +++ b/ptxdist/local_src/ecu-codesys/pid_control/include/mul.h diff --cc ptxdist/local_src/ecu-codesys/pid_control/include/neg.h index 8aa46c6,8aa46c6..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/pid_control/include/neg.h +++ b/ptxdist/local_src/ecu-codesys/pid_control/include/neg.h diff --cc ptxdist/local_src/ecu-codesys/pid_control/include/sat.h index 10ca969,10ca969..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/pid_control/include/sat.h +++ b/ptxdist/local_src/ecu-codesys/pid_control/include/sat.h diff --cc ptxdist/local_src/ecu-codesys/pid_control/include/shl.h index 7b9d97a,7b9d97a..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/pid_control/include/shl.h +++ b/ptxdist/local_src/ecu-codesys/pid_control/include/shl.h diff --cc ptxdist/local_src/ecu-codesys/pid_control/include/shr.h index de4d125,de4d125..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/pid_control/include/shr.h +++ b/ptxdist/local_src/ecu-codesys/pid_control/include/shr.h diff --cc ptxdist/local_src/ecu-codesys/pid_control/include/sqrt.h index b556089,b556089..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/pid_control/include/sqrt.h +++ b/ptxdist/local_src/ecu-codesys/pid_control/include/sqrt.h diff --cc ptxdist/local_src/ecu-codesys/pid_control/include/sum.h index 1d2a6bc,1d2a6bc..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/pid_control/include/sum.h +++ b/ptxdist/local_src/ecu-codesys/pid_control/include/sum.h diff --cc ptxdist/local_src/ecu-codesys/pid_control/include/tl_fabs.h index 3726a54,3726a54..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/pid_control/include/tl_fabs.h +++ b/ptxdist/local_src/ecu-codesys/pid_control/include/tl_fabs.h diff --cc ptxdist/local_src/ecu-codesys/pid_control/include/tl_math.h index c961863,c961863..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/pid_control/include/tl_math.h +++ b/ptxdist/local_src/ecu-codesys/pid_control/include/tl_math.h diff --cc ptxdist/local_src/ecu-codesys/pid_control/include/tllimits.h index ecff25e,ecff25e..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/pid_control/include/tllimits.h +++ b/ptxdist/local_src/ecu-codesys/pid_control/include/tllimits.h diff --cc ptxdist/local_src/ecu-codesys/pid_control/include/tlnomath.h index 610261c,610261c..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/pid_control/include/tlnomath.h +++ b/ptxdist/local_src/ecu-codesys/pid_control/include/tlnomath.h diff --cc ptxdist/local_src/ecu-codesys/pid_control/include/trig.h index 14cbdb5,14cbdb5..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/pid_control/include/trig.h +++ b/ptxdist/local_src/ecu-codesys/pid_control/include/trig.h diff --cc ptxdist/local_src/ecu-codesys/pid_control/pid_control.pro index 424192b,424192b..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/pid_control/pid_control.pro +++ b/ptxdist/local_src/ecu-codesys/pid_control/pid_control.pro diff --cc ptxdist/local_src/ecu-codesys/pid_control/tl_basetypes.h index dbf7574,dbf7574..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/pid_control/tl_basetypes.h +++ b/ptxdist/local_src/ecu-codesys/pid_control/tl_basetypes.h diff --cc ptxdist/local_src/ecu-codesys/pid_control/tl_defines_Ctrl.h index 0de9e45,0de9e45..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/pid_control/tl_defines_Ctrl.h +++ b/ptxdist/local_src/ecu-codesys/pid_control/tl_defines_Ctrl.h diff --cc ptxdist/local_src/ecu-codesys/pid_control/tl_types.h index 853f46a,853f46a..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/pid_control/tl_types.h +++ b/ptxdist/local_src/ecu-codesys/pid_control/tl_types.h diff --cc ptxdist/local_src/ecu-codesys/slc/.gitignore index b226b1a,b226b1a..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/slc/.gitignore +++ b/ptxdist/local_src/ecu-codesys/slc/.gitignore diff --cc ptxdist/local_src/ecu-codesys/slc/Makefile index b37648f,b37648f..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/slc/Makefile +++ b/ptxdist/local_src/ecu-codesys/slc/Makefile diff --cc ptxdist/local_src/ecu-codesys/slc/SLCControl.c index a6761ec,a6761ec..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/slc/SLCControl.c +++ b/ptxdist/local_src/ecu-codesys/slc/SLCControl.c diff --cc ptxdist/local_src/ecu-codesys/slc/SLCControlDep.m4 index 463e311,463e311..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/slc/SLCControlDep.m4 +++ b/ptxdist/local_src/ecu-codesys/slc/SLCControlDep.m4 diff --cc ptxdist/local_src/ecu-codesys/slc/slc.pro index 9f90743,9f90743..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/slc/slc.pro +++ b/ptxdist/local_src/ecu-codesys/slc/slc.pro diff --cc ptxdist/local_src/ecu-codesys/target_rootfs/Axis.iop index b61583b,8834bb0..0000000 Binary files differ diff --cc ptxdist/local_src/ecu-codesys/target_rootfs/AxisDE.iop index 3037a62,84c5fa2..0000000 Binary files differ diff --cc ptxdist/local_src/ecu-codesys/target_rootfs/AxisEN.iop index 1782746,a020e3d..0000000 Binary files differ diff --cc ptxdist/local_src/ecu-codesys/target_rootfs/AxisHEMCaxent.app index f84a67c,2add2e8..0000000 Binary files differ diff --cc ptxdist/local_src/ecu-codesys/target_rootfs/AxisHEMCaxent.crc index 40cee39,0c7e93b..0000000 Binary files differ diff --cc ptxdist/local_src/ecu-codesys/target_rootfs/CODESYSControl.cfg index 165c62b,903b106..0000000 --- a/ptxdist/local_src/ecu-codesys/target_rootfs/CODESYSControl.cfg +++ b/ptxdist/local_src/ecu-codesys/target_rootfs/CODESYSControl.cfg @@@ -26,4 -26,7 +26,10 @@@ Application.2=Axen itf.0.ipaddress=192.168.0.31 itf.0.name=main itf.0.networkmask=255.255.255.0 ++<<<<<<< HEAD ++======= + itf.1.ipaddress=172.21.0.31 + itf.1.name=develop + itf.1.networkmask=255.255.0.0 ++>>>>>>> rauch/jobrechner-import-20190607 diff --cc ptxdist/local_src/ecu-codesys/target_rootfs/Imperial.iop index a529565,afaa4f5..0000000 Binary files differ diff --cc ptxdist/local_src/ecu-codesys/target_rootfs/Metric.iop index 48fe23e,ec3c5ae..0000000 Binary files differ diff --cc ptxdist/local_src/ecu-codesys/target_rootfs/SKs_5x2.iop index 1f2b5b3,6012cd7..0000000 Binary files differ diff --cc ptxdist/local_src/ecu-codesys/target_rootfs/SKs_6x2.iop index ce27ffa,5a70fa9..0000000 Binary files differ diff --cc ptxdist/local_src/ecu-codesys/target_rootfs/SysFileMap.cfg index b9b4c6f,b9b4c6f..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/target_rootfs/SysFileMap.cfg +++ b/ptxdist/local_src/ecu-codesys/target_rootfs/SysFileMap.cfg diff --cc ptxdist/local_src/ecu-codesys/varispread/.gitignore index f62de9e,f62de9e..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/varispread/.gitignore +++ b/ptxdist/local_src/ecu-codesys/varispread/.gitignore diff --cc ptxdist/local_src/ecu-codesys/varispread/Makefile index 85dc025,85dc025..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/varispread/Makefile +++ b/ptxdist/local_src/ecu-codesys/varispread/Makefile diff --cc ptxdist/local_src/ecu-codesys/varispread/VariSpread.c index 96e2b8c,96e2b8c..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/varispread/VariSpread.c +++ b/ptxdist/local_src/ecu-codesys/varispread/VariSpread.c diff --cc ptxdist/local_src/ecu-codesys/varispread/VariSpreadDep.m4 index f534e49,f534e49..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/varispread/VariSpreadDep.m4 +++ b/ptxdist/local_src/ecu-codesys/varispread/VariSpreadDep.m4 diff --cc ptxdist/local_src/ecu-codesys/varispread/VariSpreadItf.m4 index 6abf838,6abf838..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/varispread/VariSpreadItf.m4 +++ b/ptxdist/local_src/ecu-codesys/varispread/VariSpreadItf.m4 diff --cc ptxdist/local_src/ecu-codesys/varispread/varispread.pro index 6b19612,6b19612..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-codesys/varispread/varispread.pro +++ b/ptxdist/local_src/ecu-codesys/varispread/varispread.pro diff --cc ptxdist/local_src/ecu-comp-cap/Makefile index 1872e03,d1ce400..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-comp-cap/Makefile +++ b/ptxdist/local_src/ecu-comp-cap/Makefile @@@ -25,6 -25,6 +25,10 @@@ ecu-comp-cap-objs := main.o comp_cap. obj-m := ecu-comp-cap.o modules modules_install clean: ++<<<<<<< HEAD + $(MAKE) -C $(PTX_KERNEL_DIR) M=$(CURDIR) V=$(V) $@ ++======= + $(MAKE) -C $(PTX_KERNEL_DIR) M=$(CURDIR) V=$(V) $@ ++>>>>>>> rauch/jobrechner-import-20190607 endif diff --cc ptxdist/local_src/ecu-comp-cap/comp_cap.c index fdb83c6,fdb83c6..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-comp-cap/comp_cap.c +++ b/ptxdist/local_src/ecu-comp-cap/comp_cap.c diff --cc ptxdist/local_src/ecu-comp-cap/comp_cap.h index 1c84510,1c84510..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-comp-cap/comp_cap.h +++ b/ptxdist/local_src/ecu-comp-cap/comp_cap.h diff --cc ptxdist/local_src/ecu-comp-cap/ecu-comp-cap.pro index fa4f146,fa4f146..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-comp-cap/ecu-comp-cap.pro +++ b/ptxdist/local_src/ecu-comp-cap/ecu-comp-cap.pro diff --cc ptxdist/local_src/ecu-comp-cap/etc/modules-load.d/ecu_comp_cap.conf index ffdf53d,ffdf53d..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-comp-cap/etc/modules-load.d/ecu_comp_cap.conf +++ b/ptxdist/local_src/ecu-comp-cap/etc/modules-load.d/ecu_comp_cap.conf diff --cc ptxdist/local_src/ecu-comp-cap/main.c index d16c95d,19bf8d6..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-comp-cap/main.c +++ b/ptxdist/local_src/ecu-comp-cap/main.c @@@ -76,7 -76,6 +76,10 @@@ int start_comp_cap( struct comp_cap_de void stop_comp_cap( struct comp_cap_dev *dev ); long get_value( struct comp_cap_dev *dev, int* value ); ++<<<<<<< HEAD + ++======= ++>>>>>>> rauch/jobrechner-import-20190607 static struct comp_cap_dev comp_cap_devices[] = { { .compCapIndex = 0, @@@ -354,10 -353,7 +357,14 @@@ long comp_cap_ioctl(struct file *filp, dev->tfb_value = user_param; break; ++<<<<<<< HEAD + case COMP_CAP_IOCGCOUNTER: + + retval = dev->cycl_counter; + break; ++======= + ++>>>>>>> rauch/jobrechner-import-20190607 default: /* redundant, as cmd was checked against MAXNR */ return -ENOTTY; diff --cc ptxdist/local_src/ecu-comp-cap/usr/lib/tmpfiles.d/ecu_comp_cap.conf index 1257b0d,1257b0d..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-comp-cap/usr/lib/tmpfiles.d/ecu_comp_cap.conf +++ b/ptxdist/local_src/ecu-comp-cap/usr/lib/tmpfiles.d/ecu_comp_cap.conf diff --cc ptxdist/local_src/ecu-control/ecu-control.pro index 0af7fae,0af7fae..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-control/ecu-control.pro +++ b/ptxdist/local_src/ecu-control/ecu-control.pro diff --cc ptxdist/local_src/ecu-control/ecucontrol.cpp index f30ddf1,f30ddf1..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-control/ecucontrol.cpp +++ b/ptxdist/local_src/ecu-control/ecucontrol.cpp diff --cc ptxdist/local_src/ecu-control/ecucontrol.h index d1f87e3,d1f87e3..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-control/ecucontrol.h +++ b/ptxdist/local_src/ecu-control/ecucontrol.h diff --cc ptxdist/local_src/ecu-control/ecufram.cpp index a415586,a415586..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-control/ecufram.cpp +++ b/ptxdist/local_src/ecu-control/ecufram.cpp diff --cc ptxdist/local_src/ecu-control/ecufram.h index b17b8c2,b17b8c2..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-control/ecufram.h +++ b/ptxdist/local_src/ecu-control/ecufram.h diff --cc ptxdist/local_src/ecu-control/ecuioanalog.cpp index e3841ef,7ac5b0c..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-control/ecuioanalog.cpp +++ b/ptxdist/local_src/ecu-control/ecuioanalog.cpp @@@ -160,7 -160,7 +160,11 @@@ int EcuIOAnalog::readInChannel(const EC fd2 = open("/dev/compcap1", 0); fd3 = open("/dev/compcap2", 0); usleep(500000); ++<<<<<<< HEAD + ulValue = ioctl(fd1, COMP_CAP_IOCGCOUNTER, &values); ++======= + ulValue = ioctl(fd1, COMP_CAP_IOCGVALUE, &values); ++>>>>>>> rauch/jobrechner-import-20190607 // if(values != 0) { // values = values / 66500; // } @@@ -176,7 -176,7 +180,11 @@@ fd3 = open("/dev/compcap2", 0); if(!fd) iRet = RETCODE_FILE_ACCESS_ERROR; usleep(500000); ++<<<<<<< HEAD + ulValue = ioctl(fd2, COMP_CAP_IOCGCOUNTER, &values); ++======= + ulValue = ioctl(fd2, COMP_CAP_IOCGVALUE, &values); ++>>>>>>> rauch/jobrechner-import-20190607 // if(values != 0) { // values = values / 66500; // } @@@ -192,7 -192,7 +200,11 @@@ fd3 = open("/dev/compcap2", 0); if(!fd) iRet = RETCODE_FILE_ACCESS_ERROR; usleep(500000); ++<<<<<<< HEAD + ulValue = ioctl(fd3, COMP_CAP_IOCGCOUNTER, &values); ++======= + ulValue = ioctl(fd3, COMP_CAP_IOCGVALUE, &values); ++>>>>>>> rauch/jobrechner-import-20190607 // if(values != 0) { // values = values / 66500; // } @@@ -379,61 -379,51 +391,95 @@@ int EcuIOAnalog::readChannelFromMAX1162 if ( channel == 34 ){ bChannel = 1; ++<<<<<<< HEAD + PCA9505::getInst().setOutput(PCA9505::EN_HS_1, true, false); ++======= ++>>>>>>> rauch/jobrechner-import-20190607 PCA9505::getInst().setOutput(PCA9505::EN_CS_1_10, false, false); } else if ( channel == 35 ){ bChannel = 1; ++<<<<<<< HEAD + PCA9505::getInst().setOutput(PCA9505::EN_HS_2, true, false); ++======= ++>>>>>>> rauch/jobrechner-import-20190607 PCA9505::getInst().setOutput(PCA9505::EN_CS_2_9, false, false); } else if ( channel == 36 ){ bChannel = 1; ++<<<<<<< HEAD + PCA9505::getInst().setOutput(PCA9505::EN_HS_3, true, false); ++======= ++>>>>>>> rauch/jobrechner-import-20190607 PCA9505::getInst().setOutput(PCA9505::EN_CS_3_8, false, false); } else if ( channel == 37 ){ bChannel = 1; ++<<<<<<< HEAD + PCA9505::getInst().setOutput(PCA9505::EN_HS_4, true, false); ++======= ++>>>>>>> rauch/jobrechner-import-20190607 PCA9505::getInst().setOutput(PCA9505::EN_CS_4_7, false, false); } else if ( channel == 38 ){ bChannel = 1; ++<<<<<<< HEAD + PCA9505::getInst().setOutput(PCA9505::EN_HS_5, true, false); ++======= ++>>>>>>> rauch/jobrechner-import-20190607 PCA9505::getInst().setOutput(PCA9505::EN_CS_5_6, false, false); } else if ( channel == 39 ){ bChannel = 2; ++<<<<<<< HEAD + PCA9505::getInst().setOutput(PCA9505::EN_HS_6, true, false); ++======= ++>>>>>>> rauch/jobrechner-import-20190607 PCA9505::getInst().setOutput(PCA9505::EN_CS_5_6, false, false); } else if ( channel == 40 ){ bChannel = 2; ++<<<<<<< HEAD + PCA9505::getInst().setOutput(PCA9505::EN_HS_7, true, false); ++======= ++>>>>>>> rauch/jobrechner-import-20190607 PCA9505::getInst().setOutput(PCA9505::EN_CS_4_7, false, false); } else if ( channel == 41 ){ bChannel = 2; ++<<<<<<< HEAD + PCA9505::getInst().setOutput(PCA9505::EN_HS_8, true, false); ++======= ++>>>>>>> rauch/jobrechner-import-20190607 PCA9505::getInst().setOutput(PCA9505::EN_CS_3_8, false, false); } else if ( channel == 42 ){ bChannel = 2; ++<<<<<<< HEAD + PCA9505::getInst().setOutput(PCA9505::EN_HS_9, true, false); ++======= ++>>>>>>> rauch/jobrechner-import-20190607 PCA9505::getInst().setOutput(PCA9505::EN_CS_2_9, false, false); } else if ( channel == 43 ){ bChannel = 2; ++<<<<<<< HEAD + PCA9505::getInst().setOutput(PCA9505::EN_HS_10, true, false); ++======= ++>>>>>>> rauch/jobrechner-import-20190607 PCA9505::getInst().setOutput(PCA9505::EN_CS_1_10, false, false); } /* Now the gpios are set, sleep until voltage is stable */ PCA9505::getInst().cleanUp(); ++<<<<<<< HEAD + usleep(500000); ++======= + usleep(1000); ++>>>>>>> rauch/jobrechner-import-20190607 } else if( channel == 44 ){ diff --cc ptxdist/local_src/ecu-control/ecuioanalog.h index 03bf522,03bf522..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-control/ecuioanalog.h +++ b/ptxdist/local_src/ecu-control/ecuioanalog.h diff --cc ptxdist/local_src/ecu-control/ecuiodigital.cpp index 1cfcc91,39825c3..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-control/ecuiodigital.cpp +++ b/ptxdist/local_src/ecu-control/ecuiodigital.cpp @@@ -242,10 -242,10 +242,17 @@@ int EcuIODigital::readInChannel( const { int iRet (RETCODE_OK); ++<<<<<<< HEAD + bool ok(false); + int iChannel(0); + int iValue(0); + int iGpioNr(0); ++======= + bool ok; + int iChannel; + int iValue; + int iGpioNr; ++>>>>>>> rauch/jobrechner-import-20190607 QString tmp; QStringList params = parameters.additionalParams(); @@@ -327,10 -327,10 +334,17 @@@ int EcuIODigital::readOutChannel( cons { int iRet (RETCODE_OK); ++<<<<<<< HEAD + bool ok(false); + int iChannel(0); + int iValue(0); + int iGpioNr(0); ++======= + bool ok; + int iChannel; + int iValue; + int iGpioNr; ++>>>>>>> rauch/jobrechner-import-20190607 QString tmp; QStringList params = parameters.additionalParams(); @@@ -465,10 -465,10 +479,17 @@@ int EcuIODigital::writeOutChannel( cons else if (iGpioNr >= 144) { // BANK2 ++<<<<<<< HEAD + // if (gpiosPCABank2.value(iGpioNr) == PCA9505::EN_MASTER_MODE) + // Ansteuerung von EN_MASTER_MODE + // Pin bliebt nur ACTIV, wenn LIN_NSLP Activ ist. + // PCA9505::getInst().setOutput(PCA9505::LIN_NSLP, ok, false); ++======= + if (gpiosPCABank2.value(iGpioNr) == PCA9505::EN_MASTER_MODE) + // Ansteuerung von EN_MASTER_MODE + // Pin bliebt nur ACTIV, wenn LIN_NSLP Activ ist. + PCA9505::getInst().setOutput(PCA9505::LIN_NSLP, ok, false); ++>>>>>>> rauch/jobrechner-import-20190607 PCA9505::getInst().setOutput(gpiosPCABank2.value(iGpioNr), ok, true); diff --cc ptxdist/local_src/ecu-control/ecuiodigital.h index 0b54acd,0b54acd..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-control/ecuiodigital.h +++ b/ptxdist/local_src/ecu-control/ecuiodigital.h diff --cc ptxdist/local_src/ecu-control/eculin.cpp index c0d07b9,c0d07b9..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-control/eculin.cpp +++ b/ptxdist/local_src/ecu-control/eculin.cpp diff --cc ptxdist/local_src/ecu-control/eculin.h index f8eb38e,f8eb38e..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-control/eculin.h +++ b/ptxdist/local_src/ecu-control/eculin.h diff --cc ptxdist/local_src/ecu-control/ecumotorcontrol.cpp index ac5e623,ac5e623..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-control/ecumotorcontrol.cpp +++ b/ptxdist/local_src/ecu-control/ecumotorcontrol.cpp diff --cc ptxdist/local_src/ecu-control/ecumotorcontrol.h index 4e2a9b8,4e2a9b8..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-control/ecumotorcontrol.h +++ b/ptxdist/local_src/ecu-control/ecumotorcontrol.h diff --cc ptxdist/local_src/ecu-control/ecuparameter.cpp index 2ddce93,2ddce93..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-control/ecuparameter.cpp +++ b/ptxdist/local_src/ecu-control/ecuparameter.cpp diff --cc ptxdist/local_src/ecu-control/ecuparameter.h index 8c5f2a8,8c5f2a8..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-control/ecuparameter.h +++ b/ptxdist/local_src/ecu-control/ecuparameter.h diff --cc ptxdist/local_src/ecu-control/ecusafety.cpp index a3914b2,ea8c121..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-control/ecusafety.cpp +++ b/ptxdist/local_src/ecu-control/ecusafety.cpp @@@ -98,8 -98,6 +98,11 @@@ int EcuSafety::threaded_triggerIOWatchd if( _guardThread ) pthread_setschedparam(_guardThread, SCHED_FIFO, &param ); ++<<<<<<< HEAD + + return 0; ++======= ++>>>>>>> rauch/jobrechner-import-20190607 } pthread_t EcuSafety::threadHdl() const diff --cc ptxdist/local_src/ecu-control/ecusafety.h index 2f276ba,2f276ba..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-control/ecusafety.h +++ b/ptxdist/local_src/ecu-control/ecusafety.h diff --cc ptxdist/local_src/ecu-control/ecutle.cpp index f52506a,814af70..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-control/ecutle.cpp +++ b/ptxdist/local_src/ecu-control/ecutle.cpp @@@ -43,144 -43,6 +43,147 @@@ /* here: Defines */ /*****************************************************************************/ ++<<<<<<< HEAD +#define WORKAROUND_TLE82353SA_C11_FUNCTION_CHANGE 1 + +/*****************************************************************************/ +/* here: Utility functions */ +/*****************************************************************************/ + +static +bool fixUpTLEReg(int tle_fd, unsigned long adr, unsigned long& value) +{ +#if WORKAROUND_TLE82353SA_C11_FUNCTION_CHANGE +/* + * Workaround for a functional change in the TLE82353SA between chip version + * B13 and chip version C11. + * + * In version C11 the "Current FB" value (bits 23:12) of registers 0x40, + * 0x41 and 0x41 needs to be multiplied by factor 2 compared to the older + * chip version B13. + * + * Fortunately the chip version can be extracted (at the cost of extra SPI + * bus traffic, if not cached "somewhere") and used to distinguish between + * both versions. + * + * ** Test sequence: + * -- snip -- + * # activate hardware safety (must run (="toggle") in the background + * # during the whole test!) + * ecu-control --safety wdt 800000 & + * # enable TLE + * ecu-control --io wdo 46 0 + * # enable power + * ecu-control --io wao 1 800 + * + * # after that it should be possible to read the power value back via + * ecu-control --tle read 0x40 + * -- snip -- + * + * Expected value should be around "0x0018c0f8". + * + * The resulting current (in Ampere) can be obtained by picking the + * nibbles out of the hexadecimal value above and then calculate the + * current like this: + * I=(0x18C / 0x0F8) * 0.75 == 1.197581 Ampere (which is close to the + * expected value of 1.2A) + * + * Quick ksh/ksh93 script to calculate the current value from the hex + * string: + * -- snip -- + * LC_NUMERICL='POSIX' + * float a b r + * + * instr="0x0018c0f8" + * + * # eregex capture from instr + * dummy="${instr//~(Er)(...)(...)}" + * a="0x${.sh.match[1]}" + * b="0x${.sh.match[2]}" + * + * (( r=(a*0.75) / b )) + * printf "result=%f\n" r' + * -- snip -- + * + */ + bool retval = false; + unsigned long tle_version = 0xDEADBEEF; + + switch(adr) + { + case 0x40: + case 0x41: + case 0x42: + if (!TLE82353SA::readICVersion(tle_fd, tle_version)) + { + (void)fprintf(stderr, "WARNING: EcuTle::readRegister: could not read TLE version, ucAdr=%x\n", (int)adr); + return false; + } + + switch(tle_version) + { + case 4: /* B13 step = 00000100 */ + retval = true; + break; + case 6: /* C11 step = 00000110 */ + { +#define TLE_CURRENT_FB_MASK (0x00FFF000UL) +#define TLE_CURRENT_FB_SHIFT (12) + unsigned long tmpval; + /* + * fetch bits 12-23 (counting from 0) for "Current FB" and + * move them to the lower bits... + */ + tmpval = (value & TLE_CURRENT_FB_MASK) >> TLE_CURRENT_FB_SHIFT; + + /* + * ... then multiply the value by 2 (and complain if + * the result gets too large to fit into 12 bits; + * pow(2,12)-1==0xFFF) ... + */ + tmpval *= 2; + if (tmpval > 0xFFF) + { + (void)fprintf(stderr, "fixUpTLEReg: value cutoff at 0xFFF %lx\n", tmpval); + tmpval = 0xFFF; + retval = false; + } + else + { + retval = true; + } + + /* + * ... and then shift the bits back into their place and into + * the value we wish to return. + */ + value &= ~TLE_CURRENT_FB_MASK; + value |= (tmpval << TLE_CURRENT_FB_SHIFT) & TLE_CURRENT_FB_MASK; + } + break; + default: + (void)fprintf(stderr, "EcuTle::readRegister: unknown TLE version %lx, no fixup done, ucAdr=%x, value=%lx\n", + tle_version, + (int)adr, + (unsigned long)value); + retval = false; + break; + } + break; + default: + retval = true; + break; + } + + return retval; +#else + return true; +#endif /* WORKAROUND_TLE82353SA_C11_FUNCTION_CHANGE */ +} + + ++======= ++>>>>>>> rauch/jobrechner-import-20190607 /*****************************************************************************/ /* here: Classes */ /*****************************************************************************/ @@@ -235,10 -97,7 +238,14 @@@ int EcuTle::execute_special(int iChanne /* initialized before */ ok = TLE82353SA::readRegister( fd, ucCmd, ulValue); if( ok ){ ++<<<<<<< HEAD + if (fixUpTLEReg(fd, ucCmd, ulValue)) + iRet = RETCODE_OK; + else + iRet = RETCODE_FAIL; ++======= + iRet = RETCODE_OK; ++>>>>>>> rauch/jobrechner-import-20190607 } else{ iRet = RETCODE_FAIL; @@@ -364,10 -223,7 +371,14 @@@ int EcuTle::readRegister(const ECuParam unsigned char ucAdr = (unsigned char)adr; ok = TLE82353SA::readRegister( fd, ucAdr, value); if( ok ){ ++<<<<<<< HEAD + if (fixUpTLEReg(fd, ucAdr, value)) + iRet = RETCODE_OK; + else + iRet = RETCODE_FAIL; ++======= + iRet = RETCODE_OK; ++>>>>>>> rauch/jobrechner-import-20190607 } else{ iRet = RETCODE_FAIL; diff --cc ptxdist/local_src/ecu-control/ecutle.h index 34f650d,34f650d..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-control/ecutle.h +++ b/ptxdist/local_src/ecu-control/ecutle.h diff --cc ptxdist/local_src/ecu-control/fram_info.txt index 187e358,187e358..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-control/fram_info.txt +++ b/ptxdist/local_src/ecu-control/fram_info.txt diff --cc ptxdist/local_src/ecu-control/install.pri index 5d0361c,5d0361c..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-control/install.pri +++ b/ptxdist/local_src/ecu-control/install.pri diff --cc ptxdist/local_src/ecu-control/io_info_analog_in.txt index b6b6064,b6b6064..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-control/io_info_analog_in.txt +++ b/ptxdist/local_src/ecu-control/io_info_analog_in.txt diff --cc ptxdist/local_src/ecu-control/io_info_analog_out.txt index c7b50ad,c7b50ad..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-control/io_info_analog_out.txt +++ b/ptxdist/local_src/ecu-control/io_info_analog_out.txt diff --cc ptxdist/local_src/ecu-control/io_info_digital_in.txt index a6e486d,a6e486d..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-control/io_info_digital_in.txt +++ b/ptxdist/local_src/ecu-control/io_info_digital_in.txt diff --cc ptxdist/local_src/ecu-control/io_info_digital_out.txt index cfae84a,cfae84a..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-control/io_info_digital_out.txt +++ b/ptxdist/local_src/ecu-control/io_info_digital_out.txt diff --cc ptxdist/local_src/ecu-control/lin_info.txt index b8974d7,b8974d7..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-control/lin_info.txt +++ b/ptxdist/local_src/ecu-control/lin_info.txt diff --cc ptxdist/local_src/ecu-control/main.cpp index 038c8a3,038c8a3..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-control/main.cpp +++ b/ptxdist/local_src/ecu-control/main.cpp diff --cc ptxdist/local_src/ecu-control/mc_info.txt index 721366a,721366a..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-control/mc_info.txt +++ b/ptxdist/local_src/ecu-control/mc_info.txt diff --cc ptxdist/local_src/ecu-control/resources.qrc index c4ef6f1,c4ef6f1..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-control/resources.qrc +++ b/ptxdist/local_src/ecu-control/resources.qrc diff --cc ptxdist/local_src/ecu-control/safety_info.txt index 6669df0,6669df0..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-control/safety_info.txt +++ b/ptxdist/local_src/ecu-control/safety_info.txt diff --cc ptxdist/local_src/ecu-control/tle_info.txt index 70f55a0,70f55a0..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-control/tle_info.txt +++ b/ptxdist/local_src/ecu-control/tle_info.txt diff --cc ptxdist/local_src/ecu-explore/emeasuretime.cpp index fe44ce3,fe44ce3..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-explore/emeasuretime.cpp +++ b/ptxdist/local_src/ecu-explore/emeasuretime.cpp diff --cc ptxdist/local_src/ecu-explore/emeasuretime.h index 504f045,504f045..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-explore/emeasuretime.h +++ b/ptxdist/local_src/ecu-explore/emeasuretime.h diff --cc ptxdist/local_src/ecu-jobctl/.gitignore index d1dcef8,d1dcef8..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-jobctl/.gitignore +++ b/ptxdist/local_src/ecu-jobctl/.gitignore diff --cc ptxdist/local_src/ecu-jobctl/app/app.pro index 558e794,558e794..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-jobctl/app/app.pro +++ b/ptxdist/local_src/ecu-jobctl/app/app.pro diff --cc ptxdist/local_src/ecu-jobctl/app/axent/axent.service index 7433aad,7433aad..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-jobctl/app/axent/axent.service +++ b/ptxdist/local_src/ecu-jobctl/app/axent/axent.service diff --cc ptxdist/local_src/ecu-jobctl/app/axis/axis.service index f781aa4,f781aa4..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-jobctl/app/axis/axis.service +++ b/ptxdist/local_src/ecu-jobctl/app/axis/axis.service diff --cc ptxdist/local_src/ecu-jobctl/app/demo/base.h index bfb5a62,11b753f..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-jobctl/app/demo/base.h +++ b/ptxdist/local_src/ecu-jobctl/app/demo/base.h @@@ -13,4 -13,15 +13,18 @@@ #include "datatypes.h" ++<<<<<<< HEAD ++======= + #include "pool.iop.h" + + #include "eculibitf.h" + #include "messages.h" + #include "memorymap.hpp" + #include "tempserviceglobals.h" //TEMP_DEBUG + #include "tempisoglobals.h" //TEMP_DEBUG + #include "tempVTglobals.h" //TEMP_DEBUG + #include <AppOutput.h> + + ++>>>>>>> rauch/jobrechner-import-20190607 #endif // BASE_H diff --cc ptxdist/local_src/ecu-jobctl/app/demo/ct_task.cpp index caa8569,8440fd7..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-jobctl/app/demo/ct_task.cpp +++ b/ptxdist/local_src/ecu-jobctl/app/demo/ct_task.cpp @@@ -1,78 -1,45 +1,120 @@@ #include <stdio.h> ++<<<<<<< HEAD +#include "ios.h" +#include "ct_task.h" +#include "etrace_defines.h" + +CT_Task::CT_Task(unsigned int priority, bool cyclic, unsigned long interval_us, char* name, const ECUParameters* pParas, ECUIO* pIOs): + ECUThread(priority, cyclic, interval_us, name, pParas, pIOs), + _myIoDriver(pParas, pIOs), + _myLibECU() +{ + // Never ever, never, never create Threads in Constructor. Never. ++======= + + #include "ct_task.h" + #include "etrace_defines.h" + + #include "ios.h" + + #include <control.h> + #include <runtimemeasurement.h> + + + CT_Task::CT_Task(unsigned int priority, bool cyclic, unsigned long interval_us, char* name, const ECUParameters* pParas, ECUIO* pIOs): + ECUThread(priority, cyclic, interval_us, name, pParas, pIOs), + _myIoDriver(pParas, pIOs) + { + // Never ever, never, never create Threads in Constructor. Never. ++>>>>>>> rauch/jobrechner-import-20190607 } CT_Task::~CT_Task() { ++<<<<<<< HEAD + // Der Destruktor wird beim Beenden des Programms aufgerufen. + // Bibliotheken sauber aufräumen: + _myLibECU.ExitLibrary(); + _myIoDriver.ExitLibrary(); ++======= + // Der Destruktor wird beim Beenden des Programms aufgerufen. + _myIoDriver.ExitLibrary(); ++>>>>>>> rauch/jobrechner-import-20190607 } void CT_Task::init(void) { ++<<<<<<< HEAD + // Initialisation of Librarys / Start Interfaces / Communications + + //LibECU + _myLibECU.InitLibrary(); + + //LibIODriver + _myIoDriver.InitLibrary(); +} + +void CT_Task::run(void) +{ + /* + * =======================================>PUT YOUR CODE HERE! + */ + static int i = 0; + + if (i == 1000) + { + ETRACE( TRC_CTTASK, "Mein toller Trace: %d und noch ein Parameter %d\n", 2, 0, 5 ); + i=0; + + enableTLE(1); + enablePower(0); + printf(" 2 TLE: %d\n", myIOs._ios.outputs.DigitalOutputs); + + if (safeSensorSupply == true) + { + printf ("safeSensorSupply\n"); + } + else if (safetyInputOne == true) + { + printf ("safetyInputOne\n"); + } + + } + else if (i == 999) + { + printf(" 1 TLE: %d\n", myIOs._ios.outputs.DigitalOutputs); + } + i++; + + + + /* + * =======================================>PUT YOUR CODE HERE! + */ + + // Trigger LibECU + _myLibECU.UpdateLibrary(); + + // Trigger IODriver + _myIoDriver.UpdateLibrary(); ++======= + // Initialisation of Librarys / Start Interfaces / Communications + + //LibIODriver + _myIoDriver.InitLibrary(); + } + + void CT_Task::run(void) + { + if ( control() != 0) + { + stop(); + return; + } + + // Trigger IODriver + _myIoDriver.UpdateLibrary(); ++>>>>>>> rauch/jobrechner-import-20190607 } diff --cc ptxdist/local_src/ecu-jobctl/app/demo/ct_task.h index 378474d,b4c811a..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-jobctl/app/demo/ct_task.h +++ b/ptxdist/local_src/ecu-jobctl/app/demo/ct_task.h @@@ -16,7 -16,6 +16,10 @@@ protected private: IODriver _myIoDriver; ++<<<<<<< HEAD + LibECU _myLibECU; ++======= ++>>>>>>> rauch/jobrechner-import-20190607 }; diff --cc ptxdist/local_src/ecu-jobctl/app/demo/datatypes.h index c4d83e9,b212cc8..0000000 --- a/ptxdist/local_src/ecu-jobctl/app/demo/datatypes.h +++ b/ptxdist/local_src/ecu-jobctl/app/demo/datatypes.h @@@ -6,9 -6,10 +6,17 @@@ typedef unsigned char uint8 typedef short int16; typedef unsigned short uint16; typedef int int32; ++<<<<<<< HEAD +//typedef unsigned int uint32; +typedef unsigned int uint; +typedef unsigned long ulong; +typedef unsigned char byte; ++======= + typedef unsigned long uint32; /* unsigned 32bit */ + typedef unsigned int uint; + typedef unsigned long ulong; + typedef unsigned char byte; + typedef unsigned long long uint64; ++>>>>>>> rauch/jobrechner-import-20190607 #endif // DATATYPES_H diff --cc ptxdist/local_src/ecu-jobctl/app/demo/demo.h index 1332f28,78679ea..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-jobctl/app/demo/demo.h +++ b/ptxdist/local_src/ecu-jobctl/app/demo/demo.h @@@ -82,13 -82,13 +82,23 @@@ // not conn. AT %QX13.0 : BOOL; (* HS_9 4A *) // not conn. AT %QX13.1 : BOOL; (* HS_10 4A *) // not conn. AT %QX13.2 : BOOL; (* HSP_1 12A *) ++<<<<<<< HEAD +#define enableTLE (((ECUIO::getInst().DigitalOutputs & (0x1 << 0) ) != 0) ? true : false) /** enable TLE HS 1-3 */ +#define bitEnableBridgeLeft (((ECUIO::getInst().DigitalOutputs & (0x1 << 0) ) != 0) ? true : false) /** enable HB_1 */ +#define bitEnableBridgeRight (((ECUIO::getInst().DigitalOutputs & (0x1 << 0) ) != 0) ? true : false) /** enable HB_2 */ +#define bitDirBridgeLeft (((ECUIO::getInst().DigitalOutputs & (0x1 << 0) ) != 0) ? true : false) /** direction HB_1 */ +#define bitDirBridgeRight (((ECUIO::getInst().DigitalOutputs & (0x1 << 0) ) != 0) ? true : false) /** direction HB_2 */ +#define enablePower (((ECUIO::getInst().DigitalOutputs & (0x1 << 0) ) != 0) ? true : false) /** power enable */ +#define rebootECU (((ECUIO::getInst().DigitalOutputs & (0x1 << 0) ) != 0) ? true : false) /** system reboot */ ++======= + #define enableTLE (((ECUIO::getInst().DigitalOutputs & (0x1 << 11) ) != 0) ? true : false) /** enable TLE HS 1-3 */ + #define bitEnableBridgeLeft (((ECUIO::getInst().DigitalOutputs & (0x1 << 12) ) != 0) ? true : false) /** enable HB_1 */ + #define bitEnableBridgeRight (((ECUIO::getInst().DigitalOutputs & (0x1 << 13) ) != 0) ? true : false) /** enable HB_2 */ + #define bitDirBridgeLeft (((ECUIO::getInst().DigitalOutputs & (0x1 << 14) ) != 0) ? true : false) /** direction HB_1 */ + #define bitDirBridgeRight (((ECUIO::getInst().DigitalOutputs & (0x1 << 15) ) != 0) ? true : false) /** direction HB_2 */ + #define enablePower (((ECUIO::getInst().DigitalOutputs & (0x1 << 16) ) != 0) ? true : false) /** power enable */ + #define rebootECU (((ECUIO::getInst().DigitalOutputs & (0x1 << 17) ) != 0) ? true : false) /** system reboot */ ++>>>>>>> rauch/jobrechner-import-20190607 /* ----------------------------------- Analog Out - PWM Ausgangssignale -------------------------------------------------*/ diff --cc ptxdist/local_src/ecu-jobctl/app/demo/demo.pro index 08c05b9,2a1ddd0..0000000 --- a/ptxdist/local_src/ecu-jobctl/app/demo/demo.pro +++ b/ptxdist/local_src/ecu-jobctl/app/demo/demo.pro @@@ -20,17 -20,219 +20,232 @@@ TARGET = ecu-jobctl-dem QT -= gui network core DEPENDPATH += . ../../platform/core ../../platform/iodriver ../../platform/ecu ../../extern/isobus INCLUDEPATH += . ../../platform/core ../../platform/iodriver ../../platform/ecu ../../extern/isobus ++<<<<<<< HEAD +CONFIG += debug +CONFIG -= qt + + +#includes Librarys +LIBS += -lrt +LIBS += -lpthread ++======= + INCLUDEPATH += ./moduleMdabis + + INCLUDEPATH += ./service + INCLUDEPATH += ./service/Isobus + INCLUDEPATH += ./service/TBState_FBs + INCLUDEPATH += ./service/AGPFB + INCLUDEPATH += ./service/FertilizerCharts + INCLUDEPATH += ./service/OptiPoint + INCLUDEPATH += ./service/Axent + INCLUDEPATH += ./service/Isobus/Callbacks/Administrative_Cbs + INCLUDEPATH += ./service/VariSpread/VariSpreadTable + INCLUDEPATH += ./service/VariSpread/SectionStates + INCLUDEPATH += ./service/TaskInit + INCLUDEPATH += ./service/Isobus/Auxiliaries + INCLUDEPATH += ./service/Isobus/TC + INCLUDEPATH += ./service/Isobus/Callbacks/PGN_Cbs + INCLUDEPATH += ./service/MachineConfig + + INCLUDEPATH += ./control/modules/ZaehlerFB + INCLUDEPATH += ./control/modules/RegelkurveFB + INCLUDEPATH += ./control/modules/SchieberFB + INCLUDEPATH += ./control/implement + INCLUDEPATH += ./control/Axent + INCLUDEPATH += ./control/Axent/limeEMC + INCLUDEPATH += ./control + INCLUDEPATH += ./control/modules + + INCLUDEPATH += ./global/Axent + INCLUDEPATH += ./global/Axent/EEPROM + INCLUDEPATH += ./global + + INCLUDEPATH += ../../extern/boost/boost_1_64_0 + INCLUDEPATH += ../../extern/varispread + INCLUDEPATH += ../../extern/optipoint + INCLUDEPATH += ../../extern/pid_control + INCLUDEPATH += ../../extern/pos_control + INCLUDEPATH += ../../extern/predos_control + INCLUDEPATH += ../../extern/emc + INCLUDEPATH += ../../extern/linbus + INCLUDEPATH += ../../extern/axmat + + #CONFIG += debug + + QMAKE_CXXFLAGS += -std=c++11 + + + # Component selection + # DEFINES += USE_UDPSERVER + DEFINES += USE_TCPSERVER + DEFINES += USE_BOOST_QUEUES + #DEFINES += USE_WIZARD + #DEFINES += USE_TRAID_FAIR_MODE + DEFINES += ENABLE_DIAG_LOGS + #DEFINES += USE_USB_CONFIG + DEFINES += SOLVE_LIB_FUNCTIONAL_BUG + DEFINES += EMC_CONTROL_ALEX + #DEFINES += USE_IMU + + #DEFINES += DEBUG_REGELKURVE + + #Wrokarounds + DEFINES += WORKAROUND_CLEAR_ALARMS #Problem: wbz driver sometimes does not detect, that an alarm is not shown anymore + + + + # IOs DEBUG defines + # DEFINES += DEBUG_ACTUATOR_DEBUG + + #debug VT + #DEFINES += DEBUG_CLIENT_EVENTS + #DEFINES += DEBUG_ISOVTAPPLIC + + # DEFINES += DEBUG_AXMAT + # DEFINES += DEBUG_AXMAT_IO_CHANGE + + #debug TC + #DEFINES += DEBUG_TCCLIENT + #debug FS + #DEFINES += DEBUG_FILESERVER + + # Console Output DEBUG defines + # DEFINES += DEBUG_PROCESSCONTROLQUEUE + # DEFINES += DEBUG_MESSAGES_QUEUEADDTOP_CONTROLQUEUE + # DEFINES += DEBUG_MESSAGES_QUEUEADDTOP_SERVICEQUEUE + # DEFINES += DEBUG_LINBUSFB + # DEFINES += DEBUG_AGP + # DEFINES += DEBUG_RS232 + # DEFINES += DEBUG_SYSTEM_IOS #writes all hw output values to stdout in the timerbaseservice.cpp + # DEFINES += DEBUG_TASK_COMM + # DEFINES += DEBUG_WBZ_DRIVER_STATES + # DEFINES += DEBUG_TASK_COMM_COUNTERS1 + # DEFINES += DEBUG_DDOP + + #************************************************ + #****************** VARI SPREAD ***************** + #************************************************ + # DEFINES += DEBUG_VARISPREAD + # DEFINES += DEBUG_VARISPREAD_NCWS + #DEFINES += DEBUG_VARISPREAD_SECTION_STATES + #DEFINES += DEBUG_VARI_SPREAD + + #********* VariSpreadSectionsHEMC.cpp ********** + #DEFINES += DEBUG_VS_TABLE_WIDTH_VSFAC + #DEFINES += DEBUG_VS_TABLE_AGP_RPM + + + # DEFINES += DEBUG_UDPSERVER + # DEFINES += DEBUG_FERTCHART + # DEFINES += DEBUG_AUTO_START + # DEFINES += DEBUG_TCPSERVER + # DEFINES += DEBUG_CONTROL_STATE + + #************************************************ + #********************** EMC ********************* + #************************************************ + # DEFINES += DEBUG_EMC + # DEFINES += DEBUG_EMC_CONTROL + # DEFINES += DEBUG_EMC_SERVICE + + + #DEFINES += DEBUG_RUNTIME_MEASUREMENT #can be used to find problems related to task jitter + + #DEFINES += DEBUG_SERVICE_RUNTIME_MEASUREMENT + # DEFINES += DEBUG_HARDWARE_CHECK + #DEFINES += DEBUG_ISO_CB_VT_MSG + + #************************************************ + #********************** AUX ********************* + #************************************************ + #DEFINES += DEBUG_ISO_CB_PREF_ASSIGN + + + # DEFINES += DEBUG_ISOBUS + # DEFINES += DEBUG_SPREAD_LIGHT + # DEFINES += DEBUG_FACTORY_SETTINGS + + # DEFINES += DEBUG_ALARMS + + # DEFINES += DEBUG_POS_CONTROL + # DEFINES += DEBUG_CONTOROL_PIPELINE + # DEFINES += DEBUG_WRITE_CONFIG + # DEFINES += DEBUG_WRITE_CONFIG_ONLY + # DEFINES += DEBUG_READ_CONFIG + + + + # Spread light + DEFINES += USE_SPREAD_LIGHT + + + #AXENT + # DEFINES += DEBUG_AXENT_SIM_MACHINE + + # DEFINES += DEBUG_SAFTY_INPUT + # DEFINES += DEBUG_WEIGHCELL + # DEFINES += DEBUG_WEIGHCELL_QUEUE + + # DEFINES += DEBUG_WEIGHCELL_CALIBRATION + + # DEFINES += DEBUG_SHAKER + # DEFINES += DEBUG_COMBROTOR + + # DEFINES += DEBUG_AXENT_STATE_MACHINE + + # DEFINES += DEBUG_PREDOS_CAL_PARAM + # DEFINES += DEBUG_AXENT_TANK_FILLSTATE + # DEFINES += DEBUG_LIME_FUNCTIONS + # DEFINES += DEBUG_DISC_CURRENT_OVERRIDE + # DEFINES += DEBUG_AXENT_OP_MODE + + # DEFINES += DEBUG_ZAEHLER_FB + #DEFINES += DEBUG_PREDOS_REF_VALUE + #DEFINES += DEBUG_DIFF_PREDOS_POS + #DEFINES += DEBUG_BELT_VALUES + #DEFINES += DEBUG_PREDOS_VALUES + + #*****************Kalk EMC********************* + #DEFINES += TEST_LIME_EMC + # DEFINES += DEBUG_AXENT_LIME_EMC_PARAMS + #DEFINES += DEBUG_AXENT_LIME_EMC_INPUTS + #DEFINES += DEBUG_AXENT_LIME_EMC_OUTPUTS + # DEFINES += DEBUG_LIME_STREAM_BUFFER + + #DEFINES += DEBUG_KALK_EMC_PREASSURE + #DEFINES += DEBUG_KALK_EMC_TORQUE + + #***************AXENT SIMULATION*************** + # DEFINES += DEBUG_AXIS_PP + # DEFINES += DEBUG_LIME_PP + # DEFINES += DEBUG_WEIGHCELL_SIM + # DEFINES += DEBUG_BYPASS_SAFTY_INPUT_AXENT + # DEFINES += DEBUG_AXENT_FL_AXIS_PP_SIM + + # Pressure return - old version + # DEFINES += USE_PRESSURE_RETURN + + DEFINES += "SVN_VERSION=\"\\\"$$system(svnversion -n)\\\"\"" + + #includes Librarys + LIBS += -lrt ++>>>>>>> rauch/jobrechner-import-20190607 LIBS += -L../../platform/core -lCore LIBS += -L../../platform/iodriver -lIODriver LIBS += -L../../platform/ecu -lECU LIBS += -L../../extern/isobus -lIsobus ++<<<<<<< HEAD ++======= + LIBS += -L../../extern/linbus -llinbus + LIBS += -L../../extern/emc -lemc + LIBS += -L../../extern/optipoint -loptipoint + LIBS += -L../../extern/pid_control -lpid_control + LIBS += -L../../extern/pos_control -lpos_control + LIBS += -L../../extern/predos_control -lpredos_control + LIBS += -L../../extern/varispread -lvarispread + LIBS += -L../../extern/axmat -laxmat + ++>>>>>>> rauch/jobrechner-import-20190607 # Input SOURCES += \ @@@ -39,16 -241,550 +254,564 @@@ st_task.cpp \ parameters.cpp \ iopfile.cpp \ ++<<<<<<< HEAD + isobus.cpp + ++======= + isobus.cpp \ + moduleMdabis/messages.cpp \ + switchondelaytimer.cpp \ + udpserver.cpp \ + service/TBState_FBs/TBStateTrunc.cpp \ + service/StartStopFB.cpp \ + service/TBState_FBs/TBState.cpp \ + service/TBState_FBs/TestPointDiagTBState.cpp \ + service/Service_globals.cpp \ + service/TBState_FBs/EntleerungTBState.cpp \ + service/TBState_FBs/AbdrehprobeTBState.cpp \ + service/Isobus/Alarm.cpp \ + service/AxisService.cpp \ + service/DiscStateFB.cpp \ + service/SpeedModeFB.cpp \ + service/ImplementSpeedFB.cpp \ + service/PlusMinusQuantityFB.cpp \ + control/modules/StirrerFB.cpp \ + service/LinbusFB.cpp \ + service/TelimatFB.cpp \ + service/AGPFB/AGPFB.cpp \ + service/AGPFB/AGPHEMCFB.cpp \ + service/FertilizerCharts/FertilizerChartFB.cpp \ + service/EMCServiceFB.cpp \ + service/MachineFB.cpp \ + service/OptiPoint/OptiPointFB.cpp \ + service/OptiPoint/OptiPointFBHEMC.cpp \ + service/BorderSpreadFB.cpp \ + service/Wiegezellen.cpp \ + service/Aktuatoren.cpp \ + service/SoftkeyHeldHandler.cpp \ + service/PosCtrlServiceFB.cpp \ + service/RS232.cpp \ + control/modules/ZaehlerFB/ZaehlerFB.cpp \ + GlobalUtils.cpp \ + control/modules/ZaehlerFB/ZaehlerHEMC.cpp \ + control/modules/RegelkurveFB/RegelkurveFB.cpp \ + control/modules/RegelkurveFB/RegelkurveFBQA.cpp \ + control/modules/SchieberFB/SchieberFB.cpp \ + control/modules/SchieberFB/SchieberFBHEMC.cpp \ + control/modules/PosCtrlControlFB.cpp \ + control/Control_globals.cpp \ + control/implement/controlAxisImplement.cpp \ + control/sendLeftScalePositionsToVT.cpp \ + control/sendRightScalePositionsToVT.cpp \ + control/control.cpp \ + control/processControlQueue.cpp \ + control/isTheSafeStateActive.cpp \ + service/Isobus/IsobusBindSKMasks.cpp \ + service/Isobus/IsobusIsoStart.cpp \ + service/TaskInit/InitServiceTaskData.cpp \ + service/HardwareCheck.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbTcExData.cpp \ + service/updateNumericValuesOnVT.cpp \ + service/VariSpread/VariSpreadTable/VariSpreadTable.cpp \ + service/VariSpread/VariSpreadTable/VariSpreadTableHEMC.cpp \ + service/VariSpread/SectionStates/VariSpreadSections.cpp \ + service/VariSpread/SectionStates/calcSectionStatesMain.cpp \ + service/VariSpread/SectionStates/processSectionStates.cpp \ + service/VariSpread/SectionStates/VariSpreadSectionsHEMC.cpp \ + service/TaskInit/InitServiceTaskDataMain.cpp \ + service/TaskInit/InitServiceTaskDataCreateEEPROMMap.cpp \ + service/TaskInit/InitServiceTaskDataReadData.cpp \ + service/FactorySettings.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_MAIN_SCREEN.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_DEBUG_GUI.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_MAIN_MENU.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_MACHINE_SET_1.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_MACHINE_SET_2.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_MACHINE_SET_3.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_SYSTEM_TEST.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_INFO_AXIS.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_TOTAL_COUNTER.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_TEST_DIAGNOSE_1.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_TEST_DIAGNOSE_2.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_TEST_DIAGNOSE_3.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_TEST_DIAGNOSE_4.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_SERVICE_TAB_1.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_SERVICE_TAB_2.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_SLIDER_CALIBRATION.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_AGP_CALIBRATION.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_HOPPER_CALIBRATION.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_DIAGNOSE_LIN_SLAVES.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_STARTUP_DIAG.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_HOPPER_COVER_AXIS.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_FACTORY_SET.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_BOOT_MENU.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_WARNING_INDICATOR_FOR_WEIGHT.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_MACHINE_OPTION_1.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_MACHINE_OPTION_2.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_MACHINE_OPTION_3.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_TRIP_COUNTER.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_KG_REST.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_MACHINE_TARE.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_METER_COUNTER.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_BOOT_CODE.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_SCALE_TRIP.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_SERV_CODE.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_START_WARNING.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_EMC_CONTROL_2.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_DISC_CONTROL.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_FERTILISER_PARAM_1.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_FERTILISER_PARAM_2.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_FERTILISER_PARAM_3.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_FERTILISER_PARAM_4.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_CHART_PAGE_1.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_CHART_PAGE_2.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_CHART_PAGE_3.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_CHART_PAGE_4.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_CHART_PAGE_5.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_CHART_OPTIONS.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_FERTILISER_PARAM_5.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_OPTIPOINT_1.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_OPTIPOINT_2.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_GPS_CONTROL_INFO.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_STIRRER.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_DIAG_EMC_SENSORS.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_TEST_HOPPER_COVER.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_DIAG_WEIGH_CELL_AXIS.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_SERVICE_LIN_1.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_SERVICE_LIN_2.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_BALANCE_CALIBRATION.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_EMPTY_FERTILIZER.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_KNOWN_QUANTITY.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_DEBUG.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_DIAG_LIN_TELIMAT.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_TELIMAT_CALIBRATION.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_AM_STOP_RELEASED.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_AM_ADJUST_DROP_POINT.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_AM_DISC_START.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_AM_STIRRER_OVERLOAD_CURRENT.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_AM_FREIER_ALARM.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_VT_CHANGE_NUMERIC_VALUE.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_AUXILIARY_INPUT_STATUS_TYPE_2.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_VT_SOFTKEY_AND_BUTTON_ACTIVATION.cpp \ + service/getStringFromData.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_VT_change_string_value.cpp \ + service/Isobus/Auxiliaries/writePrefAssignsToFile.cpp \ + service/calcRestMenge.cpp \ + service/Isobus/TC/TCClient.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtStatus.cpp \ + service/USBActionAGPTest.cpp \ + service/USBActionSpeedTest.cpp \ + service/processServiceQueue.cpp \ + service/Isobus/Callbacks/PGN_Cbs/isoCbStopButton.cpp \ + service/Isobus/IsobusIsoTecuPgnInstall.cpp \ + service/Isobus/IsobusIsoStopButtonInstall.cpp \ + service/Isobus/Callbacks/PGN_Cbs/isoCbWheelBasedSpeed.cpp \ + service/Isobus/Callbacks/PGN_Cbs/isoCbGroundBasedSpeed.cpp \ + service/Isobus/Callbacks/PGN_Cbs/isoCbNavigationBasedVehiculeSpeed.cpp \ + service/Isobus/Callbacks/PGN_Cbs/isoCbLanguageCommand.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbPrefAssign.cpp \ + service/Isobus/Auxiliaries/readPrefAssignsFromFile.cpp \ + service/ascii2string.cpp \ + service/fileServerClientFB.cpp \ + service/SoftKey.cpp \ + service/callTimerBasedServicePart.cpp \ + service/FertilizerCharts/FrtChrtImport.cpp \ + service/FertilizerCharts/FertChartSocket.cpp \ + TcpServer.cpp \ + BootloaderVersion.cpp \ + service/SpreadLight.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_SPREAD_LIGHT.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_TEST_SPREAD_LIGHT.cpp \ + moduleMdabis/runtimemeasurement.cpp \ + control/Axent/beltControl.cpp \ + control/Axent/CombRotorControl.cpp \ + control/Axent/FillLevelAXENT.cpp \ + control/Axent/FillLevelAxisPP.cpp \ + control/Axent/handleSaftyInputs.cpp \ + control/Axent/ImplementSpeed.cpp \ + control/Axent/LimeSpreader.cpp \ + control/Axent/oilcontrol.cpp \ + control/Axent/PredosControl.cpp \ + control/Axent/SendDataToServiceTask.cpp \ + control/Axent/setControlOPMode.cpp \ + control/Axent/ShakerControl.cpp \ + control/Axent/Weighcell.cpp \ + control/Axent/WeighcellHelp.cpp \ + global/Axent/EEPROM/handleEEPROM.cpp \ + global/Axent/FilterRawValue.cpp \ + global/Axent/ReadVoltage.cpp \ + global/Axent/RTMeasurement.cpp \ + service/Axent/calculateWeighCellSlopesFromCalibPoints.cpp \ + service/Axent/checkOPModeForSensorErrors.cpp \ + service/Axent/doTractorTyre100mCalib.cpp \ + service/Axent/FillProcessHandler.cpp \ + service/Axent/getAxentTankFillState.cpp \ + service/Axent/getMountedPack.cpp \ + service/Axent/PlusMinusPredos.cpp \ + service/Axent/setAxentServiceOPMode.cpp \ + service/Axent/updateAxentWorkingSetVisuOnVT.cpp \ + service/Axent/updateDebugGUI.cpp \ + service/Axent/StartStopKeyHandler.cpp \ + control/Axent/PIDControlAXENT.cpp \ + service/TaskInit/InitServiceTaskDataCreateEEPROMMap03.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_MACHINE_SET_4.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_EMC_CONTROL_1.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_DIAG_POPA_COVER_AXENT.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_TRACTOR_KMH_AXENT.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_TRACTOR_KMH_CALIB_AXENT.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_TRACTOR_KMH_EDIT_AXENT.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_CALIB_PREDOS.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_CALIBRATION_VALUE_AXENT.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_CALIB_SCALE_HOPPER_EY.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_CALIB_SCALE_KNOWN_MASS_1ST.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_CALIB_SCALE_KNOWN_MASS_2ND.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_CONTROL_PARAM_1.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_CONTROL_PARAM_2.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_DIAG_BELT.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_DIAG_HOPPER_COVER_AXENT.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_DIAG_LEVEL_SENSOR_AXIS.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_DIAG_LEVEL_SENSOR_AXENT.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_DIAG_LIME_FUNC.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_DIAG_OIL_TANK.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_DIAG_STIRRER.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_DIAG_AGP.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_DIAG_VOLTAGE.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_DIAG_TESTPOINTS_AGP.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_DIAG_HOPPER_COVER.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_FF_CALIBRATION_1.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_FF_CALIBRATION_3.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_FF_CALIBRATION_2.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_DIAG_PREDOS.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_CALIBRATION_VALUE_AXIS.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_DIAG_WEIGH_CELL_AXENT.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_FAST_EMPTYING_AXIS.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_INFO_AXENT.cpp \ + service/Axent/callTimerBasedServicePartAXENT.cpp \ + service/Axent/setOperationalPictureAXENT.cpp \ + service/Isobus/isobusPoolChangeFont.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_MACHINE_OPTION_4.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_SERVICE_TAB_3.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_STARTUP_DIAG_AXENT.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_HOPPER_COVER_AXENT.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_AXENT_FACTOR_1.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_DIAG_DOSING_SLIDER.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_DIAG_TESTPOINTS_SLIDER.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_DIAG_SPREADING_DISC.cpp \ + service/TaskInit/InitServiceTaskDataPoolInitAXENT.cpp \ + service/TaskInit/InitServiceTaskDataPoolInitAXIS.cpp \ + service/TaskInit/InitServiceTaskInitAxent.cpp \ + control/diagdatastream.cpp \ + control/Axent/controldiagstreamaxent.cpp \ + service/axentdiagstreamservice.cpp \ + control/EMCControlFB.cpp \ + service/TaskInit/InitServiceTaskDataPoolInitACCURA.cpp \ + service/TaskInit/InitServiceTaskInitAccura.cpp \ + service/TaskInit/InitServiceTaskDataCreateEEPROMMap04.cpp \ + service/Axent/updateAccuraWorkingSetVisuOnVT.cpp \ + service/Isobus/wbzdriverdebug.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isocbvtmsg_dm_param_pos_control.cpp \ + service/telimatsensor.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isocbvtmsg_dm_diag_telimat_sensor.cpp \ + service/wlansettings.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isocbvtmsg_dm_machine_option_5.cpp \ + service/MachineConfig/MachineConfig.cpp \ + service/TaskInit/InitServiceTaskDataCreateEEPROMMap05.cpp \ + service/Isobus/AppOutput.cpp \ + service/Isobus/vtclient.cpp \ + service/Isobus/poolbase.cpp \ + service/Isobus/controlfunction.cpp \ + service/Isobus/callbackhelpers.cpp \ + service/Isobus/vtapplication.cpp \ + service/Isobus/isoclientbase.cpp \ + service/TaskInit/InitServiceTaskDataCreateEEPROMMap06.cpp \ + service/TaskInit/InitServiceTaskDataCreateEEPROMMap07.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_WIZARD_START.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_WIZARD_END.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_WIZARD_6.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_WIZARD_5.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_WIZARD_4.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_WIZARD_3.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_WIZARD_2.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_WIZARD_1.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_DISPLAY_SETTINGS.cpp \ + service/Isobus/IsobusIsoNextVt.cpp \ + debug_task.cpp \ + service/Isobus/vtappbase.cpp \ + service/Axmat/axmat.cpp \ + service/Axmat/axmatcommmodule.cpp \ + service/Axmat/axmatdiag.cpp \ + service/Axmat/axmatutils.cpp \ + service/Axmat/coupleaxmat.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_DIAG_LEVEL_SENSOR.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_DOSING_SLIDER.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_EMC_CONTROL.cpp \ + diaglog.cpp \ + service/rs232stream.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_AXMAT_PARAM_3.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_AXMAT_PARAM_2.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_AXMAT_PARAM_1.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_AXMAT_DIAG.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_AXMAT_CALIB_3.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_AXMAT_CALIB_2.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_AXMAT_CALIB_1.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_AM_AXMAT_ERROR.cpp \ + control/Axent/axentStateMachine.cpp \ + control/Axent/PredosControlDiff.cpp \ + service/Axent/KalkEMCServiceFB.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_TEST_LIME_EMC.cpp \ + service/Isobus/IsobusAppTCClientLogOut.cpp \ + control/Axent/limeEMC/InterfaceKalkEMC.c \ + control/Axent/limeEMC/KalkEMCCtrlMain.c \ + service/TaskInit/InitServiceTaskDataCreateEEPROMMap08.cpp \ + service/USBActionKalkEMC.cpp \ + service/TaskInit/InitServiceTaskDataCreateEEPROMMap09.cpp \ + service/TaskInit/InitServiceTaskDataCreateEEPROMMap10.cpp \ + service/Isobus/diagclient.cpp \ + service/Isobus/Callbacks/PGN_Cbs/isoCbTimeDate.cpp \ + service/Isobus/IsobusIsoTimeDateInstall.cpp \ + service/Isobus/workaroundVT.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_EMC_FACTOR_2.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_EMC_FACTOR_1.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_DIAG_GSE_SENSOR.cpp \ + service/gseSensor.cpp \ + service/Isobus/Callbacks/PGN_Cbs/isoCbGetVtInformationation.cpp \ + service/TaskInit/InitServiceTaskDataCreateEEPROMMap11.cpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg_DM_DIAG_IMU.cpp \ + service/Isobus/IsobusIsoIMUInstall.cpp \ + service/Isobus/Callbacks/PGN_Cbs/isoCbIMUData.cpp \ + service/TaskInit/InitServiceTaskDataCreateEEPROMMap12.cpp ++>>>>>>> rauch/jobrechner-import-20190607 HEADERS += \ ct_task.h \ st_task.h \ parameters.h \ ++<<<<<<< HEAD + ios.h \ ++======= ++>>>>>>> rauch/jobrechner-import-20190607 base.h \ iopfile.h \ datatypes.h \ etrace_defines.h \ ++<<<<<<< HEAD + isobus.h + ++======= + isobus.h \ + tempserviceglobals.h \ + tempisoglobals.h \ + pool.iop.h \ + demo.h \ + moduleMdabis/messages.h \ + allisoincludes.h \ + memorymap.hpp \ + tempVTglobals.h \ + switchondelaytimer.h \ + udpserver.h \ + service/StartStopFB.h \ + service/TBState_FBs/TBStateTrunc.h \ + service/TBState_FBs/TBState.h \ + service/TBState_FBs/TestPointDiagTBState.h \ + service/Service_globals.h \ + service/TBState_FBs/EntleerungTBState.h \ + service/TBState_FBs/AbdrehprobeTBState.h \ + service/Isobus/Alarm.h \ + global/Alarms.h \ + service/VT_constants.h \ + service/ServiceState.h \ + service/AxisService.h \ + service/DiscStateFB.h \ + service/SpeedModeFB.h \ + service/ImplementSpeedFB.h \ + service/PlusMinusQuantityFB.h \ + control/modules/StirrerFB.h \ + SoftkeyState.h \ + service/LinbusFB.h \ + service/TelimatFB.h \ + service/AGPFB/AGPFB.h \ + service/AGPFB/AGPHEMCFB.h \ + service/FertilizerCharts/FertilizerChartFB.h \ + service/EMCServiceFB.h \ + service/DiscType.h \ + service/MachineFB.h \ + service/OptiPoint/OptiPointFB.h \ + service/OptiPoint/OptiPointFBHEMC.h \ + service/BorderSpreadFB.h \ + global/BorderSpreadMode.h \ + global/BorderSpreadState.h \ + service/Wiegezellen.h \ + service/Aktuatoren.h \ + global/ActuatorType.h \ + service/SoftkeyHeldHandler.h \ + service/PosCtrlServiceFB.h \ + service/RS232.h \ + control/modules/ZaehlerFB/ZaehlerFB.h \ + control/Control_constants.h \ + GlobalUtils.h \ + NumFloatUnion.h \ + control/modules/ZaehlerFB/ZaehlerHEMC.h \ + control/modules/RegelkurveFB/RegelkurveFB.h \ + control/modules/RegelkurveFB/RegelkurveFBQA.h \ + control/modules/SchieberFB/SchieberFB.h \ + control/modules/SchieberFB/SchieberFBHEMC.h \ + control/modules/PosCtrlControlFB.h \ + control/Control_globals.h \ + control/implement/controlAxisImplement.h \ + control/sendLeftScalePositionsToVT.h \ + control/sendRightScalePositionsToVT.h \ + control/control.h \ + control/ControlState.h \ + control/processControlQueue.h \ + control/isTheSafeStateActive.h \ + service/CheckHardwareState.h \ + service/TaskInit/InitServiceTaskData.h \ + service/HardwareCheck.h \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtMsg.h \ + service/Isobus/IsobusHandles.h \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbTcExData.h \ + service/updateNumericValuesOnVT.h \ + service/FertilizerCharts/FertilizationType.h \ + service/RunningScreenSelectableParam.h \ + service/VariSpread/VariSpreadTable/VariSpreadTable.h \ + service/VariSpread/VariSpreadTable/VariSpreadTableHEMC.h \ + service/VariSpread/SectionStates/VariSpreadSections.h \ + service/VariSpread/SectionStates/CalcSectionStatesMainInternalStates.h \ + service/VariSpread/SectionStates/CalcSectionStatesMainOutputs.h \ + service/VariSpread/SectionStates/CalcSectionStateCommands.h \ + service/VariSpread/SectionStates/calcSectionStatesMain.h \ + service/VariSpread/SectionStates/CalcSectionStateErrors.h \ + service/VariSpread/SectionStates/ProcessSectionStatesInputType.h \ + service/VariSpread/SectionStates/ProcessSectionStatesOutputType.h \ + service/VariSpread/SectionStates/processSectionStates.h \ + service/VariSpread/SectionStates/VariSpreadSectionsHEMC.h \ + service/SCType.h \ + service/Manufacturer.h \ + doc/SensorsAndActuators.h \ + service/FactorySettings.h \ + service/getStringFromData.h \ + service/Isobus/Auxiliaries/writePrefAssignsToFile.h \ + service/MaskState.h \ + service/SliderCalibrationStateType.h \ + service/AGPFB/AGPCalibrationStateType.h \ + service/calcRestMenge.h \ + service/Isobus/AuxBooleanNonLatchedState.h \ + service/Isobus/TC/TCClient.hpp \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbVtStatus.h \ + service/USBActionAGPTest.h \ + service/USBActionSpeedTest.h \ + service/processServiceQueue.h \ + service/Isobus/Callbacks/PGN_Cbs/isoCbStopButton.h \ + service/Isobus/Callbacks/PGN_Cbs/isoCbWheelBasedSpeed.h \ + service/Isobus/Callbacks/PGN_Cbs/isoCbGroundBasedSpeed.h \ + service/Isobus/Callbacks/PGN_Cbs/isoCbNavigationBasedVehiculeSpeed.h \ + service/Isobus/Callbacks/PGN_Cbs/isoCbLanguageCommand.h \ + service/Isobus/Callbacks/Administrative_Cbs/isoCbPrefAssign.h \ + service/Isobus/Auxiliaries/readPrefAssignsFromFile.h \ + service/ascii2string.h \ + service/FS_CLIENT_NESTED_STATE.h \ + service/FS_CLIENT_STATE.h \ + service/FS_MCM_DIR_STATE.h \ + service/fileServerClientFB.h \ + service/SoftKey.h \ + service/callTimerBasedServicePart.h \ + service/FertilizerCharts/FrtChrtImport.hpp \ + service/FertilizerCharts/FertChartSocket.hpp \ + TcpServer.h \ + BootloaderVersion.h \ + service/SpreadLight.h \ + QE_DE_2_.iop.h \ + SKs_6x2_72x72.iop.h \ + moduleMdabis/runtimemeasurement.h \ + control/Axent/beltControl.h \ + control/Axent/CCMeasurement.h \ + control/Axent/CombRotorControl.h \ + control/Axent/FillLevelAXENT.h \ + control/Axent/FillLevelAxisPP.h \ + control/Axent/handleSaftyInputs.h \ + control/Axent/ImplementSpeed.h \ + control/Axent/LimeSpreader.h \ + control/Axent/oilcontrol.h \ + control/Axent/PredosControl.h \ + control/Axent/SendDataToServiceTask.h \ + control/Axent/setControlOPMode.h \ + control/Axent/ShakerControl.h \ + control/Axent/Weighcell.h \ + control/Axent/WeighcellHelp.h \ + global/Axent/EEPROM/handleEEPROM.h \ + global/Axent/FilterRawValue.h \ + global/Axent/ReadVoltage.h \ + global/Axent/RTMeasurement.h \ + service/Axent/calculateWeighCellSlopesFromCalibPoints.h \ + service/Axent/checkOPModeForSensorErrors.h \ + service/Axent/doTractorTyre100mCalib.h \ + service/Axent/FillProcessHandler.h \ + service/Axent/getAxentTankFillState.h \ + service/Axent/getMountedPack.h \ + service/Axent/PlusMinusPredos.h \ + service/Axent/setAxentServiceOPMode.h \ + service/Axent/updateDebugGUI.h \ + service/Axent/updateNumericValuesOnVT.h \ + Unit_system_imperial.iop.h \ + Unit_system_metric.iop.h \ + service/Axent/StartStopKeyHandler.h \ + control/Axent/PIDControlAXENT.h \ + service/AxentStates.h \ + service/Axent/callTimerBasedServicePartAXENT.h \ + service/Axent/setOperationalPictureAXENT.h \ + global/SpreaderType.h \ + control/diagdatastream.h \ + control/Axent/controldiagstreamaxent.h \ + service/axentdiagstreamservice.h \ + control/EMCControlFB.h \ + service/Axent/updateWorkingSetVisuOnVT.h \ + debug_task.h \ + service/Isobus/wbzdriverdebug.h \ + service/telimatsensor.h \ + service/wlansettings.h \ + ios.h \ + service/MachineConfig/MachineConfig.h \ + service/MachineConfig/ConfigDbData.h \ + service/Isobus/AppOutput.h \ + service/Isobus/vtclient.h \ + global/functionalmod.h \ + service/Isobus/poolbase.h \ + service/Isobus/controlfunction.h \ + service/Isobus/callbackhelpers.h \ + service/Isobus/vtapplication.h \ + service/Isobus/vtappbase.h \ + service/Isobus/isoclientbase.h \ + global/SpeedMode.h \ + global/singleton.h \ + service/Isobus/callablestarter.h \ + service/Axmat/axmat.h \ + service/Axmat/axmatcommmodule.h \ + service/Axmat/axmatdiag.h \ + service/Axmat/axmatutils.h \ + service/Axmat/coupleaxmat.h \ + service/Axmat/interfaceagpaxmat.h \ + service/Axmat/interfacefertchartaxmat.h \ + service/Axmat/interfacers232comselectoraxmat.h \ + diaglog.h \ + global/atomicslot.h \ + global/atomicsignal.h \ + service/rs232stream.h \ + global/callbacklistbase.h \ + control/Axent/axentStateMachine.h \ + control/Axent/PredosControlDiff.h \ + service/Axent/KalkEMCServiceFB.h \ + SKs_5x2_72x72.iop.h \ + control/Axent/limeEMC/InterfaceKalkEMC.h \ + control/Axent/limeEMC/KalkEMCCtrlMain.h \ + control/Axent/limeEMC/multiword_types.h \ + control/Axent/limeEMC/rtwtypes.h \ + service/USBActionKalkEMC.h \ + service/Isobus/diagclient.h \ + service/Isobus/Callbacks/PGN_Cbs/isoCbTimeDate.h \ + service/Isobus/workaroundVT.h \ + service/gseSensor.h \ + service/driveMode.h \ + service/Isobus/Callbacks/PGN_Cbs/isoCbGetVtInformation.h \ + service/Isobus/Callbacks/PGN_Cbs/isoCbIMUData.h + DISTFILES += ++>>>>>>> rauch/jobrechner-import-20190607 diff --cc ptxdist/local_src/ecu-jobctl/app/demo/ecu-jobctl-demo.service index b16f3b9,b16f3b9..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-jobctl/app/demo/ecu-jobctl-demo.service +++ b/ptxdist/local_src/ecu-jobctl/app/demo/ecu-jobctl-demo.service diff --cc ptxdist/local_src/ecu-jobctl/app/demo/etrace_defines.h index 61885d7,b172752..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-jobctl/app/demo/etrace_defines.h +++ b/ptxdist/local_src/ecu-jobctl/app/demo/etrace_defines.h @@@ -10,5 -10,6 +10,9 @@@ #define TRC_PARADUMP __TRC_PARADUMP #define TRC_CTTASK 2 #define TRC_ISOCANRX 3 ++<<<<<<< HEAD ++======= + #define TRC_STASK 4 ++>>>>>>> rauch/jobrechner-import-20190607 #endif // ETRACE_DEFINES_H diff --cc ptxdist/local_src/ecu-jobctl/app/demo/iopfile.cpp index d0be556,4163abb..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-jobctl/app/demo/iopfile.cpp +++ b/ptxdist/local_src/ecu-jobctl/app/demo/iopfile.cpp @@@ -44,19 -44,19 +44,32 @@@ int IsoPoolObjectLoad( char* pcFileName if (pFile == NULL ){ /* Datei konnte nicht geoeffnet werden */ err = errno; ++<<<<<<< HEAD + error(0, err, "ERROR on IsoPoolObjectLoad. File could not be opened!"); + ++======= + error(0, err, "ERROR on IsoPoolObjectLoad. File %s could not be opened!", pcFileName); ++>>>>>>> rauch/jobrechner-import-20190607 return err; } /************************/ /* IOP-Groesse erfragen */ /************************/ ++<<<<<<< HEAD + stat( pcFileName, &file_stat ); + ptIsoPool->ulIOPSize = file_stat.st_size; //Ermittelt Größe in Bytes + if ((errno != 0) || (ptIsoPool->ulIOPSize == 0)) { + + /* Dateigroesse ungueltig */ ++======= + errno = 0; + stat( pcFileName, &file_stat ); + ptIsoPool->ulIOPSize = (unsigned long)file_stat.st_size; //Ermittelt GröÃ?e in Bytes + if ((errno != 0) || (ptIsoPool->ulIOPSize == 0)) { + + /* Dateigroesse ungueltig */ ++>>>>>>> rauch/jobrechner-import-20190607 err = errno; error(0, err, "ERROR on IsoPoolObjectLoad. File size is wrong."); @@@ -64,12 -64,14 +77,22 @@@ fclose(pFile); return err; ++<<<<<<< HEAD + } ++======= + } + ++>>>>>>> rauch/jobrechner-import-20190607 /**********************/ /* IOP-Speicher holen */ /**********************/ ++<<<<<<< HEAD + ptIsoPool->pbIOPData = (unsigned char*)malloc(ptIsoPool->ulIOPSize+1); ++======= + errno = 0; + ptIsoPool->pbIOPData = (unsigned char*)malloc((size_t)ptIsoPool->ulIOPSize+1); ++>>>>>>> rauch/jobrechner-import-20190607 if ((errno != 0) || (ptIsoPool->pbIOPData == NULL)) { /* Dateigroesse ungueltig */ @@@ -88,6 -90,7 +111,10 @@@ /**********************/ /* IOP-Daten einlesen */ /**********************/ ++<<<<<<< HEAD ++======= + errno = 0; ++>>>>>>> rauch/jobrechner-import-20190607 result = fread (ptIsoPool->pbIOPData,1,ptIsoPool->ulIOPSize,pFile); if ((errno != 0) || (result != ptIsoPool->ulIOPSize)) { @@@ -108,6 -111,92 +135,95 @@@ return err; } ++<<<<<<< HEAD ++======= + int IsoPoolObjectAppend( char* pcFileName, T_ISO_POOL* ptIsoPool ) + { + FILE * pFile; /* Filehandle */ + struct stat file_stat; + int err = 0; /* Ergebnis der Funktionen */ + size_t result; /* Gelesene Bytes */ + unsigned long fileLength; + unsigned long origDataLength; + + /*********************/ + /* IOP-Datei oeffnen */ + /*********************/ + pFile = fopen ( pcFileName,"rb" ); //rb for non text files + if (pFile == NULL ){ + /* Datei konnte nicht geoeffnet werden */ + err = errno; + error(0, err, "ERROR on IsoPoolObjectLoad. File %s could not be opened!", pcFileName); + return err; + } + + /************************/ + /* IOP-Groesse erfragen */ + /************************/ + errno = 0; + stat( pcFileName, &file_stat ); + fileLength = (unsigned long)file_stat.st_size; //Ermittelt GröÃ?e in Bytes + if ((errno != 0) || (fileLength == 0)) { + + /* Dateigroesse ungueltig */ + err = errno; + error(0, err, "ERROR on IsoPoolObjectLoad. File size is wrong."); + + /* Datei schliessen */ + fclose(pFile); + + return err; + } + origDataLength = ptIsoPool->ulIOPSize; + ptIsoPool->ulIOPSize = ptIsoPool->ulIOPSize + fileLength; + + + /**********************/ + /* IOP-Speicher holen */ + /**********************/ + errno = 0; + ptIsoPool->pbIOPData = (unsigned char*)realloc(ptIsoPool->pbIOPData,(size_t)ptIsoPool->ulIOPSize+1); + if ((errno != 0) || (ptIsoPool->pbIOPData == NULL)) { + + /* Dateigroesse ungueltig */ + err = errno; + error(0, err, "ERROR on IsoPoolObjectLoad. No Memory allocated."); + + /* Datei schliessen */ + fclose(pFile); + free(ptIsoPool->pbIOPData); + ptIsoPool->pbIOPData = NULL; + ptIsoPool->ulIOPSize = 0; + + return err; + } + + + /**********************/ + /* IOP-Daten einlesen */ + /**********************/ + errno = 0; + result = fread (&(ptIsoPool->pbIOPData[origDataLength]),1,fileLength,pFile); + if ((errno != 0) || (result != fileLength)) { + + /* IOP-Daten konnten nicht gelesen werden */ + err = errno; + error(0, err, "ERROR on IsoPoolObjectLoad. No Memory allocated."); + + /* Datei schliessen */ + fclose(pFile); + free(ptIsoPool->pbIOPData); + ptIsoPool->pbIOPData = NULL; + ptIsoPool->ulIOPSize = 0; + + return err; + } + + + return err; + } + ++>>>>>>> rauch/jobrechner-import-20190607 int IsoPoolObjectFree( unsigned char *pbIOPData ) diff --cc ptxdist/local_src/ecu-jobctl/app/demo/iopfile.h index 73e4665,19bb43a..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-jobctl/app/demo/iopfile.h +++ b/ptxdist/local_src/ecu-jobctl/app/demo/iopfile.h @@@ -49,6 -49,9 +49,12 @@@ int IsoPoolObjectLoad( char* pcFileName */ int IsoPoolObjectFree( unsigned char *pbIOPData ); ++<<<<<<< HEAD ++======= + + int IsoPoolObjectAppend( char* pcFileName, T_ISO_POOL* ptIsoPool ); + ++>>>>>>> rauch/jobrechner-import-20190607 #endif /* __ISOIOP_H__ */ diff --cc ptxdist/local_src/ecu-jobctl/app/demo/ios.h index def3d0b,e3bdb40..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-jobctl/app/demo/ios.h +++ b/ptxdist/local_src/ecu-jobctl/app/demo/ios.h @@@ -12,22 -12,25 +12,44 @@@ extern ECUIO myIOs #define stirrerCurrentMirror myIOs._ios.inputs.AIN_4 /** AIN 4 0-5V stirrer return signal */ #define Pos_Slide_L myIOs._ios.inputs.AIN_5 /** AIN 5 0-5V Position von Schieber Links */ #define Pos_Slide_R myIOs._ios.inputs.AIN_6 /** AIN 6 0-5V Position von Schieber Rechts */ ++<<<<<<< HEAD +#define levelLeft myIOs._ios.inputs.AIN_7 /** AIN 11 0-12V Fuellstand Links */ +#define levelRight myIOs._ios.inputs.AIN_8 /** AIN 12 0-20mA Fuellstand Rechts */ +#define wScale_L myIOs._ios.inputs.AIN_9 /** AIN 13 4-20mA Waage Links */ +#define wScale_R myIOs._ios.inputs.AIN_10 /** AIN 13 4-20mA Waage Links */ +/*#define input_ain11 myIOs._ios.inputs.AIN_11 +#define input_ain12 myIOs._ios.inputs.AIN_12 +#define input_ain13 myIOs._ios.inputs.AIN_13 +#define input_ain14 myIOs._ios.inputs.AIN_14 +#define input_ain15 myIOs._ios.inputs.AIN_15 +#define input_ain16 myIOs._ios.inputs.AIN_16 +#define input_ain17 myIOs._ios.inputs.AIN_17 +#define input_ain18 myIOs._ios.inputs.AIN_18 +#define input_ain19 myIOs._ios.inputs.AIN_19 +#define input_ain20 myIOs._ios.inputs.AIN_20 +#define input_ain21 myIOs._ios.inputs.AIN_21 +#define input_ain22 myIOs._ios.inputs.AIN_22*/ ++======= + #define levelLeft myIOs._ios.inputs.AIN_11 /** AIN 11 0-12V Fuellstand Links - Capacitive */ + #define levelRight myIOs._ios.inputs.AIN_12 /** AIN 12 0-20mA Fuellstand Rechts - Capacitive */ + //#define input_ain9 myIOs._ios.inputs.AIN_9 + //#define input_ain10 myIOs._ios.inputs.AIN_10 + //#define input_ain11 myIOs._ios.inputs.AIN_11 + //#define input_ain12 myIOs._ios.inputs.AIN_12 + #define wScale_L myIOs._ios.inputs.AIN_13 /** AIN 13 4-20mA Waage Links */ + #define wScale_R myIOs._ios.inputs.AIN_14 /** AIN 14 4-20mA Waage Rechts */ + //#define input_ain15 myIOs._ios.inputs.AIN_15 + //#define input_ain16 myIOs._ios.inputs.AIN_16 + //#define input_ain17 myIOs._ios.inputs.AIN_17 + //#define input_ain18 myIOs._ios.inputs.AIN_18 + //#define input_ain19 myIOs._ios.inputs.AIN_19 + //#define input_ain20 myIOs._ios.inputs.AIN_20 + #define wGseAngleSensor myIOs._ios.inputs.AIN_21 + //#define input_ain22 myIOs._ios.inputs.AIN_22 + + #define wTelimat_Down myIOs._ios.inputs.AIN_15 + #define wTelimat_Up myIOs._ios.inputs.AIN_8 ++>>>>>>> rauch/jobrechner-import-20190607 #define voltageSensorSupply12V myIOs._ios.inputs.VFB_12V_SENSOR #define voltageSupply5V myIOs._ios.inputs.VFB_5V_IO @@@ -50,7 -53,7 +72,11 @@@ #define proDiscusRSpeedLeft myIOs._ios.inputs.CC_1 /** CC_1 rpm left */ #define proDiscusRSpeedRight myIOs._ios.inputs.CC_2 /** CC_2 rpm right */ ++<<<<<<< HEAD +#define udiSpeedImp myIOs.inputs.CC_3 /** CC_3 Impulse Geschwindigkeit */ ++======= + #define udiSpeedImp myIOs._ios.inputs.CC_3 /** CC_3 Impulse Geschwindigkeit */ ++>>>>>>> rauch/jobrechner-import-20190607 #define errorDiscLeft myIOs._ios.inputs.CC_ERR_1 /** CC_1 rpm error left */ #define errorDiscRight myIOs._ios.inputs.CC_ERR_2 /** CC_2 rpm error right */ @@@ -62,14 -65,15 +88,26 @@@ /* -------------------------------------- Digitale Eingangssignale - DigitalIn ----------------------------------------*/ ++<<<<<<< HEAD +#define errorBridgeSlideActLeft (((myIOs._ios.inputs.DigitalInputs & (0x1 << 0) ) != 0) ? true : false) /** error state HB_1 */ +#define errorBridgeSlideActRight (((myIOs._ios.inputs.DigitalInputs & (0x1 << 1) ) != 0) ? true : false) /** error state HB_2 */ +#define safetyInputOne (((myIOs._ios.inputs.DigitalInputs & (0x1 << 2) ) != 0) ? true : false) /** status safety input one */ +#define safetyInputTwo (((myIOs._ios.inputs.DigitalInputs & (0x1 << 3) ) != 0) ? true : false) /** status safety input two */ +#define safeSensorSupply (((myIOs._ios.inputs.DigitalInputs & (0x1 << 4) ) != 0) ? true : false) /** status safe sensor supply */ + +/* -------------------------------------- Digitale Ausgangssignale - DigitalOut ----------------------------------------*/ + ++======= + //#define errorBridgeSlideActLeft (((myIOs._ios.outputs.DigitalOutputs & (0x1 << 0) ) != 0) ? true : false) /** error state HB_1 */ + //#define errorBridgeSlideActRight (((myIOs._ios.outputs.DigitalOutputs & (0x1 << 1) ) != 0) ? true : false) /** error state HB_2 */ + //#define safetyInputOne (((myIOs._ios.outputs.DigitalOutputs & (0x1 << 2) ) != 0) ? true : false) /** status safety input one */ + //#define safetyInputTwo (((myIOs._ios.outputs.DigitalOutputs & (0x1 << 3) ) != 0) ? true : false) /** status safety input two */ + //#define safeSensorSupply (((myIOs._ios.outputs.DigitalOutputs & (0x1 << 4) ) != 0) ? true : false) /** status safe sensor supply */ + + /* -------------------------------------- Digitale Ausgangssignale - DigitalOut ----------------------------------------*/ + + ++>>>>>>> rauch/jobrechner-import-20190607 #define enableRelayStirrer(x) ((x) ? (myIOs._ios.outputs.DigitalOutputs |= (0x1 << 0) ) : (myIOs._ios.outputs.DigitalOutputs &= ~(0x1 << 0) )) /** HS_1 4A */ //#define HS_2(x) ((x) ? (myIOs._ios.outputs.DigitalOutputs |= (0x1 << 1) ) : (myIOs._ios.outputs.DigitalOutputs &= ~(0x1 << 1) )) /** HS_2 4A */ //#define HS_3(x) ((x) ? (myIOs._ios.outputs.DigitalOutputs |= (0x1 << 2) ) : (myIOs._ios.outputs.DigitalOutputs &= ~(0x1 << 2) )) /** HS_3 4A */ @@@ -81,13 -85,33 +119,43 @@@ //#define HS_9(x) ((x) ? (myIOs._ios.outputs.DigitalOutputs |= (0x1 << 8) ) : (myIOs._ios.outputs.DigitalOutputs &= ~(0x1 << 8) )) /** HS_9 4A */ //#define HS_10(x) ((x) ? (myIOs._ios.outputs.DigitalOutputs |= (0x1 << 9) ) : (myIOs._ios.outputs.DigitalOutputs &= ~(0x1 << 9) )) /** HS_10 4A */ //#define HSP_1(x) ((x) ? (myIOs._ios.outputs.DigitalOutputs |= (0x1 << 10) ) : (myIOs._ios.outputs.DigitalOutputs &= ~(0x1 << 10) )) /** HSP_1 12A */ ++<<<<<<< HEAD +#define enableTLE(x) ((x) ? (myIOs._ios.outputs.DigitalOutputs |= (0x1 << 11) ) : (myIOs._ios.outputs.DigitalOutputs &= ~(0x1 << 11) )) /** enable TLE HS 1-3 */ +#define bitEnableBridgeLeft(x) ((x) ? (myIOs._ios.outputs.DigitalOutputs |= (0x1 << 12) ) : (myIOs._ios.outputs.DigitalOutputs &= ~(0x1 << 12) )) /** enable HB_1 */ +#define bitEnableBridgeRight(x) ((x) ? (myIOs._ios.outputs.DigitalOutputs |= (0x1 << 13) ) : (myIOs._ios.outputs.DigitalOutputs &= ~(0x1 << 13) )) /** enable HB_2 */ +#define bitDirBridgeLeft(x) ((x) ? (myIOs._ios.outputs.DigitalOutputs |= (0x1 << 14) ) : (myIOs._ios.outputs.DigitalOutputs &= ~(0x1 << 14) )) /** direction HB_1 */ +#define bitDirBridgeRight(x) ((x) ? (myIOs._ios.outputs.DigitalOutputs |= (0x1 << 15) ) : (myIOs._ios.outputs.DigitalOutputs &= ~(0x1 << 15) )) /** direction HB_2 */ +#define enablePower(x) ((x) ? (myIOs._ios.outputs.DigitalOutputs |= (0x1 << 16) ) : (myIOs._ios.outputs.DigitalOutputs &= ~(0x1 << 16) )) /** power enable */ +#define rebootECU(x) ((x) ? (myIOs._ios.outputs.DigitalOutputs |= (0x1 << 17) ) : (myIOs._ios.outputs.DigitalOutputs &= ~(0x1 << 17) )) /** system reboot */ ++======= + + /** enable TLE HS 1-3 */ + #define enableTLE(x) ((x) ? (myIOs._ios.outputs.DigitalOutputs |= (0x1 << 11) ) : (myIOs._ios.outputs.DigitalOutputs &= ~(0x1 << 11) )) + #define enableTLEGet (((myIOs._ios.outputs.DigitalOutputs & (0x1 << 11) ) != 0) ? true : false) + + /** enable HB_1 */ + #define bitEnableBridgeLeft(x) ((x) ? (myIOs._ios.outputs.DigitalOutputs |= (0x1 << 12) ) : (myIOs._ios.outputs.DigitalOutputs &= ~(0x1 << 12) )) + + /** enable HB_2 */ + #define bitEnableBridgeRight(x) ((x) ? (myIOs._ios.outputs.DigitalOutputs |= (0x1 << 13) ) : (myIOs._ios.outputs.DigitalOutputs &= ~(0x1 << 13) )) + + /** direction HB_1 */ + #define bitDirBridgeLeftSet(x) ((x) ? (myIOs._ios.outputs.DigitalOutputs |= (0x1 << 14) ) : (myIOs._ios.outputs.DigitalOutputs &= ~(0x1 << 14) )) + #define bitDirBridgeLeftGet (((myIOs._ios.outputs.DigitalOutputs & (0x1 << 14) ) != 0) ? true : false) + + /** direction HB_2 */ + #define bitDirBridgeRightSet(x) ((x) ? (myIOs._ios.outputs.DigitalOutputs |= (0x1 << 15) ) : (myIOs._ios.outputs.DigitalOutputs &= ~(0x1 << 15) )) + #define bitDirBridgeRightGet (((myIOs._ios.outputs.DigitalOutputs & (0x1 << 15) ) != 0) ? true : false) + + + /** power enable */ + #define enablePower(x) ((x) ? (myIOs._ios.outputs.DigitalOutputs |= (0x1 << 16) ) : (myIOs._ios.outputs.DigitalOutputs &= ~(0x1 << 16) )) + #define enablePowerGet (((myIOs._ios.outputs.DigitalOutputs & (0x1 << 16) ) != 0) ? true : false) + + /** system reboot */ + #define rebootECU(x) ((x) ? (myIOs._ios.outputs.DigitalOutputs |= (0x1 << 17) ) : (myIOs._ios.outputs.DigitalOutputs &= ~(0x1 << 17) )) + ++>>>>>>> rauch/jobrechner-import-20190607 /* ----------------------------------- Analog Out - PWM Ausgangssignale -------------------------------------------------*/ @@@ -99,4 -123,141 +167,144 @@@ #define PWMOutBridgeRight myIOs._ios.outputs.HB2 /** PWM HB_2 10A 100Hz - IO2 PIN 14 HB_2- and PIN 28 HB_2+ */ ++<<<<<<< HEAD ++======= + + /**********************************************************************************************************************************************/ + /**********************************************************************AXENT*******************************************************************/ + /**********************************************************************************************************************************************/ + + /* ------------------------------------Analoge Eingangssignale - AnalogIn ------------------------------------------*/ + #define pressureLeft myIOs._ios.inputs.AIN_1 /** AIN 1 0-20mA / 0-5V Drehmoment links*/ + #define pressureRight myIOs._ios.inputs.AIN_2 /** AIN 2 0-20mA / 0-5V Drehmoment rechts */ + #define pressureReturn myIOs._ios.inputs.AIN_3 /** AIN 3 0-20mA Getriebewelle Rechts */ + #define mixerLoad myIOs._ios.inputs.AIN_4 /** AIN 4 0-5V stirrer return signal */ + #define slidePosLeft myIOs._ios.inputs.AIN_5 /** AIN 5 0-5V Position Schieber Links */ + #define slidePosRight myIOs._ios.inputs.AIN_6 /** AIN 6 0-5V Position Schieber Rechts */ + #define predosPosLeft myIOs._ios.inputs.AIN_7 /** AIN 7 0-20mA Vordosierschieber links */ + #define predosPosRight myIOs._ios.inputs.AIN_8 /** AIN 8 0-20mA Vordosierschieber links */ + #define sensorAxentTank myIOs._ios.inputs.AIN_9 /** AIN 9 0-12V Leermelder AXENT - Capacitive */ + #define sensorSonicRight myIOs._ios.inputs.AIN_10 /** AIN 10 0-12V Leermelder (US-Sensor) rechts AXIS-PP */ + //#define input_ain11 myIOs._ios.inputs.AIN_11 /** AIN 11 0-12V n.c. */ + //#define input_ain12 myIOs._ios.inputs.AIN_12 /** AIN 12 0-12V n.c. */ + #define weighCellLeft myIOs._ios.inputs.AIN_13 /** AIN 13 0-20mA Wiegezelle hinten links */ + #define weighCellRight myIOs._ios.inputs.AIN_14 /** AIN 14 0-20mA Wiegezelle hinten rechts */ + #define weighCellFront myIOs._ios.inputs.AIN_15 /** AIN 15 0-20mA Wiegezelle vorne links + rechts */ + //#define input_ain16 myIOs._ios.inputs.AIN_16 /** AIN 16 0-20mA n.c. */ + //#define input_ain17 myIOs._ios.inputs.AIN_17 /** AIN 17 0-20mA n.c. */ + #define oilLevel myIOs._ios.inputs.AIN_18 /** AIN 18 0-12V �lstand - Capacitive */ + #define oilTemperature myIOs._ios.inputs.AIN_19 /** AIN 19 0-5V �ltemperatur */ + #define sensorSonicLeft myIOs._ios.inputs.AIN_20 /** AIN 20 0-12V Leermelder (US-Sensor) links AXIS-PP */ + //#define input_ain21 myIOs._ios.inputs.AIN_21 /** AIN 21 0-12V n.c. */ + #define limePowerPackDetection myIOs._ios.inputs.AIN_22 /** AIN 22 0-12V Lime - PP Detection - Spannungsteiler */ + + #define voltageSensorSupply12V myIOs._ios.inputs.VFB_12V_SENSOR + #define voltageSupply5V myIOs._ios.inputs.VFB_5V_IO + #define voltageECU myIOs._ios.inputs.VFB_12V_ECU + #define voltageSupply8_2V myIOs._ios.inputs.VFB_8V2_SENSOR + #define voltageSensorSupply5V myIOs._ios.inputs.VFB_5V_SENSOR + #define voltageSupply3_3V myIOs._ios.inputs.VFB_3V3_IO + #define voltagePWR myIOs._ios.inputs.VFB_12V_PWR + #define voltageUbInternal myIOs._ios.inputs.VFB_UB_INT + + /* -----------------------------Strommessung ----------------------------------------------*/ + #define currentSlideActLeft myIOs._ios.inputs.FB_HB_1 /** Feedback HB_1 10A Dosierschiber links AXIS-PP */ + #define currentSlideActRight myIOs._ios.inputs.FB_HB_2 /** Feedback HB_2 10A Dosierschiber links AXIS-PP */ + + #define currentValveDiscLeft myIOs._ios.inputs.FB_HS_PWM1 /** Feedback HS_PWM_1 1,5A Ventil Wurfscheibe links */ + #define currentValveDiscRight myIOs._ios.inputs.FB_HS_PWM2 /** Feedback HS_PWM_2 1,5A Ventil Wurfscheibe rechts */ + #define currentValveBelt myIOs._ios.inputs.FB_HS_PWM3 /** Feedback HS_PWM_3 1,5A Ventil F�rderband */ + + #define currentMixerHS myIOs._ios.inputs.CUR_FB_HS_1 /** Feedback HS_1 4A R�hrwerk AXIS-PP*/ + #define currentValvePredosLeftOpen myIOs._ios.inputs.CUR_FB_HS_2 /** Feedback HS_2 4A Ventil Vordosierschieber links �ffnen */ + #define currentValvePredosLeftClose myIOs._ios.inputs.CUR_FB_HS_3 /** Feedback HS_3 4A Ventil Vordosierschieber links schlie�en */ + #define currentValvePredosRightOpen myIOs._ios.inputs.CUR_FB_HS_4 /** Feedback HS_4 4A Ventil Vordosierschieber rechts �ffnen */ + #define currentValvePredosRightClose myIOs._ios.inputs.CUR_FB_HS_5 /** Feedback HS_5 4A Ventil Vordosierschieber rechts schlie�en */ + #define currentValveHopperCoverOpen myIOs._ios.inputs.CUR_FB_HS_6 /** Feedback HS_6 4A Ventil Abdeckplane �ffnen */ + #define currentValveHopperCoverClose myIOs._ios.inputs.CUR_FB_HS_7 /** Feedback HS_7 4A Ventil Abdeckplane schlie�en*/ + #define currentValveCombRotor myIOs._ios.inputs.CUR_FB_HS_8 /** Feedback HS_8 4A Abk�mmwalze */ + #define currentShaker myIOs._ios.inputs.CUR_FB_HS_9 /** Feedback HS_9 4A R�ttler */ + //#define current HS_10 myIOs._ios.inputs.CUR_FB_HS_10 /** Feedback HS_10 4A n.c.*/ + + #define currentFan myIOs._ios.inputs.CUR_FB_HSP_1 /** Feedback HSP_1 12A Ventilator �lk�hler*/ + //#define currentExtern myIOs._ios.inputs.CUR_FB_EXT /** Feedback Extern 4A n.c.*/ + + /* --------------Compare Capture and Digital Interrupts / Compare Capture Eingangssignale - CCIn ---------------------*/ + + #define CCDiscSpeedLeft myIOs._ios.inputs.CC_1 /** CC_1 Zeit zw. Impulsen Wurfscheibe links 10^-6s*/ + #define CCDiscSpeedRight myIOs._ios.inputs.CC_2 /** CC_2 Zeit zw. Impulsen Wurfscheibe rechts 10^-6s*/ + #define CCImplementSpeed myIOs._ios.inputs.CC_3 /** CC_3 Zeit zw. Impulsen Radgeschwindigkeit 10^-6s*/ + + //#define DINT_1 myIOs._ios.inputs.DINT_1 /** DINT_1 Zeit zw. Impulsen n.c. 10^-6s*/ + #define CCBeltSpeed myIOs._ios.inputs.DINT_2 /** DINT_2 Zeit zw. Impulsen Bandgeschwindigkeit 10^-6s*/ + + //#define errorDiscLeft myIOs._ios.inputs.CC_ERR_1 /** CC_1 rpm error left */ + //#define errorDiscRight myIOs._ios.inputs.CC_ERR_2 /** CC_2 rpm error right */ + //#define input_cc_err_3 myIOs._ios.inputs.CC_ERR_2 + + #define CCDiscSpeedLeftCounter myIOs._ios.inputs.CC_RES_1 /** Counter CC_1 Counter rpm left */ + #define CCDiscSpeedRightCounter myIOs._ios.inputs.CC_RES_2 /** Counter CC_2 Counter rpm right */ + #define CCImplementSpeedCounter myIOs._ios.inputs.CC_RES_3 /** Counter CC_3 Counter tractor speed */ + + //#define DINT_RES_1 myIOs._ios.inputs.DINT_RES_1 /** DINT_RES_1 Anzahl Impulse n.c. */ + #define CCBeltSpeedCounter myIOs._ios.inputs.DINT_RES_2 /** DINT_RES_2 Anzahl Impulse Bandgeschwindigkeit */ + + /* -------------------------------------- Digitale Eingangssignale - DigitalIn ----------------------------------------*/ + #define errorBridgeSlideActLeft (((myIOs._ios.inputs.DigitalInputs & (0x1 << 0) ) != 0) ? true : false) /** error state HB_1 */ + #define errorBridgeSlideActRight (((myIOs._ios.inputs.DigitalInputs & (0x1 << 1) ) != 0) ? true : false) /** error state HB_2 */ + #define safetyInputOne (((myIOs._ios.inputs.DigitalInputs & (0x1 << 2) ) != 0) ? true : false) /** status safety input one */ + #define safetyInputTwo (((myIOs._ios.inputs.DigitalInputs & (0x1 << 3) ) != 0) ? true : false) /** status safety input two */ + #define safeSensorSupply (((myIOs._ios.inputs.DigitalInputs & (0x1 << 4) ) != 0) ? true : false) /** status safe sensor supply */ + + /* -------------------------------------- Digitale Ausgangssignale - DigitalOut ----------------------------------------*/ + + #define startMixer(x) ((x) ? (myIOs._ios.outputs.DigitalOutputs |= (0x1 << 0) ) : (myIOs._ios.outputs.DigitalOutputs &= ~(0x1 << 0) )) /** HS_1 4A R�hrwerk AXIS-PP*/ + #define valvePredosLeftOpen(x) ((x) ? (myIOs._ios.outputs.DigitalOutputs |= (0x1 << 1) ) : (myIOs._ios.outputs.DigitalOutputs &= ~(0x1 << 1) )) /** HS_2 4A Ventil Vordosierschieber links �ffnen */ + #define valvePredosLeftClose(x) ((x) ? (myIOs._ios.outputs.DigitalOutputs |= (0x1 << 2) ) : (myIOs._ios.outputs.DigitalOutputs &= ~(0x1 << 2) )) /** HS_3 4A Ventil Vordosierschieber links schlie�en */ + #define valvePredosRightOpen(x) ((x) ? (myIOs._ios.outputs.DigitalOutputs |= (0x1 << 3) ) : (myIOs._ios.outputs.DigitalOutputs &= ~(0x1 << 3) )) /** HS_4 4A Ventil Vordosierschieber rechts �ffnen */ + #define valvePredosRightClose(x) ((x) ? (myIOs._ios.outputs.DigitalOutputs |= (0x1 << 4) ) : (myIOs._ios.outputs.DigitalOutputs &= ~(0x1 << 4) )) /** HS_5 4A Ventil Vordosierschieber rechts schlie�en */ + #define valveHopperCoverOpen(x) ((x) ? (myIOs._ios.outputs.DigitalOutputs |= (0x1 << 5) ) : (myIOs._ios.outputs.DigitalOutputs &= ~(0x1 << 5) )) /** HS_6 4A Ventil Abdeckplane �ffnen */ + #define valveHopperCoverClose(x) ((x) ? (myIOs._ios.outputs.DigitalOutputs |= (0x1 << 6) ) : (myIOs._ios.outputs.DigitalOutputs &= ~(0x1 << 6) )) /** HS_7 4A Ventil Abdeckplane schlie�en */ + #define valveCombRotorStart(x) ((x) ? (myIOs._ios.outputs.DigitalOutputs |= (0x1 << 7) ) : (myIOs._ios.outputs.DigitalOutputs &= ~(0x1 << 7) )) /** HS_8 4A Abk�mmwalze */ + #define shakerStart(x) ((x) ? (myIOs._ios.outputs.DigitalOutputs |= (0x1 << 8) ) : (myIOs._ios.outputs.DigitalOutputs &= ~(0x1 << 8) )) /** HS_9 4A R�ttler */ + //#define HS_10(x) ((x) ? (myIOs._ios.outputs.DigitalOutputs |= (0x1 << 9) ) : (myIOs._ios.outputs.DigitalOutputs &= ~(0x1 << 9) )) /** HS_10 4A n.c. */ + #define startFan(x) ((x) ? (myIOs._ios.outputs.DigitalOutputs |= (0x1 << 10) ) : (myIOs._ios.outputs.DigitalOutputs &= ~(0x1 << 10) )) /** HSP_1 12A Ventilator �lk�hler */ + + /** enable TLE HS 1-3 */ + #define enableTLE(x) ((x) ? (myIOs._ios.outputs.DigitalOutputs |= (0x1 << 11) ) : (myIOs._ios.outputs.DigitalOutputs &= ~(0x1 << 11) )) + #define enableTLEGet (((myIOs._ios.outputs.DigitalOutputs & (0x1 << 11) ) != 0) ? true : false) + + /** enable HB_1 */ + #define enableBridgeSlideActLeft(x) ((x) ? (myIOs._ios.outputs.DigitalOutputs |= (0x1 << 12) ) : (myIOs._ios.outputs.DigitalOutputs &= ~(0x1 << 12) )) + + /** enable HB_2 */ + #define enableBridgeSlideActRight(x) ((x) ? (myIOs._ios.outputs.DigitalOutputs |= (0x1 << 13) ) : (myIOs._ios.outputs.DigitalOutputs &= ~(0x1 << 13) )) + + /** direction HB_1 */ + //#define dirBridgeSlideActLeftSet(x) ((x) ? (myIOs._ios.outputs.DigitalOutputs |= (0x1 << 14) ) : (myIOs._ios.outputs.DigitalOutputs &= ~(0x1 << 14) )) + //#define dirBridgeSlideActLeftGet (((myIOs._ios.outputs.DigitalOutputs & (0x1 << 14) ) != 0) ? true : false) + + /** direction HB_2 */ + //#define dirBridgeSlideActRightSet(x) ((x) ? (myIOs._ios.outputs.DigitalOutputs |= (0x1 << 15) ) : (myIOs._ios.outputs.DigitalOutputs &= ~(0x1 << 15) )) + //#define dirBridgeSlideActRightGet (((myIOs._ios.outputs.DigitalOutputs & (0x1 << 15) ) != 0) ? true : false) + + + /** power enable */ + #define enablePower(x) ((x) ? (myIOs._ios.outputs.DigitalOutputs |= (0x1 << 16) ) : (myIOs._ios.outputs.DigitalOutputs &= ~(0x1 << 16) )) + #define enablePowerGet (((myIOs._ios.outputs.DigitalOutputs & (0x1 << 16) ) != 0) ? true : false) + + /** system reboot */ + #define rebootECU(x) ((x) ? (myIOs._ios.outputs.DigitalOutputs |= (0x1 << 17) ) : (myIOs._ios.outputs.DigitalOutputs &= ~(0x1 << 17) )) + + + /* ----------------------------------- Analog Out - PWM Ausgangssignale -------------------------------------------------*/ + + //#define currentOutDiscLeft myIOs._ios.outputs.HS_PWM1 /** HS_PWM_1 1,5A 160Hz Wurfscheibe links */ + //#define currentOutDiscRight myIOs._ios.outputs.HS_PWM2 /** HS_PWM_2 1,5A 160Hz Wurfscheibe links */ + #define currentOutBelt myIOs._ios.outputs.HS_PWM3 /** HS_PWM_3 1,5A 160Hz F�rderband */ + + //#define PWMOutBridgeSlideLeft myIOs._ios.outputs.HB1 /** PWM HB_1 10A 100Hz Dosierschieber links AXIS-PP */ + //#define PWMOutBridgeSlideRight myIOs._ios.outputs.HB2 /** PWM HB_2 10A 100Hz Dosierschieber rechts AXIS-PP */ + ++>>>>>>> rauch/jobrechner-import-20190607 #endif // IOS_H diff --cc ptxdist/local_src/ecu-jobctl/app/demo/isobus.cpp index b21af6f,d1cfce7..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-jobctl/app/demo/isobus.cpp +++ b/ptxdist/local_src/ecu-jobctl/app/demo/isobus.cpp @@@ -1,228 -1,274 +1,498 @@@ /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-**-*-* ++<<<<<<< HEAD + + DESCRIPTION: + -------------------------------------------------------------------- + + +*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-**-*-*-*/ + +/*****************************************************************************/ +/* here: Includes */ +/*****************************************************************************/ + +#include <error.h> +#include <errno.h> + +#include "isobus.h" + +#include "base.h" +#include "etrace_defines.h" +#include "iopfile.h" + +#include "ecanbus.h" //zur beseren Ã?bersicht/Kapselung NUR HIER! + + +/*****************************************************************************/ +/* here: Defines */ +/*****************************************************************************/ + +void watchdog ( void ); +long getTimeMs( void ); +void errorHandling ( unsigned char param1, unsigned char param2, signed int err ); + +/*****************************************************************************/ +/* here: local Functions */ +/*****************************************************************************/ + +void watchdog ( void ){ + +} /* eofn: watchdog */ + +long getTimeMs( void ){ + + long time_in_mill = 0; + struct timeval tv; + gettimeofday(&tv, NULL); + + time_in_mill = (tv.tv_sec) * 1000 + (tv.tv_usec) / 1000 ; + return time_in_mill; + +} /* eofn: getTimeMs */ + +void errorHandling ( unsigned char param1, unsigned char param2, signed int err ) +{ + // void error(int status, int errnum, const char *format, ...); + // If status has a nonzero value, then error() calls exit(3) to + // terminate the program using the given value as the exit status. + error(0,err,"ERROR in Isobus, errorHandling! Param1: %x, Param2: %x", param1, param2); +} + + +/*****************************************************************************/ +/* here: Classes */ +/*****************************************************************************/ + +bool _ignition(true); +bool _ignitionState(false); +int _iSettgVT(1); +ulong _ulSequenzNrTxMsg(0); +ECAN* _pECAN=ECAN::getInst(); + +Isobus::Isobus(): + ECULibItf() ++======= + DESCRIPTION: + -------------------------------------------------------------------- + *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-**-*-*-*/ + + /* here: Includes */ + #include "ecanbus.h" //zur beseren Ã?bersicht/Kapselung NUR HIER! + #include "isobus.h" + #include "etrace_defines.h" + #include <fileServerClientFB.h> + #include <isoCbLanguageCommand.h> + #include <vtapplication.h> + #include <isoCbTcExData.h> + #include <isoCbVtStatus.h> + #include <isoCbVtMsg.h> + #include <controlfunction.h> + #include <OptiPointFBHEMC.h> + #include "service/VariSpread/SectionStates/VariSpreadSectionsHEMC.h" + #include <VariSpreadTableHEMC.h> + #include <callablestarter.h> + #include <VTC/IsoVtcGraphicAux.h> + #include <diagclient.h> + #include <workaroundVT.h> + + + /* PGN Handles */ + /* RX */ + int16 pgnHandleStopButtonRx = HANDLE_UNVALID; + int16 pgnHandleWheelBasedSpeed = HANDLE_UNVALID; + int16 pgnHandleGroundBasedSpeed = HANDLE_UNVALID; + int16 pgnHandleNavigationBasedVehicleSpeed = HANDLE_UNVALID; + int16 pgnHandleTimeDateRx = HANDLE_UNVALID; + int16 pgnHandleIMUAcc = HANDLE_UNVALID; + int16 pgnHandleIMUAngulareRate = HANDLE_UNVALID; + int16 pgnHandleIMUAngle = HANDLE_UNVALID; + //int16 pgnHandleGetNumOfSK = HANDLE_UNVALID; + //int16 pgnHandleGetHardwareInformation = HANDLE_UNVALID; + + /* TX */ + int16 pgnHandleStopButtonTx = HANDLE_UNVALID; + + /*AUX*/ + int16 prefAssignCbCounter = 0; + T_ISO_POOL auxIsoPool; + + /*iso*/ + bool ignition = true; /* dummy value is set here, as far as not received from isobus*/ + bool ignitionState = false; /* State of ignition for storage*/ + bool _ignition(true); + bool _ignitionState(false); + + + void AppFscOnDataLinkCallback( ISO_TPREP_E eDataTransStatus, const ISO_TPINFO_T *psTpInfo ) + { + //(***********************************************************************) + //(* This Callback is used for all PGNs which don't have an own callback *) + //(* only installed PGNs or PGNs from recognized network members are *) + //(* transferred from data link layer *) + //(***********************************************************************) + (void)eDataTransStatus; + (void)psTpInfo; + } + + + ControlFunctionSng *Isobus::WorkingSetCF = new ControlFunctionSng; + + ControlFunction* ControlFunctionSng::singletonInst = nullptr; + + + ControlFunction* ControlFunctionSng::getInstance(){ + if (!singletonInst){ + singletonInst = new ControlFunction; + } + return singletonInst; + } + + Isobus::Isobus(): + ECULibItf() ++>>>>>>> rauch/jobrechner-import-20190607 { } Isobus::~Isobus() { ++<<<<<<< HEAD + /* Socket zum VT schliessen */ + _pECAN->closeSocket(); +} + +void Isobus::InitLibrary() +{ + /* Socket fuer Kommunikation zum VT oeffnen */ + _pECAN->openSocket( 0, TRUE ); + + isoStart(); +} + +void Isobus::ExitLibrary() +{ + /* Socket zum VT schliessen */ + _pECAN->closeSocket(); + + //isoEnd(); <=?? AS ++======= + // Socket zum VT schliessen + ECAN::getInst()->closeSocket(); + } + + + void Isobus::InitLibrary() + { + // Socket fuer Kommunikation zum VT oeffnen + ECAN::getInst()->openSocket( 0, true ); + + //configure pool file path + WorkingSetCF->getInstance()->VTClientInst.Pool.setPoolNameData(T_POOL_NAME_DATA{ + "/home/", + "AxisAxent", + "SKs_5x2", + "SKs_6x2", + "Metric", + "Imperial"}); + //set VTClient callbacks + WSVTApp->registerAppRunningSigCb(dynamic_cast<CallableStarter*>(WorkingSetCF->getInstance())); + // WorkingSetCF->getInstance()->VTClientInst.registerCallbacks((VTAppBase*)WSVTApp, isoCbVtStatus, isoCbVtMsg, dynamic_cast<VTClientCallable*>(WorkingSetCF->getInstance()) ); + WorkingSetCF->getInstance()->VTClientInst.registerCallbacks((VTAppBase*)WSVTApp, isoCbVtStatus, isoCbVtMsg); + //set TCClient callbacks + WorkingSetCF->getInstance()->TCClientInst.registerCallbacks(isoCbTcExData, triggerDDOPinit, isoCbTcExDataOld ); + + OptiPointFB_inst->registerTCClientForDataSending( WorkingSetCF->getInstance()->TCClientInst); + VariSpreadSections_inst->registerTCClientForDataSending( WorkingSetCF->getInstance()->TCClientInst); + VariSpreadTable_inst->registerTCClientForDataSending( WorkingSetCF->getInstance()->TCClientInst); + isoStart(); + } + + + + void Isobus::ExitLibrary() + { + // Socket zum VT schliessen + ECAN::getInst()->closeSocket(); + //isoEnd(); <=?? AS ++>>>>>>> rauch/jobrechner-import-20190607 } void Isobus::UpdateLibrary(void) { ++<<<<<<< HEAD + isoMain(); +} + +void Isobus::isoMsgtoVT ( dword dwMsgId, byte *pbMsgData, int iLength ) +{ + ISOMSG_T tMsg; + + if ( _iSettgVT == 0 ) { + + + /* Messagelaenge pruefen */ + if ((iLength == 0) || (iLength > ISO_DATA_LEN)) { + + /* Nachrichtlaenge ungueltig */ + //CAL_LogAdd(STD_LOGGER, COMPONENT_ID, LOG_WARNING, ERR_OK, 0, "CbMsgtoVT(): Nachrichtlaenge ungueltig - %i\n", iLength); + return; + } + + /* Sequenznummer erhoehen */ + _ulSequenzNrTxMsg += 1; + + /* Messagedaten in Messagepuffer kopieren */ + tMsg.dwSequenzNr = _ulSequenzNrTxMsg; + tMsg.dwIsoIdent = dwMsgId; + tMsg.bIsoMsgLen = (byte)iLength; + memcpy(tMsg.abData, pbMsgData, ISO_DATA_LEN); + } + else{ + + /* Messagedaten an CAN senden */ + _pECAN->sendMsg( dwMsgId, pbMsgData, iLength ); + } + + return; + +} /* eofn: CbMsgtoVT */ + +void Isobus::isoErrorHnd ( byte bFun, byte bLocation, sint iCause ){ + //.. + ; +} + +void Isobus::isoStart(void){ + + iso_DlDrvCanInit(0, isoMsgtoVT); // Init Isobus Driver, 2nd Param is set to zero, the send routine comes directly from Eckelmann to WBZ <=?? AS + iso_DlCallbacksInit(getTimeMs, watchdog, errorHandling); + iso_DlTPRepeatSet(0,5); // Init Number of repeats in loop for transport protocol + IsoDrvCbBasicDataInstall( IsoCbDataOfBasicDistributor ); + IsoClientsInit(getTimeMs, watchdog, errorHandling); +} + + +void Isobus::isoWait4Msg(int iTimeout){ + + const int16 MSG_DATA_LEN = 255; + + int diRet = 0; /* Rueckgabewert */ + unsigned long dwMsgId = 0; /* Message-ID */ + unsigned char abMsgData[MSG_DATA_LEN + 1]; // = 0; + int iMsgLen = 0; /* Nachrichtenlaenge */ + + /* Isobus-Nachrichtenempfang */ + diRet = _pECAN->waitForMsg( &dwMsgId, abMsgData, &iMsgLen, iTimeout ); + + if (diRet > 0) + ETRACE_RAWDATA( TRC_ISOCANRX, "Isobus-CAN-RX-Msg. Id:%08lx Length:%i.", dwMsgId, iMsgLen, (const char*)abMsgData ); + + while((diRet > 0)) + { + /* Empfangsauswertung */ + iso_DlCanMsgRec(0, dwMsgId, (abMsgData),(char)(iMsgLen)); + //--iso-- void iso_DlCanMsgRec( uint16 u16CanNode, uint32 u32Id, const uint8 apu8Data[], uint8 u8Length ) + //iso_DlCanMsgRec(p->wCanNode, p->dwId, p->pbData, p->bLength); + + diRet = _pECAN->waitForMsg( &(dwMsgId), abMsgData, &iMsgLen, iTimeout); + if (diRet > 0) + ETRACE_RAWDATA( TRC_ISOCANRX, "Isobus-CAN-RX-Msg. Id:%08lx Length:%i.", dwMsgId, iMsgLen, (const char*)abMsgData ); + } +} + +void Isobus::setVtClient(){ + /* + IsoVTInit( ADR(abName), // pointer to ws-master name + ADR(isoCbVtStatus), // pointer to function which is called in case of opening a new data mask or window mask + ADR(isoCbVtMsg), // pointer to function which is called in case of Activation messages and command responses to the user application + ADR(abNamePreferredVT) ); // pointer to name of preferred VT + + IsoVTDataSet( E_ISOVT_STATUS.VT_BOOTTIME, 3 ); // set VT boottime + + AlarmInst.initIsoAlarm(ADR(abName)); // init alarms + */ +} + +void Isobus::impReset(){ + //.. + setVtClient(); +} + +void Isobus::impIgnition(bool ignitionStateIn){ + if ((ignitionStateIn == true) && (_ignitionState == false)) + { // Power on event + impReset(); + } + else if ((ignitionStateIn == false) && (_ignitionState == true)) + { // Power off event + ;// impLogout(); // necessary when key state is used + } + _ignitionState = ignitionStateIn; +} + + +void Isobus::isoVtApplic(){ + /*CASE eIsoAnnounce OF + * SAFE_STATE : + * VT_STATUS_RECEIVED : + * WAITING_AFTER_GETVERSIONS : + * ==> IsoPoolSettings() ==> IsoPoolObjectLoad() + * MOVETOANOTHERVT : + * POOL_TRANSFER_RUNNING : + * ... + */ +} + +void Isobus::impDoProcess(){ + if(_ignitionState){ + isoVtApplic(); ++======= + isoMain(); + } + + void Isobus::isoWait4Msg(int iTimeout) + { + const int16 MSG_DATA_LEN = 255; + // Rueckgabewert + int diRet = 0; + // Message-ID + unsigned long dwMsgId = 0; + unsigned char abMsgData[MSG_DATA_LEN + 1] = {0}; + // Nachrichtenlaenge + int iMsgLen = 0; + + /* Isobus-Nachrichtenempfang */ + diRet = ECAN::getInst()->waitForMsg( &dwMsgId, abMsgData, &iMsgLen, iTimeout ); + if (diRet > 0) + { + ETRACE_RAWDATA( TRC_ISOCANRX, "Isobus-CAN-RX-Msg. Id:%08lx Length:%i.", dwMsgId, iMsgLen, (const char*)abMsgData ); + } + + while((diRet > 0)) + { + /* Empfangsauswertung */ + iso_CoreCanMsgRec(0, dwMsgId, (abMsgData),(char)(iMsgLen)); + + diRet = ECAN::getInst()->waitForMsg( &(dwMsgId), abMsgData, &iMsgLen, iTimeout); + if (diRet > 0) + { + ETRACE_RAWDATA( TRC_ISOCANRX, "Isobus-CAN-RX-Msg. Id:%08lx Length:%i.", dwMsgId, iMsgLen, (const char*)abMsgData ); + } + } + } + + + void Isobus::isoLanguagePgnInstall(int16 implementHandle) + { + int16 pgnHandleLanguageCommand; + /* Initialization of PGNs */ + + /***********************************/ + /* Receive PGNs */ + /***********************************/ + + pgnHandleLanguageCommand = iso_AlPgnRxNew(implementHandle, + PGN_LANGUAGE_COMMAND, + ISO_GLOBAL_ADDRESS, + 8, + 0, + 3, + REPRATE_INACTIVE, + 0, + isoCbLanguageCommand); + + iso_AlPgnActivate(pgnHandleLanguageCommand); + + + /***********************************/ + /* Transmit PGNs */ + /***********************************/ + //... + + } + + void Isobus::impReset() + { + int16 nmHandleImplement = HANDLE_UNVALID; + nmHandleImplement = WorkingSetCF->getInstance()->initCF(); + + if (nmHandleImplement != HANDLE_UNVALID){ + WorkingSetCF->getInstance()->VTClientInst.initClient(nmHandleImplement); + WorkingSetCF->getInstance()->TCClientInst.initClient(nmHandleImplement); + WorkingSetCF->getInstance()->FSClientInst.initClient(nmHandleImplement); + initClient(nmHandleImplement); + + isoStopButtonInstall(nmHandleImplement); + isoTecuPgnInstall(nmHandleImplement); + isoLanguagePgnInstall(nmHandleImplement); + isoIMUInstall(nmHandleImplement); + //isoTimeDatePgnInstall(nmHandleImplement); + initDiagnostic(); + + WorkingSetCF->getInstance()->VTClientInst.startClient(); + } + } + + void Isobus::debugPrintNetworkMemberInfo(iso_s16 handle){ + ISOUSERAPP_T sUserInfo; + + printf("\n"); + (void)iso_NmGetDataOfMember(handle, &sUserInfo); + #define LAZY_PRINT(varName) printf("NETWOK CALLBACK - "#varName": %ld\n",(long int)varName) + LAZY_PRINT(sUserInfo.u8IsoSourceAdd ); + LAZY_PRINT(sUserInfo.eIsoUserFunct ); + LAZY_PRINT(sUserInfo.eIsoAnnState ); + LAZY_PRINT(sUserInfo.psName->bSelfConf ); + LAZY_PRINT(sUserInfo.psName->bIndGroup ); + LAZY_PRINT(sUserInfo.psName->bDevClassInst ); + LAZY_PRINT(sUserInfo.psName->bDevClass ); + LAZY_PRINT(sUserInfo.psName->bFunction ); + LAZY_PRINT(sUserInfo.psName->bFunctionInst ); + LAZY_PRINT(sUserInfo.psName->bEcuInstance ); + LAZY_PRINT(sUserInfo.psName->wManufCode ); + LAZY_PRINT(sUserInfo.psName->dwIdentNumb ); + #undef LAZY_PRINT + printf("NETWORK MEMBER INFO pacIsoUserName:"); + for (int i=0; i < 8; i++) printf(" %d",sUserInfo.pacIsoUserName[i]); + printf("\n\n\n"); + + } + + void Isobus::debugPrintNetworkMemberInfoList(ISO_USERFUNC_e function) + { + iso_s16 sizeOfHandles = 10; + iso_s16 handles[10] = {0}; + iso_s16 numberOfMembersOnBus; + (void)IsoClientsReadListofExtHandles(function, sizeOfHandles, handles, &numberOfMembersOnBus); + + for (int i=0; i < sizeOfHandles; i++){ + debugPrintNetworkMemberInfo(handles[i]); + } + fflush(stdout); + } + + void Isobus::impIgnition(bool ignitionStateIn) + { + if (((ignitionStateIn == true) && (_ignitionState == false)) || waGetLostVTActive()) + { + // Power on event + impReset(); + } + else if ((ignitionStateIn == false) + && (_ignitionState == true)) + { + // Power off event + // impLogout(); // necessary when key state is used + } + waSetLostVTActive(false); + _ignitionState = ignitionStateIn; + } + + void Isobus::impDoProcess() + { + if(_ignitionState) + { + WorkingSetCF->getInstance()->cyclic(); ++>>>>>>> rauch/jobrechner-import-20190607 } } @@@ -231,10 -277,13 +501,22 @@@ void Isobus::isoApplic() impDoProcess(); } ++<<<<<<< HEAD +void Isobus::isoMain(void){ + isoWait4Msg(0); // fvMsgFromCanRec() in WBZ-Sample + isoApplic(); + iso_DlCyclicGlobal(); + IsoClientsCyclicCall(); + ++======= + void Isobus::isoMain(void) + { + // fvMsgFromCanRec() in WBZ-Sample + isoWait4Msg(0); + isoApplic(); + iso_CoreCyclic(); + iso_BaseCyclic(); + IsoClientsCyclicCall(); + VtcGraphicAux_Cyclic(); ++>>>>>>> rauch/jobrechner-import-20190607 } diff --cc ptxdist/local_src/ecu-jobctl/app/demo/isobus.h index 4a91f0a,4f9f1c9..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-jobctl/app/demo/isobus.h +++ b/ptxdist/local_src/ecu-jobctl/app/demo/isobus.h @@@ -6,15 -6,42 +6,54 @@@ /*****************************************************************************/ /* Headerfiles Isobus-Lib */ ++<<<<<<< HEAD +#include "typdef.h" +#include "IsoDef.h" +#include "IsoNet.h" +#include "UtST.h" +#include "IsoData.h" +#include "IsoDrv.h" +#include "base.h" + +#include "eculibitf.h" ++======= + ////#include "typdef.h" + #include "IsoDef.h" + //#include "IsoNet.h" + //#include "UtST.h" + //#include "IsoData.h" + //#include "IsoDrv.h" + #include "base.h" + + #include "eculibitf.h" + #include "iopfile.h" + + #include "tempserviceglobals.h" //TEMP_DEBUG + #include "tempisoglobals.h" //TEMP_DEBUG + + #include <switchondelaytimer.h> + + #include <singleton.h> + + + //TODO: remove this from here and solve it without globals + /* PGN Handles */ + /* RX */ + extern int16 pgnHandleStopButtonRx; + extern int16 pgnHandleWheelBasedSpeed; + extern int16 pgnHandleGroundBasedSpeed; + extern int16 pgnHandleNavigationBasedVehicleSpeed; + extern int16 pgnHandleTimeDateRx; + extern int16 pgnHandleIMUAcc; + extern int16 pgnHandleIMUAngulareRate; + extern int16 pgnHandleIMUAngle; + //extern int16 pgnHandleGetNumOfSK; + //extern int16 pgnHandleGetHardwareInformation; + + + /* TX */ + extern int16 pgnHandleStopButtonTx; ++>>>>>>> rauch/jobrechner-import-20190607 /*****************************************************************************/ /* here: Defines */ @@@ -24,10 -51,10 +63,17 @@@ #pragma pack(1) /* Alignment auf 1 setzen */ struct _isomsg_ { ++<<<<<<< HEAD + dword dwIsoIdent; + byte bIsoMsgLen; + byte abData[ISO_DATA_LEN]; + dword dwSequenzNr; ++======= + iso_u32 dwIsoIdent; + byte bIsoMsgLen; + byte abData[ISO_DATA_LEN]; + iso_u32 dwSequenzNr; ++>>>>>>> rauch/jobrechner-import-20190607 }; #pragma pack() @@@ -38,43 -65,77 +84,117 @@@ typedef struct _isomsg_ *ISOMSG_t /* here: Classes */ /*****************************************************************************/ ++<<<<<<< HEAD +class Isobus : public ECULibItf +{ +public: + Isobus(); + ~Isobus(); + + /** + * @brief UpdateLibrary() + * Call this function to update FRAM-Data. + */ + virtual void UpdateLibrary(); + + /** + * @brief InitLibrary() + * Call this function to init Library! + */ + virtual void InitLibrary(); + + /** + * @brief ExitLibrary() + * Call this function to exit Library! + */ + virtual void ExitLibrary() ; + + static void isoMsgtoVT ( dword dwMsgId, byte *pbMsgData, int iLength ); + +private: + void isoStart(void); + void isoErrorHnd ( byte bFun, byte bLocation, sint iCause ); + void isoWait4Msg(int iTimeout); + void setVtClient(); + void impReset(); + void impIgnition(bool ignitionStateIn); + void isoVtApplic(); + void impDoProcess(); + void isoApplic(); + void isoMain(void); ++======= + #include <controlfunction.h> + + class ControlFunctionSng{ + private : + static ControlFunction *singletonInst; + public: + ControlFunction *getInstance(); + }; + + class ControlFunction; + + class Isobus : public ECULibItf + { + public: + Isobus(); + ~Isobus(); + + /** + * @brief UpdateLibrary() + * Call this function to update FRAM-Data. + */ + virtual void UpdateLibrary(); + + /** + * @brief InitLibrary() + * Call this function to init Library! + */ + virtual void InitLibrary(); + + /** + * @brief ExitLibrary() + * Call this function to exit Library! + */ + virtual void ExitLibrary() ; + + /** + * @brief isRestartRequired + * @details Is a restart of the service task required? (because of pool update + * @return + */ + bool isRestartRequired() { return m_restart;} + + static iso_s32 getTimeMs( void ); + + void debugPrintNetworkMemberInfoList(ISO_USERFUNC_e function); + + static ControlFunctionSng* WorkingSetCF; + + void isoNextVT(); + + private: + void isoStart(void); + void isoWait4Msg(int iTimeout); + void impReset(); + void impIgnition(bool ignitionStateIn); + + void impDoProcess(); + void isoApplic(); + void isoMain(void); + + void isoStopButtonInstall(int16 implementHandle); + void isoTecuPgnInstall(int16 handle); + void isoTimeDatePgnInstall(int16 handle); + void isoIMUInstall(int16 handle); + + static void isoCbErrorHandler(byte bFunction, byte bLocation, iso_s16 idCause); + static void AppFscOnNetworkCallback(const ISONETEVENT_T *ptNetwork ); + + bool m_restart = false; + void isoLanguagePgnInstall(int16 implementHandle); + void debugPrintNetworkMemberInfo(iso_s16 handle); ++>>>>>>> rauch/jobrechner-import-20190607 }; #endif // ISOBUSINRTERFACE_H diff --cc ptxdist/local_src/ecu-jobctl/app/demo/main.cpp index a58929d,c0a3e25..0000000 --- a/ptxdist/local_src/ecu-jobctl/app/demo/main.cpp +++ b/ptxdist/local_src/ecu-jobctl/app/demo/main.cpp @@@ -9,18 -9,19 +9,34 @@@ #include <stdio.h> #include <sys/wait.h> #include <sys/types.h> ++<<<<<<< HEAD + +#include <pthread.h> + + +/* Meine IOs */ +ECUIO myIOs; + +/* Meine Parameters */ +const Parameters myParameters; + + +int main( int argc, const char* argv[] ) ++======= + #include <sys/reboot.h> + #include <pthread.h> + + + #include "datatypes.h" + #include "messages.h" + #include <debug_task.h> + + + /* Meine IOs */ + ECUIO myIOs; + + int main( int argc, char* argv[] ) ++>>>>>>> rauch/jobrechner-import-20190607 { char* name1 = (char*)"ControlTask"; char* name2 = (char*)"ServiceTask"; @@@ -30,33 -31,49 +46,79 @@@ /* disable warnings */ (void)argv; ++<<<<<<< HEAD + /* Meine ControlTask, zyklisch laufend alle 10000us, mit Prio 57 */ + CT_Task myCT_Task(57, true, 10000, name1, &myParameters, &myIOs); + + /* Meine ServiceTask, freilaufend, mit Prio 52 */ + ST_Task myST_Task(51, false, 0, name2, &myParameters); ++======= + + /* Meine Parameters */ + const Parameters myParameters; + + #ifndef USE_BOOST_QUEUES + // Initialise the communication queues + queueInitialise(); + #endif + + /* Meine ControlTask, zyklisch laufend alle 10000us, mit Prio 57 */ + CT_Task * myCT_Task = new CT_Task(57, true, 10000, name1, &myParameters, &myIOs); + + /* Meine ServiceTask, freilaufend, mit Prio 52 */ + ST_Task * myST_Task = new ST_Task(52, true, 10000, name2, &myParameters); ++>>>>>>> rauch/jobrechner-import-20190607 /* Mein Trace-Collector */ ETRACE::Controller::initialize( ETRACE_PROCESSID ); //Sender ID ETRACE::Controller::initCollectorInterface(); ETRACE::Controller::activateTrace(TRC_CTTASK); ++<<<<<<< HEAD + ETRACE::Controller::activateTrace(TRC_ISOCANRX); + + // IMPORTANT!!!! + /* Starte meine ControlTask */ + myCT_Task.create_thread(); + + /* Starte meine ServiceTask */ + myST_Task.create_thread(); + + // Anaylse Tools + //myCT_Task.activateTimers(); + //myCT_Task.activateTracer(); FTRACE + //myST_Task.activateTimers(); + //myST_Task.activateTracer(); FTRACE + + // The pthread_join() function waits for the thread to terminate. + pthread_join(myCT_Task.getThreadHdl(), NULL); + //pthread_join(myST_Task.getThreadHdl(), NULL); + ++======= + //ETRACE::Controller::activateTrace(TRC_ISOCANRX); + ETRACE::Controller::activateTrace(TRC_STASK); + + // IMPORTANT!!!! + /* Starte meine ControlTask */ + myCT_Task->create_thread(); + + /* Starte meine ServiceTask */ + myST_Task->create_thread(); + + // The pthread_join() function waits for the thread to terminate. + pthread_join(myCT_Task->getThreadHdl(), NULL); + pthread_join(myST_Task->getThreadHdl(), NULL); + + delete myCT_Task; + delete myST_Task; + + printf("join the two threads => restart %s !!\n", argv[0]); + fflush(stdout); + + usleep(500000); + sync(); + usleep(500000); + reboot(0x4321fedc); + + return 0; ++>>>>>>> rauch/jobrechner-import-20190607 } diff --cc ptxdist/local_src/ecu-jobctl/app/demo/parameters.cpp index 2c4ff44,cbb4775..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-jobctl/app/demo/parameters.cpp +++ b/ptxdist/local_src/ecu-jobctl/app/demo/parameters.cpp @@@ -27,42 -27,45 +27,84 @@@ Parameters::Parameters(): ECUParameters() { ++<<<<<<< HEAD + // Put your values inside! + _Paras.paras8[(int) CAN0_TERMINATION] = true; + _Paras.paras8[(int) CAN1_TERMINATION] = false; + _Paras.paras8[(int) CH1_ENABLE_DITHER] = false; + _Paras.paras8[(int) CH1_ENABLE_CFB] = false; + _Paras.paras8[(int) CH1_ENABLE_DITHER_SYNC] = false; + + _Paras.paras16[(int) CH1_DITHER_STEPS] = 0; + _Paras.paras16[(int) CH1_DITHER_STEPSIZE] = 0; + _Paras.paras16[(int) CH1_PERIOD_PERIODFIELD] = 1250; + _Paras.paras16[(int) CH1_PERIOD_KLINDEX] = 6; + + _Paras.paras8[(int) CH2_ENABLE_DITHER] = false; + _Paras.paras8[(int) CH2_ENABLE_CFB] = false; + _Paras.paras8[(int) CH2_ENABLE_DITHER_SYNC] = false; + + _Paras.paras16[(int) CH2_DITHER_STEPS] = 0; + _Paras.paras16[(int) CH2_DITHER_STEPSIZE] = 0; + _Paras.paras16[(int) CH2_PERIOD_PERIODFIELD] = 1250; + _Paras.paras16[(int) CH2_PERIOD_KLINDEX] = 6; + + _Paras.paras8[(int) CH3_ENABLE_DITHER] = false; + _Paras.paras8[(int) CH3_ENABLE_CFB] = false; + _Paras.paras8[(int) CH3_ENABLE_DITHER_SYNC] = false; + + _Paras.paras16[(int) CH3_DITHER_STEPS] = 0; + _Paras.paras16[(int) CH3_DITHER_STEPSIZE] = 0; + _Paras.paras16[(int) CH3_PERIOD_PERIODFIELD] = 1250; + _Paras.paras16[(int) CH3_PERIOD_KLINDEX] = 6; + + _Paras.paras16[(int) CLKDIVIDER_MFIELD] = 4; + _Paras.paras16[(int) CLKDIVIDER_NFIELD] = 5; + + _Paras.paras16[(int) CC1_TFB] = 700; + _Paras.paras16[(int) CC2_TFB] = 700; + _Paras.paras16[(int) CC3_TFB] = 700; ++======= + // Put your values inside! + _Paras.paras8[(int) CAN0_TERMINATION] = true; + _Paras.paras8[(int) CAN1_TERMINATION] = false; + _Paras.paras8[(int) CH1_ENABLE_DITHER] = true; + _Paras.paras8[(int) CH1_ENABLE_CFB] = false; + _Paras.paras8[(int) CH1_ENABLE_DITHER_SYNC] = false; + + _Paras.paras16[(int) CH1_DITHER_STEPS] = 31; + _Paras.paras16[(int) CH1_DITHER_STEPSIZE] = 3; + _Paras.paras16[(int) CH1_PERIOD_PERIODFIELD] = 50; + _Paras.paras16[(int) CH1_PERIOD_KLINDEX] = 6; + + _Paras.paras8[(int) CH2_ENABLE_DITHER] = true; + _Paras.paras8[(int) CH2_ENABLE_CFB] = false; + _Paras.paras8[(int) CH2_ENABLE_DITHER_SYNC] = false; + + _Paras.paras16[(int) CH2_DITHER_STEPS] = 31; + _Paras.paras16[(int) CH2_DITHER_STEPSIZE] = 3; + _Paras.paras16[(int) CH2_PERIOD_PERIODFIELD] = 50; + _Paras.paras16[(int) CH2_PERIOD_KLINDEX] = 6; + + _Paras.paras8[(int) CH3_ENABLE_DITHER] = false; + _Paras.paras8[(int) CH3_ENABLE_CFB] = false; + _Paras.paras8[(int) CH3_ENABLE_DITHER_SYNC] = false; + + _Paras.paras16[(int) CH3_DITHER_STEPS] = 0; + _Paras.paras16[(int) CH3_DITHER_STEPSIZE] = 0; + _Paras.paras16[(int) CH3_PERIOD_PERIODFIELD] = 1250; + _Paras.paras16[(int) CH3_PERIOD_KLINDEX] = 6; + + _Paras.paras16[(int) CLKDIVIDER_MFIELD] = 49; + _Paras.paras16[(int) CLKDIVIDER_NFIELD] = 2; + + _Paras.paras16[(int) CC1_TFB] = 700; + _Paras.paras16[(int) CC2_TFB] = 700; + _Paras.paras16[(int) CC3_TFB] = 700; + + _Paras.paras16[(int) PWM_HB1] = 14; //pwm-frquency = 66,5Mhz/416*(1/PWM_Bx+2) , PWM_HBx 30 -> ca. 5kHz, PWM_HBx 1000 -> ca. 150Hz + _Paras.paras16[(int) PWM_HB2] = 14; //pwm-frquency = 66,5Mhz/416*(1/PWM_Bx+2) , PWM_HBx 30 -> ca. 5kHz, PWM_HBx 1000 -> ca. 150Hz ++>>>>>>> rauch/jobrechner-import-20190607 } Parameters::~Parameters() diff --cc ptxdist/local_src/ecu-jobctl/app/demo/parameters.h index f854af0,f854af0..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-jobctl/app/demo/parameters.h +++ b/ptxdist/local_src/ecu-jobctl/app/demo/parameters.h diff --cc ptxdist/local_src/ecu-jobctl/app/demo/st_task.cpp index 3200883,8bef85b..0000000 --- a/ptxdist/local_src/ecu-jobctl/app/demo/st_task.cpp +++ b/ptxdist/local_src/ecu-jobctl/app/demo/st_task.cpp @@@ -1,29 -1,79 +1,102 @@@ #include <stdio.h> #include <unistd.h> ++<<<<<<< HEAD + +#include "st_task.h" + + + +ST_Task::ST_Task(unsigned int priority, bool cyclic, unsigned long interval_us, char* name, const ECUParameters* pParas): + ECUThread(priority, cyclic, interval_us, name, pParas) +{ ++======= + #include "etrace_defines.h" + + #include "st_task.h" + + #ifdef USE_UDPSERVER + #include <udpserver.h> + #endif + + #ifdef USE_TCPSERVER + #include <TcpServer.h> + #endif + + //// DEBUG - TEST - serial output + //#include <sys/types.h> + //#include <sys/stat.h> + //#include <fcntl.h> + //#include <termios.h> + + ST_Task::ST_Task(unsigned int priority, bool cyclic, unsigned long interval_us, char* name, const ECUParameters* pParas): + ECUThread(priority, cyclic, interval_us, name, pParas), + _myLibECU() + { + + // Never ever, never, never create Threads in Constructor. Never. ++>>>>>>> rauch/jobrechner-import-20190607 } ST_Task::~ST_Task() { ++<<<<<<< HEAD + _myIsobus.ExitLibrary(); ++======= + _myIsobus.ExitLibrary(); + // Bibliotheken sauber aufräumen: + _myLibECU.ExitLibrary(); + #ifdef USE_UDPSERVER + udpserver->Exit(); + #endif ++>>>>>>> rauch/jobrechner-import-20190607 } void ST_Task::init(void) { ++<<<<<<< HEAD + // Initialisation of global vars! Start Interfaces / Communications + _myIsobus.InitLibrary(); ++======= + // Initialisation of global vars! Start Interfaces / Communications + _myIsobus.InitLibrary(); + + //LibECU + _myLibECU.InitLibrary(); + #ifdef USE_UDPSERVER + udpserver->Init(); + #endif + #ifdef USE_TCPSERVER + tcpserver->Start(); + #endif ++>>>>>>> rauch/jobrechner-import-20190607 } void ST_Task::run(void) { // Trigger Isobus _myIsobus.UpdateLibrary(); ++<<<<<<< HEAD ++======= + + if ( _myIsobus.isRestartRequired() == true ) + { + printf("Restart required! \n"); + fflush(stdout); + + // stop the control task as well + sendValue32(E_CONTROL_QUEUE, ID_STOP_CONTROL_TASK,0); + + stop(); + + return; + } + + // Trigger LibECU + _myLibECU.UpdateLibrary(); + + #ifdef USE_UDPSERVER + udpserver->Update(); + #endif ++>>>>>>> rauch/jobrechner-import-20190607 } diff --cc ptxdist/local_src/ecu-jobctl/app/demo/st_task.h index ea76cdd,ee1b910..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-jobctl/app/demo/st_task.h +++ b/ptxdist/local_src/ecu-jobctl/app/demo/st_task.h @@@ -1,14 -1,20 +1,30 @@@ #ifndef ST_TASK_H #define ST_TASK_H ++<<<<<<< HEAD ++======= + #include "IODriver.h" + #include "ecu.h" + ++>>>>>>> rauch/jobrechner-import-20190607 #include "ecuthreads.h" #include "base.h" #include "isobus.h" ++<<<<<<< HEAD + +class ST_Task : public ECUThread +{ +public: ++======= + #ifdef USE_UDPSERVER + #include "udpserver.h" + #endif + + class ST_Task : public ECUThread + { + public: ++>>>>>>> rauch/jobrechner-import-20190607 ST_Task(unsigned int priority, bool cyclic, unsigned long interval_us, char* name, const ECUParameters* pParas); virtual ~ST_Task(); protected: @@@ -16,6 -22,7 +32,10 @@@ virtual void init(void); private: Isobus _myIsobus; ++<<<<<<< HEAD ++======= + LibECU _myLibECU; ++>>>>>>> rauch/jobrechner-import-20190607 }; #endif // ST_TASK_H diff --cc ptxdist/local_src/ecu-jobctl/ecu-jobctl.pro index 54f2201,54f2201..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-jobctl/ecu-jobctl.pro +++ b/ptxdist/local_src/ecu-jobctl/ecu-jobctl.pro diff --cc ptxdist/local_src/ecu-jobctl/ecu-jobctl.pro.user index b22d860,7674dff..0000000 --- a/ptxdist/local_src/ecu-jobctl/ecu-jobctl.pro.user +++ b/ptxdist/local_src/ecu-jobctl/ecu-jobctl.pro.user @@@ -1,820 -1,371 +1,1194 @@@ ++<<<<<<< HEAD +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE QtCreatorProject> +<!-- Written by QtCreator 4.0.0, 2017-06-08T13:40:42. --> +<qtcreator> + <data> + <variable>EnvironmentId</variable> + <value type="QByteArray">{9285100c-fe4f-4254-aec8-e4b961ea960b}</value> + </data> + <data> + <variable>ProjectExplorer.Project.ActiveTarget</variable> + <value type="int">0</value> + </data> + <data> + <variable>ProjectExplorer.Project.EditorSettings</variable> + <valuemap type="QVariantMap"> + <value type="bool" key="EditorConfiguration.AutoIndent">true</value> + <value type="bool" key="EditorConfiguration.AutoSpacesForTabs">false</value> + <value type="bool" key="EditorConfiguration.CamelCaseNavigation">true</value> + <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.0"> + <value type="QString" key="language">Cpp</value> + <valuemap type="QVariantMap" key="value"> + <value type="QByteArray" key="CurrentPreferences">CppGlobal</value> + </valuemap> + </valuemap> + <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.1"> + <value type="QString" key="language">QmlJS</value> + <valuemap type="QVariantMap" key="value"> + <value type="QByteArray" key="CurrentPreferences">QmlJSGlobal</value> + </valuemap> + </valuemap> + <value type="int" key="EditorConfiguration.CodeStyle.Count">2</value> + <value type="QByteArray" key="EditorConfiguration.Codec">UTF-8</value> + <value type="bool" key="EditorConfiguration.ConstrainTooltips">false</value> + <value type="int" key="EditorConfiguration.IndentSize">4</value> + <value type="bool" key="EditorConfiguration.KeyboardTooltips">false</value> + <value type="int" key="EditorConfiguration.MarginColumn">80</value> + <value type="bool" key="EditorConfiguration.MouseHiding">true</value> + <value type="bool" key="EditorConfiguration.MouseNavigation">true</value> + <value type="int" key="EditorConfiguration.PaddingMode">1</value> + <value type="bool" key="EditorConfiguration.ScrollWheelZooming">true</value> + <value type="bool" key="EditorConfiguration.ShowMargin">false</value> + <value type="int" key="EditorConfiguration.SmartBackspaceBehavior">0</value> + <value type="bool" key="EditorConfiguration.SmartSelectionChanging">true</value> + <value type="bool" key="EditorConfiguration.SpacesForTabs">true</value> + <value type="int" key="EditorConfiguration.TabKeyBehavior">0</value> + <value type="int" key="EditorConfiguration.TabSize">8</value> + <value type="bool" key="EditorConfiguration.UseGlobal">true</value> + <value type="int" key="EditorConfiguration.Utf8BomBehavior">1</value> + <value type="bool" key="EditorConfiguration.addFinalNewLine">true</value> + <value type="bool" key="EditorConfiguration.cleanIndentation">true</value> + <value type="bool" key="EditorConfiguration.cleanWhitespace">true</value> + <value type="bool" key="EditorConfiguration.inEntireDocument">false</value> + </valuemap> + </data> + <data> + <variable>ProjectExplorer.Project.PluginSettings</variable> + <valuemap type="QVariantMap"> + <valuelist type="QVariantList" key="ClangStaticAnalyzer.SuppressedDiagnostics"/> + </valuemap> + </data> + <data> + <variable>ProjectExplorer.Project.Target.0</variable> + <valuemap type="QVariantMap"> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">JNCG</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">JNCG</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{8c090cae-c33f-4371-abd3-cb9455cb9420}</value> + <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value> + <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value> + <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value> + <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0"> + <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/rauch/projects/jncg/ptxdist/local_src/ecu-jobctl</value> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> + <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value> + <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.SeparateDebugInfo">false</value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">false</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> + <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> + <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments"> + <value type="QString">-w</value> + <value type="QString">-r</value> + </valuelist> + <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1"> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> + <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> + <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments"> + <value type="QString">-w</value> + <value type="QString">-r</value> + </valuelist> + <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Bereinigen</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value> + <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value> + <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Debug</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value> + <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value> + <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1"> + <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/rauch/projects/jncg/ptxdist/local_src/build-ecu-jobctl-JNCG-Release</value> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> + <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value> + <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.SeparateDebugInfo">false</value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">false</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> + <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> + <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments"> + <value type="QString">-w</value> + <value type="QString">-r</value> + </valuelist> + <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1"> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> + <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> + <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments"> + <value type="QString">-w</value> + <value type="QString">-r</value> + </valuelist> + <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Bereinigen</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value> + <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value> + <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Release</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value> + <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value> + <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value> + </valuemap> + <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">2</value> + <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0"> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> + <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Freien Plattenplatz überprüfen</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">RemoteLinux.CheckForFreeDiskSpaceStep</value> + <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedFiles"/> + <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedHosts"/> + <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedRemotePaths"/> + <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedSysroots"/> + <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedTimes"/> + <value type="QString" key="RemoteLinux.CheckForFreeDiskSpaceStep.PathToCheck">/</value> + <value type="qulonglong" key="RemoteLinux.CheckForFreeDiskSpaceStep.RequiredSpace">5242880</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> + <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Benutzerdefinertes entferntes Kommando ausführen </value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">RemoteLinux.GenericRemoteLinuxCustomCommandDeploymentStep</value> + <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedFiles"/> + <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedHosts"/> + <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedRemotePaths"/> + <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedSysroots"/> + <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedTimes"/> + <value type="QString" key="RemoteLinuxCustomCommandDeploymentStep.CommandLine">rootfs.writable</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.10"> + <value type="bool" key="ProjectExplorer.BuildStep.Enabled">false</value> + <value type="QString" key="ProjectExplorer.ProcessStep.Arguments">../ecu-basiclibs/iodriver/libIODriver.so ../../platform-ecu02/sysroot-target/usr/lib/libIODriver.so</value> + <value type="QString" key="ProjectExplorer.ProcessStep.Command">cp</value> + <value type="QString" key="ProjectExplorer.ProcessStep.WorkingDirectory">%{buildDir}</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Benutzerdefinierter Verarbeitungsschritt</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.ProcessStep</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.11"> + <value type="bool" key="ProjectExplorer.BuildStep.Enabled">false</value> + <value type="QString" key="ProjectExplorer.ProcessStep.Arguments">../ecu-basiclibs/iodriver/libIODriver.so ../../platform-ecu02/root-debug/usr/lib/libIODriver.so</value> + <value type="QString" key="ProjectExplorer.ProcessStep.Command">cp</value> + <value type="QString" key="ProjectExplorer.ProcessStep.WorkingDirectory">%{buildDir}</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Benutzerdefinierter Verarbeitungsschritt</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.ProcessStep</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.12"> + <value type="bool" key="ProjectExplorer.BuildStep.Enabled">false</value> + <value type="QString" key="ProjectExplorer.ProcessStep.Arguments">../ecu-basiclibs/core/libCore.so ../../platform-ecu02/sysroot-target/usr/lib/libCore.so</value> + <value type="QString" key="ProjectExplorer.ProcessStep.Command">cp</value> + <value type="QString" key="ProjectExplorer.ProcessStep.WorkingDirectory">%{buildDir}</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Benutzerdefinierter Verarbeitungsschritt</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.ProcessStep</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.13"> + <value type="bool" key="ProjectExplorer.BuildStep.Enabled">false</value> + <value type="QString" key="ProjectExplorer.ProcessStep.Arguments">../ecu-basiclibs/core/libCore.so ../../platform-ecu02/root-debug/usr/lib/libCore.so</value> + <value type="QString" key="ProjectExplorer.ProcessStep.Command">cp</value> + <value type="QString" key="ProjectExplorer.ProcessStep.WorkingDirectory">%{buildDir}</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Benutzerdefinierter Verarbeitungsschritt</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.ProcessStep</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.14"> + <value type="bool" key="ProjectExplorer.BuildStep.Enabled">false</value> + <value type="QString" key="ProjectExplorer.ProcessStep.Arguments">extern/isobus/libIsobus.so ../../platform-ecu02/sysroot-target/usr/lib/libIsobus.so</value> + <value type="QString" key="ProjectExplorer.ProcessStep.Command">cp</value> + <value type="QString" key="ProjectExplorer.ProcessStep.WorkingDirectory">%{buildDir}</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Benutzerdefinierter Verarbeitungsschritt</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.ProcessStep</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.15"> + <value type="bool" key="ProjectExplorer.BuildStep.Enabled">false</value> + <value type="QString" key="ProjectExplorer.ProcessStep.Arguments">extern/isobus/libIsobus.so ../../platform-ecu02/root-debug/usr/lib/libIsobus.so</value> + <value type="QString" key="ProjectExplorer.ProcessStep.Command">cp</value> + <value type="QString" key="ProjectExplorer.ProcessStep.WorkingDirectory">%{buildDir}</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Benutzerdefinierter Verarbeitungsschritt</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.ProcessStep</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.16"> + <value type="bool" key="ProjectExplorer.BuildStep.Enabled">false</value> + <value type="QString" key="ProjectExplorer.ProcessStep.Arguments">app/demo/ecu-jobctl-demo ../../platform-ecu02/root-debug/usr/bin</value> + <value type="QString" key="ProjectExplorer.ProcessStep.Command">cp</value> + <value type="QString" key="ProjectExplorer.ProcessStep.WorkingDirectory">%{buildDir}</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Benutzerdefinierter Verarbeitungsschritt</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.ProcessStep</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.2"> + <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Benutzerdefinertes entferntes Kommando ausführen </value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">RemoteLinux.GenericRemoteLinuxCustomCommandDeploymentStep</value> + <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedFiles"/> + <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedHosts"/> + <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedRemotePaths"/> + <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedSysroots"/> + <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedTimes"/> + <value type="QString" key="RemoteLinuxCustomCommandDeploymentStep.CommandLine">systemctl stop ecu-jobctl-demo</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.3"> + <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> + <value type="QString" key="ProjectExplorer.ProcessStep.Arguments">app/demo/ecu-jobctl-demo root@192.168.0.31:/usr/bin</value> + <value type="QString" key="ProjectExplorer.ProcessStep.Command">scp</value> + <value type="QString" key="ProjectExplorer.ProcessStep.WorkingDirectory">%{buildDir}</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Benutzerdefinierter Verarbeitungsschritt</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.ProcessStep</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.4"> + <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> + <value type="QString" key="ProjectExplorer.ProcessStep.Arguments">extern/isobus/libIsobus.so root@192.168.0.31:/usr/lib</value> + <value type="QString" key="ProjectExplorer.ProcessStep.Command">scp</value> + <value type="QString" key="ProjectExplorer.ProcessStep.WorkingDirectory">%{buildDir}</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Benutzerdefinierter Verarbeitungsschritt</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.ProcessStep</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.5"> + <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> + <value type="QString" key="ProjectExplorer.ProcessStep.Arguments">platform/core/libCore.so root@192.168.0.31:/usr/lib</value> + <value type="QString" key="ProjectExplorer.ProcessStep.Command">scp</value> + <value type="QString" key="ProjectExplorer.ProcessStep.WorkingDirectory">%{buildDir}</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Benutzerdefinierter Verarbeitungsschritt</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.ProcessStep</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.6"> + <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> + <value type="QString" key="ProjectExplorer.ProcessStep.Arguments">platform/ecu/libECU.so root@192.168.0.31:/usr/lib</value> + <value type="QString" key="ProjectExplorer.ProcessStep.Command">scp</value> + <value type="QString" key="ProjectExplorer.ProcessStep.WorkingDirectory">%{buildDir}</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Benutzerdefinierter Verarbeitungsschritt</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.ProcessStep</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.7"> + <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> + <value type="QString" key="ProjectExplorer.ProcessStep.Arguments">platform/iodriver/libIODriver.so root@192.168.0.31:/usr/lib</value> + <value type="QString" key="ProjectExplorer.ProcessStep.Command">scp</value> + <value type="QString" key="ProjectExplorer.ProcessStep.WorkingDirectory">%{buildDir}</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Benutzerdefinierter Verarbeitungsschritt</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.ProcessStep</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.8"> + <value type="bool" key="ProjectExplorer.BuildStep.Enabled">false</value> + <value type="QString" key="ProjectExplorer.ProcessStep.Arguments">../ecu-basiclibs/ecu/libECU.so ../../platform-ecu02/sysroot-target/usr/lib/libECU.so</value> + <value type="QString" key="ProjectExplorer.ProcessStep.Command">cp</value> + <value type="QString" key="ProjectExplorer.ProcessStep.WorkingDirectory">%{buildDir}</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Benutzerdefinierter Verarbeitungsschritt</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.ProcessStep</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.9"> + <value type="bool" key="ProjectExplorer.BuildStep.Enabled">false</value> + <value type="QString" key="ProjectExplorer.ProcessStep.Arguments">../ecu-basiclibs/ecu/libECU.so ../../platform-ecu02/root-debug/usr/lib/libECU.so</value> + <value type="QString" key="ProjectExplorer.ProcessStep.Command">cp</value> + <value type="QString" key="ProjectExplorer.ProcessStep.WorkingDirectory">%{buildDir}</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Benutzerdefinierter Verarbeitungsschritt</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.ProcessStep</value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">17</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deployment</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Auf Linux-Mobilgerät ausführen</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Demo</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">DeployToGenericLinux</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.1"> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> + <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Freien Plattenplatz überprüfen</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">RemoteLinux.CheckForFreeDiskSpaceStep</value> + <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedFiles"/> + <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedHosts"/> + <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedRemotePaths"/> + <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedSysroots"/> + <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedTimes"/> + <value type="QString" key="RemoteLinux.CheckForFreeDiskSpaceStep.PathToCheck">/</value> + <value type="qulonglong" key="RemoteLinux.CheckForFreeDiskSpaceStep.RequiredSpace">5242880</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> + <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> + <value type="QString" key="ProjectExplorer.ProcessStep.Arguments">app/axent/axent /var/projects/jncg/ptxdist/platform-ecu02/root-debug/usr/bin</value> + <value type="QString" key="ProjectExplorer.ProcessStep.Command">cp</value> + <value type="QString" key="ProjectExplorer.ProcessStep.WorkingDirectory">%{buildDir}</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Benutzerdefinierter Verarbeitungsschritt</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.ProcessStep</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.2"> + <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> + <value type="QString" key="ProjectExplorer.ProcessStep.Arguments">platform/ecu/libECU.so ../../platform-ecu02/sysroot-target/usr/lib/libECU.so</value> + <value type="QString" key="ProjectExplorer.ProcessStep.Command">cp</value> + <value type="QString" key="ProjectExplorer.ProcessStep.WorkingDirectory">%{buildDir}</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Benutzerdefinierter Verarbeitungsschritt</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.ProcessStep</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.3"> + <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> + <value type="QString" key="ProjectExplorer.ProcessStep.Arguments">platform/ecu/libECU.so ../../platform-ecu02/root-debug/usr/lib/libECU.so</value> + <value type="QString" key="ProjectExplorer.ProcessStep.Command">cp</value> + <value type="QString" key="ProjectExplorer.ProcessStep.WorkingDirectory">%{buildDir}</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Benutzerdefinierter Verarbeitungsschritt</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.ProcessStep</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.4"> + <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> + <value type="QString" key="ProjectExplorer.ProcessStep.Arguments">platform/iodriver/libIODriver.so ../../platform-ecu02/sysroot-target/usr/lib/libIODriver.so</value> + <value type="QString" key="ProjectExplorer.ProcessStep.Command">cp</value> + <value type="QString" key="ProjectExplorer.ProcessStep.WorkingDirectory">%{buildDir}</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Benutzerdefinierter Verarbeitungsschritt</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.ProcessStep</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.5"> + <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> + <value type="QString" key="ProjectExplorer.ProcessStep.Arguments">platform/iodriver/libIODriver.so ../../platform-ecu02/root-debug/usr/lib/libIODriver.so</value> + <value type="QString" key="ProjectExplorer.ProcessStep.Command">cp</value> + <value type="QString" key="ProjectExplorer.ProcessStep.WorkingDirectory">%{buildDir}</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Benutzerdefinierter Verarbeitungsschritt</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.ProcessStep</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.6"> + <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> + <value type="QString" key="ProjectExplorer.ProcessStep.Arguments">platform/core/libCore.so ../../platform-ecu02/sysroot-target/usr/lib/libCore.so</value> + <value type="QString" key="ProjectExplorer.ProcessStep.Command">cp</value> + <value type="QString" key="ProjectExplorer.ProcessStep.WorkingDirectory">%{buildDir}</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Benutzerdefinierter Verarbeitungsschritt</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.ProcessStep</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.7"> + <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> + <value type="QString" key="ProjectExplorer.ProcessStep.Arguments">platform/core/libCore.so ../../platform-ecu02/root-debug/usr/lib/libCore.so</value> + <value type="QString" key="ProjectExplorer.ProcessStep.Command">cp</value> + <value type="QString" key="ProjectExplorer.ProcessStep.WorkingDirectory">%{buildDir}</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Benutzerdefinierter Verarbeitungsschritt</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.ProcessStep</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.8"> + <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> + <value type="QString" key="ProjectExplorer.ProcessStep.Arguments">extern/isobus/libIsobus.so ../../platform-ecu02/root-debug/usr/lib/libIsobus.so</value> + <value type="QString" key="ProjectExplorer.ProcessStep.Command">cp</value> + <value type="QString" key="ProjectExplorer.ProcessStep.WorkingDirectory">%{buildDir}</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Benutzerdefinierter Verarbeitungsschritt</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.ProcessStep</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.9"> + <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> + <value type="QString" key="ProjectExplorer.ProcessStep.Arguments">extern/isobus/libIsobus.so ../../platform-ecu02/sysroot-target/usr/lib/libIsobus.so</value> + <value type="QString" key="ProjectExplorer.ProcessStep.Command">cp</value> + <value type="QString" key="ProjectExplorer.ProcessStep.WorkingDirectory">%{buildDir}</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Benutzerdefinierter Verarbeitungsschritt</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.ProcessStep</value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">10</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deployment</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Auf Linux-Mobilgerät ausführen</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Axent</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">DeployToGenericLinux</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.2"> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> + <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Freien Plattenplatz überprüfen</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">RemoteLinux.CheckForFreeDiskSpaceStep</value> + <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedFiles"/> + <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedHosts"/> + <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedRemotePaths"/> + <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedSysroots"/> + <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedTimes"/> + <value type="QString" key="RemoteLinux.CheckForFreeDiskSpaceStep.PathToCheck">/</value> + <value type="qulonglong" key="RemoteLinux.CheckForFreeDiskSpaceStep.RequiredSpace">5242880</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> + <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> + <value type="QString" key="ProjectExplorer.ProcessStep.Arguments">app/axis/axis /var/projects/jncg/ptxdist/platform-ecu02/root-debug/usr/bin</value> + <value type="QString" key="ProjectExplorer.ProcessStep.Command">cp</value> + <value type="QString" key="ProjectExplorer.ProcessStep.WorkingDirectory">%{buildDir}</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Benutzerdefinierter Verarbeitungsschritt</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.ProcessStep</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.2"> + <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> + <value type="QString" key="ProjectExplorer.ProcessStep.Arguments">platform/ecu/libECU.so ../../platform-ecu02/sysroot-target/usr/lib/libECU.so</value> + <value type="QString" key="ProjectExplorer.ProcessStep.Command">cp</value> + <value type="QString" key="ProjectExplorer.ProcessStep.WorkingDirectory">%{buildDir}</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Benutzerdefinierter Verarbeitungsschritt</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.ProcessStep</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.3"> + <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> + <value type="QString" key="ProjectExplorer.ProcessStep.Arguments">platform/ecu/libECU.so ../../platform-ecu02/root-debug/usr/lib/libECU.so</value> + <value type="QString" key="ProjectExplorer.ProcessStep.Command">cp</value> + <value type="QString" key="ProjectExplorer.ProcessStep.WorkingDirectory">%{buildDir}</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Benutzerdefinierter Verarbeitungsschritt</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.ProcessStep</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.4"> + <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> + <value type="QString" key="ProjectExplorer.ProcessStep.Arguments">platform/iodriver/libIODriver.so ../../platform-ecu02/sysroot-target/usr/lib/libIODriver.so</value> + <value type="QString" key="ProjectExplorer.ProcessStep.Command">cp</value> + <value type="QString" key="ProjectExplorer.ProcessStep.WorkingDirectory">%{buildDir}</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Benutzerdefinierter Verarbeitungsschritt</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.ProcessStep</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.5"> + <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> + <value type="QString" key="ProjectExplorer.ProcessStep.Arguments">platform/iodriver/libIODriver.so ../../platform-ecu02/root-debug/usr/lib/libIODriver.so</value> + <value type="QString" key="ProjectExplorer.ProcessStep.Command">cp</value> + <value type="QString" key="ProjectExplorer.ProcessStep.WorkingDirectory">%{buildDir}</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Benutzerdefinierter Verarbeitungsschritt</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.ProcessStep</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.6"> + <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> + <value type="QString" key="ProjectExplorer.ProcessStep.Arguments">platform/core/libCore.so ../../platform-ecu02/sysroot-target/usr/lib/libCore.so</value> + <value type="QString" key="ProjectExplorer.ProcessStep.Command">cp</value> + <value type="QString" key="ProjectExplorer.ProcessStep.WorkingDirectory">%{buildDir}</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Benutzerdefinierter Verarbeitungsschritt</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.ProcessStep</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.7"> + <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> + <value type="QString" key="ProjectExplorer.ProcessStep.Arguments">platform/core/libCore.so ../../platform-ecu02/root-debug/usr/lib/libCore.so</value> + <value type="QString" key="ProjectExplorer.ProcessStep.Command">cp</value> + <value type="QString" key="ProjectExplorer.ProcessStep.WorkingDirectory">%{buildDir}</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Benutzerdefinierter Verarbeitungsschritt</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.ProcessStep</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.8"> + <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> + <value type="QString" key="ProjectExplorer.ProcessStep.Arguments">extern/isobus/libIsobus.so ../../platform-ecu02/root-debug/usr/lib/libIsobus.so</value> + <value type="QString" key="ProjectExplorer.ProcessStep.Command">cp</value> + <value type="QString" key="ProjectExplorer.ProcessStep.WorkingDirectory">%{buildDir}</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Benutzerdefinierter Verarbeitungsschritt</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.ProcessStep</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.9"> + <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> + <value type="QString" key="ProjectExplorer.ProcessStep.Arguments">extern/isobus/libIsobus.so ../../platform-ecu02/sysroot-target/usr/lib/libIsobus.so</value> + <value type="QString" key="ProjectExplorer.ProcessStep.Command">cp</value> + <value type="QString" key="ProjectExplorer.ProcessStep.WorkingDirectory">%{buildDir}</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Benutzerdefinierter Verarbeitungsschritt</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.ProcessStep</value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">10</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deployment</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Auf Linux-Mobilgerät ausführen</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Axis</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">DeployToGenericLinux</value> + </valuemap> + <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">3</value> + <valuemap type="QVariantMap" key="ProjectExplorer.Target.PluginSettings"/> + <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0"> + <value type="bool" key="Analyzer.QmlProfiler.AggregateTraces">false</value> + <value type="bool" key="Analyzer.QmlProfiler.FlushEnabled">false</value> + <value type="uint" key="Analyzer.QmlProfiler.FlushInterval">1000</value> + <value type="QString" key="Analyzer.QmlProfiler.LastTraceFile"></value> + <value type="bool" key="Analyzer.QmlProfiler.Settings.UseGlobalSettings">true</value> + <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/> + <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value> + <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value> + <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value> + <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value> + <value type="int" key="Analyzer.Valgrind.LeakCheckOnFinish">1</value> + <value type="int" key="Analyzer.Valgrind.NumCallers">25</value> + <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/> + <value type="int" key="Analyzer.Valgrind.SelfModifyingCodeDetection">1</value> + <value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value> + <value type="bool" key="Analyzer.Valgrind.ShowReachable">false</value> + <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value> + <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value> + <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds"> + <value type="int">0</value> + <value type="int">1</value> + <value type="int">2</value> + <value type="int">3</value> + <value type="int">4</value> + <value type="int">5</value> + <value type="int">6</value> + <value type="int">7</value> + <value type="int">8</value> + <value type="int">9</value> + <value type="int">10</value> + <value type="int">11</value> + <value type="int">12</value> + <value type="int">13</value> + <value type="int">14</value> + </valuelist> + <value type="int" key="PE.EnvironmentAspect.Base">1</value> + <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Benutzerdefinierte ausführbare Datei (auf entferntem generischem Linux-Host)</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">&quot;/usr/bin/ecu-jobctl-demo&quot; auf Linux-Gerät ausführen</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">RemoteLinux.CustomRunConfig</value> + <value type="QString" key="RemoteLinux.CustomRunConfig.Arguments"></value> + <value type="QString" key="RemoteLinux.CustomRunConfig.LocalExecutable">/home/rauch/projects/jncg/ptxdist/local_src/ecu-jobctl/app/demo/ecu-jobctl-demo</value> + <value type="QString" key="RemoteLinux.CustomRunConfig.RemoteExecutable">/usr/bin/ecu-jobctl-demo</value> + <value type="QString" key="RemoteLinux.CustomRunConfig.WorkingDirectory"></value> + <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value> + <value type="bool" key="RunConfiguration.UseCppDebugger">false</value> + <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value> + <value type="bool" key="RunConfiguration.UseMultiProcess">true</value> + <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value> + <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.1"> + <value type="bool" key="Analyzer.QmlProfiler.AggregateTraces">false</value> + <value type="bool" key="Analyzer.QmlProfiler.FlushEnabled">false</value> + <value type="uint" key="Analyzer.QmlProfiler.FlushInterval">1000</value> + <value type="QString" key="Analyzer.QmlProfiler.LastTraceFile"></value> + <value type="bool" key="Analyzer.QmlProfiler.Settings.UseGlobalSettings">true</value> + <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/> + <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value> + <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value> + <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value> + <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value> + <value type="int" key="Analyzer.Valgrind.LeakCheckOnFinish">1</value> + <value type="int" key="Analyzer.Valgrind.NumCallers">25</value> + <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/> + <value type="int" key="Analyzer.Valgrind.SelfModifyingCodeDetection">1</value> + <value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value> + <value type="bool" key="Analyzer.Valgrind.ShowReachable">false</value> + <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value> + <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value> + <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds"> + <value type="int">0</value> + <value type="int">1</value> + <value type="int">2</value> + <value type="int">3</value> + <value type="int">4</value> + <value type="int">5</value> + <value type="int">6</value> + <value type="int">7</value> + <value type="int">8</value> + <value type="int">9</value> + <value type="int">10</value> + <value type="int">11</value> + <value type="int">12</value> + <value type="int">13</value> + <value type="int">14</value> + </valuelist> + <value type="int" key="PE.EnvironmentAspect.Base">1</value> + <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Benutzerdefinierte ausführbare Datei (auf entferntem generischem Linux-Host)</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">&quot;/usr/bin/axent&quot; auf Linux-Gerät ausführen</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">RemoteLinux.CustomRunConfig</value> + <value type="QString" key="RemoteLinux.CustomRunConfig.Arguments"></value> + <value type="QString" key="RemoteLinux.CustomRunConfig.LocalExecutable">/home/rauch/projects/jncg/ptxdist/local_src/ecu-jobctl/app/axent/axent</value> + <value type="QString" key="RemoteLinux.CustomRunConfig.RemoteExecutable">/usr/bin/axent</value> + <value type="QString" key="RemoteLinux.CustomRunConfig.WorkingDirectory"></value> + <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value> + <value type="bool" key="RunConfiguration.UseCppDebugger">false</value> + <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value> + <value type="bool" key="RunConfiguration.UseMultiProcess">false</value> + <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value> + <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.2"> + <value type="bool" key="Analyzer.QmlProfiler.AggregateTraces">false</value> + <value type="bool" key="Analyzer.QmlProfiler.FlushEnabled">false</value> + <value type="uint" key="Analyzer.QmlProfiler.FlushInterval">1000</value> + <value type="QString" key="Analyzer.QmlProfiler.LastTraceFile"></value> + <value type="bool" key="Analyzer.QmlProfiler.Settings.UseGlobalSettings">true</value> + <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/> + <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value> + <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value> + <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value> + <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value> + <value type="int" key="Analyzer.Valgrind.LeakCheckOnFinish">1</value> + <value type="int" key="Analyzer.Valgrind.NumCallers">25</value> + <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/> + <value type="int" key="Analyzer.Valgrind.SelfModifyingCodeDetection">1</value> + <value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value> + <value type="bool" key="Analyzer.Valgrind.ShowReachable">false</value> + <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value> + <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value> + <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds"> + <value type="int">0</value> + <value type="int">1</value> + <value type="int">2</value> + <value type="int">3</value> + <value type="int">4</value> + <value type="int">5</value> + <value type="int">6</value> + <value type="int">7</value> + <value type="int">8</value> + <value type="int">9</value> + <value type="int">10</value> + <value type="int">11</value> + <value type="int">12</value> + <value type="int">13</value> + <value type="int">14</value> + </valuelist> + <value type="int" key="PE.EnvironmentAspect.Base">1</value> + <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Benutzerdefinierte ausführbare Datei (auf entferntem generischem Linux-Host)</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">&quot;/usr/bin/axis&quot; auf Linux-Gerät ausführen</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">RemoteLinux.CustomRunConfig</value> + <value type="QString" key="RemoteLinux.CustomRunConfig.Arguments"></value> + <value type="QString" key="RemoteLinux.CustomRunConfig.LocalExecutable">/home/rauch/projects/jncg/ptxdist/local_src/ecu-jobctl/app/axis/axis</value> + <value type="QString" key="RemoteLinux.CustomRunConfig.RemoteExecutable">/usr/bin/axis</value> + <value type="QString" key="RemoteLinux.CustomRunConfig.WorkingDirectory"></value> + <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value> + <value type="bool" key="RunConfiguration.UseCppDebugger">false</value> + <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value> + <value type="bool" key="RunConfiguration.UseMultiProcess">false</value> + <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value> + <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.3"> + <value type="bool" key="Analyzer.QmlProfiler.AggregateTraces">false</value> + <value type="bool" key="Analyzer.QmlProfiler.FlushEnabled">false</value> + <value type="uint" key="Analyzer.QmlProfiler.FlushInterval">1000</value> + <value type="QString" key="Analyzer.QmlProfiler.LastTraceFile"></value> + <value type="bool" key="Analyzer.QmlProfiler.Settings.UseGlobalSettings">true</value> + <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/> + <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value> + <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value> + <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value> + <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value> + <value type="int" key="Analyzer.Valgrind.LeakCheckOnFinish">1</value> + <value type="int" key="Analyzer.Valgrind.NumCallers">25</value> + <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/> + <value type="int" key="Analyzer.Valgrind.SelfModifyingCodeDetection">1</value> + <value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value> + <value type="bool" key="Analyzer.Valgrind.ShowReachable">false</value> + <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value> + <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value> + <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds"> + <value type="int">0</value> + <value type="int">1</value> + <value type="int">2</value> + <value type="int">3</value> + <value type="int">4</value> + <value type="int">5</value> + <value type="int">6</value> + <value type="int">7</value> + <value type="int">8</value> + <value type="int">9</value> + <value type="int">10</value> + <value type="int">11</value> + <value type="int">12</value> + <value type="int">13</value> + <value type="int">14</value> + </valuelist> + <value type="int" key="PE.EnvironmentAspect.Base">-1</value> + <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">ecu-jobctl-demo (auf Mobilgerät)</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">RemoteLinuxRunConfiguration:ecu-jobctl-demo</value> + <value type="QString" key="Qt4ProjectManager.MaemoRunConfiguration.Arguments"></value> + <value type="QString" key="Qt4ProjectManager.MaemoRunConfiguration.TargetName">ecu-jobctl-demo</value> + <value type="QString" key="RemoteLinux.RunConfig.AlternateRemoteExecutable"></value> + <value type="bool" key="RemoteLinux.RunConfig.UseAlternateRemoteExecutable">false</value> + <value type="QString" key="RemoteLinux.RunConfig.WorkingDirectory"></value> + <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value> + <value type="bool" key="RunConfiguration.UseCppDebugger">false</value> + <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value> + <value type="bool" key="RunConfiguration.UseMultiProcess">false</value> + <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value> + <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value> + </valuemap> + <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">4</value> + </valuemap> + </data> + <data> + <variable>ProjectExplorer.Project.TargetCount</variable> + <value type="int">1</value> + </data> + <data> + <variable>ProjectExplorer.Project.Updater.FileVersion</variable> + <value type="int">18</value> + </data> + <data> + <variable>Version</variable> + <value type="int">18</value> + </data> +</qtcreator> ++======= + <?xml version="1.0" encoding="UTF-8"?> + <!DOCTYPE QtCreatorProject> + <!-- Written by QtCreator 4.2.0, 2019-07-30T16:48:56. --> + <qtcreator> + <data> + <variable>EnvironmentId</variable> + <value type="QByteArray">{1e2c78dd-ddc2-43cb-ae11-e1e47428f095}</value> + </data> + <data> + <variable>ProjectExplorer.Project.ActiveTarget</variable> + <value type="int">0</value> + </data> + <data> + <variable>ProjectExplorer.Project.EditorSettings</variable> + <valuemap type="QVariantMap"> + <value type="bool" key="EditorConfiguration.AutoIndent">true</value> + <value type="bool" key="EditorConfiguration.AutoSpacesForTabs">false</value> + <value type="bool" key="EditorConfiguration.CamelCaseNavigation">true</value> + <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.0"> + <value type="QString" key="language">Cpp</value> + <valuemap type="QVariantMap" key="value"> + <value type="QByteArray" key="CurrentPreferences">CppGlobal</value> + </valuemap> + </valuemap> + <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.1"> + <value type="QString" key="language">QmlJS</value> + <valuemap type="QVariantMap" key="value"> + <value type="QByteArray" key="CurrentPreferences">QmlJSGlobal</value> + </valuemap> + </valuemap> + <value type="int" key="EditorConfiguration.CodeStyle.Count">2</value> + <value type="QByteArray" key="EditorConfiguration.Codec">UTF-8</value> + <value type="bool" key="EditorConfiguration.ConstrainTooltips">false</value> + <value type="int" key="EditorConfiguration.IndentSize">4</value> + <value type="bool" key="EditorConfiguration.KeyboardTooltips">false</value> + <value type="int" key="EditorConfiguration.MarginColumn">80</value> + <value type="bool" key="EditorConfiguration.MouseHiding">true</value> + <value type="bool" key="EditorConfiguration.MouseNavigation">true</value> + <value type="int" key="EditorConfiguration.PaddingMode">1</value> + <value type="bool" key="EditorConfiguration.ScrollWheelZooming">true</value> + <value type="bool" key="EditorConfiguration.ShowMargin">false</value> + <value type="int" key="EditorConfiguration.SmartBackspaceBehavior">0</value> + <value type="bool" key="EditorConfiguration.SmartSelectionChanging">true</value> + <value type="bool" key="EditorConfiguration.SpacesForTabs">true</value> + <value type="int" key="EditorConfiguration.TabKeyBehavior">0</value> + <value type="int" key="EditorConfiguration.TabSize">8</value> + <value type="bool" key="EditorConfiguration.UseGlobal">true</value> + <value type="int" key="EditorConfiguration.Utf8BomBehavior">1</value> + <value type="bool" key="EditorConfiguration.addFinalNewLine">true</value> + <value type="bool" key="EditorConfiguration.cleanIndentation">true</value> + <value type="bool" key="EditorConfiguration.cleanWhitespace">true</value> + <value type="bool" key="EditorConfiguration.inEntireDocument">false</value> + </valuemap> + </data> + <data> + <variable>ProjectExplorer.Project.PluginSettings</variable> + <valuemap type="QVariantMap"> + <valuelist type="QVariantList" key="ClangStaticAnalyzer.SuppressedDiagnostics"/> + </valuemap> + </data> + <data> + <variable>ProjectExplorer.Project.Target.0</variable> + <valuemap type="QVariantMap"> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 5.7.1 MinGW 32bit</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 5.7.1 MinGW 32bit</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">qt.57.win32_mingw53_kit</value> + <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value> + <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value> + <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value> + <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0"> + <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:/daten/Projekte/AXIS_AXENT/trunk/projekt/ptxdist/local_src/build-ecu-jobctl-Desktop_Qt_5_7_1_MinGW_32bit-Debug</value> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> + <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">true</value> + <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.SeparateDebugInfo">false</value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">false</value> + <valuelist type="QVariantList" key="UserStickyKeys"> + <value type="QString">QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary</value> + </valuelist> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> + <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> + <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments"/> + <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> + <valuelist type="QVariantList" key="UserStickyKeys"> + <value type="QString">Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments</value> + </valuelist> + </valuemap> + <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1"> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> + <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> + <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments"/> + <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> + <valuelist type="QVariantList" key="UserStickyKeys"> + <value type="QString">Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments</value> + </valuelist> + </valuemap> + <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Bereinigen</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value> + <valuelist type="QVariantList" key="UserStickyKeys"> + <value type="QString">ProjectExplorer.ProjectConfiguration.DefaultDisplayName</value> + </valuelist> + </valuemap> + <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value> + <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value> + <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Debug</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value> + <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value> + <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value> + <valuelist type="QVariantList" key="UserStickyKeys"> + <value type="QString">ProjectExplorer.BuildConfiguration.BuildDirectory</value> + </valuelist> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1"> + <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:/daten/Projekte/AXIS_AXENT/trunk/projekt/ptxdist/local_src/build-ecu-jobctl-Desktop_Qt_5_7_1_MinGW_32bit-Release</value> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> + <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value> + <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.SeparateDebugInfo">false</value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">false</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> + <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> + <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments"/> + <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> + <valuelist type="QVariantList" key="UserStickyKeys"> + <value type="QString">Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments</value> + </valuelist> + </valuemap> + <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1"> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> + <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> + <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments"/> + <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> + <valuelist type="QVariantList" key="UserStickyKeys"> + <value type="QString">Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments</value> + </valuelist> + </valuemap> + <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Bereinigen</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value> + <valuelist type="QVariantList" key="UserStickyKeys"> + <value type="QString">ProjectExplorer.ProjectConfiguration.DefaultDisplayName</value> + </valuelist> + </valuemap> + <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value> + <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value> + <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Release</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value> + <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value> + <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value> + <valuelist type="QVariantList" key="UserStickyKeys"> + <value type="QString">ProjectExplorer.BuildConfiguration.BuildDirectory</value> + </valuelist> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.2"> + <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:/daten/Projekte/AXIS_AXENT/trunk/projekt/ptxdist/local_src/build-ecu-jobctl-Desktop_Qt_5_7_1_MinGW_32bit-Profile</value> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> + <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">true</value> + <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.SeparateDebugInfo">true</value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">false</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> + <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> + <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments"/> + <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1"> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> + <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> + <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments"/> + <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Bereinigen</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value> + <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value> + <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Profile</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value> + <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value> + <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value> + </valuemap> + <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">3</value> + <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0"> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> + <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deployment</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value> + <valuelist type="QVariantList" key="UserStickyKeys"> + <value type="QString">ProjectExplorer.BuildStepList.StepsCount</value> + <value type="QString">ProjectExplorer.ProjectConfiguration.DefaultDisplayName</value> + </valuelist> + </valuemap> + <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Lokales Deployment</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value> + <valuelist type="QVariantList" key="UserStickyKeys"> + <value type="QString">ProjectExplorer.ProjectConfiguration.DefaultDisplayName</value> + <value type="QString">ProjectExplorer.ProjectConfiguration.DisplayName</value> + <value type="QString">ProjectExplorer.ProjectConfiguration.Id</value> + </valuelist> + </valuemap> + <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value> + <valuemap type="QVariantMap" key="ProjectExplorer.Target.PluginSettings"/> + <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0"> + <value type="bool" key="Analyzer.QmlProfiler.AggregateTraces">false</value> + <value type="bool" key="Analyzer.QmlProfiler.FlushEnabled">false</value> + <value type="uint" key="Analyzer.QmlProfiler.FlushInterval">1000</value> + <value type="QString" key="Analyzer.QmlProfiler.LastTraceFile"></value> + <value type="bool" key="Analyzer.QmlProfiler.Settings.UseGlobalSettings">true</value> + <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/> + <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value> + <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value> + <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value> + <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value> + <value type="int" key="Analyzer.Valgrind.LeakCheckOnFinish">1</value> + <value type="int" key="Analyzer.Valgrind.NumCallers">25</value> + <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/> + <value type="int" key="Analyzer.Valgrind.SelfModifyingCodeDetection">1</value> + <value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value> + <value type="bool" key="Analyzer.Valgrind.ShowReachable">false</value> + <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value> + <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value> + <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds"> + <value type="int">0</value> + <value type="int">1</value> + <value type="int">2</value> + <value type="int">3</value> + <value type="int">4</value> + <value type="int">5</value> + <value type="int">6</value> + <value type="int">7</value> + <value type="int">8</value> + <value type="int">9</value> + <value type="int">10</value> + <value type="int">11</value> + <value type="int">12</value> + <value type="int">13</value> + <value type="int">14</value> + </valuelist> + <value type="int" key="PE.EnvironmentAspect.Base">2</value> + <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">demo</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:C:/daten/Projekte/AXIS_AXENT/trunk/projekt/ptxdist/local_src/ecu-jobctl/app/demo/demo.pro</value> + <value type="bool" key="QmakeProjectManager.QmakeRunConfiguration.UseLibrarySearchPath">true</value> + <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments"></value> + <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">app/demo/demo.pro</value> + <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix">false</value> + <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory"></value> + <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory.default"></value> + <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value> + <value type="bool" key="RunConfiguration.UseCppDebugger">false</value> + <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value> + <value type="bool" key="RunConfiguration.UseMultiProcess">false</value> + <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value> + <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value> + <valuelist type="QVariantList" key="UserStickyKeys"> + <value type="QString">PE.EnvironmentAspect.Base</value> + <value type="QString">ProjectExplorer.ProjectConfiguration.DefaultDisplayName</value> + <value type="QString">ProjectExplorer.ProjectConfiguration.DisplayName</value> + <value type="QString">ProjectExplorer.ProjectConfiguration.Id</value> + <value type="QString">RunConfiguration.UseMultiProcess</value> + </valuelist> + </valuemap> + <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value> + <valuelist type="QVariantList" key="UserStickyKeys"> + <value type="QString">ProjectExplorer.ProjectConfiguration.DefaultDisplayName</value> + <value type="QString">ProjectExplorer.ProjectConfiguration.DisplayName</value> + <value type="QString">ProjectExplorer.ProjectConfiguration.Id</value> + <value type="QString">ProjectExplorer.Target.BuildConfigurationCount</value> + <value type="QString">ProjectExplorer.Target.DeployConfigurationCount</value> + <value type="QString">ProjectExplorer.Target.RunConfigurationCount</value> + </valuelist> + </valuemap> + </data> + <data> + <variable>ProjectExplorer.Project.TargetCount</variable> + <value type="int">1</value> + </data> + <data> + <variable>ProjectExplorer.Project.Updater.FileVersion</variable> + <value type="int">18</value> + </data> + <data> + <variable>Version</variable> + <value type="int">18</value> + </data> + </qtcreator> ++>>>>>>> rauch/jobrechner-import-20190607 diff --cc ptxdist/local_src/ecu-jobctl/extern/extern.pro index abea5d8,e999c35..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-jobctl/extern/extern.pro +++ b/ptxdist/local_src/ecu-jobctl/extern/extern.pro @@@ -19,7 -19,15 +19,19 @@@ TEMPLATE = subdirs SUBDIRS = \ ++<<<<<<< HEAD + isobus ++======= + isobus \ + linbus \ + emc \ + optipoint \ + pid_control \ + pos_control \ + predos_control \ + varispread \ + axmat ++>>>>>>> rauch/jobrechner-import-20190607 CONFIG += ordered diff --cc ptxdist/local_src/ecu-jobctl/extern/isobus/IsoClientsApi.h index c1dcb06,da7dbf9..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-jobctl/extern/isobus/IsoClientsApi.h +++ b/ptxdist/local_src/ecu-jobctl/extern/isobus/IsoClientsApi.h @@@ -1,334 -1,409 +1,746 @@@ ++<<<<<<< HEAD +/* ************************************************************************ */ +/*! + \file + \brief ECU Driver Clients Api Header File + \author Wegscheider Peter + \date Created XX.01.13 + + \copyright Copyright (c) WBZ-Engineering GmbH + + \par History: + \par + 24.01.2013 - author P. Wegscheider + - ISO 11783 Clients api declarations moved form IsoDef.h to this file + \par + 15.05.2014 - author E. Hammerl + - Version number updated + - Added function IsoCFControlCbSet() +*/ +/* ************************************************************************ */ +#ifndef DEF_IsoClientsApi_H + #define DEF_IsoClientsApi_H + +#ifdef __cplusplus +extern "C" { +#endif +/* ************************************************************************ */ + +/* ************************************************************************ */ +/*! \ingroup grp_versions + \brief Client Shared Module Version +*/ +#define VERSION_CSHARED 1.04 + + +/* ************************************************************************ */ +/* ************************************************************************ */ +/** \defgroup clientsshared Clients Shared + \ingroup clients +*/ +/* ************************************************************************ */ +/** \defgroup clientscommon Clients Common + \ingroup clientsshared +*/ + + +/* ************************************************************************ */ +/** \addtogroup clientsshared +@{ +*/ +#define NULL_OBJECTID 0xFFFFu /**< Null Object ID */ +/** @} */ + +/* ************************************************************************ */ +/** \addtogroup cfcontrol +@{ +*/ +/** \brief +Event of alive control +*/ +typedef enum +{ + IsoCF_Active, /**< Client/Server cyclic message is received */ + IsoCF_Lost /**< Client/Server cyclic message is missing */ +} ISOCFEXT_EVENT_e; + + +typedef struct +{ + ISOCFEXT_EVENT_e eCFEvent; /**< \brief Client/Server active or lost */ + ISO_USERFUNC_e eIsoUserFunct; /**< \brief Function of the user on the bus */ + sint16 s16Handle; /**< \brief Network member handle of the CF / network member */ +} ISOCFEVENT_T; + +/* **************************************************************************************** */ +typedef void (*iso_fnCbCFControl_t)( ISOCFEVENT_T* psCfEvent); + +/** @} */ /* END cfcontrol */ + +/** \addtogroup clientscommon +@{ +*/ +/*****************************************************************************/ +/*! + \brief This function installs the necessary callbackfunctions for timebase, watchdog and errorhandler + + Installs callbackfunctions for clients + \param[in] \wpp{rpfTime, slong(*)(void)} + Pointer on (callback-)function, which gives over the time in 1 ms resolution + \param[in] \wpp{rpfWatchdog, void(*)(void)} + Pointer on (callback-)function, which triggers the watchdog + \param[in] \wpp{rpfErrorhand, void(*)(byte\,byte\,sint)} + Pointer to (callback-)function of error handler \n + ( see also \ref errorhand for more informations ) + + \retval sint + - E_NO_ERR on success + + \note + You must also call IsoDrvCbBasicDataInstall() to add a callback function to receive messages for the clients. \n + See IsoCbDataOfBasicDistributor() for a single threading sample. +*/ +sint IsoClientsInit( slong (*rpfTime)( void ), + void (*rpfWatchdog) (void ), + void (*rpfErrorhand)( byte bFun, byte bLoc, sint iCause ) ); + + +/***************************************************************************************/ +/*! + \brief MainCyclic Call function for clients + + This function executes the cyclic functions of all modules of the clients ( VTC, SCC, TCC ..) + + \retval sint + - E_NO_ERR +*/ + +sint IsoClientsCyclicCall( void ); + +/************************************************************************************/ +/*! + \brief This is the default receive callback function of all messages and infos for the clients + \details + \param[in] \wp{eTargetClient, ISO_USERFUNC_e} + Intern meaning of the ISO member \n + ( working_set_member, auxiliary, tractor_ecu ..) + \param[in] \wp{eDataTransStatus, ISO_TPREP_E} + Callbackfunction for data link layer \n + Interface of this user for all ISO msg which arent processed + of the application layer, TC, VT, ... + \param[in] \wp{psTpData, ISO_TPINFO_T *} + Pointer on struct with all necessary infos \n + ( iInfoDirection, dwPGN, wSAInternUser, wSAPartner, dwNumberofBytes, pabData ) + + \par Sample + Initialise ECU driver clients in single thread + \code + IsoDrvCbBasicDataInstall( IsoCbDataOfBasicDistributor ); + IsoClientsInit( (long(*)( void))TimeMs_get, fvWatchdog, CbErrorOutp ); + \endcode +*/ + +void IsoCbDataOfBasicDistributor( ISO_USERFUNC_e eTargetClient, ISO_TPREP_E eDataTransStatus, ISO_TPINFO_T * psTpData ); + +/* ************************************************************************ */ +/** @} */ /* END clientscommon */ +/* ************************************************************************ */ + + +/* ************************** IsoWoSe.c ********************************** */ +/* ************************************************************************ */ +/** \defgroup workset WorkingSet + \ingroup clientsshared +*/ + +/* ************************************************************************ */ +/** \addtogroup workset +@{ +*/ + +/******************************************************************************/ +/*! + \brief This function sets a new working set master + + This function extends a normal CF to a working set master. VT and TC clients + can only work on the base of a working set master. + + \param[in] \wpp{rabWsMasterName, const byte[]} + Pointer to working set master name + \retval sint16 + - E_NO_ERR + - E_NO_INSTANCE - there is no empty working set struct \ + \note \par + NAME can be created with IsoSetName() +*/ + + sint16 IsoSetWorkingSetMaster( const byte rabWsMasterName[] ); + +/*****************************************************************************/ +/*! + \brief Adding of a new member to the working set + + \param[in] \wpp{rabWorkSetMasterName, const #byte[]} + Pointer to working set master (WSM Name) + \param[in] \wpp{rpabNewMemberName, const #byte[]} + Name of new member of the working set + \retval sint + - E_NO_ERR - OK + - E_OVERFLOW - Array full + - E_USER_ERROR - WorkingSetMaster unknown + \note \par + NAME can be created with IsoSetName() +*/ + sint IsoAddWorkingSetMember( const byte rabWorkSetMasterName[], const byte rpabNewMemberName[] ); + +/******************************************************************************/ +/*! + \brief This function reads the language of the working set + + The language command of the VT which displays the data masks is retured. If there + is no VT the language command of the TECU is returned. + + \param[in] \wpp{rabWsMasterName, const #byte[]} + Pointer to working set master name + \param[out] \wp{abLanguageCmd, byte[]} + Pointer to language command of this working set + \retval sint + - E_NO_ERR - OK + - E_ERROR_INDI - WS not found +*/ + sint IsoReadWorkingSetLanguageData( const byte rabWsMasterName[], byte abLanguageCmd[] ); + +/*****************************************************************************/ +/*! + \brief + \param[in] \wpp{rabAuxInputDeviceName[], const byte} + NAME of auxiliary input client function + \param[out] \wp{psMic, word*} + Returned "Model identification code" of the auxiliary unit device +*/ + sint IsoReadAuxInputDevModIdentCode( const byte rabAuxInputDeviceName[], word * psMic ); + +/* ************************************************************************ */ +/** @} */ /* END workingset */ +/* ************************************************************************ */ + + /* ************************************************************************ */ +/** \defgroup cfcontrol Extern Client and Server Control + \ingroup clientsshared +*/ + +/* ************************************************************************ */ +/** \addtogroup cfcontrol +@{ +*/ +/* **************************************************************************************** */ +/*! + \brief Set callback function for extern client function + + This function sets for a working set master the extern implement/server event callback + ( CFs with cyclic messages ) + + \param[in] \wpp{rabWsMasterName, const byte[]} + Pointer to working set master name + \param[in] \wp{pfnCallbackFunction, iso_fnCbCFControl_t} + Pointer to the callback function. + \retval sint16 + - #E_NO_ERR + - #E_NO_INSTANCE - Working set not found + \note \par + This function must be called after IsoSetWorkingSetMaster()! +*/ +sint16 IsoCFControlCbSet( const byte rabWsMasterName[], iso_fnCbCFControl_t pfnCallbackFunction ); + +/*****************************************************************************/ +/*! + \brief Read list of extern CF which have a cyclic status message + + Read list of certain extern CFs ( working_set_master, task_controller, virtual_terminal, + auxiliary, sequenz_control_master, file_server ) with the help of their "userfunction" + + \param[in] \wp{eCFfunction, ISO_USERFUNC_e} + Function ( driver enumeration ) of the searched CFs + \param[in] \wp{s16ArrSizeForHand, sint16} + Size of application array for handles see next parameter \n + Range: maximum ISO_USER_MAX + \param[out] \wp{as16Handles, sint16 []} + Pointer to a array of sint16 ( Size depends on bus good size is 10 - 30 ) \n + The driver entries all handles of extern network members here. + \param[out] \wp{s16NumbOfHa, sint16*} + Number of extern network members with a specific NAME function + \retval sint16 + - #E_NO_ERR + - #E_OVERFLOW - Application array is to small + - #E_RANGE - Input parameter unvalid + \note \par + A CF is here only available after receiving of the first status or maintenance message +*/ +sint16 IsoClientsReadListofExtHandles( ISO_USERFUNC_e eCFfunction, sint16 s16ArrSizeForHand, + sint16 as16Handles[], sint16* s16NumbOfHa ); + +/* ************************************************************************ */ +/** @} */ /* END cfcontrol */ +/* ************************************************************************ */ + +/* ************************************************************************ */ +#ifndef ISO_MODULE_CLIENTS + #if defined(_LAY6_) || defined(_LAY10_) || defined(_LAY13_) || defined(_LAY14_) + /*! \brief Enable client shared module compilation */ + #define ISO_MODULE_CLIENTS + #endif +#endif + +/* ************************************************************************ */ +#ifdef ISO_MODULE_CLIENTS +/* check and include client module api files */ + +#ifdef _LAY6_ + /*! \brief Enable VT client module compilation */ + #define ISO_MODULE_VTC + #include "IsoVtcApi.h" +#endif + +#ifdef _LAY10_ + /*! \brief Enable TC client module compilation */ + #define ISO_MODULE_TCC + #include "IsoTccApi.h" +#endif + + +#ifdef _LAY14_ + /*! \brief Enable SQC client module compilation */ + #define ISO_MODULE_SQCC + #include "IsoSccApi.h" +#endif + +#ifdef _LAY13_ + /*! \brief Enable FS client module compilation */ + #define ISO_MODULE_FSC + #include "IsoFscApi.h" +#endif + + +/* ************************************************************************ */ +#endif /* ISO_MODULE_CLIENTS */ +/* ************************************************************************ */ + + +/* ************************************************************************ */ +#ifdef __cplusplus +} /* end of extern "C" */ +#endif + +#endif /* DEF_IsoClientsApi_H */ +/* ************************************************************************ */ ++======= + /* ************************************************************************ */ + /*! + \file + \brief ECU Driver Clients API Header File + \author Wegscheider Peter + \date Created XX.01.13 + + \copyright Competence Center ISOBUS e.V. + + \par History: + \par + 24.01.2013 - author P. Wegscheider + - ISO 11783 Clients API declarations moved form IsoDef.h to this file + \par + 15.05.2014 - author E. Hammerl + - Version number updated + - Added function IsoCFControlCbSet() + \par + 08.04.2015 - author P. Wegscheider + - Version number updated + \par + 07.04.2016 - author P. Wegscheider + - added IsoClientsGetTimeMs() + \par + 14.12.2016 - author P. Wegscheider + - Feature ID 4209: declare pointer parameter in functions as const* where applicable + - IsoCbDataOfBasicDistributor() - set ISO_TPINFO_T as const + \par + 26.01.2017 - author P. Wegscheider + - Feature ID 4209: declare pointer parameter in functions as const* where applicable + - #iso_fnCbCFControl_t - set ISOCFEVENT_T as const + \par + 20.02.2017 - author P. Wegscheider + - Feature ID 6003: client interfaces should only use handles (rather then ISOBUS NAME) + - Added function IsoClGetCfHandleToName() + - Replaced IsoSetWorkingSetMaster() parameter rabWsMasterName with s16CfHandleMaster + - Replaced IsoAddWorkingSetMember() parameter rabWsMasterName with s16CfHandleMaster + - Replaced IsoCFControlCbSet() parameter rabWsMasterName with s16CfHandleMaster + - Replaced IsoReadAuxInputDevModIdentCode() parameter rabAuxInputDeviceName with s16CfHandleAuxInputDevice + \par + 11.12.2017 - author P. Wegscheider + - IsoClGraphicAuxCbSet() added for BugID 8108 to set a callback function for forwarding "VT" messages + from a graphical aux to the application + \par + 13.02.2018 -author P.Wegscheider + - Feature request ID 7504: Split Base Driver into "Base" and "AppInterface" + - updated IsoClientsInit() + \par + 06.05.2018 - author P.Wegscheider + - Feature ID 3910: header files should include header files they depend on + \par + 14.06.2018 -author P.Wegscheider + - Feature request ID 8424: use ISO_CF_NAME_T in API functions + \par + 02.08.2018 - author P. Wegscheider + - BugID 9103: iso_s16 IsoCFControlCbSet() misses the user parameter + */ + /* ************************************************************************ */ + #ifndef DEF_IsoClientsApi_H + #define DEF_IsoClientsApi_H + + /* include configuration, driver standard types and common definitions */ + #include "IsoCommonDef.h" + + #ifdef __cplusplus + extern "C" { + #endif + /* ************************************************************************ */ + + /* ************************************************************************ */ + /*! \ingroup grp_versions + \brief Client Shared Module Version + */ + #define VERSION_CSHARED 1.09 /* changed for v10.00 */ + + + /* ************************************************************************ */ + /* ************************************************************************ */ + /** \defgroup clientsshared Clients Shared + \ingroup clients + */ + /* ************************************************************************ */ + /** \defgroup clientscommon Clients Common + \ingroup clientsshared + */ + + + /* ************************************************************************ */ + /** \addtogroup clientsshared + @{ + */ + #define NULL_OBJECTID 0xFFFFu /**< Null Object ID */ + /** @} */ + + /* ************************************************************************ */ + /** \addtogroup cfcontrol + @{ + */ + /** \brief Event of alive control */ + typedef enum + { + IsoCF_Active, /**< Client/Server cyclic message is received */ + IsoCF_Lost, /**< Client/Server cyclic message is missing */ + IsoCF_LCReceived /**< Server has sent a Language command */ + } ISOCFEXT_EVENT_e; + + /*! \brief Client/Server alive control event stucture */ + typedef struct + { + ISOCFEXT_EVENT_e eCFEvent; /**< \brief Client/Server active or lost */ + ISO_USERFUNC_e eIsoUserFunct; /**< \brief Function of the user on the bus */ + iso_s16 s16Handle; /**< \brief Network member handle of the CF / network member */ + ISO_USER_PARAM_T userParam; /**< \brief User defined parameter set with IsoCFControlCbSet() */ + } ISOCFEVENT_T; + + /* **************************************************************************************** */ + /*! \brief Typedef of the callback function pointer */ + typedef void (*iso_fnCbCFControl_t)( const ISOCFEVENT_T* psCfEvent); + + /** @} */ /* END cfcontrol */ + + /** \addtogroup clientscommon + @{ + */ + /*****************************************************************************/ + /*! + \brief This function installs the necessary callback functions for time base, watchdog and error handler + + Installs callback functions for clients and initialises the client modules. + \param[in] \wp{pfGetTimeMs, ISO_CbGetTimeMs_t } + Pointer to the application specific timestamp callback function. + \param[in] \wp{pfTriggerWatchdog, ISO_CbTriggerWatchdog_t} + Pointer to the watchdog trigger callback function or NULL pointer if not needed. + \param[in] \wp{pfErrorHandler, ISO_CbErrorHandler_t} + Pointer to the error handler callback function or NULL pointer. \n + ( see also \ref errorhand for more information ) + + \retval iso_s16 + - #E_NO_ERR on success + - #E_RANGE rpfTime function pointer is the NULL pointer + \note + You must also call iso_BaseInit() to add a callback function to receive messages for the clients. \n + See IsoCbDataOfBasicDistributor() for a single threading sample. + */ + iso_s16 IsoClientsInit( ISO_CbGetTimeMs_t pfGetTimeMs, + ISO_CbTriggerWatchdog_t pfTriggerWatchdog, + ISO_CbErrorHandler_t pfErrorHandler ); + + + /***************************************************************************************/ + /*! + \brief MainCyclic Call function for clients + + This function executes the cyclic functions of all modules of the clients ( VTC, SCC, TCC ..) + + \retval iso_s16 + - E_NO_ERR + */ + + iso_s16 IsoClientsCyclicCall( void ); + + /************************************************************************************/ + /*! + \brief This is the default receive callback function of all messages and infos for the clients + \details + \param[in] \wp{eTargetClient, ISO_USERFUNC_e} + Intern meaning of the ISO member \n + ( working_set_member, auxiliary, tractor_ecu ..) + \param[in] \wp{eDataTransStatus, ISO_TPREP_E} + Callbackfunction for data link layer \n + Interface of this user for all ISO msg which arent processed + of the application layer, TC, VT, ... + \param[in] \wpp{psTpData, const #ISO_TPINFO_T *} + Pointer on struct with all necessary infos \n + ( iInfoDirection, dwPGN, u8SAIntern, u8SAPartner, dwNumberofBytes, pabData ) + + \par Sample + Initialise ECU driver clients in single thread + \code + iso_BaseInit( TimeMs_get, fvWatchdog, CbErrorOutp, IsoCbDataOfBasicDistributor ); + IsoClientsInit( TimeMs_get, fvWatchdog, CbErrorOutp ); + \endcode + */ + + void IsoCbDataOfBasicDistributor( ISO_USERFUNC_e eTargetClient, ISO_TPREP_E eDataTransStatus, const ISO_TPINFO_T * psTpData ); + + /* ************************************************************************ */ + /*! + \brief Returns the current time since startup in milliseconds + \retval iso_s32 + Time stamp in milliseconds + + The function uses the application-specific function of time, which was passed with IsoClientsInit(). + */ + iso_s32 IsoClientsGetTimeMs(void); + + + /* ************************************************************************ */ + /*! + \brief Returns the CF member handle of a CF for a given ISO NAME + \param[in] \wp{u16CanNode, iso_u16} + CAN bus node index \n + Should be set to #ISO_CAN_VT for the clients. + \param[in] \wpp{au8CfName, const #ISO_CF_NAME_T*} + Pointer to the 8 byte CF name array + \retval iso_s16 + CF member handle or HANDLE_UNVALID + \par Hint: + Currently the clients can use only the #ISO_CAN_VT CAN node. + The function wraps the base driver iso_NmGetMemHandleofName() function. + */ + iso_s16 IsoClGetCfHandleToName(iso_u16 u16CanNode, const ISO_CF_NAME_T* au8CfName); + + + /*****************************************************************************/ + /*! + \brief This function sets the callback function for forwarding the received + "VT" messages from a graphical auxiliary input device to the application. + + \param[in] \wpp{rpfCbDataOfAuxVt, void(*)(ISO_TPREP_E\,const ISO_TPINFO_T *)} + Pointer to the application specific callback-function or \n + NULL pointer to disable the forwarding. + + \retval iso_s16 + - #E_NO_ERR on success + \note + This function must be called after IsoClientsInit(). \n + The callback is a workaround for V9.01 to make it easier for an application + to communicate and upload a pool to a graphical aux. \n + The function is only for V9.01 and will be removed or modified for V10. + */ + iso_s16 IsoClGraphicAuxCbSet( void (*rpfCbDataOfAuxVt)(ISO_TPREP_E eDataTransStatus, const ISO_TPINFO_T * psTpData) ); + + /* ************************************************************************ */ + /** @} */ /* END clientscommon */ + /* ************************************************************************ */ + + + /* ************************** IsoWoSe.c ********************************** */ + /* ************************************************************************ */ + /** \defgroup workset WorkingSet + \ingroup clientsshared + */ + + /* ************************************************************************ */ + /** \addtogroup workset + @{ + */ + + /******************************************************************************/ + /*! + \brief This function sets a new working set master + + This function extends a normal CF to a working set master. VT and TC clients + can only work on the base of a working set master. + + \param[in] \wp{s16CfHandleMaster, iso_s16} + CF handle of working set master + \retval iso_s16 + - #E_NO_ERR + - #E_ERROR_INDI - master already set + - #E_NO_INSTANCE - there is no empty working set entry + - #E_USER_ERROR - CF handle is not valid + \par + Use IsoClGetCfHandleToName(ISO_CAN_VT, ...) to get the CF handle for an ISOBUS NAME. + */ + iso_s16 IsoSetWorkingSetMaster( iso_s16 s16CfHandleMaster); + + /*****************************************************************************/ + /*! + \brief Adding of a new member to the working set + + \param[in] \wp{s16CfHandleMaster, iso_s16} + CF handle of working set master + \param[in] \wpp{rpabNewMemberName, const #ISO_CF_NAME_T*} + Name of new member of the working set + \retval iso_s16 + - #E_NO_ERR - OK + - #E_OVERFLOW - Array full + - #E_USER_ERROR - WorkingSetMaster unknown + \note \par + - Use IsoClGetCfHandleToName(ISO_CAN_VT, ...) to get the CF handle for an ISOBUS NAME. + - NAME can be created with IsoSetName() + - Working set member functionality is not supported of driver ( -> manual handling ) + */ + iso_s16 IsoAddWorkingSetMember(iso_s16 s16CfHandleMaster, const ISO_CF_NAME_T* rpabNewMemberName ); + + /*****************************************************************************/ + /*! + \brief Function to get the "Model identification code" of an auxiliary input device + \param[in] \wp{s16CfHandleAuxInputDevice, iso_s16} + CF handle of auxiliary input device + \param[out] \wp{psMic, iso_u16*} + Returned "Model identification code" of the auxiliary unit device + \retval iso_s16 + - E_NO_ERR + - E_ERROR_INDI - Working set not found + - E_NOT_AVAILABLE - CF is not an auxiliary input device + */ + iso_s16 IsoReadAuxInputDevModIdentCode(iso_s16 s16CfHandleAuxInputDevice, iso_u16 * psMic ); + + /* ************************************************************************ */ + /** @} */ /* END workingset */ + /* ************************************************************************ */ + + /* ************************************************************************ */ + /** \defgroup cfcontrol Extern Client and Server Control + \ingroup clientsshared + */ + + /* ************************************************************************ */ + /** \addtogroup cfcontrol + @{ + */ + /* ************************************************************************ */ + /*! + \brief Set optional "alive control" event callback function + + This function sets for a working set master the extern implement/server event callback + ( CFs with cyclic messages ) + + \param[in] \wp{s16CfHandleMaster, iso_s16} + CF handle of the working set master + \param[in] \wpp{userParam, const #ISO_USER_PARAM_T} + User parameter value for the callback function calls. \n + Use #ISO_USER_PARAM_DEFAULT if not used/needed. + \param[in] \wp{pfnCallbackFunction, iso_fnCbCFControl_t} + Pointer to the callback function. + \retval iso_s16 + - #E_NO_ERR + - #E_NO_INSTANCE - Working set not found + \par + This function must be called after the IsoSetWorkingSetMaster() call! + */ + iso_s16 IsoCFControlCbSet( iso_s16 s16CfHandleMaster, const ISO_USER_PARAM_T userParam, iso_fnCbCFControl_t pfnCallbackFunction ); + + /* ************************************************************************* */ + /*! + \brief Read list of extern CFs + + The function reads a list of extern CFs which have a periodic status or maintenance message. + It can be used only for following control functions: + - working_set_master + - task_controller + - datalogger + - virtual_terminal + - auxiliary ( unit devices ) + - sequenz_control_master + - file_server + - tim_server + + \param[in] \wp{eCFfunction, ISO_USERFUNC_e} + Userfunction ( limited ) of the searched CFs + \param[in] \wp{s16ArrSizeForHand, iso_s16} + Size of application array for handles see next parameter \n + Range: maximum ISO_USER_MAX + \param[out] \wp{as16Handles, iso_s16 []} + Pointer to a array of iso_s16 ( Size depends on bus good size is 10 - 30 ) \n + The driver entries all handles of extern network members here. + \param[out] \wp{s16NumbOfHa, iso_s16*} + Number of extern network members + \retval iso_s16 + - #E_NO_ERR + - #E_OVERFLOW - Application array is to small + - #E_RANGE - Input parameter unvalid + \note \par + A CF is here only available after receiving of the first status or maintenance message + */ + iso_s16 IsoClientsReadListofExtHandles( ISO_USERFUNC_e eCFfunction, iso_s16 s16ArrSizeForHand, + iso_s16 as16Handles[], iso_s16* s16NumbOfHa ); + + /****************************************************************************/ + /*! + \brief Reads the Language command of a server + + \param[in] \wpp{rs16ServHandle, const #iso_s16 } + CF server handle + \param[out] \wpp{au8LanguageCmd, #iso_u8[] } + Pointer to Language command data + \retval iso_s16 + - #E_NO_ERR + - #E_USER_ERROR + - #E_NOT_AVAILABLE - There are no valid LC data + */ + iso_s16 IsoClServ_ReadLCOfServer(const iso_s16 rs16ServHandle, iso_u8 au8LanguageCmd[]); + + /****************************************************************************/ + /*! + \brief Reads the Language command of the primary TECU + + \param[out] \wpp{au8LanguageCmd, #iso_u8[] } + Pointer to Language command data + \retval iso_s16 + - #E_NO_ERR + - #E_NOT_AVAILABLE - There are no valid LC data of the primary TECU + */ + iso_s16 IsoClServ_ReadLCofTECU(iso_u8 au8LanguageCmd[]); + + /* ************************************************************************ */ + /** @} */ /* END cfcontrol */ + /* ************************************************************************ */ + + /* ************************************************************************ */ + #ifdef __cplusplus + } /* end of extern "C" */ + #endif + + #endif /* DEF_IsoClientsApi_H */ + /* ************************************************************************ */ ++>>>>>>> rauch/jobrechner-import-20190607 diff --cc ptxdist/local_src/ecu-jobctl/extern/isobus/IsoConf.h index bfd7d0d,4ea1c7f..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-jobctl/extern/isobus/IsoConf.h +++ b/ptxdist/local_src/ecu-jobctl/extern/isobus/IsoConf.h @@@ -1,82 -1,368 +1,453 @@@ ++<<<<<<< HEAD +/* ************************************************************************** */ +/*! + \file IsoConf.h + + \brief Sample Configuration file for ISO11783 Driver + - should be modified by the application programmer + + File for individual configuration settings of ISO Driver + + +*/ +/* ************************************************************************** */ +#ifndef DEF_ISO_CONF_H + #define DEF_ISO_CONF_H + + +#define _LAY78_ /**< \brief Enable support of the new Multi CAN Node Application Layer Interface */ +#define _LAY6_ /**< \brief Enable Part 6: \link vtcl Virtual Terminal Client \endlink functionality */ +#define _LAY10_ /**< \brief Enable Part 10: \link taskc Task Controller Client \endlink functionality */ +#define _LAY13_ /**< \brief Enable Part 13: \link fsclient File Server Client \endlink functionality */ +#define _LAY14_ /**< \brief Enable Part 14: \link sequencectrl Sequence Control Client \endlink functionality (needs _LAY6_) */ +//#define _NMEA_ /**< \brief Enable NMEA 2000 extension: fast packet transfer, Modul IsoDataM.c is necessary */ + +#define ISO_CAN_NODE1 0 /**< \brief CAN 1 */ +#define ISO_PART5_SE /**< \brief Activate Part 5 Second edition */ +#define NUMBERPGN_MAX 40 /**< \brief Maximum number of PGN handles - predefined with 10 */ +#define NUMBERSPN_MAX 60 /**< \brief Maximum number of SPNs - predefined with 20 */ + +#define RAMSIZEPOOL 0x80000 /* Poolbuffer size */ +//#define ISO_POOL_DIRECT_LOAD +//#define ISO_DEBUG_ENABLED // activate output +#define ISO_DEBUG_USE_EXTERN_FUNCTIONS // intern states to output window else in to cout +#define ENABLE_ISO_APP_TYPEDEFS + +#define VTMSG_BUFSIZE (500u) // Command buffer - normal size */ + +/* Feature 1459: AUXINPUTMAX in IsoConf.h */ +#define AUXINPUTMAX (40u) /**< Max. number of auxiliary inputs */ + +#define STRBUFFSIZE (50) /**< \brief Number of strings which can be stored */ +/* ECU Driver typedef needed for application ( VS2008 sample ) */ + +#define PROCESSDATA_MAX (200) /**< Predefined number of process data ( -> more IsoConf.h) */ + +#define DEVICEDESCRIPTION_SIZE (10000u) /**< Predefined size of buffer for device description pool ( -> more IsoConf.h) */ + +#define TC_NUMNESTED_DE (100) /**< Predefined size of number of nested Device elements ( -> more IsoConf.h) */ + + +#ifdef ENABLE_ISO_APP_TYPEDEFS + /* Typs of typedef */ + typedef char schar; /* 8-bit */ + typedef short sshort; /* 16-bit */ + typedef int sint; /* Compiler! */ + typedef long slong; /* 32-bit */ + + typedef unsigned short ushort; /* unsigned 16-bit */ + typedef void tVoid; + typedef float sfloat; /* 4 Byte floating-point */ + + /* Unsigned basic typs */ + + typedef unsigned char byte; /* 8-bit */ + typedef unsigned short word; /* 16 bit */ + typedef unsigned long dword; /* 32-bit */ + + /* Other */ + typedef unsigned char cbool; + + /* if not supported of EOS */ + typedef unsigned char uint8; /* unsigned 8bit */ + typedef signed char sint8; /* signed 8bit */ + typedef unsigned short uint16; /* unsigned 16bit */ + typedef signed short sint16; /* signed 16bit */ + typedef unsigned long uint32; /* unsigned 32bit */ + typedef signed long sint32; /* signed 32bit */ + typedef float float32; /* IEEE float 32bit */ + typedef double float64; /* IEEE float 64bit */ + +#endif + +#endif /* DEF_ISO_CONF_H */ ++======= + /* ************************************************************************** */ + /*! + \file IsoConf.h + + \brief Sample Configuration file for ISO11783 Driver + - should be modified by the application programmer + + File for individual configuration settings of ISO Driver - Version for WBZ Demo + + + \author Hammerl Erwin + \date Created 29.06.2006 \n + Updated 04.11.2016 + + Copyright (c) WBZ-Engineering GmbH + + */ + /* ************************************************************************** */ + #ifndef DEF_ISO_CONF_H + #define DEF_ISO_CONF_H + + /* ************************************************************************** */ + /*! \addtogroup isoconf IsoConf.h Sample + \ingroup isoconfig + \brief Sample configuration file + \details To define an other file than IsoConf.h as configuration file + add the define ISOCONF_APPFILE to your application. + \code + #define ISOCONF_APPFILE "MyIsoConf.h" + \endcode + */ + /*! @{ */ + /* ************************************************************************** */ + + /* ************************************************************************** */ + /*! + \def HUGE_C + \brief Memory Type for pointers to huge size variables. + */ + #ifdef __C166__ /*Keil*/ + #define HUGE_C xhuge + #else + #ifdef _C166 /*Tasking 16 bit*/ + #define HUGE_C huge + #else + /* #define HUGE_C define only if needed */ + #endif + #endif + + /* ************************************************************************** */ + /*! \name Defines - Enable Clients, protocols, layers, ... + To disable a functionality and compilation remove the corresponding define. + */ + /*! @{ */ + + #define _LAY78_ /**< \brief Enable Part 7: \link apla Multi CAN Node Application Layer \endlink functionality + \details Since version 8.0 the Base Driver Multi CAN Node API is used as default. \n + Removing _LAY78_ from the configuration disables only the application layer module compilation. \n */ + #define _LAY6_ /**< \brief Enable Part 6: \link vtcl Virtual Terminal Client \endlink functionality */ + #define _LAY10_ /**< \brief Enable Part 10: \link taskc Task Controller Client \endlink functionality */ + #define _LAY13_ /**< \brief Enable Part 13: \link fsclient File Server Client \endlink functionality */ + #define _LAY14_ /**< \brief Enable Part 14: \link sequencectrl Sequence Control Client \endlink functionality (needs _LAY6_) */ + #define _NMEA_ /**< \brief Enable NMEA 2000 extension: fast packet transfer, Module IsoDataM.c is necessary */ + + #define ISO_VTC_ENABLE_ALARM + + #ifdef DOXYGEN /* add define to documentation */ + #define _LAY4_ /**< \brief Enable Part 4: \link niuapi Network Interconnection Unit \endlink service functionality + \details Use the defines in the \ref niuconfig "configuration" section to configure the service. */ + #endif + /*!@} */ + + /* ************************************************************************** */ + /** \name Defines - Base Driver Multi CAN Node configuration (optional) + @{ */ + /*! [CAN Node configuration] */ + /*! \def ISO_CAN_NODES + \brief Number of physical CAN-busses which shall work with the J1939/ISO11783 protocol ( 1, 2, ...) (default 1) */ + #define ISO_CAN_NODES 1 + + /*! \def ISO_CAN_VT + \brief CAN Node which supports VT, TC, SC, FS functionality (default 0). + \details Number of the CAN-bus with full ISO-functionality. \n + This CAN bus node is used for all clients ( VT-Client, TC-Client, ... ). \n + All other busses support only basic-functionality. + Range: 0, 1, ... , (ISO_CAN_NODES-1) + */ + #define ISO_CAN_VT 0u + + /*! [CAN Node configuration] */ + /* not used in the driver, only a sample */ + #define ISO_CAN_NODE1 0u /**< \brief CAN 1 */ + #define ISO_CAN_NODE2 1u /**< \brief CAN 2 .... */ + #define ISO_CAN_NODE3 2u /**< \brief CAN 3 .... */ + #define ISO_CAN_NODE4 3u /**< \brief CAN 4 .... */ + /*! @} */ + + /* ************************************************************************** */ + /** \name Defines - Base Driver Part 5: Network management configuration (optional) + @{ */ + /*! \def ISO_PART5_SE + \brief Enable the Part 5 second edition behaviour. + \details For further information see \link drivernodeconfig Part 5 Configuration \endlink + */ + #define ISO_PART5_SE + + /* The self-configurable address range is between 128 and 247 */ + /* Constriction because of conformance test */ + #define ISO_FIRST_FREE_SA 200u /**< \brief First self-configurable address - predefined with 200u */ + #define ISO_LAST_FREE_SA 220u /**< \brief Last self-configurable address - predefined with 220u */ + + #define ISO_USER_MAX 32 /**< \brief Default value for the maximum number of network members for a CAN Node - predefined with 32 + \details This value is used as maximum number of entries in the address table for a node, + if nothing else is specified. To set the maximum number of network members entries + for a specific CAN node, you can add #ISO_USER_MAX_NODE1, #ISO_USER_MAX_NODE2, ..., #ISO_USER_MAX_NODE6 + to this configuration file. */ + + #define ISO_NM_LOOPTIME (15L) /**< \brief Loop time of the ISO-Task in order to compensate negative effects on + wait-times - predefined with 10 */ + + #ifdef DOXYGEN /* add defines to documentation */ + #define ISO_USER_MAX_NODE1 ISO_USER_MAX /**< \brief Maximum number of network members for CAN Node 1 */ + #define ISO_USER_MAX_NODE2 ISO_USER_MAX /**< \brief Maximum number of network members for CAN Node 2 */ + #define ISO_USER_MAX_NODE3 ISO_USER_MAX /**< \brief Maximum number of network members for CAN Node 3 */ + #define ISO_USER_MAX_NODE4 ISO_USER_MAX /**< \brief Maximum number of network members for CAN Node 4 */ + #define ISO_USER_MAX_NODE5 ISO_USER_MAX /**< \brief Maximum number of network members for CAN Node 5 */ + #define ISO_USER_MAX_NODE6 ISO_USER_MAX /**< \brief Maximum number of network members for CAN Node 6 */ + #endif + + /*! @} */ + + /* ************************************************************************** */ + /** \name Defines - Base Driver Part 3: Transport protocol configuration (optional) + @{ */ + + /*! \def TP_PARALLEL_MAX + \brief Parallel transport channels for all CAN-nodes - predefined with 5 + \details Number of transport protocols which run simultaneously respectively which are saved + temporarily (same sender and receiver). This parameter defines the transport channels + for all CAN-nodes ! ( in contrary to version before 6.01 - for every CAN-node ) */ + #define TP_PARALLEL_MAX 10 + + /* Optional for version >= 6.02 -> Saving RAM, enhancing number of channels per CAN-node */ + + /*! \def ISO_TPREDUCED_MAX + \brief Optional: Number of transport channels with reduced buffer size - predefined with 0 + \details This parameter defines the number of transport channels with reduced buffer size. + #TP_PARALLEL_MAX - #ISO_TPREDUCED_MAX are the channels with complete TP size (1785bytes) + For setting reduced size see BLOCK_SIZE_J1939 */ + #define ISO_TPREDUCED_MAX 5 + + /*! \def BLOCK_SIZE_J1939 + \brief Optional: Reduced data buffer size for TPs - predefined with 1785 Bytes + \details Defines the data buffer size for the with #ISO_TPREDUCED_MAX defined TP channels. + Range: 9 to 1785 bytes \n + E. g. 223 corresponds to the max. NMEA FPT size */ + #define BLOCK_SIZE_J1939 223u + + #ifdef DOXYGEN /* Used for creating the documentation ! */ + #define _J1939_ /**< \brief obsolete - normally not needed + \details Default priority of connection management (TP) is switched to J1939 style. */ + #endif + + /*! @} */ + + /* ************************************************************************** */ + /** \name Defines - Base Driver Part 7: Application layer configuration (optional) + @{ */ + #define NUMBERPGN_MAX 40 /**< \brief Maximum number of PGN handles - predefined with 10 + \details Number of PGNs which can be initialised in the revised application layer */ + + #define NUMBERSPN_MAX 60 /**< \brief Maximum number of SPNs - predefined with 20 + \details Number of SPNs which can be initialised in the revised application layer + - SPN-Support deactivation: Set NUMBERSPN_MAX to 0 */ + #ifdef DOXYGEN /* add defines to documentation */ + #define NO_SPN_DEFINES /**< \brief Do not use the SPN defines of the ECU Driver */ + #endif + /*! @} */ + + /* END base driver */ + + /* ************************************************************************** */ + /** \name Defines - Part 6 Virtual Terminal Client (LAYER 6) + See \link vtclmem Reduce memory footprint options \endlink for + options to disable or enable specific sub modules or functionalities. + */ + /*! @{ */ + + /** \def WORKING_SETS + \brief Number of possible working sets + + */ + #define ISO_USER_PARAM_TYPE void* + #define ISO_USER_PARAM_DEFAULT (0) + #define ISO_VTC_WAITFORPOOLLOAD + + #define CCI_USER_PARAM_NULL 0 //CAUTION -> will lead to memory leak, only here for compatibility reasons + + #define WORKING_SETS 3 /**< \brief Working Set with auxiliary functions type 2 needs 2 Number of Working Sets - + each working set with auxiliary function increases this value by 2, without by 1 */ + + #define WS_EXTERN 10 /**< \brief All extern Working sets ( auxiliary units, workings sets ) - predefined with 10 */ + + + /* Define IsoVt.c */ + #define VTMSG_BUFSIZE (4000u) /**< \brief Command buffer - normal size + + Size of the command message buffer. When opening a data mask, usually a command + is sent for each object. The buffer must be bigger than this number. */ + + #define STRBUFFSIZE 50 /**< \brief Number of strings which can be stored + + Number of strings which can be saved temporarily for a command buffer entry + (> maximum number of strings which are on one page) */ + + #define STRLENGTHMAX (70u) /**< \brief String length - Maximal size of a single string + + This buffer must be bigger than the longest string present (in bytes), + which is sent via the bus. */ + + #define ISO_WAITVT_SEC (5u) /**< \brief Waittime in seconds for preferred VT - predefined with 7 + + Length of time in seconds, equals waiting period for the preferred terminal + (see IsoVtInit() ), pre-defined with 7 seconds */ + + #define POOLVERSIONS (10u) /**< \brief Max. number of version strings stored after get version - predef. with 5 + + This Parameter defines the number of pool versions which are stored in the VTClient + when receiving the get version command */ + + #define POOBBUFF (50uL) /**< \brief Size of buffer for WSobject - predefined with 30 */ + + /* Define IsoPool.c */ + #define RAMSIZEPOOL 0x860000 /**< \brief Size of buffer for segmented pool transfer + + Size of memory in bytes for objects which are being sent with a single ETP. + In case there is sufficient RAM, the buffer should correlate to the pool size + as some terminals display a charge indicator which applies to the whole pool + and the whole pool is being downloaded in an ETP. In any case this buffer + must be bigger than the biggest object in the pool (256 colour-images!). */ + + #define SEGPOOLBLOCK 1000u /**< \brief Block request during segmented pool transfer + + Number of bytes requested of driver of "flash" - depends on the OS */ + + #define ISO_NO_SCALING_ELEMENTS_MAX (30u) /**< \brief Maximal number of manipulation ranges + + Maximum number of ranges given for pool manipulation + ( Number of calling IsoPoolSetIDRangeMode() ) */ + + #define ISO_MANIPULATE_MAX_LOOPS 1000 /**< \brief Maximum number of objects loaded, manipulated .. to RAM during one loop + + Number of manipulated objects during one machine loop - default is 4 */ + + #define ISO_MANIPULATE_MAX_TIME_MS 100 /**< \brief Maximum time in ms which driver can load objects before next loop + + Maximum time in ms for manipulating objects till driver leave this loop - default is 1000 */ + + #define ISO_POOLNUMANICOPY 4 /**< \brief Maximum number of multiple copied objects including original */ + + /* Define IsoVtXcr.c */ + /** \def MASKBITSNUMBER + \brief For size of array for automatic responses - predefined with 6 + + */ + #define MASKBITSNUMBER 0x06u /**< \brief Number of maskbits -> array size ( 2 ^ MASKBITSNUMBER ) + 20 + + The maximum number of objects which can be sent to a data/alarm mask by using special + command functions ( see IsoCommandEC(), IsoCommandTC() ... ), is calculated with this parameter. + These functions use a key search algorithm, the number of mask bits determine the array size. + The latter is calculated with the formula (2 ^ MASKBITSNUMBER + 20), + i.e. MASKBITSNUMBER = 6 equals 84 elements, MASKBITSNUMBER = 7 equals 148 elements. */ + + /* Define IsoAux.c */ + #define AUXINPUTMAX (400u) /**< \brief Number of auxiliary functions (in the working set pool, predefined with 40 + + Maximum number of auxiliary functions (with auxiliary devices auxiliary inputs) + in the pool */ + + #define BUFF_PREASS 300 /**< \brief Buffer for sending preferred assignment to the VT - predefined with 200 + + Internal buffer for preferred assignment (approx. 15 bytes per allocation + is sufficient)*/ + + #define ISO_VTC_GRAPHIC_AUX + /*! @} */ /* END Part 6 */ + + /* ************************************************************************** */ + /** \name Defines - Part 10 Task Controller Client */ + /** @{ */ + #define TC_NUMB_TCCLIENTS 1 /**< \brief Defines the number of possible TC-Clients */ + + #define PROCESSDATA_MAX 400 /**< \brief Maximum number of process data ( predefined is 20) + + (must be higher than the real number PDs). */ + + #define DEVICEDESCRIPTION_SIZE 20000 /**< \brief Size of buffer for device description pool ( predefined is 1000) + + RAM-buffer for the DeviceDescription (number DD-objects * 50 should be sufficient) + - Minimum is real size + 50 */ + + #define TC_NUMNESTED_DE 200 /**< \brief Number of nested Device elements ( predefined with 10 ) */ + + #define TC_TIMECYCLEMIN_PDS (50L) /**< \brief Minimum timecycle for PD list ( reducing prozessor load ) */ + + /** @} */ /* END Part 10 */ + + /* ************************************************************************** */ + /** \name Defines - Part 13 File Server Client (optional) + see \link fscconfig FS-Client Configuration \endlink for a list of all defines \n + Configuration Sample: + */ + /*! @{ */ + #define FSC_MAX_CONNECTIONS 2 /**< \brief Maximum of simultaneous connections ( predefined is 2) */ + #define FSC_MAX_IO_HANDLES 6 /**< \brief Maximum of simultaneous io channels ( predefined is FSC_MAX_CONNECTIONS * 3) */ + /*! @} */ /* END Part 13 */ + + /* ************************************************************************** */ + /** \name Defines - Part 14 Sequence Control Client */ + /*! @{ */ + #define SCD_SIZE 1000 /**< \brief Predefined size of SCD buffer is 1000 */ + #define SCFUNCTION_MAX 10 /**< \brief Predefined number of functions is 20 + \details Maximum number of SCD function objects (more than in SCD) */ + #define SCSTATES_MAX 15 /**< \brief Predefined number of functions is 20 + \details Maximum number of SCD state objects (more than in SCD) */ + #define SCPOOBBUFFEXT 20 /**< \brief Size of buffer for ExtDefObjDef object - predefined with 30 */ + /*!@} */ /* END Part 14 */ + + + #ifdef DOXYGEN /* add define to documentation */ + /* ************************************************************************** */ + /*! \name Defines - Enable message forwarding to the data link callback function for specific layers + The following defines can be added to the IsoConf.h to receive PGN messages which are normally + forwarded to a client with the CF data link callback function. + It is recommended that the corresponding client (layer) is deactivated in this case. + */ + /*! @{ */ + #define ISO_DLCB_LAY6 /*!< \brief Forward #PGN_ECUtoVT and #PGN_VTtoECU messages to CF data link callback function */ + #define ISO_DLCB_LAY10 /*!< \brief Forward #PGN_PROCESS_DATA messages to CF data link callback function */ + #define ISO_DLCB_LAY13 /*!< \brief Forward #PGN_FS_TO_FSC and #PGN_FSC_TO_FS messages to CF data link callback function */ + #define ISO_DLCB_LAY14 /*!< \brief Forward #PGN_SCM_TO_SCC and #PGN_SCC_TO_SCM messages to CF data link callback function */ + /*!@} */ + /*! \name Defines - Enable message forwarding to the application layer + The following defines can be added to the IsoConf.h to receive PGN messages which are normally + forwarded to a client with the application layer module. + The corresponding client (layer) can not be used in this case, because the client message processing is skipped. + */ + /*! @{ */ + #define ISO_OMIT_VTC_PGNS /*!< forward PGN_VTtoECU and PGN_ECUtoVT messages to "application layer" */ + #define ISO_OMIT_TCC_PGNS /*!< forward PGN_PROCESS_DATA messages to "application layer" */ + #define ISO_OMIT_SCC_PGNS /*!< forward PGN_SCM_TO_SCC and PGN_SCC_TO_SCM messages to "application layer" */ + #define ISO_OMIT_FSC_PGNS /*!< forward PGN_FSC_TO_FS and PGN_FS_TO_FSC messages to "application layer" */ + #define ISO_MODULE_APPLAYER_OMIT_RETURN_VALUE /*!< CCI workaround: Handle TP message in application layer and network layer callback*/ + /*!@} */ + #undef ISO_OMIT_VTC_PGNS + #undef ISO_OMIT_TCC_PGNS + #undef ISO_OMIT_SCC_PGNS + #undef ISO_OMIT_FSC_PGNS + #undef ISO_MODULE_APPLAYER_OMIT_RETURN_VALUE + + + #endif + + /* ************************************************************************** */ + /*!@}*/ /* END doxygen group isoconf */ + /* ************************************************************************** */ + + #endif /* DEF_ISO_CONF_H */ ++>>>>>>> rauch/jobrechner-import-20190607 diff --cc ptxdist/local_src/ecu-jobctl/extern/isobus/IsoDef.h index 07ddcb9,76c81f7..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-jobctl/extern/isobus/IsoDef.h +++ b/ptxdist/local_src/ecu-jobctl/extern/isobus/IsoDef.h @@@ -1,1366 -1,155 +1,1524 @@@ ++<<<<<<< HEAD +/* ************************************************************************ */ +/*! + \file IsoDef.h + \brief API for basic driver (old style) and VT, TC, SC client + + Global defines like PGNs, function fields, application functions, user enumerations + + \author Hammerl Erwin + \date Created 27.11.2003 + + \par Copyright (c) WBZ-Engineering GmbH + + \par HISTORY: + + \par + 01.04.2010 - author E. Hammerl + - Definitions, structures and functions for sequenz control + - 4.07 + + \par + 16.04.2010 - author E. Hammerl + - IsoUserLogOut() added 4.08 + + \par + 08.06.2010 - author E. Hammerl + - 4.13 + + \par + 28.06.2010 - author E. Hammerl + - PGN_REQ_FOR_REP_RATE added + - Version 4.14 + + \par + 26.07.2010 - author E. Hammerl + - Added function IsoTPRepeatSet() and enum IsoTaskStartStop + - case UNKNOWN_REC for fiIsoJ1939PGNStatus() - controlling first receiption of a PGN + - Version 4.15 + + \par + 30.07.2010 - author E. Hammerl + - New style (typedef enum..) for enums -> direct links in doxygen + - All function comments of the applic. interface are now here + - All for supporting new IL4 objects ( + - Commands: Get Attribute (see F.58/59), Select Colour Map (F.60/61) \n + - Activation msg: VT on User-Layout Hide/Show (H.20/H.21) + - Technical mag: Get Window Mask Data (D.12/13), Get Supported Objects (D.14/15) + - Complete interface for sequence control (_LAY14_) + - Version 4.54 + + \par + 03.09.2010 - author E. Hammerl + - Added fun. IsoWsSetSccInst( ) for finding instance of SC + - Added fun. IsoSC_StatusInfoGet() with corresponding enum + - Version 4.55 + + \par + 06.12.2010 - author E. Hammerl + - Added fun. IsoUserDelete() + - New enum (WS_VERSION_NR) for fun. IsoVTDataSet() + - New element IsoTcLogOut for ISO_TC_CMD_e + - Version 4.57 + + \par + 20.12.2010 - author E. Hammerl + - Enum and struct for network event handler + - Changing the parameter for the Network callback function (-> IsoUserAnnounce() ) + - Changing a parameter (NAME)function into NAME of IsoVTInit() and IsoAlarmObjInit() + - Version 4.60 + + \par + 11.01.2011 - author E. Hammerl + - Priority of messages is part of the application info struct + - Some dokumentation and Version 4.61 + + \par + 16.02.2011 - author E. Hammerl + - Added Alarm command AlDelete + - Version 4.62 + + \par + 30.03.2011 - author E. Hammerl + - TC: Defines for properties and triggermethods + - Version 4.63 + + \par + 30.06.2011 - author E. Hammerl + - Version 4.64 ( change see IsoPool.c ) + + \par + 27.04.2011 - author E. Hammerl + - States of VT state machine changed + - Added objects ObjectExternalObjDef, ExternalRefName, ExternalObjectPointer + - New manipulation modes: Load, LoadMoveID + - New functions: IsoPoolReload(), IsoSC_ExternalObjDefSet() + - ISOVT_STATUS_e: added VT_LOGOUT, ISO_SC_CMD_e: added IsoScLogOut + - Version 4.70 + + \par + 27.10.2011 - author P. Wegscheider + - Definitions for Part 13 File Server added + + \par + 16.11.2011 - author E. Hammerl + - Added IsoTimeWDInit(), Changed IsoDrvInit() and IsoPoolReload() + - Added Errorhandler function numbers of revised app-layer + - Version 4.82 + + \par + 21.11.2011 - author P. Wegscheider + - Added typedefs and function declarations for Part 13 File Server + - ISO_TPREP_E state record_firstdata added + + \par + 20.12.2011 - author E. Hammerl + - Version 4.83 + \par + 14.03.2012 - author E. Hammerl + - Version 5.01.00 layered architecture + \par + 20.03.2012 - author P. Wegscheider + - Version 5.02.00 changes for ISO 11783-5 second edition + - PGN_NAME_MANAGEMENT added + - Iso Driver / Node Config functions added + \par + 23.03.2012 - author P. Wegscheider + - enum value Isonet_MemberAddressViolation added + - define CFG_PARAM_CHECK_ADDRESS_VIOLATION added + - define ISOCONF_APPFILE added + \par + 30.03.2012 - author P. Wegscheider + - changes for Doxygen output generation + \par + 18.04.2012 - author E. Hammerl + - Added changes for calculating correct estimated size to version 5.02 + \par + 15.05.2012 - author E. Hammerl + - Added enum and functions for functionality "Segmented pool transfer" + - Version 5.03.00 - segmented pool transfer + \par + 19.06.2012 - author E. Hammerl + - New manipulation modes + - Version 5.04.00 + \par + 17.07.2012 - author P. Wegscheider + - fixed doxygen tags + - added Part 4 / NIU defines + \par + 08.08.2012 - author E. Hammerl + - Added function IsoReadWorkingSetLanguageData(), enum record_request + - Version 5.04.02 + \par + 14.08.2012 - author E. Hammerl + - Version 5.04.03 + \par + 21.08.2012 - author P. Wegscheider + - Version 6.00.00 + - Network Interconnection Unit (NIU) files added + \par + 01.10.2012 - author E. Hammerl + - Added function IsoTC_AddDPD_DPTObject() and IsoTC_DeviceElement_End() + - virtual_cf for NIU connection routing added to ISO_USERFUNC_e enum + - Network member handle ( s16Handle )added to ISONETEVENT_T structure + \par + 29.10.2012 - author P. Wegscheider + - Added defines for the file server client mode values + - Version 6.00.01 + \par + 31.10.2012 - author P. Wegscheider + - Version 6.00.02 + \par + 07.12.2012 - author E. Hammerl + - Version 6.00.03 + \par + 20.12.2012 - author E. Hammerl + - Version 6.00.04 + \par + 21.01.2013 - author E. Hammerl + - Version 6.00.05 + \par + 24.01.2013 - author E. Hammerl + - Version 6.00.06 + \par + 08.03.2013 - author P. Wegscheider + - Client api declarations moved to IsoClientsApi.h + - PGN definitions moved to IsoPgnDef.h + - Single CAN node api declarations moved to IsoSnApi.h + - Version 6.02.00 + \par + 25.04.2013 - author E. Hammerl + - Version 6.02.01 + \par + 13.05.2013 - author P. Wegscheider + - IsoSnApi.h is only included if _LAY78_ is not defined + - Version 6.02.02 + \par + 04.06.2013 - author P. Wegscheider + - Version 6.03.00 + - SRL1 Lint code review updates + - iso_NodeConfigSet() u16CanNr parameter type set to uint16 + - iso_NodeConfigGet() u16CanNr parameter type set to uint16 + - define CFG_PARAM_EXTERNAL_ADDRESS_CLAIM replaced with CFG_PARAM_EXTERNAL_ADDR_CLAIM + - define CFG_PARAM_CHECK_ADDRESS_VIOLATION replaced with CFG_PARAM_CHECK_ADDR_VIOLATION + - define CFG_PARAM_REQ_FOR_ACL_ON_STARTUP replaced with CFG_PARAM_REQ_FOR_ACL_ON_START + \par + 04.07.2013 - author P. Wegscheider + - Module version defines VERSION_GLOBAL and VERSION_BASE added + - Pointer cast defines for HUGE_C added ( should not defined in IsoConf.h if using SRL1 ) + - defines ISO_MODULE_* added for conditional compilation of the configurable driver modules + - define _DEBUG replaced with define ISO_DEBUG_ENABLED + - Debug function TextToBuffer() replaced with iso_DebugPuts() + - Debug function iso_DebugPrint() added + - Debug function DebVtStatesTrace() replaced with iso_DebugVtStatesTrace() + - Debug functions PrintTRACE() and PrintTRACE3() replaced with iso_DebugTrace() + \par + 18.11.2013 - author P. Wegscheider + - Version 6.04.00 + \par + 23.04.2014 - author E. Hammerl + - Version 6.04.01 + \par + 15.05.2014 - author P. Wegscheider + - Function IsoDriverVersionRead() return value changed from word to dword + - Version 7.00.01 + - iso_DebugVtStatesTrace() moved to IsoVt.c + - Debug fuction iso_DebugSetCallbackFunction() and define ISO_DEBUG_USE_CALLBACK_FUNCTION check added + \par + 22.07.2014 - author P. Wegscheider + - Version 7.00.02 + \par + 08.09.2014 - author P. Wegscheider + - Bugfixes for ISO_DEBUG_CALLBACK_t handling +*/ +/* ************************************************************************ */ + +/* ************************************************************************ */ +#ifndef DEF_ISO_DEF_H + #define DEF_ISO_DEF_H + +#ifdef __cplusplus +extern "C" { +#endif +/* ************************************************************************ */ + +/* ************************************************************************ */ +#ifdef ISOCONF_APPFILE /* if defined use the application specific IsoConf header file */ + #include ISOCONF_APPFILE +#else + #include "IsoConf.h" +#endif +/* ************************************************************************ */ + +/* ************************************************************************ */ +/*! \ingroup grp_versions + \brief ECU Driver Version + \details Version is returned from API function IsoDriverVersionRead() +*/ +#define DRIVER_VERSION 70003u + +/*! \ingroup grp_versions + \brief ECU Driver Marurity + \details This define is used to mark in progress versions. \n + - final, srl1 or empty string if finished + - pr01, pr02, pr[x] for a release candidate + - br01, br02, br[x] for a preview version + - b001, b[svn ref] for a beta version +*/ +#define DRIVER_MATURITY "" + +/* ************************************************************************ */ +/*! \ingroup grp_versions + \brief Global / Packet Version +*/ +#define VERSION_GLOBAL 7.00 + +/* ************************************************************************ */ +/*! \ingroup grp_versions + \brief Base Driver Module Version +*/ +#define VERSION_BASE 1.03 + + +/****************************************************************************/ +/****************************************************************************/ +/*! \addtogroup base_general +@{ */ + +#ifndef ISO_CAN_NODES + #define ISO_CAN_NODES 1 /**< Default number of CAN nodes */ +#endif /* ISO_CAN_NODES */ + +#ifndef ISO_CAN_VT + #define ISO_CAN_VT 0 /**< Default CAN node for clients */ +#endif /* ISO_CAN_VT */ + +/*! \brief Size of the NIU CAN message buffer array + \details Default: 20 * ISO_CAN_NODES := ( 10 ms * 2 msg/ms * CanNodes ) +*/ +#ifndef ISO_CANMSG_QUEUE_SIZE + #define ISO_CANMSG_QUEUE_SIZE ( 20 * ISO_CAN_NODES ) +#endif + +#ifndef PARAM_UNUSED + /*! \brief use this macro for all your unused function parameters */ + #define PARAM_UNUSED(x) (void)(x) +#endif + +/* ************************************************************************** */ +/*! \name Huge Memory Type Qualifier And Pointer Casts + + Add this defines only to your IsoConf.h, if use the VTC or FSC modul \n + and the normal memory model and pointer arithmetic is limited to 16kB or 64 kB \n + and your pool buffer or file data arrays are greater then the limit of 16kB or 64 kB. + \n + IsoConf.h Sample for Tasking VX-Toolset for C166: + \code{.c} + + #define HUGE_C __huge + #define CAST_TO_U8_PTR( ptr_huge ) ((byte*)((uint32)(ptr_huge))) + #define CAST_TO_U8_HUGE_PTR( ptr ) ((byte HUGE_C *)( ptr )) + + \endcode + \note + It is not recommend to use this defines for SRL1. \n + Use for SRL1 a memory model where no casts are needed. + @{ */ + +/* ************************************************************************** */ +/*! + \def HUGE_C + \brief Memory Type for pointers to huge size variables. + \details +*/ +#ifndef HUGE_C + #define HUGE_C + /*! \brief define to optimise code for using only one memory model... */ + #define HUGE_C_NOT_USED +#endif + +/* ************************************************************************** */ +/*! + \def CAST_TO_U8_PTR + \brief Macro to cast a #HUGE_C byte array pointer to standard memory byte array pointer. + \details You need to define this this macro if you have defined #HUGE_C. +*/ +#ifndef CAST_TO_U8_PTR + #define CAST_TO_U8_PTR +#endif + +/* ************************************************************************** */ +/*! + \def CAST_TO_U8_HUGE_PTR + \brief Macro to cast a standard memory byte array pointer to #HUGE_C byte array pointer. + \details + Define this macro only if your compiler needs an explicit cast to a huge pointer. +*/ +#ifndef CAST_TO_U8_HUGE_PTR + #define CAST_TO_U8_HUGE_PTR +#endif + +/* ************************************************************************** */ +/*! @} */ /* End group Huge Memory Type Qualifier And Pointer Casts */ +/* ************************************************************************** */ + +/* ************************************************************************ */ +/** @} */ /* END addtogroup base_general */ +/* ************************************************************************ */ + + +/****************************************************************************/ +/*! + \ingroup base_general + \brief Reading the actual ISO driver version + \retval dword + Version number of ISO driver ( e.g. 50101 means 5.01.01 ) + \note \par + The first number corresponds with the implementaion level ( 4 -> IL 4 ) + till version < 5.00. + In the case of adding some new functionalities the next number increases. + The last number increases in case of small improvements or bugfixing. + +*/ +dword IsoDriverVersionRead( void ); + +/* ************************************************************************ */ +/** \addtogroup datalink_types Datalink Layer Type Definitions + \ingroup datalink mndl +@{ +*/ +/* ************************************************************************ */ + +/* Defines */ +/* Timing defines */ +#define IS0_ONE_SECOND (1000L) /**< One second in ms */ +#define ISO_TIME_OUT (1250L) /**< Time in ms for expecting an answer */ + +#define ISO_DUMMY (0u) /**< Used in case of unused parameter */ +#define ISO_DEFAULT (0xFFFFu) /**< 16bit default value for parameter */ + +/* ************************************************************************ */ +/** \brief Enums of control byte of PGN ACKM */ +typedef enum { ACK = 0, NACK = 1, ACCESS_DENIED = 2, CANNOT_RESPOND = 3 } ISO_ACK_E; + +/* ************************************************************************ */ +/** \brief Message direction enum (used in #ISO_TPINFO_T field iInfoDirection ) */ +typedef enum { received, sended, not_known } ISO_DIR_E; + +/* ************************************************************************ */ +/** \brief Typedef of the message transport data structure + \details Info for application or intern moduls about sended or received data. \n + The the values of the fields depend on the ISO_TPREP_E status value of the callback. + \note pabData can be the NULL pointer also if dwNumberofBytes has a value greater than zero. \n + \par + + - record_start: dwNumberofBytes is zero, pabData not valid + - record_firstdata: dwNumberofBytes of the first data packet, pabData valid + - record_finish: dwNumberofBytes of received bytes, pabData is valid + + - record_request: ( application layer specific ) + + - send_buffed: dwNumberofBytes is zero and pabData is the NULL pointer + - send_start_OK: dwNumberofBytes is zero, pabData not valid + - send_packet_request: dwNumberofBytes is zero, pabData not valid ( only direct transfer ) + - send_finished: dwNumberofBytes of sended bytes (ETP only the offset bytes) , pabData is valid + - datatrans_abort: dwNumberofBytes = TP: size of buffer ETP: offset bytes BAM/FPT: zero , pabData is valid + - tp_pause: not used + - pgn_missed: ( application layer specific ) + - address_conflict ( network management specific ) + + +*/ +typedef struct +{ + ISO_DIR_E iInfoDirection; /**< \brief Message direction (Data sended or received) */ + dword dwPGN; /**< \brief PGN of the transported message */ + sint16 s16HndIntern; /**< \brief Network member handle of the internal CF */ + sint16 s16HndPartner; /**< \brief Network member handle of the external CF */ + word wSAInternUser; /**< \brief SA of internal user / CF */ + word wSAPartner; /**< \brief SA of the external user / CF */ + dword dwNumberofBytes; /**< \brief Amount of bytes recorded */ + byte HUGE_C *pabData; /**< \brief Pointer to the data buffer or NULL pointer */ + byte bMsgPrio; /**< \brief Priority of the CAN message */ +} ISO_TPINFO_T; + +typedef ISO_TPINFO_T *ISO_TPINFO_t; /**< \brief Pointer typedef of the message transport data structure */ + +/* ************************************************************************ */ +/** \brief Enum for informing the application about a running TP or incoming ISO Message with lower or equal 8 bytes */ +typedef enum +{ + record_start, /**< An extern ECU has started a TP */ + record_firstdata, /**< An extern ECU has sended the first data message (7 byte, TP ...) */ + record_finish, /**< An extern ECU has finished sending data (8 byte, TP ...) */ + record_request, /**< An extern ECU has sent an request - only Multinode API */ + send_buffed, /**< An intern ECU has called IsoOpenTP successfully, data buffered */ + send_start_OK, /**< An intern ECU has started a transport successfully */ + send_packet_request, /**< The transport module is ready to send the next data packet ( 7 Bytes ) - Direct transfer only */ + send_finished, /**< An intern ECU has finished a transport successfully */ + datatrans_abort, /**< A transport is aborted */ + tp_pause, /**< Transport stopped (by the extern ECU) */ + pgn_missed, /**< Cyclic PGN is missed */ + address_conflict /**< Address conflict occured */ +} ISO_TPREP_E; + +/* ************************************************************************ */ +/** @} */ /* END group datalink_types Datalink Layer Type Definitions */ +/* ************************************************************************ */ + + +/* *********************** Network Management ***************************** */ +/** \addtogroup nmma_types Network Management Type Definitions + \ingroup netlink nmma +@{ +*/ + +/* ************************************************************************ */ +/** \brief CF / User network location +*/ +typedef enum +{ + intern = 0, /**< Internal CF / user */ + network = 1, /**< External CF / user */ + thisMember = 2, /**< Event is for this internal CF / user */ + notdef = -1 /**< Value not valid */ +} ISOUSERHOME_e; + +/* ************************************************************************ */ +/** \brief Userfunction (similiar with NAME function) + \details Used for intern sorting the ISO user and (driver module) identification +*/ +typedef enum +{ working_set_master = 0, + task_controller = 1, + virtual_terminal = 2, + tractor_ecu = 3, + auxiliary = 4, + sequenz_control_master = 5, + working_set_member = 6, + steering_control = 7, + off_vehicle_gateway = 8, + network_interconnection_unit = 9, + unknown = 10, + file_server = 11, + virtual_cf = 12, /* virtual CF on this network segment managed from the NIU */ + bridged_cf = 13, /* NIU bridged CF on this network segment */ + all_clients = 20, + undefined = -1 +} ISO_USERFUNC_e; + +/* ************************************************************************ */ +/** \brief Announcement state of ISO user */ +typedef enum +{ isouser_OK, /**< Network member if full announced ( logged on ) */ + isouser_NOTOK, /**< State is not announced (off, empty, preannounce ..) */ + isouser_last +} ISO_USERSTAAPP_e; + +/* ************************************************************************ */ +/** \brief Network managment event type */ +typedef enum +{ + Isonet_MemberActive, /**< There is a new member on network (intern or extern) */ + Isonet_MemberAddressConflict, /**< Network member has lost address conflict */ + Isonet_MemberInactive, /**< Member stopped or commanded address */ + Isonet_MemberNewAddress, /**< Address claimed after SA conflict */ + Isonet_MemberAddressViolation,/**< Address violation: internal SA conflicts with SA from extern msg */ + Isonet_Last +} ISO_NETEVENT_e; + +/* ************************************************************************ */ +/** \brief Typedef of the network managment event structure + \details + The event structure is used from the network managment callback function, + to inform the user / CF about changes of the announcement state of this or an external CF. \n + The following list shows the possible events depending on the member location: \n + + - \b eMemberRefer == #thisMember:\n + \n + - eNetEvent == #Isonet_MemberActive \n + 250 ms after the "address claimed" message for this CF was sended. + - eNetEvent == #Isonet_MemberNewAddress \n + 250 ms after this CF has lost an address conflict and claimed a new source address. + + - eNetEvent == #Isonet_MemberAddressConflict \n + The CF has lost its source address and will claim a new one. \n + The field wSAMember contains already the new source address. + - eNetEvent == #Isonet_MemberInactive \n + if this CF has send "can not claim source address", \n + or if it is logged out with a iso_NmMemberLoggedOut() function call \n + or if the "commanded address" message is accepted and the CF has to claim the new address. \n + The field wSAMember contains the old source address or #ISO_NULL_ADDRESS \n + if the CF has lost an address conflict and can not claim a new source address. \n + In the case of the commanded address message wSAMember contains the new source address. + + - eNetEvent == #Isonet_MemberAddressViolation \n + if an external message is received with the same source address. \n + The ECU driver sends in this case automatically the address claimed message for this CF. \n + \n + - \b eMemberRefer == #network:\n + \n + - eNetEvent == #Isonet_MemberActive \n + 250 ms after the "address claimed" message of this CF arrived. + - eNetEvent == #Isonet_MemberAddressConflict \n + The extern CF has lost its source address and has to claim a new one. \n + The field wSAMember contains the conflicted source address. + - eNetEvent == #Isonet_MemberInactive \n + if the external CF has sent "can not claim source address", \n + or if the CF is logged out in case of a alive timeout or a iso_NmMemberLoggedOut() function call. \n + \n + - \b eMemberRefer == #intern: \n + not used in the callback ( used only internal to identify internal CFs in the network managment member table). + +*/ +typedef struct +{ + ISO_NETEVENT_e eNetEvent; /**< \brief Which event occurs in the network memeber administration? */ + word wSAMember; /**< \brief Source address (SA) of the network member */ + ISOUSERHOME_e eMemberRefer; /**< \brief Which member concerned: Owner of this callback, another internal or external CF */ + sint16 s16Handle; /**< \brief Network member handle of the CF / user */ +} ISONETEVENT_T; + +typedef ISONETEVENT_T *ISONETEVENT_t; /**< Pointer typedef of the network event structure */ + +/* ************************************************************************ */ +/** \brief Typdef of the CF name field structure - see ISO Part 5 table 1 */ +typedef struct +{ + cbool bSelfConf; /**< \brief self-configurable-address ECU? */ + byte bIndGroup; /**< \brief NAMES associated with industries */ + byte bDevClassInst; /**< \brief Identifier if a device class more than 1 times in net */ + byte bDevClass; /**< \brief ISO Defined */ + byte bFunction; /**< \brief ISO defined, -> SA */ + byte bFunctionInst; /**< \brief subgroup of function */ + byte bEcuInstance; /**< \brief which ECU associaated with a given function */ + word wManufCode; /**< \brief ISO defined */ + dword dwIdentNumb; /**< \brief Used when the NAME is not unique in same network */ +} ISONAMEFIELD_T; + +typedef ISONAMEFIELD_T *ISONAMEFIELD_t; /**< Pointer typdef of the CF name field structure */ + +/* ************************************************************************ */ +/** \brief Typedef of the ISO user application data structure */ +typedef struct +{ + word wIsoSourceAdd; /**< \brief Source address (SA) of the control function (CF) / user */ + ISONAMEFIELD_T* psName; /**< \brief Pointer to the name field entry */ + byte* pacIsoUserName; /**< \brief Pointer to the CF (Bus) Name */ + ISO_USERFUNC_e eIsoUserFunct; /**< \brief Function of the user on the bus */ + ISO_USERSTAAPP_e eIsoAnnState; /**< \brief Announcement state of the CF / user */ +} ISOUSERAPP_T; + +typedef ISOUSERAPP_T *ISOUSERAPP_t; /**< Pointer typdef of the ISO user application data structure */ + +/* ************************************************************************ */ +/** @} */ /* END group nmma_types Network Management Type Definitions */ +/* ************************************************************************ */ + +/* ************************************************************************ */ +/*! + \ingroup base_general + \brief This function installs the callbackfunction + which sends all data to the clients + + \param[in] \wpp{rpfDataForClient, void (*)(#ISO_USERFUNC_e \,#ISO_TPREP_E \,#ISO_TPINFO_T*)} + Pointer to the callback function + + \par Sample + Install the default callback function + \code + IsoDrvCbBasicDataInstall( IsoCbDataOfBasicDistributor ); + \endcode + */ +void IsoDrvCbBasicDataInstall( void (*rpfDataForClient)( ISO_USERFUNC_e eTarget, ISO_TPREP_E eTpStatus, ISO_TPINFO_T* psTpInfo ) ); + +/* ************************************************************************ */ +/*! + \ingroup base_general + \brief Giving errors to the application + + This is the intern function which is called in case of errors to the application. + It can be used for extension of the errorhandler to the application. The + corresponding defines can be found at the end of IsoDef.h. + + + \param[in] \wp{bFunction, byte} + Number of function occuring the error. Every function with an error + call has a define at the end of IsoDef.h + \param[in] \wp{Location, byte} + Error location that means module or layer ( M_DATA, M_USER, M_NET ...) + \param[in] \wp{iCause, sint} + Error cause ( E_NO_ERR, E_UNKNOWN_ERR, E_WARN ...) + \note \par + Function number and Error location has to define for own application modules. + Dont use the same numbers like the driver + */ +void IsoErrorOut ( byte bFunction, byte Location, sint iCause ); + + +/* ************************************************************************ */ +/* ******************** Single Node Base Api ****************************** */ +/* ************************************************************************ */ + +#ifndef _LAY78_ + /*! \brief Enable "Single CAN Node Api" module compilation */ + #define ISO_MODULE_SINGLE_NODE + /*! \brief Enable part 7 module compilation for "Single CAN Node Api" */ + #define ISO_MODULE_J1939 + #include "IsoSnApi.h" +#endif + +/* ************************************************************************ */ +/* ******************** Multi Node Base Api ******************************* */ +/* ************************************************************************ */ + +#ifdef _LAY78_ + /*! \brief Enable "Multi CAN Node Api" module compilation */ + #define ISO_MODULE_MULTI_NODE + /*! \brief Enable "Multi CAN Node " part 7 application layer module compilation */ + #define ISO_MODULE_APPLAYER + #if !defined(NUMBERSPN_MAX) || ( NUMBERSPN_MAX > 0 ) + /*! \brief Enable "Multi CAN Node " SPN module compilation */ + #define ISO_MODULE_SPN + #endif + #include "IsoMnApi.h" +#endif + +/* ************************************************************************ */ +/* ******************** NIU - Network interconnection Unit Api ************ */ +/* ************************************************************************ */ + +#ifdef _LAY4_ + /*! \brief Enable "Network Interconnection Unit" module compilation */ + #define ISO_MODULE_NIU + #include "IsoMnNiuApi.h" +#endif + + + +/* ************************************************************************ */ +/** \defgroup drivernodeconfig Part 5 Configuration + \ingroup netlink nmma + + \brief Use this defines and functions to configure the CAN node specific behaviour. \n\n + You can also add the define ISO_PART5_SE to your IsoConf.h file \n + to enable the Part 5 second edition behaviour for all nodes. \n + + \par Parameter and default settings + - CFG_PARAM_PART5 - ISO Part 5: + - CFG_VAL_PART5_FIRST_EDITON (0 = frist edition) + - CFG_VAL_PART5_SECOND_EDITON (1 = second edition) + - 2 = reserved + - 3 = reserved + - CFG_PARAM_COMMANDED_ADRESS - Commanded address message + - CFG_VAL_OFF = disabled (default for Part 5 SE) + - CFG_VAL_ON = enabled (default for Part 5 first edition) + - CFG_PARAM_ADDRESS_CLAIM - Send address claim + - CFG_VAL_ON = enabled ( ISO conform, default) + - CFG_VAL_OFF = disabled ( e.g. diagnostic ) + - CFG_PARAM_EXTERNAL_ADDR_CLAIM - external address claim required + - CFG_VAL_ON = yes ( ISO conform, default) + - CFG_VAL_OFF = no ( e.g. diagnostic ) + - CFG_PARAM_CANNOT_CLAIM_ADDRESS - On Request, respond with cannot claim source address + - CFG_VAL_ON = enabled ( ISO conform, is the default for Part 5 SE) + - CFG_VAL_OFF = disabled ( to avoid bus off ) + - CFG_PARAM_CHECK_ADDR_VIOLATION - Check if an external msg has the same SA as an internal CF + - CFG_VAL_ON = enabled ( ISO conform, is the default for Part 5 SE) + - CFG_VAL_OFF = disabled ( default for Part 5 first edition ) + - CFG_PARAM_REQ_FOR_ACL_ON_START - Request on ACL will be send on startup + - CFG_VAL_ON = enabled ( ISO conform, default) + - CFG_VAL_OFF = disabled ( for simple ECUs. Used in combination with CFG_PARAM_EXTERNAL_ADDR_CLAIM ) +*/ +/* ************************************************************************ */ +/** \addtogroup drivernodeconfig +@{ +*/ +/* ************************************************************************ */ + +/* ************************************************************************ */ +/** \name Configuration parameter (group) +@{ +*/ +#define CFG_PARAM_PART5 (0u) /**< \brief ISO Part 5 (edition) settings */ +#define CFG_PARAM_COMMANDED_ADRESS (2u) /**< \brief Commanded address message settings */ + +#define CFG_PARAM_ADDRESS_CLAIM (3u) /**< \brief Internal address claim message settings */ +#define CFG_PARAM_EXTERNAL_ADDR_CLAIM (4u) /**< \brief External address claim response settings */ +#define CFG_PARAM_CANNOT_CLAIM_ADDRESS (5u) /**< \brief On Request, respond with cannot claim source address */ +#define CFG_PARAM_CHECK_ADDR_VIOLATION (6u) /**< \brief Check if an external msg has the same SA as an internal CF */ +#define CFG_PARAM_REQ_FOR_ACL_ON_START (7u) /**< \brief Request on ACL will be send on startup */ +/** @} */ + +/* ************************************************************************ */ +/** \name Configuration common values +@{ +*/ +#define CFG_VAL_OFF 0x00u /**< \brief Configuration value: 0 = off, disabled, ... */ +#define CFG_VAL_ON 0x01u /**< \brief Configuration value: 1 = on, enabled, ... */ +#define CFG_RET_ERROR 0xFFFFu /**< \brief Get return value: 0xFFFF = value not valid */ +/** @} */ + +/* ************************************************************************ */ +/** \name Configuration CFG_PARAM_PART5 specific values +@{ +*/ +#define CFG_VAL_PART5_FIRST_EDITON 0x00u /**< \brief Network Management mode = ISO Part 5 - First edition */ +#define CFG_VAL_PART5_SECOND_EDITON 0x01u /**< \brief Network Management mode = ISO Part 5 - Second edition */ +/** @} */ + +/* ************************************************************************ */ +/** \name Configuration Functions +@{ +*/ + +/* ************************************************************************ */ +/*! + \brief Set the #ISO_CAN_VT CAN node specific driver configuration for the current CAN Node + + \param[in] \wp{cfgParam, uint16 } + Configuration parameter ( CFG_PARAM_xxx defines ) + \param[in] \wp{cfgValue, uint16 } + Configuration value ( CFG_VAL_xxx defines ) + \retval sint16 + - E_NO_ERR + - E_RANGE + \par Sample + + iRet = iso_DrvConfigSet( CFG_PARAM_PART5, CFG_VAL_PART5_SECOND_EDITON); \n + iRet = iso_DrvConfigSet( CFG_PARAM_COMMANDED_ADRESS, CFG_VAL_OFF); \n +*/ +/* ************************************************************************ */ +sint16 iso_DrvConfigSet( uint16 cfgParam, uint16 cfgValue ); + +/* ************************************************************************ */ +/*! + \brief Get the #ISO_CAN_VT CAN node specific driver configuration + + \param[in] \wp{cfgParam, uint16 } + Configuration parameter ( CFG_PARAM_xxx defines ) + \retval uint16 + - Current configuration value ( CFG_VAL_xxx defines ) + - CFG_RET_ERROR + \par Sample + uVal = iso_DrvConfigGet( CFG_PARAM_PART5 ); +*/ +uint16 iso_DrvConfigGet( uint16 cfgParam ); + +/* ************************************************************************ */ +/*! + \brief Set the CAN node specific driver configuration + \param[in] \wp{u16CanNr, uint16 } + CAN-bus number 0, 1, ... ( ISO_CAN_NODES - 1 ) + \param[in] \wp{cfgParam, uint16 } + Configuration parameter ( CFG_PARAM_xxx defines ) + \param[in] \wp{cfgValue, uint16 } + Configuration value ( CFG_VAL_xxx defines ) + \retval sint16 + - E_NO_ERR + - E_RANGE + \par Sample + iRet = iso_NodeConfigSet( u16CanNr, CFG_PARAM_PART5, CFG_VAL_PART5_SECOND_EDITON); \n + iRet = iso_NodeConfigSet( u16CanNr, CFG_PARAM_COMMANDED_ADRESS, CFG_VAL_OFF); \n +*/ +sint16 iso_NodeConfigSet( uint16 u16CanNr, uint16 cfgParam, uint16 cfgValue ); + +/* ************************************************************************ */ +/*! + \brief Set the CAN node specific driver configuration + \param[in] \wp{u16CanNr, uint16 } + CAN-bus number 0, 1, ... ( ISO_CAN_NODES - 1 ) + \param[in] \wp{cfgParam, uint16 } + Configuration parameter ( CFG_PARAM_xxx defines ) + + \retval uint16 + - Current configuration value ( CFG_VAL_xxx defines ) + - CFG_RET_ERROR + \par Sample + uVal = iso_NodeConfigGet( u16CanNr, CFG_PARAM_PART5); \n +*/ +uint16 iso_NodeConfigGet( uint16 u16CanNr, uint16 cfgParam ); + +/** @} */ /* END name Configuration Functions */ + +/* ************************************************************************ */ +/** @} */ /* END group drivernodeconfig - Driver / Node Configuration */ +/* ************************************************************************ */ + + +/* ************************************************************************ */ +/* ******************** CLIENTS ******************************************* */ +/* ************************************************************************ */ + + +#if defined(_LAY6_) || defined(_LAY10_) || defined(_LAY13_) || defined(_LAY14_) + /*! \brief Enable client shared module compilation */ + #define ISO_MODULE_CLIENTS + /*! \brief Enable basic client wrapper module compilation */ + #define ISO_MODULE_BASIC_CL_WRAPPER +#endif + +#ifdef ISO_MODULE_CLIENTS + #include "IsoClientsApi.h" +#endif + +/* ************************************************************************ */ +/* **************** DEFINES *********************************************** */ +/* ************************************************************************ */ + +/* ************************************************************************ */ +/** \defgroup isodefines Defines */ +/** \defgroup isofuncnames Function Names + \ingroup isodefines +*/ +/* ************************************************************************ */ +/** \defgroup isodevclass Device Classes + \ingroup isodefines +*/ +/* ************************************************************************ */ +/** \defgroup isopgns PGNs - Parameter Group Numbers + \ingroup isodefines +*/ +/* ************************************************************************ */ +/** \defgroup isospns SPNs - Suspect Parameter Numbers + \ingroup isodefines +*/ +/* ************************************************************************ */ +/** \defgroup isofmis FMIs (see J1939-73) + \ingroup isodefines +*/ +/* ************************************************************************ */ +/** \defgroup isodefslayer78 Common definitions for LAYER 7, 8 + \ingroup isodefines +*/ +/* ************************************************************************ */ +/** \defgroup errorhand Errorhandler Definitions + \ingroup isodefines + \brief This section contains the definitions for the error responses. + \see IsoErrorhandlerInit +*/ +/* ************************************************************************ */ + +/* ************************************************************************ */ +/** \addtogroup isodefines + @{ +*/ + +/** \name ISO special source addresses +@{ +*/ +/* SAs and handles with special meaning */ +#define ISO_NULL_ADDRESS 254u /**< \brief 0xFEu NULL address - only sender with network man. */ +#define ISO_GLOBAL_ADDRESS 255u /**< \brief 0xFFu GLOBAL address - only destination address field */ + +#define HANDLE_UNVALID (-1) /**< \brief 0xFFFF Unvalid or unused handle */ +#define HANDLE_GLOBAL 32767 /**< \brief 0x7FFF pseudo handle to address a global destination */ +/** @} */ + +/** @} */ /* END isodefines */ +/* ************************************************************************ */ + +/* ************************************************************************ */ +/* include PGN and SPN definitions */ +/* ************************************************************************ */ +#include "IsoPgnDef.h" +/* ************************************************************************ */ + +/* ************************************************************************ */ +/* Name function defines */ +/* ************************************************************************ */ + +/** \addtogroup isofuncnames +@{ +*/ + +/** \name Industry non-specific function defines +@{ +*/ +#define F_ENGINE ((byte) 0 ) /**< Function for engine 1 */ +#define F_AUX_POWER_UNIT ((byte) 1 ) /**< Function for auxiliary power unit (engine 2) */ +#define F_ELEC_PROPULSION_CONTROL ((byte) 2 ) +#define F_TRANSMISSION ((byte) 3 ) /**< Function for transmission */ +#define F_BRAKES_SYSTEMCONTROL ((byte) 9 ) /**< Function for system control of brakes */ +#define F_RETARDER_ENGINE ((byte) 12 ) /**< Function for retarder */ +#define F_RETARDER_DRIVELINE ((byte) 13 ) +#define F_CRUISE_CONTROL ((byte) 14 ) +#define F_STEERING_CONTROL ((byte) 16 ) /**< Function for steering controller */ +#define F_AERODYNAMIC_CONTROL ((byte) 22 ) /**< Function for aerodynamic controller */ +#define F_VEHICLE_NAVIGATION ((byte) 23 ) +#define F_NETWORK_INTERCONNECT_UNIT ((byte) 25 ) /**< Function for network interconnect unit ( NIU ) */ +#define F_OFF_VEHICLE_GATEWAY ((byte) 28 ) +#define F_VTERMINAL ((byte) 29 ) /**< Function for virtual terminal */ +#define F_FILESERVER ((byte) 61 ) /**< Function for file server / printer */ +/** @} */ +/** \name Industry group 2, device class 13 functions +@{ */ +#define F_AUXILIARY_DEVICE ((byte) 57 ) /**< == Operator Control< Function of ISO Aux_Input */ +/** @} */ +/** \name Industry group 2, device class 0 functions +@{ */ +#define F_NONVIRTUAL_TERMINAL ((byte) 128 ) +#define F_OPERATOR_CONTROL ((byte) 129 ) +#define F_TASKCONTROL ((byte) 130 ) +#define F_POSITION_CONTROL ((byte) 131 ) +#define F_TRACTOR_ECU ((byte) 134 ) +#define F_SEQUENZ_CONTROL_MASTER ((byte) 135 ) +/** @} */ +/** @} */ /* END isofuncnames */ +/* ************************************************************************ */ + +/** \addtogroup isodevclass +@{ +*/ +/* Device Classes Industrie Group 2 */ +#define DC_NONSPECIFIC_SYSTEM 0u /**< Device Class Non-Specific-System */ +#define DC_TRACTOR 1u /**< Device Class Tractor */ +#define DC_TILLAGE 2u /**< Device Class Tillage */ +#define DC_SECONDARY_TILLAGE 3u /**< Device Class Secondary Tillage */ +#define DC_PLANTERS_SEEDERS 4u /**< Device Class Planters/ Seeders */ +#define DC_FERTILIZERS 5u /**< Device Class Fertilizers */ +#define DC_SPRAYERS 6u /**< Device Class Sprayers */ +#define DC_HARVESTERS 7u /**< Device Class Harvesters */ +#define DC_ROOT_HARVESTERS 8u /**< Device Class Root Harvesters */ +#define DC_FORAGE 9u /**< Device Class Forage */ +#define DC_IRRIGATION 10u /**< Device Class Irrigation */ +#define DC_TRANSPORT_TRAILER 11u /**< Device Class Transport/Trailer */ +#define DC_FARM_YARD_OPERATIONS 12u /**< Device Class Farm Yard Operations */ +#define DC_POWERED_AUXILIARY_DEVICES 13u /**< Device Class Powered Auxiliary Devices */ +#define DC_SPECIAL_CROPS 14u /**< Device Class Special Crops */ +#define DC_EARTH_WORK 15u /**< Device Class Earth Work */ +#define DC_SKIDDER 16u /**< Device Class Skidder */ +#define DC_SENSORSYSTEMS 17u /**< Device Class Sensor systems */ +#define DC_TIMBER_HARVESTERS 19u /**< Device Class Timber harvesters */ +#define DC_FORWARDERS 20u /**< Device Class Forwarders */ +#define DC_TIMBER_LOADERS 21u /**< Device Class Timber loaders */ +#define DC_TIMBER_PROCESSING_MACHINES 22u /**< Device Class Timber processing machines */ +#define DC_MULCHERS 23u /**< Device Class Mulchers */ +#define DC_UTILITY_VEHICLES 24u /**< Device Class Utility vehicles */ +#define DC_SLURRY_APPLICATORS 25u /**< Device Class Slurry applicators */ + +/** @} */ /* END isodevclass */ + +/* ************************************************************************ */ +/** \addtogroup errorhand +@{ +*/ + +/* ErrorCause - common */ +/** \name Common error codes + \details These defines are used as parameter iCause in the error handler callback function and as return value of the interface functions. +@{ +*/ +#define E_NO_ERR ( 0 ) /**< \brief ErrorCause: No error */ +#define E_UNKNOWN_ERR (-1 ) /**< \brief ErrorCause: Unknown error */ +#define E_WARN (-2 ) /**< \brief ErrorCause: System warnings */ +#define E_DEFAULT (-3 ) /**< \brief ErrorCause: Called function works with default values */ +#define E_BUSY (-4 ) /**< \brief ErrorCause: Repeated calling of a function */ +#define E_RANGE (-5 ) /**< \brief ErrorCause: One ore more input parameter wrong */ +#define E_OVERFLOW (-6 ) /**< \brief ErrorCause: Buffer overflow */ +#define E_RD_WR (-7 ) /**< \brief ErrorCause: Write- or readerror */ +#define E_NOACT (-8 ) /**< \brief ErrorCause: Called functionality has not been executed */ +#define E_COM (-9 ) /**< \brief ErrorCause: Communication error with other application hardware */ +#define E_CONFIG (-10) /**< \brief ErrorCause: Configuration error (function call not possible ) */ +#define E_CHECKSUM (-11) /**< \brief ErrorCause: Checksum error */ +/** @} */ +/* ISO special */ +/** \name ISO special error codes + \details These defines are used as parameter iCause in the error handler callback function and as return value of the interface functions. +@{ +*/ +#define E_ERROR_INDI (-16) /**< \brief ErrorCause: ISO error indicator */ +#define E_NOT_AVAILABLE (-17) /**< \brief ErrorCause: Parameter, value ... not available */ +#define E_PGN_UNKNOWN (-18) /**< \brief ErrorCause: unknown PGN */ +#define E_USER_ERROR (-19) /**< \brief ErrorCause: IsoUser unknown, not announced ... */ +#define E_DATA_LINK (-20) /**< \brief ErrorCause: Transport protocol used ... */ +#define E_NO_INSTANCE (-21) /**< \brief ErrorCause: Instance not found */ +#define E_CANMSG_MISSED (-22) /**< \brief ErrorCause: CAN message was not received */ +#define E_VALUE_WRONG (-23) /**< \brief ErrorCause: Value or parameter has the wrong value */ +#define E_OUT_OF_MEMORY (-24) /**< \brief ErrorCause: VT, TC has run out of memory */ +#define E_NACK (-25) /**< \brief ErrorCause: NACK or PDNACK received of bus */ +#define E_RESPTOCMDERROR (-26) /**< \brief ErrorCause: Response to Command with ErrorCode != 0 */ +/** @} */ +/** \name User defined error codes + \brief Range for own error codes - application errors can integrated with IsoErrorOut( ... ) +@{ +*/ +#define E_USER_DEFINED_START (-32) +#define E_USER_DEFINED_END (-47) +/** @} */ /* END Error cause / code definitions */ + +/* ************************************************************************ */ +/** \name Modul error location numbers + \details These defines are used as parameter bLoc in the error handler callback function. +@{ +*/ +#define M_DATA 0u /**< Error in IsoTL.c, IsoDataM.c */ +#define M_USER 1u /**< IsoUser.c */ +#define M_NET 2u /**< IsoNet.c */ +#define M_DRV 3u /**< IsoDrvN.c */ +#define M_J1939 4u /**< IsoJ1939.c */ +#define M_VT 6u /**< IsoVt.c */ +#define M_ALARM 7u /**< IsoAlarm.c */ +#define M_POOL 8u /**< IsoPool.c */ +#define M_INTERN 9u /**< Intern functions */ +#define M_APP 10u /**< User application*/ +#define M_AUX 11u /**< IsoAux.c */ +#define M_TASKC 12u /**< IsoTaskC.c */ +#define M_UTPICT 13u /**< UtPoPict.c */ +#define M_VTMSG 14u /**< IsoVtMsg.c */ +#define M_VTXCR 15u /**< IsoVtXcr.c */ +#define M_WOSE 16u /**< IsoWoSe.c */ +#define M_SC 17u /**< IsoSCWork.c, IsoSCCtrl.c, IsoSCLogin.c */ +#define M_NMNET 29u /**< Multinode network management - IsoMnNm.c */ +#define M_APLAY 30u /**< Application Layer */ +#define M_SPN 18u /**< SPN-Modul */ +#define M_FSC 19u /**< FSC-Modul (File server client) - IsoFSC.c */ +#define M_NIU 20u /**< NIU-Management-Modul - IsoMnNlm.c */ +#define M_NL 21u /**< NIU-Service-Modul - IsoMnNl.c */ +#define M_DD 22u /**< (PGN) Data Distributor - IsoDD.c */ +#define M_CLSH 23u /**< Client shared IsoClShCtrl.c */ +/** @} */ + +/* ************************************************************************ */ +/** \name Errorhandler function numbers + \brief The number of the function is only unique in combination with a module or layer location number. + \details These defines are used as parameter bFun in the error handler callback function. +@{ +*/ +#define ISODRVINIT 1u /* IsoDrvN.c */ +#define ISOGETPTRCANNODE 2u +#define ISODRVCYCLE 3u + +#define ISODDPROCMSG 2u /* IsoDD.c function iso_ddDistributeMsg() */ + +#define ISOSPECIFICSEND 1u /* IsoTL, IsoDataM.c */ +#define ISOBROADCASTSEND 2u +#define ISOFPPRECEIVE 3u +#define ISOOPENTP 4u +#define ISORELEASETP 5u +#define ISOTLDOSEND 6u +#define ISOTLDIRECTSEND 7u + +#define ISOUSERANNOUNCE 1u /* IsoNet.c and IsoUser.c */ +#define ISOGETUSERINFOVIASA 3u +#define ISOUSERLOGOUT 4u + +#define FIISOJ1939INIT 1u /* IsoJ1939.c */ +#define FIISOJ1939DATAREAD 2u +#define FIISOJ1939DATASET 3u +#define FIISOJ1939PGNSEND 4u +#define FIISOJ1939SETSENDER 5u + +#define ISOADDWORKINGSETMEMBER 1u /* IsoWoSe.c */ + +#define ISOCLSHREADLISTEXTHAND 1u /* IsoClShCtrl.c */ +#define ISOCLSHMSGDISTRIBUTOR 2u + +/* IsoVTMsg.c and IsoVt.c (as responses to commands !) */ +#define ISOCMD_SHOWHIDE 3u +#define ISOCMD_DISENABLE 4u +#define ISOCMD_INPUTSELECT 5u +#define ISOCMD_ESC 6u +#define ISOCMD_CONTROLAUDIO 7u +#define ISOCMD_SETAUDIOVOLUME 8u +#define ISOCMD_CHILDLOCATION 9u +#define ISOCMD_CHILDPOSITION 10u +#define ISOCMD_SIZE 11u +#define ISOCMD_BACKGROUNDCOLOUR 12u +#define ISOCMD_NUMERICVALUE 13u +#define ISOCMD_NUMERICVALUEREF 14u +#define ISOCMD_STRING 15u +#define ISOCMD_STRINGREF 16u +#define ISOCMD_ENDPOINT 17u +#define ISOCMD_FONTATTRIBUTES 18u +#define ISOCMD_LINEATTRIBUTES 19u +#define ISOCMD_FILLATTRIBUTES 20u +#define ISOCMD_ACTIVEMASK 21u +#define ISOCMD_SOFTKEYMASK 22u +#define ISOCMD_ATTRIBUTE 23u +#define ISOCMD_PRIORITY 24u +#define ISOCMD_LISTITEM 25u +#define ISOCMD_DELETEOBJECTPOOL 26u +#define ISODELETEVERSION 27u +#define ISOSTOREVERSION 28u +#define ISOCMD_SELECTCOLOURMAP 29u +#define ISOLOADVERSION 30u +#define ISOENDOFOBJECTPOOL 31u +#define ISOGETATTRIBUTEVALUE 32u +#define ISOVTMULTIPLENEXTVT 40u +#define ISOVTRUN 41u +#define ISOCOMMANDADMIN 42u +#define ISOVTINIT 43u +#define ISOWORKINGSET 44u +#define ISOCMDCONTROL 45u + +#define ISOCOMMANDSC 1u /* IsoVtXcr.c */ +#define ISOCOMMANDEC 2u +#define ISOCOMMANDTC 3u + +#define ISOALARMOBJINIT 1u /* IsoAlarm.c */ +#define ISOALARMCMD 2u +#define ISOALARMGETNUM 3u +#define ISOALARMSETRETURNOBJID 4u + +#define ISOAUXIMPCYCLIC 1u /* IsoAux.c (Intern call) */ +#define ISOAUXASSIGNEXT 2u /* Intern call */ +#define ISOAUXFUNCTOAPP 3u /* Intern call */ +#define ISOAUXPREFASSIGN 4u /* Intern call */ + +#define ISOPOOLSETIDRANGEMODE 1u /* IsoPool.c */ +#define ISOPOOLSCAN 3u +#define ISOPOOLRUN 4u +#define ISOPOOLMANIPULATE 5u +#define ISOPOOLTESTIFLOAD 6u + +#define POOLOBJPICTCONVERT 1u /* UtPoPict.c */ + +#define ISOTC_INSTCMD 1u /* IsoTaskC.c */ +#define ISOTC_DEVICE_SET 2u +#define ISOTC_DEVICEELEMENT_SET 3u +#define ISOTC_DEVICEPROCESSDATA_SET 4u +#define ISOTC_DEVICEPROPERTY_SET 5u +#define ISOTC_DEVICEVALUEPRESENT_SET 6u +#define ISOTASKCAPPINIT 7u +#define ISOTC_RUN 8u +#define ISOTC_RECEIVE 9u +#define ISOTC_PROCESSDATADEFTRIGGER_SET 10u +#define ISOTC_DEVICESETVERSION 11u +#define ISOTC_SETPREFTC 12u + +#define ISOSCCtoSCMSEND 1u /* IsoSCCtrl.c, IsoSCWork.c .. */ +#define ISOSC_INSTCMD 2u +#define ISOSC_FUNCTIONOBJSET 3u +#define ISOSC_FUNCTVALUESET 4u +#define ISOSC_STATEOBJSET 5u +#define ISOSC_EXECUTIONINDICATION 6u +#define ISOSC_EXECUTIONSTATUS 7u +#define ISOSC_CLIENTABORT 8u +#define ISOSC_FUNERRORSTATUSSET 9u +#define ISOSC_FUNTRIGGERSET 10u +#define ISOSC_LOGINREC 11u +#define ISOSCDPOOLPREPARE 12u +#define ISOSC_EXTOBJDEFSET 13u +#define ISOSC_SETVERSION 14u + +#define ISOAL_PGNTXNEW 1u /* IsoMnAl.h, IsoMnApi.h */ +#define ISOAL_PGNRXNEW 2u +#define ISOAL_PGNACTIVATE 3u +#define ISOAL_PGNDEACTIVATE 4u +#define ISOAL_PGNCHANGEPRIORITY 5u +#define ISOAL_PGNCHANGESRCDEST 6u +#define ISOAL_PGNSETREPETITIONRATE 7u +#define ISOAL_PGNGETREPETITIONRATE 8u +#define ISOAL_PGNRXREQUEST 9u +#define ISOAL_PGNRXREQUESTCYC 10u +#define ISOAL_PGNTXSETLIMITS 11u +#define ISOAL_PGNTXSEND 12u +#define ISOAL_PGNSEND 15u /* Intern function */ + +#define ISONM_LISTOFEXTERNHANDLES 30u /* IsoMnNm.h, IsoMnApi.h */ +#define ISONM_LISTOFEXHANDFUNC 31u +#define ISONM_GETDATAOFMEMBER 32u +#define ISONM_LISTOFINTERNHANDLES 33u + +#define ISOSPNDEFINE 1u /* SPN module */ +#define ISOALPGNDATASET 2u +#define ISOALPGNDATAREAD 3u +#define ISOALSPNADDDTC 4u + +#define ISOFSC_FUNCTION 0u /* File server client internal functions */ +#define ISOFSC_INIT 1u +#define ISOFSC_PROCESSMSG 2u +#define ISOFSC_RUN 3u +#define ISOFSC_SEND 4u +#define ISOFSC_DOCALLBACK 5u +#define ISOFSC_CLOSE_CONNECTION 6u +#define ISOFSC_CLOSE_IO 7u +#define ISOFSC_IOMODE_CALLBACK 8u +#define ISOFSC_FUNCTION_CALL 20u /* File server client interface / public functions */ + +/** @} */ +/** @} */ /* END errorhand */ +/* ************************************************************************ */ + + + +/* *********************** Debugging ***************************** */ +/** \addtogroup debugging Debugging + \ingroup base_general + \brief The use of the debugging functionality is only allowed for testing. \n + You must disable debugging for a SRL1 release version. + \details The debug output functions are not thread safe. \n + To use debugging, you must add the define ISO_DEBUG_ENABLED \n + You can add the define ISO_DEBUG_USE_EXTERN_FUNCTIONS + and replace the default implementation for iso_DebugPuts(), iso_DebugPrint() and iso_DebugTrace(). \n + Or if you add the define #ISO_DEBUG_USE_CALLBACK_FUNCTION to your config file + you can set a callback function with iso_DebugSetCallbackFunction() + to redirect the debug output to your callback function. \n + @{ +*/ + +/* For documentation */ +#ifdef DOXYGEN +/* ************************************************************************ */ +/** \name Debugging Macros +@{ */ +/* ************************************************************************ */ +#define ISO_DEBUG_ENABLED /*!< \brief define to enable the developer debug output */ +#define ISO_DEBUG_USE_CALLBACK_FUNCTION /*!< \brief define to enable the developer debug output callback function */ +/* ************************************************************************ */ +/** @} */ /* debugging macros */ +#endif +/* ************************************************************************ */ + +/* ************************************************************************ */ +#ifdef ISO_DEBUG_ENABLED +/* ************************************************************************ */ + +/*! \brief Automatically set by the driver to enable the debug module compilation */ +#define ISO_MODULE_DEBUG + +/* optional defines to replace old debug functions +#define TextToBuffer iso_DebugPuts +#define PrintTRACE iso_DebugTrace +#define PrintTRACE3 iso_DebugTrace +*/ + +/* ********************************************************************* */ +/*! \brief debuging puts() function + \param[in] \wpp{pacString, const schar []} +*/ +void iso_DebugPuts ( const schar pacString[] ); + +/* ********************************************************************* */ +/*! \brief debuging printf() function + \param[in] \wpp{pacFormat, const schar []} + \param[in] ... + Parameters specified in pacFormat +*/ +void iso_DebugPrint( const schar pacFormat[], ... ); + +/***********************************************************************/ +/*! \brief debuging trace() function + \param[in] \wpp{pacFormat, const schar []} + \param[in] ... + Parameters specified in pacFormat +*/ +void iso_DebugTrace( const schar pacFormat[], ... ); + + +#ifdef ISO_DEBUG_USE_CALLBACK_FUNCTION + +#include <stdarg.h> /* needed for va_list definition... */ + +/* replacement for typedef void (*ISO_DEBUG_CALLBACK_t)( const schar pacFormat[], ... ); */ +/*! \brief Typedef of the debug output callback function pointer + \param[in] \wpp{pacFormat, const schar[]} + Format string ( have a look at printf() for more informations ) + \param[in] \wpp{args, va_list} + Parameters specified in pacFormat +*/ +typedef void (*ISO_DEBUG_CALLBACK_t)( const schar pacFormat[], va_list args ); + + +/*! \brief Function to set the external debug output callback function + \param[in] \wp{ pfDebugTraceFunc, ISO_DEBUG_CALLBACK_t } + Pointer to the callback function. \n + Use the NULL pointer to disable the callback execution. + \retval sint + - #E_NO_ERR + + \par Example + Callback function: + \code{.c} + void cb_app_debug_out( const schar pacFormat[], va_list args ) + { + #ifdef __cplusplus + schar sOut[500]; + vsprintf( sOut, pacFormat, args ); + std::cout << sOut; + #else + vprintf( pacFormat, args ); + #endif + } + \endcode + Set the callback function: + \code{.c} + (void)iso_DebugSetCallbackFunction(cb_app_debug_out); + \endcode +*/ +sint iso_DebugSetCallbackFunction( ISO_DEBUG_CALLBACK_t pfDebugTraceFunc ); + +#endif + +/* ************************************************************************ */ +#endif /* ISO_DEBUG_ENABLED */ +/** @} */ /* debugging */ +/* ************************************************************************ */ + +/* ************************************************************************ */ +/* ************************************************************************ */ +#ifdef __cplusplus +} /* end of extern "C" */ +#endif + +#endif /* DEF_ISO_DEF_H */ +/* ************************************************************************ */ +/* ************************************************************************ */ + ++======= + /* ************************************************************************ */ + /*! + \file IsoDef.h + \brief API for basic driver (old style) and VT, TC, SC client + + Global defines like PGNs, function fields, application functions, user enumerations + + \author Hammerl Erwin + \date Created 27.11.2003 + + \copyright Competence Center ISOBUS e.V. + + \par HISTORY: + + \par + 21.01.2013 - author E. Hammerl + - Version 6.00.05 + \par + 24.01.2013 - author E. Hammerl + - Version 6.00.06 + \par + 08.03.2013 - author P. Wegscheider + - Client API declarations moved to IsoClientsApi.h + - PGN definitions moved to IsoPgnDef.h + - Single CAN node API declarations moved to IsoSnApi.h + - Version 6.02.00 + \par + 25.04.2013 - author E. Hammerl + - Version 6.02.01 + \par + 13.05.2013 - author P. Wegscheider + - IsoSnApi.h is only included if _LAY78_ is not defined + - Version 6.02.02 + \par + 04.06.2013 - author P. Wegscheider + - Version 6.03.00 + - SRL1 Lint code review updates + - iso_NodeConfigSet() u16CanNr parameter type set to iso_u16 + - iso_NodeConfigGet() u16CanNr parameter type set to iso_u16 + - define CFG_PARAM_EXTERNAL_ADDRESS_CLAIM replaced with CFG_PARAM_EXTERNAL_ADDR_CLAIM + - define CFG_PARAM_CHECK_ADDRESS_VIOLATION replaced with CFG_PARAM_CHECK_ADDR_VIOLATION + - define CFG_PARAM_REQ_FOR_ACL_ON_STARTUP replaced with CFG_PARAM_REQ_FOR_ACL_ON_START + \par + 04.07.2013 - author P. Wegscheider + - Module version defines VERSION_GLOBAL and VERSION_BASE added + - Pointer cast defines for HUGE_C added ( should not defined in IsoConf.h if using SRL1 ) + - defines ISO_MODULE_* added for conditional compilation of the configurable driver modules + - define _DEBUG replaced with define ISO_DEBUG_ENABLED + - Debug function TextToBuffer() replaced with iso_DebugPuts() + - Debug function iso_DebugPrint() added + - Debug function DebVtStatesTrace() replaced with iso_DebugVtStatesTrace() + - Debug functions PrintTRACE() and PrintTRACE3() replaced with iso_DebugTrace() + \par + 18.11.2013 - author P. Wegscheider + - Version 6.04.00 + \par + 23.04.2014 - author E. Hammerl + - Version 6.04.01 + \par + 15.05.2014 - author P. Wegscheider + - Function IsoDriverVersionRead() return value changed from iso_u16 to iso_u32 + - Version 7.00.01 + - iso_DebugVtStatesTrace() moved to IsoVt.c + - Debug fuction iso_DebugSetCallbackFunction() and define ISO_DEBUG_USE_CALLBACK_FUNCTION check added + \par + 22.07.2014 - author P. Wegscheider + - Version 7.00.02 + \par + 08.09.2014 - author P. Wegscheider + - Bugfixes for ISO_DEBUG_CALLBACK_t handling + \par + 02.03.2015 - author P. Wegscheider + - Moved definitions to IsoBaseDef.h and include "IsoBaseDef.h" + - Moved functions to IsoBaseApi.h and include "IsoBaseApi.h" + \par + 04.11.2016 - author P. Wegscheider + - Feature request ID 4625: removed single node API + \par + 07.02.2018 - author P. Wegscheider + - Feature request ID 7504: Split Base Driver into "Core" and "Base" + - IsoBaseDef.h renamed to IsoCommonDef.h + - Added IsoCoreApi.h + \par + 27.02.2018 - author P. Wegscheider + - Feature request ID 7504: Split Base Driver into "Core" and "Base" + - Added IsoCommonApi.h + */ + /* ************************************************************************ */ + + /* ************************************************************************ */ + #ifndef DEF_ISO_DEF_H + #define DEF_ISO_DEF_H + + #ifdef __cplusplus + extern "C" { + #endif + /* ************************************************************************ */ + + #include "IsoCommonApi.h" + #include "IsoCoreApi.h" + #include "IsoBaseApi.h" + + + /* ******************** Multi Node Base API ******************************* */ + #include "IsoMnApi.h" + + /* ******************** NIU - Network interconnection Unit API ************ */ + #ifdef ISO_MODULE_NIU + #include "IsoMnNiuApi.h" + #endif + + /* ******************** CLIENTS ******************************************* */ + #ifdef ISO_MODULE_CLIENTS + #include "IsoClientsApi.h" + + /* check and include client module API files */ + + #ifdef ISO_MODULE_VTC + #include "IsoVtcApi.h" + #endif + + #if defined(ISO_VT_SERVICE) + #include "IsoVtsApi.h" + #endif + + #ifdef ISO_MODULE_TCC + #include "IsoTccApi.h" + #endif + + + #ifdef ISO_MODULE_SQCC + #include "IsoSccApi.h" + #endif + + #ifdef ISO_MODULE_FSC + #include "IsoFscApi.h" + #endif + + #ifdef ISO_MODULE_TIMS + #include "IsoTimSApi.h" + #endif + + #endif + + + /* ************************************************************************ */ + /* ************************************************************************ */ + #ifdef __cplusplus + } /* end of extern "C" */ + #endif + + #endif /* DEF_ISO_DEF_H */ + /* ************************************************************************ */ + /* ************************************************************************ */ + ++>>>>>>> rauch/jobrechner-import-20190607 diff --cc ptxdist/local_src/ecu-jobctl/extern/isobus/IsoFscApi.h index ce51811,5acb77a..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-jobctl/extern/isobus/IsoFscApi.h +++ b/ptxdist/local_src/ecu-jobctl/extern/isobus/IsoFscApi.h @@@ -1,1154 -1,1216 +1,2373 @@@ ++<<<<<<< HEAD +/* ************************************************************************ */ +/*! + \file + \brief ECU Driver FS Client Api Header File + \author Wegscheider Peter + \date Created XX.07.13 + + \copyright Copyright (c) WBZ-Engineering GmbH + + \par History: + \par + 04.07.2013 - author P. Wegscheider + - API declarations moved to this file + - Module version define added +*/ +/* ************************************************************************ */ +#ifndef DEF_IsoFscApi_H + #define DEF_IsoFscApi_H + +#ifdef __cplusplus +extern "C" { +#endif +/* ************************************************************************ */ + +/* ************************************************************************ */ +/*! \ingroup grp_versions + \brief File Server Client Module Version +*/ +#define VERSION_FSC 3.0 + + +/* ************************************************************************ */ +/* **** FILE SERVER CLIENT **** */ +/* ************************************************************************ */ +/** \defgroup fsclient FS-Client + \ingroup clients + \brief Part 13 - File Server Client + + The File Server Client Module has been developed for Part 13 Version 3 + ( Second published edition of the International Standard ). + The Module is not backward compatible to previous versions. \n + \n + The FS-Client Module offers the following features: + - Lowlevel implementation of the Part 13 protocol + - Callback functions for returning the FS Response to the client application + - Pre processed response header data + ( response header data are pre processed and the extracted informations are stored + in the ISO_FSC_INFO_T usInfo union of the ISO_FSC_CBDATA_T callback structure ) + - Extended functions for reading and writing files + - More than one client member (user) connection per server + - More than one io channel per connection + \internal + - Simultaneous connections on different can nodes ( only Version 4.83 and 4.84 ) + \endinternal + + For the module version see \ref grp_versions #VERSION_FSC +*/ + +/* ************************************************************************ */ +/** \addtogroup fsclient +@{ +*/ +/* ************************************************************************ */ + +/* ************************************************************************ */ +/** \name Part 13 - Enable FS-Client Module in IsoConf.h +@{ +*/ +#ifdef DOXYGEN +/** \def _LAY13_ + \brief Add the define _LAY13_ to IsoConf.h to enable the file server client functionality. +*/ +#define _LAY13_ + +#endif +/** @} */ + +/* ************************************************************************ */ +/** \brief FS-Client Definitions for IsoConf.h +*/ +/** \addtogroup fscconfig FS-Client Configuration +@{ +*/ + +/** \name Defines - Part 13 File Server Client Configuration +@{ */ + +/** \def FSC_MAX_CONNECTIONS + \brief Maximum of simultaneous connections ( predefined is 2) + \details This define is used to set the size of the CF / file server connection array. +*/ +#ifndef FSC_MAX_CONNECTIONS + #define FSC_MAX_CONNECTIONS (2) +#endif +/** \def FSC_MAX_IO_HANDLES + \brief Maximum of simultaneous io channels ( predefined is FSC_MAX_CONNECTIONS * 3) + \details This define is used to set the size of the io channel array. +*/ +#ifndef FSC_MAX_IO_HANDLES + #define FSC_MAX_IO_HANDLES (FSC_MAX_CONNECTIONS * 3) +#endif + +/** @} */ + +/** \name Defines - Part 13 File Server Client Settings +@{ +*/ + +/** \def FSC_CLIENT_VERSION + \brief Version Number 0x03u = Second published edition of the International Standard - Part 13 B.5 +*/ +#ifndef FSC_CLIENT_VERSION + #define FSC_CLIENT_VERSION (3u) +#endif + +/** \def FSC_MSG_PRIO + \brief Default message priority - Part 13 C.1.1 +*/ +#ifndef FSC_MSG_PRIO + #define FSC_MSG_PRIO (0x07u) +#endif + +/** \def FSC_MAX_CMD_REQUEST_TRIES + \brief Maximum number of request tries - Part 13 5.3.1 / Part 3 5.12.3 +*/ +#ifndef FSC_MAX_CMD_REQUEST_TRIES + #define FSC_MAX_CMD_REQUEST_TRIES (3u) +#endif +/** @} */ + + +/** @} */ + + +/* ************************************************************************ */ +/** \brief FS-Client Structure and Enum Type Definitions + + This part contains the structure, enum and type definitions for the FS-Client module. +*/ +/** \addtogroup fscdefinitions FS-Client Type Definitions +@{ +*/ + + +/** \name Defines - Part 13 B.14 File Handling Flags + \brief See iso_FscOpenFile() parameter u8Flags for more informations + \details Sample: FSC_OPEN_READWRITE | FSC_OPEN_CREATE +@{ +*/ +#define FSC_OPEN_READONLY 0x00u /**< \brief Open file for reading only. */ +#define FSC_OPEN_WRITING 0x01u /**< \brief Open file for writing only. */ +#define FSC_OPEN_READWRITE 0x02u /**< \brief Open file for reading and writing. */ +#define FSC_OPEN_DIRECTORY 0x03u /**< \brief Open directory. */ + +#define FSC_OPEN_CREATE 0x04u /**< \brief Create a new file and/or directories if not yet existing. */ +#define FSC_OPEN_APPEND 0x08u /**< \brief Open file for appending data to the end of the file. */ +#define FSC_OPEN_EXCLUSIVE 0x10u /**< \brief Open file with exclusive access (fails if already open). */ +/** @} */ +/* *************************************************************************************** */ + +/** \name Defines - Part 13 B.15 Attributes + \brief (ISO_FSC_FILE_INFO_T and ISO_FSC_FILE_ATTRIBUTES_T Porperty u8Attributes values) +@{ +*/ +#define FSC_ATTR_READONLY 0x01u /**< \brief ?Read-only? attribute is set. */ +#define FSC_ATTR_HIDDEN 0x02u /**< \brief ?Hidden? attribute is set (not applicable unless volume supports hidden attribute). */ +#define FSC_ATTR_HIDDEN_SUPPORT 0x04u /**< \brief Volume supports hidden attribute. */ +#define FSC_ATTR_VOLUME_HND 0x08u /**< \brief Handle specifies a volume. */ + +#define FSC_ATTR_DIRECTORY_HND 0x10u /**< \brief Handle specifies a directory. */ +#define FSC_ATTR_LONG_NAMES 0x20u /**< \brief Volume supports long filenames. */ +#define FSC_ATTR_VOL_NOT_REMOVABLE 0x40u /**< \brief Volume is not removable. */ +#define FSC_ATTR_CASE_SENSITIVE 0x80u /**< \brief Volume is case-sensitive. */ +/** @} */ +/* ************************************************************************ */ + +/** \name Defines - Part 13 B.16 Set Attributes Command + \brief See iso_FscSetFileAttributes() parameter u8AttrCmds for more informations. + \details Sample: FSC_ATTR_LEAVE_READONLY | FSC_ATTR_SET_HIDDEN | FSC_ATTR_SET_RESERVED +@{ +*/ +#define FSC_ATTR_CLEAR_READONLY 0x00u /**< \brief Clear ?read-only? attribute. */ +#define FSC_ATTR_SET_READONLY 0x01u /**< \brief Set ?read-only? attribute. */ +#define FSC_ATTR_LEAVE_READONLY 0x03u /**< \brief Don't care, leave ?read-only? attribute in current state. */ + +#define FSC_ATTR_CLEAR_HIDDEN 0x00u /**< \brief Clear ?hidden? attribute. */ +#define FSC_ATTR_SET_HIDDEN 0x04u /**< \brief Set ?hidden? attribute (not applicable unless volume supports hidden attribute). */ +#define FSC_ATTR_LEAVE_HIDDEN 0x0Cu /**< \brief Don't care, leave ?hidden? attribute in current state. */ + +#define FSC_ATTR_SET_RESERVED 0xF0u /**< \brief Reserved bists 4..7, set to 1111 (Don't care) */ +/** @} */ +/* ************************************************************************ */ + + +/** \name Defines - Part 13 B.17 Position Mode + \brief See iso_FscSeekFile() parameter u8Mode for more informations. + \details Sample: FSC_ATTR_LEAVE_READONLY | FSC_ATTR_SET_HIDDEN | FSC_ATTR_SET_RESERVED +@{ +*/ +#define FSC_SEEK_BEGIN 0x00u /**< \brief Seek from the beginning of the file. */ +#define FSC_SEEK_CURRENT 0x01u /**< \brief Seek from the beginning of the file. */ +#define FSC_SEEK_END 0x02u /**< \brief Seek from end of the file. */ +/** @} */ +/* ************************************************************************ */ + +/** \name Defines - Part 13 B.27 File Handling Mode + \brief See iso_FscMoveFile() and iso_FscDeleteFile() parameter u8Mode for more informations. +@{ +*/ +#define FSC_FILE_MODE_COPY 0x01u /**< \brief "Copy" mode. */ +#define FSC_FILE_MODE_FORCE 0x02u /**< \brief "Force" mode. */ +#define FSC_FILE_MODE_RECURSIVE 0x04u /**< \brief "Recursive" mode. */ +/** @} */ +/* ************************************************************************ */ + + +/** \name Defines - Part 13 B.30 Volume Mode + \brief See iso_FscGetVolumeStatus parameter u8Mode for more informations. +@{ +*/ +#define FSC_VOL_MODE_NOT_IN_USE 0x00u /**< \brief Report volume not in use by client. */ +#define FSC_VOL_MODE_IN_USE 0x01u /**< \brief Report volume in use by client. */ +#define FSC_VOL_MODE_REQ_REMOVAL 0x02u /**< \brief Request volume to prepare for removal. */ +/** @} */ +/* ************************************************************************ */ + +/** \name Defines - Part 13 B.31 Volume Status + \brief (ISO_FSC_VOLUME_STATUS_T Porperty u8VolumeStatus values) +@{ +*/ +#define FSC_VOLUME_STATUS_PRESENT 0x00u /**< \brief Volume is present. */ +#define FSC_VOLUME_STATUS_IN_USE 0x01u /**< \brief Volume is in use. */ +#define FSC_VOLUME_STATUS_REMOVAL 0x02u /**< \brief Volume is prepared for removal. */ +#define FSC_VOLUME_STATUS_REMOVED 0x03u /**< \brief Volume is removed. */ +/** @} */ +/* ************************************************************************ */ + + + /** \brief + Typedef enum for file server response error codes - Part 13 B.9 + + \par The enum contains also FS-Client specific error codes - start at 6400 (0x1900) + */ + typedef enum + { + IsoFsSuccess = 0, /**< Success */ + IsoFsAccessDenied = 1, /**< Access Denied */ + IsoFsInvalidAccess = 2, /**< Invalid Access */ + IsoFsTooManyFilesOpen = 3, /**< Too many files open */ + IsoFsItemNotFound = 4, /**< File, path or volume not found */ + IsoFsInvalidHandle = 5, /**< Invalid Handle */ + IsoFsInvalidSourceName = 6, /**< Invalid given source name */ + IsoFsInvalidDestinationName = 7, /**< Invalid given destination name */ + IsoFsVolumeOutOfFreeSpace = 8, /**< Volume out of free space */ + IsoFsWriteFailure = 9, /**< Failure during a write operation */ + IsoFsMediaIsNotPresent = 10, /**< Media is not present [formerly the code for error 13, below, in Version 2 FSs (see B.5)] */ + IsoFsReadFailure = 11, /**< Failure during a read operation */ + IsoFsFunctionNotSupported = 12, /**< Function not supported */ + IsoFsVolumeNotInitialized = 13, /**< Volume is possibly not initialized */ + /**< 14 ... 41 Reserved */ + IsoFsInvalidRequestLength = 42, /**< Invalid request length (used when the file pointer hits the start/top of the file or on invalid space request of the volume) */ + IsoFsOutOfMemory = 43, /**< Out of memory (used by FS to indicate out of resources at this time and can complete request) */ + IsoFsError = 44, /**< Any other error */ + IsoFsEndOfFileReached = 45, /**< End of file reached (reported only when file pointer is at end of file) */ + /**< ( 46 ... 255 Reserved ) */ + + /* FSClient driver specific error codes - start at 0x1900 */ + IsoFscErrorTryAgain = 6400, /**< Request faild try again (0x1900) */ + IsoFscServerBusy = 6401, /**< file server busy */ + IsoFscServerTimeout = 6402, /**< Server status timeout - closing connections... */ + IsoFscRequestError = 6403, /**< Too many faild requests - no more retries */ + IsoFscResponseTimeout = 6404, /**< Response timeout - no more retries */ + IsoFscResponseError = 6405, /**< Response error - no more retries */ + IsoFscResponseDataError = 6406, /**< Response data error - response data length not valid */ + IsoFscInvalidHandle = 6407, /**< Invalid Handle */ + IsoFscInvalidFunction = 6408, /**< Function is not valid */ + IsoFscBufferIsFull = 6409, /**< The data buffer is full - copy the data and set the length to zero to continue... */ + IsoFscError = 6410 /**< Any other client error */ + } ISO_FSC_ERRORCODE_e; + +/* ************************************************************************ */ + /** \brief + Typedef enum for file server command + functions - Part 13 C.1 - C.5 + */ + typedef enum + { + IsoFscCmdSignalIOChannelState = -3, /**< Client Cmd: signal currently changed IO channel state */ + IsoFscCmdSignalConnectionState = -2, /**< Client Cmd: signal currently changed connection state */ + IsoFsCmdUnknown = -1, /**< Command function not set or unknown */ + + IsoFsCmdAliveStatus = 0, /**< File server status or client connection Maintenance message */ + IsoFsCmdServerProperties = 1, /**< File Server properties */ + IsoFsCmdVolumeStatus = 2, /**< Volume Status */ + IsoFsCmdGetCurrentDirectory = 16, /**< Get Current Directory */ + IsoFsCmdChangeCurrentDirectory = 17, /**< Change Current Directory */ + IsoFsCmdOpenFile = 32, /**< Open File */ + IsoFsCmdSeekFile = 33, /**< Seek File */ + IsoFsCmdReadFile = 34, /**< Read File */ + IsoFsCmdWriteFile = 35, /**< Write File */ + IsoFsCmdCloseFile = 36, /**< Close File */ + IsoFsCmdMoveFile = 48, /**< Move File */ + IsoFsCmdDeleteFile = 49, /**< Delete File */ + IsoFsCmdGetFileAttributes = 50, /**< Get File Attributes */ + IsoFsCmdSetFileAttributes = 51, /**< Set File Attributes */ + IsoFsCmdGetFileDateTime = 52, /**< Get File Date & Time */ + IsoFsCmdInitializeVolume = 64 /**< Initialize Volume */ + } ISO_FSC_CMDFUNCTION_e; + +/* ************************************************************************ */ + /** \brief + Typedef enum of file server client io channel or connection states + */ + typedef enum + { + IsoFscFree = 0, /**< array member is free */ + IsoFscInit = 1, /**< array member data are set to init values */ + IsoFscClosed = 2, /**< array member data are valid - handle not active - can be (re)used */ + IsoFscConnecting = 3, /**< wait for server status response ... */ + IsoFscOpen = 4, /**< connection or IO can be used */ + IsoFscDoRequest = 5, /**< (re)try to send the request */ + IsoFscDoWaitReqested = 6, /**< Wait for TP request finished */ + IsoFscDoWaitResponse = 7, /**< wait for FS responce start message */ + IsoFscDoResponse = 8, /**< wait for FS responce data */ + IsoFscDoCallBack = 9, /**< return data and current state - used from IsoFsCmdReadFile if the data buffer is full */ + IsoFscDoAbort = 10, /**< abort cmd function */ + IsoFscFinished = 11 /**< cmd function processing is finished */ + } ISO_FSC_STATE_e; + + +/* ************************************************************************ */ + /** \brief FS client handle type definition + + - 0xFFFF : Invalid handle ( use #ISO_FSC_HANDLE_INVALID ) + - Bits 0-7 : array index from 0 to 255 + - Bits 8-9 : random value between 0 and 3 + - Bits 10-11: sub type of the handle - 0 = IO handle, 1 = connection handle + - Bits 12-15: main type of the handle - 4 = FSC handle + */ + typedef uint16 ISO_FSC_HANDLE_T; + typedef ISO_FSC_HANDLE_T* ISO_FSC_HANDLE_t; /**< Pointer typedef of ISO_FSC_HANDLE_T */ + + /** \brief FS client invalid handle */ + #define ISO_FSC_HANDLE_INVALID ((ISO_FSC_HANDLE_T) 0xFFFFu) + +/* ************************************************************************ */ + /** \brief + Typedef struct for file server client to server connection status + */ + typedef struct + { + ISO_FSC_HANDLE_T hConn; /**< \brief connection handle - set to ISO_FSC_HANDLE_INVALID to indicate a free/unused entry */ + ISO_FSC_STATE_e eState; /**< \brief client connection / comand state */ + sint16 s16FSClientMember; /**< \brief file server client member (user) handle */ + sint16 s16FServerMember; /**< \brief current file server member (user) handle */ + slong lLastFServerAlive; /**< \brief timestamp of last server status message */ + slong lLastFSClientAlive; /**< \brief timestamp of last client maintenance message */ + uint8 u8usedIOs; /**< \brief number of IOs witch use this connections ... */ + } ISO_FSC_CONNECTION_STATUS_T; + + typedef ISO_FSC_CONNECTION_STATUS_T* ISO_FSC_CONNECTION_STATUS_t; /**< Pointer typedef of ISO_FSC_CONNECTION_STATUS_T */ + +/* ************************************************************************ */ + /** \brief Typedef struct for file server client data buffers */ + typedef struct + { + uint8 HUGE_C *au8Data; /**< \brief Pointer on data buffer */ + uint32 u32DataSize; /**< \brief Size of the data buffer */ + uint32 u32DataLength; /**< \brief Number of used data bytes */ + } ISO_FSC_DATA_T; + + typedef ISO_FSC_DATA_T ISO_FSC_PATH_T; /**< Typedef of ISO_FSC_PATH_T */ + typedef ISO_FSC_DATA_T* ISO_FSC_DATA_t; /**< Pointer typedef of ISO_FSC_DATA_T */ + typedef ISO_FSC_PATH_T* ISO_FSC_PATH_t; /**< Pointer typedef of ISO_FSC_PATH_T */ + +/* ************************************************************************ */ + /** \brief + Typedef struct for file server status and properties response + */ + typedef struct + { + uint8 u8Status; /**< \brief current file server status - Part 13 B.3 */ + uint8 u8OpenFiles; /**< \brief current open files on the file server - Part 13 B.4 */ + uint8 u8MaxOpenFiles; /**< \brief maximum open files on the file server - Part 13 B.6 */ + uint8 u8Version; /**< \brief version number of the file server - Part 13 B.5 */ + uint8 u8Capabilities; /**< \brief file server capabilities - Part 13 B.7 */ + } ISO_FSC_FS_INFO_T; + + typedef ISO_FSC_FS_INFO_T* ISO_FSC_FS_INFO_t; /**< Pointer typedef of ISO_FSC_FS_INFO_T */ + +/* ************************************************************************ */ + /** \brief Typedef struct for file server volume status response */ + typedef struct + { + uint8 u8VolumeStatus; /**< \brief current file server status - Part 13 B.31 */ + uint8 u8MaxTimeBeforeRemoval; /**< \brief current open files on the file server - Part 13 B.32 */ + } ISO_FSC_VOLUME_STATUS_T; + + typedef ISO_FSC_VOLUME_STATUS_T* ISO_FSC_VOLUME_STATUS_t; /**< Pointer typedef of ISO_FSC_VOLUME_STATUS_T */ + +/* ************************************************************************ */ + /** \brief Typedef struct for file server get current directory response */ + typedef struct + { + uint32 u32TotalSpace; /**< \brief get current dir total space (in units of 512 bytes) - Part 13 B.11 */ + uint32 u32FreeSpace; /**< \brief get current dir free space (in units of 512 bytes) - Part 13 B.11 */ + } ISO_FSC_CURRENT_DIR_INFO_T; + + typedef ISO_FSC_CURRENT_DIR_INFO_T* ISO_FSC_CURRENT_DIR_INFO_t; /**< Pointer typedef of ISO_FSC_CURRENT_DIR_INFO_T */ + +/* ************************************************************************ */ + /** \brief Typedef struct for file server file response */ + typedef struct + { + uint8 u8Attributes; /**< \brief open file attributes - Part 13 B.15 */ + uint16 u16Count; /**< \brief number of bytes or directory entries - Part 13 B.20 */ + uint32 u32Position; /**< \brief position after seek file - Part 13 B.29 */ + } ISO_FSC_FILE_INFO_T; + + typedef ISO_FSC_FILE_INFO_T* ISO_FSC_FILE_INFO_t; /**<Pointer typedef of ISO_FSC_FILE_INFO_T */ + +/* ************************************************************************ */ + /** \brief Typedef struct for file server file attributes response */ + typedef struct + { + uint8 u8Attributes; /**< \brief file attributes - Part 13 B.15 */ + uint32 u32Size; /**< \brief file size - Part 13 B.26 */ + } ISO_FSC_FILE_ATTRIBUTES_T; + + typedef ISO_FSC_FILE_ATTRIBUTES_T* ISO_FSC_ATTRIBUTES_INFO_t; /**< Pointer typedef of ISO_FSC_FILE_ATTRIBUTES_T */ + +/* ************************************************************************ */ + /** \brief Typedef struct for file server get file date time response */ + typedef struct + { + uint16 u16Date; /**< \brief file date - Part 13 B.24 */ + uint16 u16Time; /**< \brief file time - Part 13 B.25 */ + } ISO_FSC_DATE_TIME_T; + + typedef ISO_FSC_DATE_TIME_T* ISO_FSC_DATE_TIME_t; /**< Pointer typedef of ISO_FSC_DATE_TIME_T */ + + +/* ************************************************************************ */ + /** \brief + Typedef union for file server response + + The responce content depend on ISO_FSC_CMDFUNCTION_e: + - IsoFsCmdAliveStatus: sServerInfo + - IsoFsCmdServerProperties: sServerInfo + - IsoFsCmdVolumeStatus: sVolumeStatus + - IsoFsCmdGetCurrentDirectory: sCurrentDirInfo + - IsoFsCmdChangeCurrentDirectory: not used + - IsoFsCmdOpenFile: sFileInfo.u8Attributes + - IsoFsCmdSeekFile: sFileInfo.u32Position + - IsoFsCmdReadFile: sFileInfo.u16Count + - IsoFsCmdWriteFile: sFileInfo.u16Count + - IsoFsCmdCloseFile: not used + - IsoFsCmdMoveFile: not used + - IsoFsCmdDeleteFile: not used + - IsoFsCmdSetFileAttributes: not used + - IsoFsCmdGetFileDateTime: sDateTime + - IsoFsCmdInitializeVolume: sInitVolumeAttributes.u8Attributes + + */ + typedef union + { + ISO_FSC_FS_INFO_T sServerInfo; /**< \brief file server status and properties - IsoFsCmdServerProperties */ + ISO_FSC_VOLUME_STATUS_T sVolumeStatus; /**< \brief file server volume status */ + ISO_FSC_CURRENT_DIR_INFO_T sCurrentDirInfo; /**< \brief file server get current directory properties */ + ISO_FSC_FILE_INFO_T sFileInfo; /**< \brief file open read write or read directory entries info */ + ISO_FSC_FILE_ATTRIBUTES_T sFileAttributes; /**< \brief file server get file attributes info */ + ISO_FSC_DATE_TIME_T sDateTime; /**< \brief file server get file date time info */ + ISO_FSC_FILE_ATTRIBUTES_T sInitVolumeAttributes; /**< \brief file server initialize volume attributes */ + } ISO_FSC_INFO_T; + + typedef ISO_FSC_INFO_T* ISO_FSC_INFO_t; /**< Pointer typedef of ISO_FSC_INFO_T */ + +/* ************************************************************************ */ + /** \brief Typedef struct for file server client callback data */ + typedef struct + { + ISO_FSC_CMDFUNCTION_e eFunction; /**< \brief current / last cmd function */ + ISO_FSC_ERRORCODE_e eError; /**< \brief last file server response or client error */ + ISO_FSC_HANDLE_T hFscHandle; /**< \brief IO channel (or connection) handle */ + ISO_FSC_STATE_e eState; /**< \brief client connection / io command state */ + ISO_FSC_INFO_T usInfo; /**< \brief union for the server response. \n + The content depend on eFunction and is only valid if eState is IsoFscFinished. */ + uint8 HUGE_C *au8Data; /**< \brief Pointer on data buffer. Contains the data without the usInfo values. */ + uint32 u32DataSize; /**< \brief Size of the data buffer */ + uint32 u32DataLength; /**< \brief Number of used data bytes */ + } ISO_FSC_CBDATA_T; + + typedef ISO_FSC_CBDATA_T* ISO_FSC_CBDATA_t; /**< Pointer typedef of ISO_FSC_CBDATA_T */ + +/* ************************************************************************ */ + /** \brief + Typedef call back function ( for handling all unhandled responses and errors ) + + The ISO_FSC_CBDATA_T data pointer and the referenced data are only valid during the call back. + */ + typedef void (*ISO_FSC_CALLBACK_t)( ISO_FSC_CBDATA_T* psData ); + +/** @} */ /* end group fscdefinitions */ +/* ************************************************************************ */ + /** \name Part 13 - Client Management Functions + + Use this functions to create and connect io channels to a file server + + @{ + */ + + /*! + \brief Create a new io channel and connect it to the file server + + If the connection does not exist, a new connect between the client and the server is created and opend. + The FSC module executes the callback function when the io channel ( or connection) is open and can be used. + + \param[out] \wp{phIO, ISO_FSC_HANDLE_T*} + Pointer to the new io channel handle + \param[in] \wp{s16FSClientMemberHandle, sint16} + Valid client (internal) network member (user) handle + \param[in] \wp{s16FServerMemberHandle, sint16} + Valid server (external) network member (user) handle + \param[in] \wp{pFunction, ISO_FSC_CALLBACK_t} + Pointer to callback function or NULL pointer if you do't need a callback function for this io channel + + \retval sint16 + - E_NO_ERR + - E_RANGE (Input parameter not valid) + - E_CONFIG (no free connection or io channel) + */ + sint16 iso_FscConnect( /* out */ ISO_FSC_HANDLE_T* phIO, sint16 s16FSClientMemberHandle, sint16 s16FServerMemberHandle, ISO_FSC_CALLBACK_t pFunction ); + +/* ************************************************************************ */ + /*! + \brief Get the status of a connection + + \param[in] \wp{hFscHandle, ISO_FSC_HANDLE_T} + Valid connection or IO handle + \param[out] \wp{psConnStatus, ISO_FSC_CONNECTION_STATUS_T*} + Pointer to a ISO_FSC_CONNECTION_STATUS_T structure + \retval sint16 + - E_NO_ERR + - E_RANGE ( handle not valid ) + */ + sint16 iso_FscGetConnectionStatus( ISO_FSC_HANDLE_T hFscHandle, ISO_FSC_CONNECTION_STATUS_T* psConnStatus ); + +/* ************************************************************************ */ + /*! + \brief Delete a connection or an io channel + + \param[in] \wp{hFscHandle, ISO_FSC_HANDLE_T} + Valid connection or IO handle + + \retval sint16 + - E_NO_ERR + - E_RANGE ( handle not valid ) + */ + + sint16 iso_FscDelete( ISO_FSC_HANDLE_T hFscHandle ); + + /* ************************************************************************ */ + /*! + \brief Close an open connection or io channel + + \param[in] \wp{hFscHandle, ISO_FSC_HANDLE_T} + Valid connection or IO handle + + \retval sint16 + - E_NO_ERR + - E_RANGE ( handle not valid ) + */ + + + sint16 iso_FscClose( ISO_FSC_HANDLE_T hFscHandle ); + + /* ************************************************************************ */ + /*! + \brief Open or reopen a connection or an io channel + + \param[in] \wp{hFscHandle, ISO_FSC_HANDLE_T} + Valid connection or IO handle + + \retval sint16 + - E_NO_ERR + - E_RANGE ( handle not valid ) + - E_CONFIG ( Connection not valid ) + */ + sint16 iso_FscOpen( ISO_FSC_HANDLE_T hFscHandle ); + + + /** @} */ + /* ************************************************************************ */ + /** \name Part 13 C.1 Functions + @{ + */ + /*! + \brief Request the file server properties + + \param[in] \wp{hIO, ISO_FSC_HANDLE_T} + Valid IO channel handle + + \retval sint16 + - E_NO_ERR + - E_RANGE ( handle not valid ) + - E_CONFIG ( IO channel busy or connection not valid ) + */ + sint16 iso_FscGetServerProperties( ISO_FSC_HANDLE_T hIO ); + + /* ************************************************************************ */ + /*! + \brief Request the status of a file server volume + + \param[in] \wp{hIO, ISO_FSC_HANDLE_T} + Valid IO channel handle + \param[in] \wp{u8Mode, uint8} + Volume Mode - Part 13 B.30 + \param[in] \wpp{psPath, const #ISO_FSC_PATH_T*} + Pointer to volume name structure or NULL pointer to get the volume status of the current directory volume. + + \retval sint16 + - E_NO_ERR + - E_RANGE ( handle not valid ) + - E_CONFIG ( IO channel busy or connection not valid ) + + \note B.30 Volume Mode + \par + The data object used by a client to specify the mode of the volume access requested. + A value of 00000000 requests the current status. \n + - Bit 7..2: 000000 = Reserved, send as 000000. + - Bit 1: 1 = Request volume to prepare for removal (#FSC_VOL_MODE_REQ_REMOVAL). + - Bit 0: 1 = Report volume in use by client (#FSC_VOL_MODE_IN_USE). + 0 = Report volume not in use by client (#FSC_VOL_MODE_NOT_IN_USE). + */ + sint16 iso_FscGetVolumeStatus( ISO_FSC_HANDLE_T hIO, uint8 u8Mode, const ISO_FSC_PATH_T* psPath ); + + /** @} */ + + + /* ************************************************************************ */ + /** \name Part 13 C.2 Functions + @{ + */ + + /* ************************************************************************ */ + /*! + \brief Request the current directory path + + \param[in] \wp{hIO, ISO_FSC_HANDLE_T} + Valid IO channel handle + \param[out] \wp{psPath, ISO_FSC_PATH_T*} + Pointer to path name structure to store the current directory or NULL pointer. \n + The pointer and the structure must be valid until the response is arrived \n + + \retval sint16 + - E_NO_ERR + - E_RANGE ( handle not valid ) + - E_CONFIG ( IO channel busy or connection not valid ) + */ + sint16 iso_FscGetCurrentDirectory( ISO_FSC_HANDLE_T hIO, ISO_FSC_PATH_T* psPath ); + + /* ************************************************************************ */ + /*! + \brief Request for changing the current directory path + + \param[in] \wp{hIO, ISO_FSC_HANDLE_T} + Valid IO channel handle + \param[out] \wpp{psPath, const #ISO_FSC_PATH_T*} + Pointer to path name structure that contains the directory path. \n + The pointer and the structure must be valid until the response is arrived \n + + \retval sint16 + - E_NO_ERR + - E_RANGE ( handle not valid ) + - E_CONFIG ( IO channel busy or connection not valid + */ + sint16 iso_FscChangeCurrentDirectory( ISO_FSC_HANDLE_T hIO, const ISO_FSC_PATH_T* psPath ); + + /** @} */ + /* ************************************************************************ */ + /** \name Part 13 C.3 Functions + @{ + */ + + /* ************************************************************************ */ + /*! + \brief Request to open a file or directory + + \param[in] \wp{hIO, ISO_FSC_HANDLE_T} + Valid IO channel handle + \param[in] \wp{u8Flags, uint8} + Flags (see Part 13 - B.14): + - Bit 7..5: 000 Reserved, send as 000. + - Bit 4: + - 0 = Open file for shared read access. + - 1 = #FSC_OPEN_EXCLUSIVE: Open file with exclusive access (fails if already open). + - Bit 3: + - 0 = Open file for random access (file pointer set to the start of the file). + - 1 = #FSC_OPEN_APPEND: Open file for appending data to the end of the file + (file pointer set to the end of the file). + - Bit 2: + - 0 = Open an existing file (fails if non-existent file). + - 1 = #FSC_OPEN_CREATE: Create a new file and/or directories if not yet existing. + - Bit 1,0: + - 00 = #FSC_OPEN_READONLY: Open file for reading only. + - 01 = #FSC_OPEN_WRITING: Open file for writing only. + - 10 = #FSC_OPEN_READWRITE: Open file for reading and writing. + - 11 = #FSC_OPEN_DIRECTORY: Open directory. + \param[in] \wpp{psPath, const #ISO_FSC_PATH_T*} + Pointer to path name structure that contains the file or directory path. \n + The pointer and the structure must be valid until the response is arrived \n + \retval sint16 + - E_NO_ERR + - E_RANGE ( handle not valid ) + - E_CONFIG ( IO channel busy or connection not valid + */ + + sint16 iso_FscOpenFile( ISO_FSC_HANDLE_T hIO, uint8 u8Flags , const ISO_FSC_PATH_T* psPath ); + + /* ************************************************************************ */ + /*! + \brief Request to move the current postion in an open file or directory + + \param[in] \wp{hIO, ISO_FSC_HANDLE_T} + Valid IO channel handle + \param[in] \wp{u8Mode, uint8} + Position mode - Part 13 B.17 \n + The position mode specifies the location from which the offset value is used to determine the file pointer position. + - #FSC_SEEK_BEGIN: 0x00u = From the beginning of the file. + - #FSC_SEEK_CURRENT: 0x01u = From the current pointer position. + - #FSC_SEEK_END: 0x02u = From the end of the file. + \param[in] \wp{s32Offset, sint32} + Offset - Part 13 B.18 \n + The offset is used with the position mode to determine the file pointer position. \n + + \retval sint16 + - E_NO_ERR + - E_RANGE ( handle not valid ) + - E_CONFIG ( IO is not assigned with a file handle or IO channel busy or connection not valid ) + */ + sint16 iso_FscSeekFile( ISO_FSC_HANDLE_T hIO, uint8 u8Mode , sint32 s32Offset ); + + /* ************************************************************************ */ + /*! + \brief Request to read data from an open file or directory + + \param[in] \wp{hIO, ISO_FSC_HANDLE_T} + Valid IO channel handle + \param[out] \wp{psDataBuffer, ISO_FSC_DATA_T*} + Pointer to data structure to store the response data or NULL pointer. \n + The pointer and the structure must be valid until the response is arrived. \n + The function is reading (u32DataSize - u32DataLength) data bytes if u32DataLength is set to zero. + \param[in] \wp{u32DataLength, uint32} + Optional: if greater then zero, the client tries to read this count of bytes or directory entries. + \param[in] \wp{u8ReportHidden, uint8} + Report hidden files (only used, if the handle points to a directory - Part 13 B.28) \n + - 0x00u = Do not report hidden files in a directory listing. + - 0x01u = Report hidden files in a directory listing. + - 0xFFu = Parameter is not available, FS shall not report hidden files in a directory listing. + \retval sint16 + - E_NO_ERR + - E_RANGE ( handle not valid ) + - E_CONFIG ( IO is not assigned with a file handle or IO channel busy or connection not valid ) + \note + If the data buffer is full the FSC calls the callback function with the state IsoFscDoCallBack and the error code IsoFscBufferIsFull. + After this the FSC set the length of the buffer to zero, if the application has not done this... + */ + sint16 iso_FscReadFile( ISO_FSC_HANDLE_T hIO, ISO_FSC_DATA_T* psDataBuffer, uint32 u32DataLength, uint8 u8ReportHidden ); + + /* ************************************************************************ */ + /*! + \brief Request to write data to an open file + + \param[in] \wp{hIO, ISO_FSC_HANDLE_T} + ISO_FSC_HANDLE_T Valid IO channel handle + \param[in] \wpp{psDataBuffer, const #ISO_FSC_DATA_T*} + Pointer to data structure. \n + The pointer and the structure must be valid until the response is arrived \n + The function uses the TP protocol and is writing psDataBuffer->u32DataLength data bytes in one ore more FSC_RW_BLOCK_SIZE blocks ( FSC_RW_BLOCK_SIZE = BLOCK_SIZE_J1939 - 5uL). \n + \retval sint16 + - E_NO_ERR + - E_RANGE ( handle not valid ) + - E_CONFIG ( IO is not assigned with a file handle or IO channel busy or connection not valid ) + */ + sint16 iso_FscWriteFile( ISO_FSC_HANDLE_T hIO, const ISO_FSC_DATA_T* psDataBuffer ); + + /* ************************************************************************ */ + /*! + \brief Request to write data to an open file + + \param[in] \wp{hIO, ISO_FSC_HANDLE_T} + Valid IO channel handle + \retval sint16 + - E_NO_ERR + - E_RANGE ( handle not valid ) + - E_CONFIG ( IO is not assigned with a file handle or IO channel busy or connection not valid ) + */ + sint16 iso_FscCloseFile( ISO_FSC_HANDLE_T hIO); + + /** @} */ + /* ************************************************************************ */ + /** \name Part 13 C.4 Functions + @{ + */ + + /* ************************************************************************ */ + /*! + \brief Request to move a file or directory + + \param[in] \wp{hIO, ISO_FSC_HANDLE_T} + Valid IO channel handle \n + \param[in] \wp{u8Mode, uint8} + File handling mode - Part 13 B.27 \n + - Bit 7-3: 00000 = Reserved, send as 00000. + - Bit 2 : + - 0 = "Recursive" mode is not set. + - 1 = "Recursive" mode is set (#FSC_FILE_MODE_RECURSIVE). + - Bit 1 : + - 0 = "Force" mode is not set. + - 1 = "Force" mode is set (#FSC_FILE_MODE_FORCE). + - Bit 0 : + - 0 = "Copy" mode is not set. + - 1 = "Copy" mode is set (#FSC_FILE_MODE_COPY). + \param[in] \wpp{psSourcePath, const #ISO_FSC_PATH_T*} + Pointer to path name structure that contains the file or directory source path. \n + The pointer and the structure must be valid until the response is arrived \n + \param[in] \wp{psDestinationPath, ISO_FSC_PATH_T*} + Pointer to path name structure that contains the file or directory destination path. \n + The pointer and the structure must be valid until the response is arrived \n + \retval sint16 + - E_NO_ERR + - E_RANGE ( handle not valid ) + - E_CONFIG ( Source or destination path stucture not valid ) + */ + sint16 iso_FscMoveFile( ISO_FSC_HANDLE_T hIO, uint8 u8Mode , const ISO_FSC_PATH_T* psSourcePath, ISO_FSC_PATH_T* psDestinationPath ); + + /* ************************************************************************ */ + /*! + \brief Request to delete a file or directory + + \param[in] \wp{hIO, ISO_FSC_HANDLE_T} + Valid IO channel handle \n + \param[in] \wp{u8Mode, uint8} + File handling mode - Part 13 B.27 \n + - Bit 7-3: 00000 = Reserved, send as 00000. + - Bit 2 : + - 0 = "Recursive" mode is not set. + - 1 = "Recursive" mode is set (#FSC_FILE_MODE_RECURSIVE). + - Bit 1 : + - 0 = "Force" mode is not set. + - 1 = "Force" mode is set (#FSC_FILE_MODE_FORCE). + - Bit 0 : + - 0 = "Copy" mode is not set. + - 1 = "Copy" mode is set (#FSC_FILE_MODE_COPY). + \param[in] \wpp{psPath, const #ISO_FSC_PATH_T*} + Pointer to path name structure that contains the file or directory path. \n + The pointer and the structure must be valid until the response is arrived \n + \retval sint16 + - E_NO_ERR + - E_RANGE ( handle not valid ) + - E_CONFIG ( Path stucture not valid ) + */ + sint16 iso_FscDeleteFile( ISO_FSC_HANDLE_T hIO, uint8 u8Mode , const ISO_FSC_PATH_T* psPath ); + + + /* ************************************************************************ */ + /*! + \brief Request to get file attributes + + \param[in] \wp{hIO, ISO_FSC_HANDLE_T} + Valid IO channel handle + \param[in] \wpp{psPath, const #ISO_FSC_PATH_T*} + Pointer to path name structure that contains the file path. \n + The pointer and the structure must be valid until the response is arrived + + \retval sint16 + - E_NO_ERR + - E_RANGE ( handle not valid ) + - E_CONFIG ( path stucture not valid ) + */ + sint16 iso_FscGetFileAttributes( ISO_FSC_HANDLE_T hIO, const ISO_FSC_PATH_T* psPath ); + + /* ************************************************************************ */ + /*! + \brief Request to set file attributes + + \param[in] \wp{hIO, ISO_FSC_HANDLE_T} + Valid IO channel handle + \param[in] \wp{u8AttrCmds, uint8} + Set Attributes Command - Part 13 B.16 \n + The command from the client to the FS for setting or clearing file attributes. + - Bit 7,6 and Bit 5,4 : Reserved, set to #FSC_ATTR_SET_RESERVED ( 0xF0u ). + - Bit 3,2 : + - #FSC_ATTR_CLEAR_HIDDEN: 00 = Clear "hidden" attribute. + - #FSC_ATTR_SET_HIDDEN: 01 = Set "hidden" attribute. + - #FSC_ATTR_LEAVE_READONLY: 11 = Don't care, leave "hidden" attribute in current state. + - Bit 1,0 : + - #FSC_ATTR_CLEAR_READONLY: 00 = Clear "read-only" attribute. + - #FSC_ATTR_SET_READONLY: 01 = Set "read-only" attribute. + - #FSC_ATTR_LEAVE_READONLY: 11 = Don't care, leave "read-only" attribute in current state. + \param[in] \wpp{psPath, const #ISO_FSC_PATH_T*} + Pointer to path name structure that contains the file path. \n + The pointer and the structure must be valid until the response is arrived \n + \retval sint16 + - E_NO_ERR + - E_RANGE ( handle not valid ) + - E_CONFIG ( path stucture not valid ) + */ + sint16 iso_FscSetFileAttributes( ISO_FSC_HANDLE_T hIO, uint8 u8AttrCmds , const ISO_FSC_PATH_T* psPath ); + + /* ************************************************************************ */ + /*! + \brief Request to get file date and time + + \param[in] \wp{hIO, ISO_FSC_HANDLE_T} + Valid IO channel handle + \param[in] \wpp{psPath, const #ISO_FSC_PATH_T*} + Pointer to path name structure that contains the file path. \n + The pointer and the structure must be valid until the response is arrived + + \retval sint16 + - E_NO_ERR + - E_RANGE ( handle not valid ) + - E_CONFIG ( path stucture not valid ) + */ + sint16 iso_FscGetFileDateTime( ISO_FSC_HANDLE_T hIO, const ISO_FSC_PATH_T* psPath ); + + /** @} */ + /* ************************************************************************ */ + /** \name Part 13 C.5 Functions + @{ + */ + + /* ************************************************************************ */ + /*! + \brief Request for initalizing a volume + + \param[in] \wp{hIO, ISO_FSC_HANDLE_T} + Valid IO channel handle + \param[in] \wp{u32Space, uint32} + Space in 512 byte units - Part 13 B.11 + \param[in] \wp{u8Flags, uint8} + Flags see Part 13 B.29 + \param[in] \wpp{psPath, const #ISO_FSC_PATH_T*} + Pointer to path name structure that contains the volume path. \n + The pointer and the structure must be valid until the response is arrived + + \retval sint16 + - E_NO_ERR + - E_RANGE ( handle not valid ) + - E_CONFIG ( IO channel busy or connection not valid ) + */ + sint16 iso_FscInitializeVolume( ISO_FSC_HANDLE_T hIO, uint32 u32Space, uint8 u8Flags , const ISO_FSC_PATH_T* psPath ); + + /** @} */ + /* ************************************************************************ */ + /** \name FSC - Extended Functions + @{ + */ + + /*! + \brief Set optional global call back function for handling all unhandled responses + + \param[in] \wp{pFunction, ISO_FSC_CALLBACK_t} + pointer to callback function or NULL pointer to remove the module global callback function. + + \retval sint16 + E_NO_ERR + */ + sint16 iso_FscSetGlobalCallBack( ISO_FSC_CALLBACK_t pFunction ); + + /* ************************************************************************ */ + /*! + \brief Set callback function for channel or connection ( for handling all unhandled responses or errors ) + + \param[in] \wp{hFscHandle, ISO_FSC_HANDLE_T} + valid connection or io channel handle + \param[in] \wp{pFunction, ISO_FSC_CALLBACK_t} + pointer to callback function or NULL pointer to remove the callback function. + + \retval sint16 + - E_NO_ERR + - E_RANGE ( handle not valid ) + */ + sint16 iso_FscSetCallbackFunction( ISO_FSC_HANDLE_T hFscHandle, ISO_FSC_CALLBACK_t pFunction ); + + /* ************************************************************************ */ + /*! + \brief Extended function to read a complete file. + + The FS client is automatically creating and freeing the connection. + + \param[in] \wp{s16FSClientMemberHandle, sint16} + Valid client (internal) network member (user) handle. + \param[in] \wp{s16FServerMemberHandle, sint16} + Valid server (external) network member (user) handle. + \param[out] \wpp{psPath, const #ISO_FSC_PATH_T*} + Pointer to data structure to store the response data or NULL pointer. \n + The pointer and the structure must be valid until the response is arrived. + \param[in] \wp{psDataBuffer, ISO_FSC_DATA_T*} + \param[in] \wp{pFunction, ISO_FSC_CALLBACK_t} + Pointer to callback function. + + \retval sint16 + - E_NO_ERR + - E_RANGE ( parameter not valid ) + - E_CONFIG ( no free IO channel or connection entry ) + \note + If the data buffer is full the FSC calls the callback function with the state IsoFscDoCallBack and the error code IsoFscBufferIsFull. + After this the FSC set the length of the buffer to zero, if the application has not done this... + */ + sint16 iso_FscReadFileFromServer( sint16 s16FSClientMemberHandle, sint16 s16FServerMemberHandle, + const ISO_FSC_PATH_T* psPath, ISO_FSC_DATA_T* psDataBuffer, + ISO_FSC_CALLBACK_t pFunction ); + + /* ************************************************************************ */ + /*! + \brief Extended function to write a complete file. + + The FS client is automatically creating and freeing the connection. + The FS client deletes automatically an existing file, before writing the new file, + to make sure that no unvalid data are left at the end of the file... + + \param[in] \wp{s16FSClientMemberHandle, sint16} + Valid client (internal) network member (user) handle. + \param[in] \wp{s16FServerMemberHandle, sint16} + Valid server (external) network member (user) handle. + \param[in] \wpp{psPath, const #ISO_FSC_PATH_T*} + \param[in] \wp{psDataBuffer, ISO_FSC_DATA_T*} + Pointer to data structure. \n + The pointer and the structure must be valid until the response is arrived \n + The function uses the TP protocol and is writing psDataBuffer->u32DataLength data bytes in one ore more FSC_RW_BLOCK_SIZE blocks ( FSC_RW_BLOCK_SIZE = BLOCK_SIZE_J1939 - 5uL). \n + \param[in] \wp{pFunction, ISO_FSC_CALLBACK_t} + Pointer to callback function. + + \retval sint16 + - E_NO_ERR + - E_RANGE ( parameter not valid ) + - E_CONFIG ( no free IO channel or connection entry ) + */ + + sint16 iso_FscWriteFileToServer( sint16 s16FSClientMemberHandle, sint16 s16FServerMemberHandle, + const ISO_FSC_PATH_T* psPath, ISO_FSC_DATA_T* psDataBuffer, + ISO_FSC_CALLBACK_t pFunction ); + + /* ************************************************************************ */ + /*! + \brief Extended function to append data to a file. + + The FS client is automatically creating and freeing the connection. + The FS client creates automatically the file, if it does not exist. + + \param[in] \wp{s16FSClientMemberHandle, sint16} + Valid client (internal) network member (user) handle. + \param[in] \wp{s16FServerMemberHandle, sint16} + Valid server (external) network member (user) handle. + \param[in] \wpp{psPath, const #ISO_FSC_PATH_T*} + \param[in] \wp{psDataBuffer, ISO_FSC_DATA_T* } + Pointer to data structure. \n + The pointer and the structure must be valid until the response is arrived \n + The function uses the TP protocol and is writing psDataBuffer->u32DataLength data bytes in one ore more FSC_RW_BLOCK_SIZE blocks ( FSC_RW_BLOCK_SIZE = BLOCK_SIZE_J1939 - 5uL). \n + \param[in] \wp{pFunction, ISO_FSC_CALLBACK_t} + Pointer to callback function. + \retval sint16 + - E_NO_ERR + - E_RANGE ( parameter not valid ) + - E_CONFIG ( no free IO channel or connection entry ) + */ + sint16 iso_FscAppendFileToServer( sint16 s16FSClientMemberHandle, + sint16 s16FServerMemberHandle, + const ISO_FSC_PATH_T* psPath, + ISO_FSC_DATA_T* psDataBuffer, + ISO_FSC_CALLBACK_t pFunction ); + + /** @} */ + /* ************************************************************************ */ + /** \name FSC - Helper Functions + @{ + */ + + /* ************************************************************************ */ + /*! + \brief Helper function to initialize a ISO_FSC_DATA_T buffer. + + \param[in] \wp{psDataStruct, ISO_FSC_DATA_T*} + Pointer to data buffer structure which shall be initialized. + \param[in] \wp{au8DataArray, uint8*} + Pointer to the byte array which shall be used for the buffer. + \param[in] \wp{u32DataArraySize, uint32} + Size of the byte array. + \param[in] \wp{u32DataLength, uint32} + Currently used bytes of the array ( usually 0uL ). + + \retval sint16 + - E_NO_ERR + - E_RANGE ( parameter not valid ) + */ + + sint16 iso_FscInitDataStruct( ISO_FSC_DATA_T* psDataStruct, uint8 HUGE_C * au8DataArray, uint32 u32DataArraySize, uint32 u32DataLength ); + + /* ************************************************************************ */ + /*! + \brief Helper function to copy a zero terminated char array into a ISO_FSC_DATA_T buffer. + + The function does not copy the zero byte into the buffer... + The function is setting u32DataLength after the last copied byte. + + \param[in] \wp{psDataStruct, ISO_FSC_DATA_T*} + Pointer to data buffer structure. \n + \param[in] \wp{u32AtPos, uint32} + Start position in the data buffer ( 0uL >= u32AtPos <= u32DataSize). \n + \param[in] \wpp{au8DataArray, const #uint8[]} + Pointer to the char array which shall be copied into the buffer. \n + + \retval sint16 + - E_NO_ERR + - E_RANGE ( parameter not valid ) + */ + + sint16 iso_FscCopyStringToDataStruct( ISO_FSC_DATA_T* psDataStruct, uint32 u32AtPos ,const uint8 HUGE_C au8DataArray[] ); + + /* ************************************************************************ */ + /*! + \brief Helper function to copy data into a ISO_FSC_DATA_T buffer. + + The function is setting u32DataLength after the last copied byte. + + \param[in] \wp{psDataStruct, ISO_FSC_DATA_T*} + Pointer to data buffer structure. + \param[in] \wp{u32AtPos, uint32} + Start position in the data buffer ( 0uL >= u32AtPos <= u32DataSize). + \param[in] \wpp{au8DataArray, const #uint8[]} + Pointer to the byte array which shall be copied into the buffer. + \param[in] \wp{u32DataArrayLength, uint32} + Number of bytes which shall be copied. + + \retval sint16 + - E_NO_ERR + - E_RANGE ( parameter not valid ) + */ + sint16 iso_FscCopyArrayToDataStruct( ISO_FSC_DATA_T* psDataStruct, uint32 u32AtPos , const uint8 HUGE_C au8DataArray[], uint32 u32DataArrayLength ); + + /** @} */ + +/* ************************************************************************ */ +/** @} */ /* end defgroup fsclient */ +/* ************************************************************************ */ + +/* ************************************************************************ */ +#ifdef __cplusplus +} /* end of extern "C" */ +#endif + +#endif /* DEF_IsoFscApi_H */ +/* ************************************************************************ */ ++======= + /* ************************************************************************ */ + /*! + \file + \brief ISOBUS ECU Driver FS Client API Header File + \details File Server Client API + \author Wegscheider Peter + \date Created XX.07.13 + + \copyright Competence Center ISOBUS e.V. + + \par History: + \par + 04.07.2013 - author P. Wegscheider + - API declarations moved to this file + - Module version define added + \par + 18.04.2016 - author P. Wegscheider + - Module version number increased + - Type names updated + \par + 09.01.2017 - author P. Wegscheider + - Non ASCII characters and typo fixes + \par + 19.02.2018 -author P.Wegscheider + - Feature ID 7528: add user parameter to callback functions + - Moved deprecated pointer type definitions into ISO_FSC_DEPRECATED define section. + \par + 06.05.2018 - author P.Wegscheider + - Feature ID 3910: header files should include header files they depend on + \par + 10.08.2018 - author P. Wegscheider + - BugID 8581: add "namespace ISOBUSDRIVER" to header files + */ + /* ************************************************************************ */ + #ifndef DEF_IsoFscApi_H + #define DEF_IsoFscApi_H + + /* include configuration, driver standard types and common definitions */ + #include "IsoCommonDef.h" + + #ifdef __cplusplus + extern "C" { + #endif + /* ************************************************************************ */ + + /* ************************************************************************ */ + /*! \ingroup grp_versions + \brief File Server Client Module Version + */ + #define VERSION_FSC 3.4 /* changed for v10.00 */ + + + /* ************************************************************************ */ + /* **** FILE SERVER CLIENT **** */ + /* ************************************************************************ */ + /** \defgroup fsclient FS-Client + \ingroup clients + \brief Part 13 - File Server Client + + The File Server Client Module has been developed for Part 13 Version 3 + ( Second published edition of the International Standard ). + The Module is not backward compatible to previous versions. \n + \n + The FS-Client Module offers the following features: + - Lowlevel implementation of the Part 13 protocol + - Callback functions for returning the FS Response to the client application + - Pre processed response header data + ( response header data are pre processed and the extracted information are stored + in the ISO_FSC_INFO_T usInfo union of the ISO_FSC_CBDATA_T callback structure ) + - Extended functions for reading and writing files + - More than one client member (user) connection per server + - More than one io channel per connection + \internal + - Simultaneous connections on different can nodes ( only Version 4.83 and 4.84 ) + \endinternal + + For the module version see \ref grp_versions #VERSION_FSC + */ + + /* ************************************************************************ */ + /** \addtogroup fsclient + @{ + */ + /* ************************************************************************ */ + + /* ************************************************************************ */ + /** \name Part 13 - Enable FS-Client Module in IsoConf.h + @{ + */ + #ifdef DOXYGEN + /** \def _LAY13_ + \brief Add the define _LAY13_ to IsoConf.h to enable the file server client functionality. + */ + #define _LAY13_ + + /** \def ISO_FSC_DEPRECATED + \brief Add the define ISO_FSC_DEPRECATED to IsoConf.h to enable the deprecated pointer type definitions. + \details Deprecated type definitions and functions will be removed in the next versions. + */ + #define ISO_FSC_DEPRECATED + + #endif + /** @} */ + + /* ************************************************************************ */ + /** \brief FS-Client Definitions for IsoConf.h + */ + /** \addtogroup fscconfig FS-Client Configuration + @{ + */ + + /** \name Defines - Part 13 File Server Client Configuration + @{ */ + + /** \def FSC_MAX_CONNECTIONS + \brief Maximum of simultaneous connections ( predefined is 2) + \details This define is used to set the size of the CF / file server connection array. + */ + #ifndef FSC_MAX_CONNECTIONS + #define FSC_MAX_CONNECTIONS (2) + #endif + /** \def FSC_MAX_IO_HANDLES + \brief Maximum of simultaneous io channels ( predefined is FSC_MAX_CONNECTIONS * 3) + \details This define is used to set the size of the io channel array. + */ + #ifndef FSC_MAX_IO_HANDLES + #define FSC_MAX_IO_HANDLES (FSC_MAX_CONNECTIONS * 3) + #endif + + /** @} */ + + /** \name Defines - Part 13 File Server Client Settings + @{ + */ + + /** \def FSC_CLIENT_VERSION + \brief Version Number 0x03u = Second published edition of the International Standard - Part 13 B.5 + */ + #ifndef FSC_CLIENT_VERSION + #define FSC_CLIENT_VERSION (3u) + #endif + + /** \def FSC_MSG_PRIO + \brief Default message priority - Part 13 C.1.1 + */ + #ifndef FSC_MSG_PRIO + #define FSC_MSG_PRIO (0x07u) + #endif + + /** \def FSC_MAX_CMD_REQUEST_TRIES + \brief Maximum number of request tries - Part 13 5.3.1 / Part 3 5.12.3 + */ + #ifndef FSC_MAX_CMD_REQUEST_TRIES + #define FSC_MAX_CMD_REQUEST_TRIES (3u) + #endif + /** @} */ + + + /** @} */ + + /* ************************************************************************ */ + /** \brief FS-Client Structure and Enum Type Definitions + + This part contains the structure, enum and type definitions for the FS-Client module. + */ + /** \addtogroup fscdefinitions FS-Client Type Definitions + @{ + */ + + #if defined(CCI_USE_NAMESPACE) && defined(__cplusplus) + #include "IsoFscApi.hpp" + #else /* not: defined(CCI_USE_NAMESPACE) && defined(__cplusplus) -> use C defines */ + + + /** \name Defines - Part 13 B.14 File Handling Flags + \brief See iso_FscOpenFile() parameter u8Flags for more information + \details Sample: FSC_OPEN_READWRITE | FSC_OPEN_CREATE + @{ + */ + #define FSC_OPEN_READONLY 0x00u /**< \brief Open file for reading only. */ + #define FSC_OPEN_WRITING 0x01u /**< \brief Open file for writing only. */ + #define FSC_OPEN_READWRITE 0x02u /**< \brief Open file for reading and writing. */ + #define FSC_OPEN_DIRECTORY 0x03u /**< \brief Open directory. */ + + #define FSC_OPEN_CREATE 0x04u /**< \brief Create a new file and/or directories if not yet existing. */ + #define FSC_OPEN_APPEND 0x08u /**< \brief Open file for appending data to the end of the file. */ + #define FSC_OPEN_EXCLUSIVE 0x10u /**< \brief Open file with exclusive access (fails if already open). */ + /** @} */ + /* *************************************************************************************** */ + + /** \name Defines - Part 13 B.15 Attributes + \brief (ISO_FSC_FILE_INFO_T and ISO_FSC_FILE_ATTRIBUTES_T Property u8Attributes values) + @{ + */ + #define FSC_ATTR_READONLY 0x01u /**< \brief "Read-only" attribute is set. */ + #define FSC_ATTR_HIDDEN 0x02u /**< \brief "Hidden" attribute is set (not applicable unless volume supports hidden attribute). */ + #define FSC_ATTR_HIDDEN_SUPPORT 0x04u /**< \brief Volume supports hidden attribute. */ + #define FSC_ATTR_VOLUME_HND 0x08u /**< \brief Handle specifies a volume. */ + + #define FSC_ATTR_DIRECTORY_HND 0x10u /**< \brief Handle specifies a directory. */ + #define FSC_ATTR_LONG_NAMES 0x20u /**< \brief Volume supports long filenames. */ + #define FSC_ATTR_VOL_NOT_REMOVABLE 0x40u /**< \brief Volume is not removable. */ + #define FSC_ATTR_CASE_SENSITIVE 0x80u /**< \brief Volume is case-sensitive. */ + /** @} */ + /* ************************************************************************ */ + + /** \name Defines - Part 13 B.16 Set Attributes Command + \brief See iso_FscSetFileAttributes() parameter u8AttrCmds for more information. + \details Sample: FSC_ATTR_LEAVE_READONLY | FSC_ATTR_SET_HIDDEN | FSC_ATTR_SET_RESERVED + @{ + */ + #define FSC_ATTR_CLEAR_READONLY 0x00u /**< \brief Clear "read-only" attribute. */ + #define FSC_ATTR_SET_READONLY 0x01u /**< \brief Set "read-only" attribute. */ + #define FSC_ATTR_LEAVE_READONLY 0x03u /**< \brief Don't care, leave "read-only" attribute in current state. */ + + #define FSC_ATTR_CLEAR_HIDDEN 0x00u /**< \brief Clear "hidden" attribute. */ + #define FSC_ATTR_SET_HIDDEN 0x04u /**< \brief Set "hidden" attribute (not applicable unless volume supports hidden attribute). */ + #define FSC_ATTR_LEAVE_HIDDEN 0x0Cu /**< \brief Don't care, leave "hidden" attribute in current state. */ + + #define FSC_ATTR_SET_RESERVED 0xF0u /**< \brief Reserved bits 4..7, set to 1111 (Don't care) */ + /** @} */ + /* ************************************************************************ */ + + + /** \name Defines - Part 13 B.17 Position Mode + \brief See iso_FscSeekFile() parameter u8Mode for more information. + \details Sample: FSC_ATTR_LEAVE_READONLY | FSC_ATTR_SET_HIDDEN | FSC_ATTR_SET_RESERVED + @{ + */ + #define FSC_SEEK_BEGIN 0x00u /**< \brief Seek from the beginning of the file. */ + #define FSC_SEEK_CURRENT 0x01u /**< \brief Seek from the beginning of the file. */ + #define FSC_SEEK_END 0x02u /**< \brief Seek from end of the file. */ + /** @} */ + /* ************************************************************************ */ + + /** \name Defines - Part 13 B.27 File Handling Mode + \brief See iso_FscMoveFile() and iso_FscDeleteFile() parameter u8Mode for more information. + @{ + */ + #define FSC_FILE_MODE_COPY 0x01u /**< \brief "Copy" mode. */ + #define FSC_FILE_MODE_FORCE 0x02u /**< \brief "Force" mode. */ + #define FSC_FILE_MODE_RECURSIVE 0x04u /**< \brief "Recursive" mode. */ + /** @} */ + /* ************************************************************************ */ + + + /** \name Defines - Part 13 B.30 Volume Mode + \brief See iso_FscGetVolumeStatus parameter u8Mode for more information. + @{ + */ + #define FSC_VOL_MODE_NOT_IN_USE 0x00u /**< \brief Report volume not in use by client. */ + #define FSC_VOL_MODE_IN_USE 0x01u /**< \brief Report volume in use by client. */ + #define FSC_VOL_MODE_REQ_REMOVAL 0x02u /**< \brief Request volume to prepare for removal. */ + /** @} */ + /* ************************************************************************ */ + + /** \name Defines - Part 13 B.31 Volume Status + \brief (ISO_FSC_VOLUME_STATUS_T Property u8VolumeStatus values) + @{ + */ + #define FSC_VOLUME_STATUS_PRESENT 0x00u /**< \brief Volume is present. */ + #define FSC_VOLUME_STATUS_IN_USE 0x01u /**< \brief Volume is in use. */ + #define FSC_VOLUME_STATUS_REMOVAL 0x02u /**< \brief Volume is prepared for removal. */ + #define FSC_VOLUME_STATUS_REMOVED 0x03u /**< \brief Volume is removed. */ + /** @} */ + /* ************************************************************************ */ + + #endif /* not: defined(CCI_USE_NAMESPACE) && defined(__cplusplus) */ + + /** \brief + Typedef enum for file server response error codes - Part 13 B.9 + + \par The enum contains also FS-Client specific error codes - start at 6400 (0x1900) + */ + typedef enum + { + IsoFsSuccess = 0, /**< Success */ + IsoFsAccessDenied = 1, /**< Access Denied */ + IsoFsInvalidAccess = 2, /**< Invalid Access */ + IsoFsTooManyFilesOpen = 3, /**< Too many files open */ + IsoFsItemNotFound = 4, /**< File, path or volume not found */ + IsoFsInvalidHandle = 5, /**< Invalid Handle */ + IsoFsInvalidSourceName = 6, /**< Invalid given source name */ + IsoFsInvalidDestinationName = 7, /**< Invalid given destination name */ + IsoFsVolumeOutOfFreeSpace = 8, /**< Volume out of free space */ + IsoFsWriteFailure = 9, /**< Failure during a write operation */ + IsoFsMediaIsNotPresent = 10, /**< Media is not present [formerly the code for error 13, below, in Version 2 FSs (see B.5)] */ + IsoFsReadFailure = 11, /**< Failure during a read operation */ + IsoFsFunctionNotSupported = 12, /**< Function not supported */ + IsoFsVolumeNotInitialized = 13, /**< Volume is possibly not initialized */ + /**< 14 ... 41 Reserved */ + IsoFsInvalidRequestLength = 42, /**< Invalid request length (used when the file pointer hits the start/top of the file or on invalid space request of the volume) */ + IsoFsOutOfMemory = 43, /**< Out of memory (used by FS to indicate out of resources at this time and can complete request) */ + IsoFsError = 44, /**< Any other error */ + IsoFsEndOfFileReached = 45, /**< End of file reached (reported only when file pointer is at end of file) */ + /**< ( 46 ... 255 Reserved ) */ + + /* FSClient driver specific error codes - start at 0x1900 */ + IsoFscErrorTryAgain = 6400, /**< Request failed try again (0x1900) */ + IsoFscServerBusy = 6401, /**< file server busy */ + IsoFscServerTimeout = 6402, /**< Server status timeout - closing connections... */ + IsoFscRequestError = 6403, /**< Too many failed requests - no more retries */ + IsoFscResponseTimeout = 6404, /**< Response timeout - no more retries */ + IsoFscResponseError = 6405, /**< Response error - no more retries */ + IsoFscResponseDataError = 6406, /**< Response data error - response data length not valid */ + IsoFscInvalidHandle = 6407, /**< Invalid Handle */ + IsoFscInvalidFunction = 6408, /**< Function is not valid */ + IsoFscBufferIsFull = 6409, /**< The data buffer is full - copy the data and set the length to zero to continue... */ + IsoFscError = 6410 /**< Any other client error */ + } ISO_FSC_ERRORCODE_e; + + /* ************************************************************************ */ + /** \brief + Typedef enum for file server command + functions - Part 13 C.1 - C.5 + */ + typedef enum + { + IsoFscCmdSignalIOChannelState = -3, /**< Client Cmd: signal currently changed IO channel state */ + IsoFscCmdSignalConnectionState = -2, /**< Client Cmd: signal currently changed connection state */ + IsoFsCmdUnknown = -1, /**< Command function not set or unknown */ + + IsoFsCmdAliveStatus = 0, /**< File server status or client connection Maintenance message */ + IsoFsCmdServerProperties = 1, /**< File Server properties */ + IsoFsCmdVolumeStatus = 2, /**< Volume Status */ + IsoFsCmdGetCurrentDirectory = 16, /**< Get Current Directory */ + IsoFsCmdChangeCurrentDirectory = 17, /**< Change Current Directory */ + IsoFsCmdOpenFile = 32, /**< Open File */ + IsoFsCmdSeekFile = 33, /**< Seek File */ + IsoFsCmdReadFile = 34, /**< Read File */ + IsoFsCmdWriteFile = 35, /**< Write File */ + IsoFsCmdCloseFile = 36, /**< Close File */ + IsoFsCmdMoveFile = 48, /**< Move File */ + IsoFsCmdDeleteFile = 49, /**< Delete File */ + IsoFsCmdGetFileAttributes = 50, /**< Get File Attributes */ + IsoFsCmdSetFileAttributes = 51, /**< Set File Attributes */ + IsoFsCmdGetFileDateTime = 52, /**< Get File Date & Time */ + IsoFsCmdInitializeVolume = 64 /**< Initialize Volume */ + } ISO_FSC_CMDFUNCTION_e; + + /* ************************************************************************ */ + /** \brief + Typedef enum of file server client io channel or connection states + */ + typedef enum + { + IsoFscFree = 0, /**< array member is free */ + IsoFscInit = 1, /**< array member data are set to init values */ + IsoFscClosed = 2, /**< array member data are valid - handle not active - can be (re)used */ + IsoFscConnecting = 3, /**< wait for server status response ... */ + IsoFscOpen = 4, /**< connection or IO can be used */ + IsoFscDoRequest = 5, /**< (re)try to send the request */ + IsoFscDoWaitReqested = 6, /**< Wait for TP request finished */ + IsoFscDoWaitResponse = 7, /**< wait for FS response start message */ + IsoFscDoResponse = 8, /**< wait for FS response data */ + IsoFscDoCallBack = 9, /**< return data and current state - used from IsoFsCmdReadFile if the data buffer is full */ + IsoFscDoAbort = 10, /**< abort cmd function */ + IsoFscFinished = 11 /**< cmd function processing is finished */ + } ISO_FSC_STATE_e; + + + /* ************************************************************************ */ + /** \brief FS client handle type definition + + - 0xFFFF : Invalid handle ( use #ISO_FSC_HANDLE_INVALID ) + - Bits 0-7 : array index from 0 to 255 + - Bits 8-9 : random value between 0 and 3 + - Bits 10-11: sub type of the handle - 0 = IO handle, 1 = connection handle + - Bits 12-15: main type of the handle - 4 = FSC handle + */ + typedef iso_u16 ISO_FSC_HANDLE_T; + + /** \brief FS client invalid handle */ + #define ISO_FSC_HANDLE_INVALID ((ISO_FSC_HANDLE_T) 0xFFFFu) + + /* ************************************************************************ */ + /** \brief + Typedef struct for file server client to server connection status + */ + typedef struct + { + ISO_FSC_HANDLE_T hConn; /**< \brief connection handle - set to ISO_FSC_HANDLE_INVALID to indicate a free/unused entry */ + ISO_FSC_STATE_e eState; /**< \brief client connection / command state */ + iso_s16 s16FSClientMember; /**< \brief file server client member (user) handle */ + iso_s16 s16FServerMember; /**< \brief current file server member (user) handle */ + iso_s32 lLastFServerAlive; /**< \brief timestamp of last server status message */ + iso_s32 lLastFSClientAlive; /**< \brief timestamp of last client maintenance message */ + iso_u8 u8usedIOs; /**< \brief number of IOs witch use this connections ... */ + } ISO_FSC_CONNECTION_STATUS_T; + + /* ************************************************************************ */ + /** \brief Typedef struct for file server client data buffers */ + typedef struct + { + iso_u8 HUGE_C *au8Data; /**< \brief Pointer on data buffer */ + iso_u32 u32DataSize; /**< \brief Size of the data buffer */ + iso_u32 u32DataLength; /**< \brief Number of used data bytes */ + } ISO_FSC_DATA_T; + + typedef ISO_FSC_DATA_T ISO_FSC_PATH_T; /**< Typedef of ISO_FSC_PATH_T */ + + /* ************************************************************************ */ + /** \brief + Typedef struct for file server status and properties response + */ + typedef struct + { + iso_u8 u8Status; /**< \brief current file server status - Part 13 B.3 */ + iso_u8 u8OpenFiles; /**< \brief current open files on the file server - Part 13 B.4 */ + iso_u8 u8MaxOpenFiles; /**< \brief maximum open files on the file server - Part 13 B.6 */ + iso_u8 u8Version; /**< \brief version number of the file server - Part 13 B.5 */ + iso_u8 u8Capabilities; /**< \brief file server capabilities - Part 13 B.7 */ + } ISO_FSC_FS_INFO_T; + + /* ************************************************************************ */ + /** \brief Typedef struct for file server volume status response */ + typedef struct + { + iso_u8 u8VolumeStatus; /**< \brief current file server status - Part 13 B.31 */ + iso_u8 u8MaxTimeBeforeRemoval; /**< \brief current open files on the file server - Part 13 B.32 */ + } ISO_FSC_VOLUME_STATUS_T; + + /* ************************************************************************ */ + /** \brief Typedef struct for file server get current directory response */ + typedef struct + { + iso_u32 u32TotalSpace; /**< \brief get current dir total space (in units of 512 bytes) - Part 13 B.11 */ + iso_u32 u32FreeSpace; /**< \brief get current dir free space (in units of 512 bytes) - Part 13 B.11 */ + } ISO_FSC_CURRENT_DIR_INFO_T; + + /* ************************************************************************ */ + /** \brief Typedef struct for file server file response */ + typedef struct + { + iso_u8 u8Attributes; /**< \brief open file attributes - Part 13 B.15 */ + iso_u16 u16Count; /**< \brief number of bytes or directory entries - Part 13 B.20 */ + iso_u32 u32Position; /**< \brief position after seek file - Part 13 B.29 */ + } ISO_FSC_FILE_INFO_T; + + /* ************************************************************************ */ + /** \brief Typedef struct for file server file attributes response */ + typedef struct + { + iso_u8 u8Attributes; /**< \brief file attributes - Part 13 B.15 */ + iso_u32 u32Size; /**< \brief file size - Part 13 B.26 */ + } ISO_FSC_FILE_ATTRIBUTES_T; + + /* ************************************************************************ */ + /** \brief Typedef struct for file server get file date time response */ + typedef struct + { + iso_u16 u16Date; /**< \brief file date - Part 13 B.24 */ + iso_u16 u16Time; /**< \brief file time - Part 13 B.25 */ + } ISO_FSC_DATE_TIME_T; + + /* ************************************************************************ */ + /** \brief + Typedef union for file server response + + The response content depend on ISO_FSC_CMDFUNCTION_e: + - IsoFsCmdAliveStatus: sServerInfo + - IsoFsCmdServerProperties: sServerInfo + - IsoFsCmdVolumeStatus: sVolumeStatus + - IsoFsCmdGetCurrentDirectory: sCurrentDirInfo + - IsoFsCmdChangeCurrentDirectory: not used + - IsoFsCmdOpenFile: sFileInfo.u8Attributes + - IsoFsCmdSeekFile: sFileInfo.u32Position + - IsoFsCmdReadFile: sFileInfo.u16Count + - IsoFsCmdWriteFile: sFileInfo.u16Count + - IsoFsCmdCloseFile: not used + - IsoFsCmdMoveFile: not used + - IsoFsCmdDeleteFile: not used + - IsoFsCmdSetFileAttributes: not used + - IsoFsCmdGetFileDateTime: sDateTime + - IsoFsCmdInitializeVolume: sInitVolumeAttributes.u8Attributes + + */ + typedef union + { + ISO_FSC_FS_INFO_T sServerInfo; /**< \brief file server status and properties - IsoFsCmdServerProperties */ + ISO_FSC_VOLUME_STATUS_T sVolumeStatus; /**< \brief file server volume status */ + ISO_FSC_CURRENT_DIR_INFO_T sCurrentDirInfo; /**< \brief file server get current directory properties */ + ISO_FSC_FILE_INFO_T sFileInfo; /**< \brief file open read write or read directory entries info */ + ISO_FSC_FILE_ATTRIBUTES_T sFileAttributes; /**< \brief file server get file attributes info */ + ISO_FSC_DATE_TIME_T sDateTime; /**< \brief file server get file date time info */ + ISO_FSC_FILE_ATTRIBUTES_T sInitVolumeAttributes; /**< \brief file server initialize volume attributes */ + } ISO_FSC_INFO_T; + + /* ************************************************************************ */ + /** \brief Typedef struct for file server client callback data */ + typedef struct + { + ISO_FSC_CMDFUNCTION_e eFunction; /**< \brief current / last cmd function */ + ISO_FSC_ERRORCODE_e eError; /**< \brief last file server response or client error */ + ISO_FSC_HANDLE_T hFscHandle; /**< \brief IO channel (or connection) handle */ + ISO_FSC_STATE_e eState; /**< \brief client connection / IO command state */ + ISO_FSC_INFO_T usInfo; /**< \brief union for the server response. \n + The content depend on eFunction and is only valid if eState is IsoFscFinished. */ + iso_u8 HUGE_C *au8Data; /**< \brief Pointer on data buffer. Contains the data without the usInfo values. */ + iso_u32 u32DataSize; /**< \brief Size of the data buffer */ + iso_u32 u32DataLength; /**< \brief Number of used data bytes */ + ISO_USER_PARAM_T userParam; /*!< \brief User parameter */ + } ISO_FSC_CBDATA_T; + + typedef ISO_FSC_CBDATA_T* ISO_FSC_CBDATA_t; /**< Pointer typedef of ISO_FSC_CBDATA_T */ + + /* ************************************************************************ */ + /** \brief + Typedef call back function ( for handling all unhandled responses and errors ) + + The ISO_FSC_CBDATA_T data pointer and the referenced data are only valid during the call back. + */ + typedef void (*ISO_FSC_CALLBACK_t)( ISO_FSC_CBDATA_T* psData ); + + + /** \name Deprecated + \brief Deprecated pointer type definitions + \details This type definitions are not really needed + and should be replaced with normal pointer definitions of this type. \n + Use XXX_T* for XXX_t pointer type definition. + + @{ + */ + #ifdef ISO_FSC_DEPRECATED + typedef ISO_FSC_HANDLE_T* ISO_FSC_HANDLE_t; /**< Deprecated pointer typedef of ISO_FSC_HANDLE_T */ + typedef ISO_FSC_CONNECTION_STATUS_T* ISO_FSC_CONNECTION_STATUS_t; /**< Pointer typedef of ISO_FSC_CONNECTION_STATUS_T */ + typedef ISO_FSC_DATA_T* ISO_FSC_DATA_t; /**< Deprecated pointer typedef of ISO_FSC_DATA_T */ + typedef ISO_FSC_PATH_T* ISO_FSC_PATH_t; /**< Deprecated pointer typedef of ISO_FSC_PATH_T */ + typedef ISO_FSC_FS_INFO_T* ISO_FSC_FS_INFO_t; /**< Deprecated pointer typedef of ISO_FSC_FS_INFO_T */ + typedef ISO_FSC_VOLUME_STATUS_T* ISO_FSC_VOLUME_STATUS_t; /**< Deprecated pointer typedef of ISO_FSC_VOLUME_STATUS_T */ + typedef ISO_FSC_CURRENT_DIR_INFO_T* ISO_FSC_CURRENT_DIR_INFO_t; /**< Deprecated pointer typedef of ISO_FSC_CURRENT_DIR_INFO_T */ + typedef ISO_FSC_FILE_INFO_T* ISO_FSC_FILE_INFO_t; /**<Deprecated pointer typedef of ISO_FSC_FILE_INFO_T */ + typedef ISO_FSC_FILE_ATTRIBUTES_T* ISO_FSC_ATTRIBUTES_INFO_t; /**< Deprecated pointer typedef of ISO_FSC_FILE_ATTRIBUTES_T */ + typedef ISO_FSC_DATE_TIME_T* ISO_FSC_DATE_TIME_t; /**< Deprecated pointer typedef of ISO_FSC_DATE_TIME_T */ + typedef ISO_FSC_INFO_T* ISO_FSC_INFO_t; /**< Deprecated pointer typedef of ISO_FSC_INFO_T */ + #endif /* ISO_FSC_DEPRECATED */ + /** @} */ /* end name Deprecated pointer type definitions */ + + /** @} */ /* end group fscdefinitions */ + /* ************************************************************************ */ + /** \name Part 13 - Client Management Functions + + Use this functions to create and connect io channels to a file server + + @{ + */ + + /*! + \brief Create a new io channel and connect it to the file server + + If the connection does not exist, a new connect between the client and the server is created and opened. + The FSC module executes the callback function when the io channel ( or connection) is open and can be used. + + \param[out] \wp{phIO, ISO_FSC_HANDLE_T*} + Pointer to the new io channel handle + \param[in] \wp{s16FSClientMemberHandle, iso_s16} + Valid client (internal) network member (user) handle + \param[in] \wp{s16FServerMemberHandle, iso_s16} + Valid server (external) network member (user) handle + \param[in] \wpp{userParam, const #ISO_USER_PARAM_T} + User parameter value for the callback function calls. \n + Use #ISO_USER_PARAM_DEFAULT if not used/needed. + \param[in] \wp{pFunction, ISO_FSC_CALLBACK_t} + Pointer to callback function or NULL pointer if you don't need a callback function for this io channel + + \retval iso_s16 + - E_NO_ERR + - E_RANGE (Input parameter not valid) + - E_CONFIG (no free connection or io channel) + */ + iso_s16 iso_FscConnect( /* out */ ISO_FSC_HANDLE_T* phIO, iso_s16 s16FSClientMemberHandle, iso_s16 s16FServerMemberHandle, + const ISO_USER_PARAM_T userParam, ISO_FSC_CALLBACK_t pFunction ); + + /* ************************************************************************ */ + /*! + \brief Get the status of a connection + + \param[in] \wp{hFscHandle, ISO_FSC_HANDLE_T} + Valid connection or IO handle + \param[out] \wp{psConnStatus, ISO_FSC_CONNECTION_STATUS_T*} + Pointer to a ISO_FSC_CONNECTION_STATUS_T structure + \retval iso_s16 + - E_NO_ERR + - E_RANGE ( handle not valid ) + */ + iso_s16 iso_FscGetConnectionStatus( ISO_FSC_HANDLE_T hFscHandle, ISO_FSC_CONNECTION_STATUS_T* psConnStatus ); + + /* ************************************************************************ */ + /*! + \brief Delete a connection or an io channel + + \param[in] \wp{hFscHandle, ISO_FSC_HANDLE_T} + Valid connection or IO handle + + \retval iso_s16 + - E_NO_ERR + - E_RANGE ( handle not valid ) + */ + + iso_s16 iso_FscDelete( ISO_FSC_HANDLE_T hFscHandle ); + + /* ************************************************************************ */ + /*! + \brief Close an open connection or io channel + + \param[in] \wp{hFscHandle, ISO_FSC_HANDLE_T} + Valid connection or IO handle + + \retval iso_s16 + - E_NO_ERR + - E_RANGE ( handle not valid ) + */ + + + iso_s16 iso_FscClose( ISO_FSC_HANDLE_T hFscHandle ); + + /* ************************************************************************ */ + /*! + \brief Open or reopen a connection or an io channel + + \param[in] \wp{hFscHandle, ISO_FSC_HANDLE_T} + Valid connection or IO handle + + \retval iso_s16 + - E_NO_ERR + - E_RANGE ( handle not valid ) + - E_CONFIG ( Connection not valid ) + */ + iso_s16 iso_FscOpen( ISO_FSC_HANDLE_T hFscHandle ); + + + /** @} */ + /* ************************************************************************ */ + /** \name Part 13 C.1 Functions + @{ + */ + /*! + \brief Request the file server properties + + \param[in] \wp{hIO, ISO_FSC_HANDLE_T} + Valid IO channel handle + + \retval iso_s16 + - E_NO_ERR + - E_RANGE ( handle not valid ) + - E_CONFIG ( IO channel busy or connection not valid ) + */ + iso_s16 iso_FscGetServerProperties( ISO_FSC_HANDLE_T hIO ); + + /* ************************************************************************ */ + /*! + \brief Request the status of a file server volume + + \param[in] \wp{hIO, ISO_FSC_HANDLE_T} + Valid IO channel handle + \param[in] \wp{u8Mode, iso_u8} + Volume Mode - Part 13 B.30 + \param[in] \wpp{psPath, const #ISO_FSC_PATH_T*} + Pointer to volume name structure or NULL pointer to get the volume status of the current directory volume. + + \retval iso_s16 + - E_NO_ERR + - E_RANGE ( handle not valid ) + - E_CONFIG ( IO channel busy or connection not valid ) + + \note B.30 Volume Mode + \par + The data object used by a client to specify the mode of the volume access requested. + A value of 00000000 requests the current status. \n + - Bit 7..2: 000000 = Reserved, send as 000000. + - Bit 1: 1 = Request volume to prepare for removal (#FSC_VOL_MODE_REQ_REMOVAL). + - Bit 0: 1 = Report volume in use by client (#FSC_VOL_MODE_IN_USE). + 0 = Report volume not in use by client (#FSC_VOL_MODE_NOT_IN_USE). + */ + iso_s16 iso_FscGetVolumeStatus( ISO_FSC_HANDLE_T hIO, iso_u8 u8Mode, const ISO_FSC_PATH_T* psPath ); + + /** @} */ + + + /* ************************************************************************ */ + /** \name Part 13 C.2 Functions + @{ + */ + + /* ************************************************************************ */ + /*! + \brief Request the current directory path + + \param[in] \wp{hIO, ISO_FSC_HANDLE_T} + Valid IO channel handle + \param[out] \wp{psPath, ISO_FSC_PATH_T*} + Pointer to path name structure to store the current directory or NULL pointer. \n + The pointer and the structure must be valid until the response is arrived \n + + \retval iso_s16 + - E_NO_ERR + - E_RANGE ( handle not valid ) + - E_CONFIG ( IO channel busy or connection not valid ) + */ + iso_s16 iso_FscGetCurrentDirectory( ISO_FSC_HANDLE_T hIO, ISO_FSC_PATH_T* psPath ); + + /* ************************************************************************ */ + /*! + \brief Request for changing the current directory path + + \param[in] \wp{hIO, ISO_FSC_HANDLE_T} + Valid IO channel handle + \param[out] \wpp{psPath, const #ISO_FSC_PATH_T*} + Pointer to path name structure that contains the directory path. \n + The pointer and the structure must be valid until the response is arrived \n + + \retval iso_s16 + - E_NO_ERR + - E_RANGE ( handle not valid ) + - E_CONFIG ( IO channel busy or connection not valid + */ + iso_s16 iso_FscChangeCurrentDirectory( ISO_FSC_HANDLE_T hIO, const ISO_FSC_PATH_T* psPath ); + + /** @} */ + /* ************************************************************************ */ + /** \name Part 13 C.3 Functions + @{ + */ + + /* ************************************************************************ */ + /*! + \brief Request to open a file or directory + + \param[in] \wp{hIO, ISO_FSC_HANDLE_T} + Valid IO channel handle + \param[in] \wp{u8Flags, iso_u8} + Flags (see Part 13 - B.14): + - Bit 7..5: 000 Reserved, send as 000. + - Bit 4: + - 0 = Open file for shared read access. + - 1 = #FSC_OPEN_EXCLUSIVE: Open file with exclusive access (fails if already open). + - Bit 3: + - 0 = Open file for random access (file pointer set to the start of the file). + - 1 = #FSC_OPEN_APPEND: Open file for appending data to the end of the file + (file pointer set to the end of the file). + - Bit 2: + - 0 = Open an existing file (fails if non-existent file). + - 1 = #FSC_OPEN_CREATE: Create a new file and/or directories if not yet existing. + - Bit 1,0: + - 00 = #FSC_OPEN_READONLY: Open file for reading only. + - 01 = #FSC_OPEN_WRITING: Open file for writing only. + - 10 = #FSC_OPEN_READWRITE: Open file for reading and writing. + - 11 = #FSC_OPEN_DIRECTORY: Open directory. + \param[in] \wpp{psPath, const #ISO_FSC_PATH_T*} + Pointer to path name structure that contains the file or directory path. \n + The pointer and the structure must be valid until the response is arrived \n + \retval iso_s16 + - E_NO_ERR + - E_RANGE ( handle not valid ) + - E_CONFIG ( IO channel busy or connection not valid + */ + + iso_s16 iso_FscOpenFile( ISO_FSC_HANDLE_T hIO, iso_u8 u8Flags , const ISO_FSC_PATH_T* psPath ); + + /* ************************************************************************ */ + /*! + \brief Request to move the current position in an open file or directory + + \param[in] \wp{hIO, ISO_FSC_HANDLE_T} + Valid IO channel handle + \param[in] \wp{u8Mode, iso_u8} + Position mode - Part 13 B.17 \n + The position mode specifies the location from which the offset value is used to determine the file pointer position. + - #FSC_SEEK_BEGIN: 0x00u = From the beginning of the file. + - #FSC_SEEK_CURRENT: 0x01u = From the current pointer position. + - #FSC_SEEK_END: 0x02u = From the end of the file. + \param[in] \wp{s32Offset, iso_s32} + Offset - Part 13 B.18 \n + The offset is used with the position mode to determine the file pointer position. \n + + \retval iso_s16 + - E_NO_ERR + - E_RANGE ( handle not valid ) + - E_CONFIG ( IO is not assigned with a file handle or IO channel busy or connection not valid ) + */ + iso_s16 iso_FscSeekFile( ISO_FSC_HANDLE_T hIO, iso_u8 u8Mode , iso_s32 s32Offset ); + + /* ************************************************************************ */ + /*! + \brief Request to read data from an open file or directory + + \param[in] \wp{hIO, ISO_FSC_HANDLE_T} + Valid IO channel handle + \param[out] \wp{psDataBuffer, ISO_FSC_DATA_T*} + Pointer to data structure to store the response data or NULL pointer. \n + The pointer and the structure must be valid until the response is arrived. \n + The function is reading (u32DataSize - u32DataLength) data bytes if u32DataLength is set to zero. + \param[in] \wp{u32DataLength, iso_u32} + Optional: if greater than zero, the client tries to read this count of bytes or directory entries. + \param[in] \wp{u8ReportHidden, iso_u8} + Report hidden files (only used, if the handle points to a directory - Part 13 B.28) \n + - 0x00u = Do not report hidden files in a directory listing. + - 0x01u = Report hidden files in a directory listing. + - 0xFFu = Parameter is not available, FS shall not report hidden files in a directory listing. + \retval iso_s16 + - E_NO_ERR + - E_RANGE ( handle not valid ) + - E_CONFIG ( IO is not assigned with a file handle or IO channel busy or connection not valid ) + \note + If the data buffer is full the FSC calls the callback function with the state IsoFscDoCallBack and the error code IsoFscBufferIsFull. + After this the FSC set the length of the buffer to zero, if the application has not done this... + */ + iso_s16 iso_FscReadFile( ISO_FSC_HANDLE_T hIO, ISO_FSC_DATA_T* psDataBuffer, iso_u32 u32DataLength, iso_u8 u8ReportHidden ); + + /* ************************************************************************ */ + /*! + \brief Request to write data to an open file + + \param[in] \wp{hIO, ISO_FSC_HANDLE_T} + ISO_FSC_HANDLE_T Valid IO channel handle + \param[in] \wpp{psDataBuffer, const #ISO_FSC_DATA_T*} + Pointer to data structure. \n + The pointer and the structure must be valid until the response is arrived \n + The function uses the TP protocol and is writing psDataBuffer->u32DataLength data bytes in one ore more FSC_RW_BLOCK_SIZE blocks ( FSC_RW_BLOCK_SIZE = BLOCK_SIZE_J1939 - 5uL). \n + \retval iso_s16 + - E_NO_ERR + - E_RANGE ( handle not valid ) + - E_CONFIG ( IO is not assigned with a file handle or IO channel busy or connection not valid ) + */ + iso_s16 iso_FscWriteFile( ISO_FSC_HANDLE_T hIO, const ISO_FSC_DATA_T* psDataBuffer ); + + /* ************************************************************************ */ + /*! + \brief Request to write data to an open file + + \param[in] \wp{hIO, ISO_FSC_HANDLE_T} + Valid IO channel handle + \retval iso_s16 + - E_NO_ERR + - E_RANGE ( handle not valid ) + - E_CONFIG ( IO is not assigned with a file handle or IO channel busy or connection not valid ) + */ + iso_s16 iso_FscCloseFile( ISO_FSC_HANDLE_T hIO); + + /** @} */ + /* ************************************************************************ */ + /** \name Part 13 C.4 Functions + @{ + */ + + /* ************************************************************************ */ + /*! + \brief Request to move a file or directory + + \param[in] \wp{hIO, ISO_FSC_HANDLE_T} + Valid IO channel handle \n + \param[in] \wp{u8Mode, iso_u8} + File handling mode - Part 13 B.27 \n + - Bit 7-3: 00000 = Reserved, send as 00000. + - Bit 2 : + - 0 = "Recursive" mode is not set. + - 1 = "Recursive" mode is set (#FSC_FILE_MODE_RECURSIVE). + - Bit 1 : + - 0 = "Force" mode is not set. + - 1 = "Force" mode is set (#FSC_FILE_MODE_FORCE). + - Bit 0 : + - 0 = "Copy" mode is not set. + - 1 = "Copy" mode is set (#FSC_FILE_MODE_COPY). + \param[in] \wpp{psSourcePath, const #ISO_FSC_PATH_T*} + Pointer to path name structure that contains the file or directory source path. \n + The pointer and the structure must be valid until the response is arrived \n + \param[in] \wp{psDestinationPath, ISO_FSC_PATH_T*} + Pointer to path name structure that contains the file or directory destination path. \n + The pointer and the structure must be valid until the response is arrived \n + \retval iso_s16 + - E_NO_ERR + - E_RANGE ( handle not valid ) + - E_CONFIG ( Source or destination path structure not valid ) + */ + iso_s16 iso_FscMoveFile( ISO_FSC_HANDLE_T hIO, iso_u8 u8Mode , const ISO_FSC_PATH_T* psSourcePath, ISO_FSC_PATH_T* psDestinationPath ); + + /* ************************************************************************ */ + /*! + \brief Request to delete a file or directory + + \param[in] \wp{hIO, ISO_FSC_HANDLE_T} + Valid IO channel handle \n + \param[in] \wp{u8Mode, iso_u8} + File handling mode - Part 13 B.27 \n + - Bit 7-3: 00000 = Reserved, send as 00000. + - Bit 2 : + - 0 = "Recursive" mode is not set. + - 1 = "Recursive" mode is set (#FSC_FILE_MODE_RECURSIVE). + - Bit 1 : + - 0 = "Force" mode is not set. + - 1 = "Force" mode is set (#FSC_FILE_MODE_FORCE). + - Bit 0 : + - 0 = "Copy" mode is not set. + - 1 = "Copy" mode is set (#FSC_FILE_MODE_COPY). + \param[in] \wpp{psPath, const #ISO_FSC_PATH_T*} + Pointer to path name structure that contains the file or directory path. \n + The pointer and the structure must be valid until the response is arrived \n + \retval iso_s16 + - E_NO_ERR + - E_RANGE ( handle not valid ) + - E_CONFIG ( Path structure not valid ) + */ + iso_s16 iso_FscDeleteFile( ISO_FSC_HANDLE_T hIO, iso_u8 u8Mode , const ISO_FSC_PATH_T* psPath ); + + + /* ************************************************************************ */ + /*! + \brief Request to get file attributes + + \param[in] \wp{hIO, ISO_FSC_HANDLE_T} + Valid IO channel handle + \param[in] \wpp{psPath, const #ISO_FSC_PATH_T*} + Pointer to path name structure that contains the file path. \n + The pointer and the structure must be valid until the response is arrived + + \retval iso_s16 + - E_NO_ERR + - E_RANGE ( handle not valid ) + - E_CONFIG ( path structure not valid ) + */ + iso_s16 iso_FscGetFileAttributes( ISO_FSC_HANDLE_T hIO, const ISO_FSC_PATH_T* psPath ); + + /* ************************************************************************ */ + /*! + \brief Request to set file attributes + + \param[in] \wp{hIO, ISO_FSC_HANDLE_T} + Valid IO channel handle + \param[in] \wp{u8AttrCmds, iso_u8} + Set Attributes Command - Part 13 B.16 \n + The command from the client to the FS for setting or clearing file attributes. + - Bit 7,6 and Bit 5,4 : Reserved, set to #FSC_ATTR_SET_RESERVED ( 0xF0u ). + - Bit 3,2 : + - #FSC_ATTR_CLEAR_HIDDEN: 00 = Clear "hidden" attribute. + - #FSC_ATTR_SET_HIDDEN: 01 = Set "hidden" attribute. + - #FSC_ATTR_LEAVE_READONLY: 11 = Don't care, leave "hidden" attribute in current state. + - Bit 1,0 : + - #FSC_ATTR_CLEAR_READONLY: 00 = Clear "read-only" attribute. + - #FSC_ATTR_SET_READONLY: 01 = Set "read-only" attribute. + - #FSC_ATTR_LEAVE_READONLY: 11 = Don't care, leave "read-only" attribute in current state. + \param[in] \wpp{psPath, const #ISO_FSC_PATH_T*} + Pointer to path name structure that contains the file path. \n + The pointer and the structure must be valid until the response is arrived \n + \retval iso_s16 + - E_NO_ERR + - E_RANGE ( handle not valid ) + - E_CONFIG ( path structure not valid ) + */ + iso_s16 iso_FscSetFileAttributes( ISO_FSC_HANDLE_T hIO, iso_u8 u8AttrCmds , const ISO_FSC_PATH_T* psPath ); + + /* ************************************************************************ */ + /*! + \brief Request to get file date and time + + \param[in] \wp{hIO, ISO_FSC_HANDLE_T} + Valid IO channel handle + \param[in] \wpp{psPath, const #ISO_FSC_PATH_T*} + Pointer to path name structure that contains the file path. \n + The pointer and the structure must be valid until the response is arrived + + \retval iso_s16 + - E_NO_ERR + - E_RANGE ( handle not valid ) + - E_CONFIG ( path stucture not valid ) + */ + iso_s16 iso_FscGetFileDateTime( ISO_FSC_HANDLE_T hIO, const ISO_FSC_PATH_T* psPath ); + + /** @} */ + /* ************************************************************************ */ + /** \name Part 13 C.5 Functions + @{ + */ + + /* ************************************************************************ */ + /*! + \brief Request for initializing a volume + + \param[in] \wp{hIO, ISO_FSC_HANDLE_T} + Valid IO channel handle + \param[in] \wp{u32Space, iso_u32} + Space in 512 iso_u8 units - Part 13 B.11 + \param[in] \wp{u8Flags, iso_u8} + Flags see Part 13 B.29 + \param[in] \wpp{psPath, const #ISO_FSC_PATH_T*} + Pointer to path name structure that contains the volume path. \n + The pointer and the structure must be valid until the response is arrived + + \retval iso_s16 + - E_NO_ERR + - E_RANGE ( handle not valid ) + - E_CONFIG ( IO channel busy or connection not valid ) + */ + iso_s16 iso_FscInitializeVolume( ISO_FSC_HANDLE_T hIO, iso_u32 u32Space, iso_u8 u8Flags , const ISO_FSC_PATH_T* psPath ); + + /** @} */ + /* ************************************************************************ */ + /** \name FSC - Extended Functions + @{ + */ + + /*! + \brief Set optional global call back function for handling all unhandled responses + + \param[in] \wpp{userParam, const #ISO_USER_PARAM_T} + User parameter value for the callback function calls. \n + Use #ISO_USER_PARAM_DEFAULT if not used/needed. + \param[in] \wp{pFunction, ISO_FSC_CALLBACK_t} + pointer to callback function or NULL pointer to remove the module global callback function. + + \retval iso_s16 + E_NO_ERR + */ + iso_s16 iso_FscSetGlobalCallBack( const ISO_USER_PARAM_T userParam, ISO_FSC_CALLBACK_t pFunction ); + + /* ************************************************************************ */ + /*! + \brief Set callback function for channel or connection ( for handling all unhandled responses or errors ) + + \param[in] \wp{hFscHandle, ISO_FSC_HANDLE_T} + Valid connection or io channel handle + \param[in] \wpp{userParam, const #ISO_USER_PARAM_T} + User parameter value for the callback function calls. \n + Use #ISO_USER_PARAM_DEFAULT if not used/needed. + \param[in] \wp{pFunction, ISO_FSC_CALLBACK_t} + Pointer to callback function or NULL pointer to remove the callback function. + + \retval iso_s16 + - E_NO_ERR + - E_RANGE ( handle not valid ) + */ + iso_s16 iso_FscSetCallbackFunction( ISO_FSC_HANDLE_T hFscHandle, const ISO_USER_PARAM_T userParam, ISO_FSC_CALLBACK_t pFunction ); + + /* ************************************************************************ */ + /*! + \brief Extended function to read a complete file. + + The FS client is automatically creating and freeing the connection. + + \param[in] \wp{s16FSClientMemberHandle, iso_s16} + Valid client (internal) network member (user) handle. + \param[in] \wp{s16FServerMemberHandle, iso_s16} + Valid server (external) network member (user) handle. + \param[in] \wpp{psPath, const #ISO_FSC_PATH_T*} + Pointer to file path structure. \n + The pointer and the structure must be valid until the response is arrived. + \param[out] \wp{psDataBuffer, ISO_FSC_DATA_T*} + Pointer to data structure to store the response data or NULL pointer. \n + The pointer and the structure must be valid until the response is arrived. + \param[in] \wpp{userParam, const #ISO_USER_PARAM_T} + User parameter value for the callback function calls. \n + Use #ISO_USER_PARAM_DEFAULT if not used/needed. + \param[in] \wp{pFunction, ISO_FSC_CALLBACK_t} + Pointer to callback function. + + \retval iso_s16 + - E_NO_ERR + - E_RANGE ( parameter not valid ) + - E_CONFIG ( no free IO channel or connection entry ) + \note + If the data buffer is full the FSC calls the callback function with the state IsoFscDoCallBack and the error code IsoFscBufferIsFull. + After this the FSC set the length of the buffer to zero, if the application has not done this... + */ + iso_s16 iso_FscReadFileFromServer( iso_s16 s16FSClientMemberHandle, iso_s16 s16FServerMemberHandle, + const ISO_FSC_PATH_T* psPath, ISO_FSC_DATA_T* psDataBuffer, + const ISO_USER_PARAM_T userParam, ISO_FSC_CALLBACK_t pFunction ); + + /* ************************************************************************ */ + /*! + \brief Extended function to write a complete file. + + The FS client is automatically creating and freeing the connection. + The FS client deletes automatically an existing file, before writing the new file, + to make sure that no invalid data are left at the end of the file... + + \param[in] \wp{s16FSClientMemberHandle, iso_s16} + Valid client (internal) network member (user) handle. + \param[in] \wp{s16FServerMemberHandle, iso_s16} + Valid server (external) network member (user) handle. + \param[in] \wpp{psPath, const #ISO_FSC_PATH_T*} + Pointer to file path structure. \n + The pointer and the structure must be valid until the response is arrived. + \param[in] \wp{psDataBuffer, ISO_FSC_DATA_T*} + Pointer to data structure. \n + The pointer and the structure must be valid until the response is arrived \n + The function uses the TP protocol and is writing psDataBuffer->u32DataLength data bytes in one ore more FSC_RW_BLOCK_SIZE blocks ( FSC_RW_BLOCK_SIZE = BLOCK_SIZE_J1939 - 5uL). \n + \param[in] \wpp{userParam, const #ISO_USER_PARAM_T} + User parameter value for the callback function calls. \n + Use #ISO_USER_PARAM_DEFAULT if not used/needed. + \param[in] \wp{pFunction, ISO_FSC_CALLBACK_t} + Pointer to callback function. + + \retval iso_s16 + - E_NO_ERR + - E_RANGE ( parameter not valid ) + - E_CONFIG ( no free IO channel or connection entry ) + */ + + iso_s16 iso_FscWriteFileToServer( iso_s16 s16FSClientMemberHandle, iso_s16 s16FServerMemberHandle, + const ISO_FSC_PATH_T* psPath, ISO_FSC_DATA_T* psDataBuffer, + const ISO_USER_PARAM_T userParam, ISO_FSC_CALLBACK_t pFunction ); + + /* ************************************************************************ */ + /*! + \brief Extended function to append data to a file. + + The FS client is automatically creating and freeing the connection. + The FS client creates automatically the file, if it does not exist. + + \param[in] \wp{s16FSClientMemberHandle, iso_s16} + Valid client (internal) network member (user) handle. + \param[in] \wp{s16FServerMemberHandle, iso_s16} + Valid server (external) network member (user) handle. + \param[in] \wpp{psPath, const #ISO_FSC_PATH_T*} + Pointer to file path structure. \n + The pointer and the structure must be valid until the response is arrived. + \param[in] \wp{psDataBuffer, ISO_FSC_DATA_T* } + Pointer to data structure. \n + The pointer and the structure must be valid until the response is arrived \n + The function uses the TP protocol and is writing psDataBuffer->u32DataLength data bytes in one ore more FSC_RW_BLOCK_SIZE blocks ( FSC_RW_BLOCK_SIZE = BLOCK_SIZE_J1939 - 5uL). \n + \param[in] \wpp{userParam, const #ISO_USER_PARAM_T} + User parameter value for the callback function calls. \n + Use #ISO_USER_PARAM_DEFAULT if not used/needed. + \param[in] \wp{pFunction, ISO_FSC_CALLBACK_t} + Pointer to callback function. + \retval iso_s16 + - E_NO_ERR + - E_RANGE ( parameter not valid ) + - E_CONFIG ( no free IO channel or connection entry ) + */ + iso_s16 iso_FscAppendFileToServer( iso_s16 s16FSClientMemberHandle, + iso_s16 s16FServerMemberHandle, + const ISO_FSC_PATH_T* psPath, + ISO_FSC_DATA_T* psDataBuffer, + const ISO_USER_PARAM_T userParam, + ISO_FSC_CALLBACK_t pFunction ); + + /** @} */ + /* ************************************************************************ */ + /** \name FSC - Helper Functions + @{ + */ + + /* ************************************************************************ */ + /*! + \brief Helper function to initialize a ISO_FSC_DATA_T buffer. + + \param[in] \wp{psDataStruct, ISO_FSC_DATA_T*} + Pointer to data buffer structure which shall be initialized. + \param[in] \wp{au8DataArray, iso_u8*} + Pointer to the iso_u8 array which shall be used for the buffer. + \param[in] \wp{u32DataArraySize, iso_u32} + Size of the iso_u8 array. + \param[in] \wp{u32DataLength, iso_u32} + Currently used bytes of the array ( usually 0uL ). + + \retval iso_s16 + - E_NO_ERR + - E_RANGE ( parameter not valid ) + */ + + iso_s16 iso_FscInitDataStruct( ISO_FSC_DATA_T* psDataStruct, iso_u8 HUGE_C * au8DataArray, iso_u32 u32DataArraySize, iso_u32 u32DataLength ); + + /* ************************************************************************ */ + /*! + \brief Helper function to copy a zero terminated char array into a ISO_FSC_DATA_T buffer. + + The function does not copy the zero byte into the buffer... + The function is setting u32DataLength after the last copied byte. + + \param[in] \wp{psDataStruct, ISO_FSC_DATA_T*} + Pointer to data buffer structure. \n + \param[in] \wp{u32AtPos, iso_u32} + Start position in the data buffer ( 0uL >= u32AtPos <= u32DataSize). \n + \param[in] \wpp{au8DataArray, const #iso_u8[]} + Pointer to the char array which shall be copied into the buffer. \n + + \retval iso_s16 + - E_NO_ERR + - E_RANGE ( parameter not valid ) + */ + + iso_s16 iso_FscCopyStringToDataStruct( ISO_FSC_DATA_T* psDataStruct, iso_u32 u32AtPos ,const iso_u8 HUGE_C au8DataArray[] ); + + /* ************************************************************************ */ + /*! + \brief Helper function to copy data into a ISO_FSC_DATA_T buffer. + + The function is setting u32DataLength after the last copied byte. + + \param[in] \wp{psDataStruct, ISO_FSC_DATA_T*} + Pointer to data buffer structure. + \param[in] \wp{u32AtPos, iso_u32} + Start position in the data buffer ( 0uL >= u32AtPos <= u32DataSize). + \param[in] \wpp{au8DataArray, const #iso_u8[]} + Pointer to the iso_u8 array which shall be copied into the buffer. + \param[in] \wp{u32DataArrayLength, iso_u32} + Number of bytes which shall be copied. + + \retval iso_s16 + - E_NO_ERR + - E_RANGE ( parameter not valid ) + */ + iso_s16 iso_FscCopyArrayToDataStruct( ISO_FSC_DATA_T* psDataStruct, iso_u32 u32AtPos , const iso_u8 HUGE_C au8DataArray[], iso_u32 u32DataArrayLength ); + + /** @} */ + + /* ************************************************************************ */ + /** @} */ /* end defgroup fsclient */ + /* ************************************************************************ */ + + /* ************************************************************************ */ + #ifdef __cplusplus + } /* end of extern "C" */ + #endif + + #endif /* DEF_IsoFscApi_H */ + /* ************************************************************************ */ ++>>>>>>> rauch/jobrechner-import-20190607 diff --cc ptxdist/local_src/ecu-jobctl/extern/isobus/IsoMnApi.h index 489818f,09fda99..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-jobctl/extern/isobus/IsoMnApi.h +++ b/ptxdist/local_src/ecu-jobctl/extern/isobus/IsoMnApi.h @@@ -1,1031 -1,1052 +1,2086 @@@ ++<<<<<<< HEAD +/****************************************************************************/ +/*! + \file IsoMnApi.h + \brief API for revised network management and application layer for versions from 4.80 + \author Hammerl Erwin + \date Created XX.07.11 + \copyright Copyright (c) WBZ-Engineering GmbH + + \par History: + \par + 20.12.2011 - author E. Hammerl + - Added function iso_AlKeySwitchStateRead() for start over KeySwitchState of implements + + \par + 08.12.2011 - author E. Hammerl + - Input parameter for arraysize in functions iso_NmReadListOf...() added + + \par + 25.01.2012 - author E. Hammerl + - Added iso_AlPgnTxSpecificSend(), iso_AlPgnTxBroadcastSend(), iso_DlCanBusSet, + iso_SpnDataReadCom() + - REPRATE_DEF renamed in REPRATE_INACTIVE + - iso_NmMemberDelete renamed in iso_NmMemberLoggedOut + - Added functions for DM ( diagnostic messages ) + + \par + 30.03.2012 - author P. Wegscheider + - changes for Doxygen output generation + \par + 04.03.2013 - author P. Wegscheider + - internal base driver restructuring + - Function iso_DlCanBusSet() removed from multi CAN node API (Version 06.02.00) + \par + 25.04.2013 - author P. Wegscheider + - Added function iso_NmMbrExternAdd() + \par + 02.05.2013 - author P. Wegscheider + - Added function iso_NmGetMemHandleofName() + \par + 19.02.2014 - author E. Hammerl + - Added function iso_AlPgnDisable() for completely inactivation of PGNs +*/ + +#ifndef DEF_MnApi_H + #define DEF_MnApi_H + +#ifdef __cplusplus +extern "C" { +#endif + +/* Dl - Data link layer interface */ +/** \addtogroup dllain Global functions and CAN + \ingroup base_new +*/ +/**@{*/ + + #define HANDLE_AL_OFFSET 0x1000 /**< Offset for first PGN handle value */ + #define REPRATE_INACTIVE 0xFFFFu /**< Repetition rate inactive */ + +/* ***************************************************************************************** */ +/*! + \brief This function installs the necessary callbackfunction for timebase, watchdog and errorhandler + + \param[in] \wpp{rpfTime, void(*))(slong) } + Pointer on (callback-)function, which gives over the time in 1 ms resolution + \param[in] \wpp{rpfWatchdog, void(*)(void)} + Pointer on (callback-)function, which triggers the watchdog + \param[in] \wpp{rpfErrorhand, void(*)( byte\, byte\, sint)} + Pointer to (callback-)function of error handler \n + ( see also IsoErrorOut() and \ref errorhand for more informations ) +*/ +void iso_DlCallbacksInit( slong (*rpfTime)( void ), + void (*rpfWatchdog)( void ), + void (*rpfErrorhand)( byte bFun, byte bLoc, sint iCause ) ); + +/* ********************************************************************* */ +/*! + \brief Initialising of the ISO 11783 implement driver + This function initialises all base modules of the driver. It can be used for complete reinitialising. + Client modules have to be initialised separately with IsoClientsInit(). + + \param[in] \wp{u16CanNr, uint16} + CAN-bus number 0, 1, ... ( ISO_CAN_NODES - 1 ) + \param[in] \wpp{rpfCanSend, void (*)(dword\, byte*\, sint} + Pointer on (callback-)function for sendung CAN messages + \retval sint16 + - #E_NO_ERR on success + - #E_RANGE + \note \par + All init functions of the modules are called + */ + sint16 iso_DlDrvCanInit( uint16 u16CanNr, void (*rpfCanSend)( dword dwMsgId, byte* pbMsgData, sint iDlc ) ); + + /* ********************************************************************* */ + /*! + \brief Initialising of the repitition value of the TP in one loop + + \param[in] \wp{u16CanNr, uint16} + CAN-bus number 0, 1, ... ( ISO_CAN_NODES - 1 ) \n + At the moment the value has to be set to ISO_CAN_VT + \param[in] \wp{s16TPSpeed, sint16} + Number of TP cyclic calls in one loop to adapt the TP busload on the used hardware \n + Range: 1 - about 10 (depends on CAN-buffer, bus traffic, network partner ..) \n + Default: 1 + \retval sint16 + - #E_NO_ERR on success + \note \par + All init functions of the modules are called + */ + sint16 iso_DlTPRepeatSet( uint16 u16CanNr, sint16 s16TPSpeed ); + + /* ********************************************************************* */ + /*! + \brief The driver gets a single received message of CAN bus + + With this function gets the driver a single message of the CAN bus. This + message is analysed and processed immediatly. + + \param[in] \wp{u16CanNode, uint16} + CAN-bus number 0, 1, ... ( ISO_CAN_NODES - 1 ) + \param[in] \wp{u32Id, uint32} + (29bit)-CAN-Identifier \n + Range: 0 - 0x1FFFFFFF + \param[in] \wpp{apu8Data, const uint8[]} + Pointer to received data array + \param[in] \wp{u8Length, uint8} + Number of received bytes + \note \par + The received message is routed to the correct instance into the + corresponding module. Most PDU2 messages are given to the application + over the J1939-Module. Calling this function and iso_DlCyclicGlobal() must + be single threaded. For multi thread this function must be locked. + */ + void iso_DlCanMsgRec( uint16 u16CanNode, uint32 u32Id, const uint8 apu8Data[], uint8 u8Length ); + + /* ********************************************************************* */ + /*! + \brief MainCyclic Call function + + This function executes the cyclic functions of all modules. + + \note \par + Time behaviour: This function should called about every 10ms or faster. \n + Calling this function and IsoCanReceiveMsgSingle() must be single threaded. + */ + +void iso_DlCyclicGlobal( void ); + +/**@}*/ + +/* Nm - Network management interface */ +/** \addtogroup nmma Network Management + \ingroup base_new +*/ +/**@{*/ + /***********************************************************************/ + /*! + \brief Setting the NAME of an ISO user ( see ISO 11783 - 5 - 5.1.2 ) + + This function builds the NAME of an network member out of the single NAME fields. + + \param[in] \wp{bSelfConf, byte} + Self-configurable address: ECU is self-configurable (TRUE) or not (FALSE) + \param[in] \wp{u8IndGroup, uint8} + Industry group ( ISO PART1 - Annex B ) \n + Range: 0 - 7 + \param[in] \wp{u8DevClass, uint8} + Device class e. g. Tractor, Tillage .. ( ISO PART1 - Annex E ) \n + Range: 0 - 127 + \param[in] \wp{u8DevClassInst, uint8} + Device class instance \n + ( e. g. identical implements of same device ) \n + Range: 0 - 15 + \param[in] \wp{u8Function, uint8} + Function of implement \n + 0 - 127 independent of other fields, > 127 and < 254 depends on device class, + when combined with industry group and device class, can becorrelated to a common + NAME for specifichardware ( ISO PART1 - Annex E ) + \param[in] \wp{u16ManufCode, uint16} + Manufacturer code \n + Indicates manufacturer of ECU for which the NAME is being referenced ( ISO PART1 - Annex G ) \n + Range: 0 - 2047 + \param[in] \wp{u32SeriNo, uint32} + Identity number (also serial number) \n + Assigned by the ECU manufacturer, necessary where the NAME is not unique \n + Range: 0 - 2097152 + \param[in] \wp{u8FunctionInst, uint8} + Function instance \n + Indicates specific occurrence of a function on a particular device system of a network \n + Range: 0 - 31 + \param[in] \wp{u8EcuInstance, uint8} + ECU instance \n + Indicates which of a group of ECUs associated with a given function is referenced \n + Range: 0 - 7 + \param[out] \wp{au8IsoName, uint8*} + Pointer to array ( Name[8] ) !! + + \note \par + - LSB begins with the identity number, MSB Bit 8 is the selfconfigurable bit + - Array of bytes for the name is modul global + - Range is not controlled + */ +void iso_NmSetName( cbool bSelfConf, uint8 u8IndGroup, uint8 u8DevClass, uint8 u8DevClassInst, uint8 u8Function, + uint16 u16ManufCode, uint32 u32SeriNo, uint8 u8FunctionInst, uint8 u8EcuInstance, uint8* au8IsoName ); + + /***********************************************************************/ + /*! + \brief A new (intern) logic network member is connected to the bus + + Start of the login of an intern ISO network member. + + \param[in] \wp{u16CanNode, uint16} + CAN-bus number 0, 1, ... ( ISO_CAN_NODES - 1 ) + \param[in] \wp{u16WishedSA, uint16} + Preferred ISO Source address of new user \n + See ISO PART 1 - Annex C and D + \param[in] \wpp{au8Descript, const #uint8 []} + NAME of the new ISO user ( see IsoSetName() ) + \param[in] \wp{eUserFunction, ISO_USERFUNC_e} + Intern meaning of the ISO member \n + ( working_set_member, auxiliary, tractor_ecu ..) + \param[in] \wpp{rpfAnnRel, void(*)(#ISONETEVENT_T*)} + Callback function for the network managment to inform this user / CF + about changes of the announcement state of this or another internal or external CF. \n + See #ISONETEVENT_T for more informations. + \param[in] \wpp{rpfDaTrans, void(*)(#ISO_TPREP_E\, #ISO_TPINFO_T*)} + Callback function for the data link layer to inform this user / CF about all ISO messages + which arent processed from an internal module ( like the application layer, TC, VT, ... ). \n + See #ISO_TPINFO_T for more informations. + + \retval sint16 + - #E_NO_ERR Announcing successful + - #E_OVERFLOW Userlist is full + - #E_RANGE - Parameter error + \note \par + After getting an dynamic address the application reports this with the help + of a callbackfunction. This function indicates the application the releasing of the ISO-bus, too. + This function controls if the new user has been already entried in the user list. If yes nothing + occurs except of an error message, if not the new user is entried. After calling the cyclic + function of the ISO driver ( iso_DlCyclicGlobal() ) this user sends its address claim. + */ + + sint16 iso_NmMemberNew( uint16 u16CanNode, + uint16 u16WishedSA, + const uint8 au8Descript[], + ISO_USERFUNC_e eUserFunction, + void (*rpfAnnRel)( ISONETEVENT_T* psEv ), + void (*rpfDaTrans)( ISO_TPREP_E eTpRep, ISO_TPINFO_T* psTpInfo ) + ); + + /* *************************************************************************** */ + /*! + \brief Add an extern network member manually to the user list + + The function can be used to add a external CF, + that does not send a address claimed message, + manually to the user array. \n + The added external CF is managed like a normal CF + that has send an address claimed message. + + \param[in] \wp{u16CanNode, uint16} + CAN-bus number 0, 1, ... ( ISO_CAN_NODES - 1 ) + \param[in] \wp{u16SA, uint16} + Source address of the extern user / CF \n + See ISO PART 1 - Annex C and D + \retval sint16 + - #E_NO_ERR Adding was successful + - #E_OVERFLOW Userlist is full + - #E_WARN User is in list and active + \note + The use of this function is not ISO 11783 Part 5 conform. \n + Use this function only if you must communicate with an external CF, \n + that does not send a address claimed message. \n + An address claimed message of an external CF with the same source address \n + will replace this manuall added member entry. \n + The function works independent from the configuration of the #CFG_PARAM_EXTERNAL_ADDR_CLAIM parameter. \n + The added CF will be set to anounnced in the next iso_DlCyclicGlobal() run. + */ + sint16 iso_NmMbrExternAdd( uint16 u16CanNode, uint16 u16SA ); + +/***********************************************************************/ +/*! + \brief A (intern) logic network member is deleted + \param[in] \wp{s16MemHandle, sint16} + Handle to wished network member + \retval sint16 + - #E_NO_ERR delete of member successful + - #E_USER_ERROR Member not found +*/ + sint16 iso_NmMemberLoggedOut( sint16 s16MemHandle ); + + /* ********************************************************************* */ + /*! + \brief This function determines the handle of a network member over CAN-Node and SA + + \param[in] \wp{u16CanNode, uint16} + CAN-bus number 0, 1, ... ( ISO_CAN_NODES - 1 ) + \param[in] \wp{u16SouAdd, uint16} + Source address of network member + \retval sint16 + - Handle of network member of concrete CAN-bus + - HANDLE_UNVALID if there is no network member with this SA + +*/ +sint16 iso_NmGetMemHandleofSA( uint16 u16CanNode, uint16 u16SouAdd ); + + /* *************************************************************************** */ + /*! + \brief This function determines the handle of a network member over CAN-Node and Name + + \param[in] \wp{u16CanNode,uint16} + CAN-bus number 0, 1, ... ( ISO_CAN_NODES - 1 ) + \param[in] \wpp{au8Name, const uint8[]} + NAME of the network member ( see IsoSetName() ) + \retval sint16 + - Handle of network member of concrete CAN-bus + - HANDLE_UNVALID if there is no network member with this Name + +*/ +sint16 iso_NmGetMemHandleofName( uint16 u16CanNode, const uint8 au8Name[] ); + +/* ********************************************************************* */ +/*! + \brief With this function the application has access to the data of all (intern) network members + \param[in] \wp{u16CanNode, uint16} + CAN-bus number 0, 1, ... ( ISO_CAN_NODES - 1 ) + \param[in] \wp{s16ArrSizeForHand, sint16} + Size of application array for handles see next parameter \n + Range: maximum intern members + \param[in,out] \wp{as16Handles, sint16 []} + Pointer to a array of sint16 \n + The driver entries all handles of intern network members here. + \param[out] \wp{s16NumbOfHa, sint16*} + Number of intern network members + \retval sint16 + - #E_NO_ERR + - #E_OVERFLOW Application array is to small + - #E_RANGE u16CanNode not valid +*/ +sint16 iso_NmReadListOfInternHandles( uint16 u16CanNode, sint16 s16ArrSizeForHand, + sint16 as16Handles[], sint16* s16NumbOfHa ); + +/* ********************************************************************* */ +/*! + \brief With this function the application has access to the data of all (extern) network members + \param[in] \wp{u16CanNode, uint16} + CAN-bus number 0, 1, ... ( ISO_CAN_NODES - 1 ) + \param[in] \wp{s16ArrSizeForHand, sint16} + Size of application array for handles see next parameter \n + Range: maximum ISO_USER_MAX - intern members + \param[out] \wp{as16Handles, sint16 []} + Pointer to a array of sint16 \n + The driver entries all handles of extern network members here. + \param[out] \wp{s16NumbOfHa, sint16*} + Number of extern network members + + \retval sint16 + - #E_NO_ERR + - #E_OVERFLOW Application array is to small + - #E_RANGE u16CanNode not valid +*/ + +sint16 iso_NmReadListOfExternHandles( uint16 u16CanNode, sint16 s16ArrSizeForHand, + sint16 as16Handles[], sint16* s16NumbOfHa ); + + /* ********************************************************************* */ + /*! + \brief With this function the application has access to the data of all (extern) network members + with a specific ISO NAME function + \param[in] \wp{u16CanNode, uint16} + CAN-bus number 0, 1, ... ( ISO_CAN_NODES - 1 ) + \param[in] \wp{u8Function, uint8} + NAME function of the searched network members + \param[in] \wp{s16ArrSizeForHand, sint16} + Size of application array for handles see next parameter \n + Range: maximum ISO_USER_MAX + \param[out] \wp{as16Handles, sint16 []} + Pointer to a array of sint16 ( Size depends on bus good size is 10 - 30 ) \n + The driver entries all handles of extern network members here. + \param[out] \wp{s16NumbOfHa, sint16*} + Number of extern network members with a specific NAME function + \retval sint16 + - #E_NO_ERR + - #E_OVERFLOW Application array is to small + - #E_RANGE u16CanNode not valid + \note \par + This function works only for unique NAME functions that means functions which are independent of + industry group and device class ( VT, TECU, TC .. ). For auxiliary unit devices e. g. there is a + function value but not consequently used of all manufacturers. +*/ + +sint16 iso_NmReadListOfExtHandWithFunc( uint16 u16CanNode, uint8 u8Function, sint16 s16ArrSizeForHand, + sint16 as16Handles[], sint16* s16NumbOfHa ); + +/* ********************************************************************* */ +/*! + \brief This function enables the reading of characteristics of a network member + \param[in] \wp{s16MnHandle,sint16} + Handle to network member + \param[out] \wp{psUserInfo,ISOUSERAPP_T*} + Pointer to network member data + \retval sint16 + - #E_NO_ERR on success + - #E_USER_ERROR Network member not found + - #E_RANGE if psUserInfo is the NULL pointer + \note \par + Following informations are available: \n \code + - word wIsoSourceAdd - Source address (SA) + - ISONAMEFIELD_t psName - Pointer to NAME entries + - byte* pacIsoUserName - Pointer to (Bus) NAME + - ISO_USERFUNC_e eIsoUserFunct - Userfunction of network member + - ISO_USERSTAAPP_e eIsoAnnState - Actual announce state of member ( OK / NOK ) + \endcode +*/ + +sint16 iso_NmGetDataOfMember( sint16 s16MnHandle, ISOUSERAPP_T* psUserInfo ); + +/**@}*/ +/* Al - Application layer interface */ +/** \addtogroup apla Application Layer + \ingroup base_new +*/ +/**@{*/ + + /** \brief Typedef struct for controlling the receiption of PGNs */ + typedef struct + { + uint16 u16SAPGNSender; /**< SA of user which send data */ + sint16 s16HandleOfSender; /**< Handle of sender or HANDLE_UNVALID */ + uint32 u32PGN; /**< PGN of DATA */ + uint32 u32NumbofBytes; /**< Number of bytes recorded */ + uint8 HUGE_C *pau8Data; /**< Pointer on data buffer */ + uint8 bPgnPriority; /**< Priority of received Pgn */ + cbool qTimedOut; /**< True means cyclic PGN isnot received timely */ + } PGNDAT_T; + + typedef PGNDAT_T *PGNDAT_t; /**< Pointer typedef for #PGNDAT_T */ + + /* ******************************************************************** */ + /*! + \brief This function installs a Transmit PGN (TX) + + \param[in] \wp{s16NmHandle, sint16} + Handle of network member assigned of Network management + \param[in] \wp{u32Pgn, uint32} + PGN - Range: 0 - 0x3FFFF + \param[in] \wp{u16NmDestin, uint16} + Destination address of this (Transmit-) PGN + - 0 - 0xFC - SA of unclaimed network member + - ISO_GLOBAL_ADDRESS - broadcast + - Handle of extern network member + \param[in] \wp{u16DaSize, uint16} + Data length of this PGN ( if variable set new size with iso_AlPgnTxChangeDataSize ) + \param[in] \wp{pu8PtrData, uint8} + Pointer to data located in application ( must be used if > 8 bytes ) \n + <= 8 bytes driver intern storage should be used and this pointer shall be zero + \param[in] \wp{u8Priority, uint8} + Default priority of this PGN + \param[in] \wp{u16DefRepRate, uint16} + Default transmission repetition rate \n + Range: 0 ... 0xFDFF ms for time intervall of cyclic transmission \n + Cyclic transmission is switched off with REPRATE_INACTIVE \n + -> Activation is then not possible + + \retval sint16 + - PGN-handle on success ( The handle numbers are starting with #HANDLE_AL_OFFSET \n + and will be incremented for every new RX or TX entry ) + - #HANDLE_UNVALID in case of an error ( PGN-handle not valid ) + + \par + It is possible to add more than one entry for a specific sender and pgn, + to send in parallel multiple Tx-messages with same PGN, specific dest. and repetition rate. \n + To use this functionality, make sure that at least the data buffer is different. + \par + PGNs created with iso_AlPgnTxNew() are disabled by default. That means they do not react to Requests. \n + Use the function iso_AlPgnDeactivate() to switch on the response to requests and iso_AlPgnActivate() + to additionally switch on the sending of the TX-PGN. + \par + It is not allowed to use INVALID_HANDLE (-1) as destination address (u16NmDestin). \n + If needed use HANDLE_GLOBAL or ISO_GLOBAL_ADDRESS instead of INVALID_HANDLE. +*/ + + sint16 iso_AlPgnTxNew( sint16 s16NmHandle, + uint32 u32Pgn, + uint16 u16NmDestin, + uint16 u16DaSize, + uint8* pu8PtrData, + uint8 u8Priority, + uint16 u16DefRepRate ); + + /* ********************************************************************* */ + /*! + \brief This function installs a Receive PGN (RX) + + \param[in] \wp{s16NmHandle, sint16} + Handle of network member assigned of Network management + \param[in] \wp{u32Pgn, uint32} + PGN - Range: 0 - 0x3FFFF + \param[in] \wp{u16NmSource, uint16} + Source of this PGN + - 0 - 0xFC - SA of unclaimed network member + - ISO_GLOBAL_ADDRESS - sender is dont care + - Handle of extern network member (specific sender) + \param[in] \wp{u16DaSize, uint16} + Data length of this PGN ( if variable maximum expected size must be entried ) + \param[in] \wp{pu8PtrData, uint8*} + Pointer to data located in application ( must be used if > 8 bytes and rpfCbPgn is the NULL pointer ) \n + <= 8 bytes driver intern storage should be used and this pointer shall be zero + \param[in] \wp{u8Priority, uint8} + Default priority of this PGN ( not used e. g. in order to filter PGNs ) + \param[in] \wp{u16CtrlTime, uint16} + Control time of a receive PGN \n + Range: 0 ... 0xFDFF ms \n + REPRATE_INACTIVE - time control is switched off + \param[in] \wpp{rpfCbPgn, void(*)(#PGNDAT_T*)} + It can be installed a own callbackfunction for this PGN, if this callback + is not used set this parameter to 0 (NULL) + + \retval sint16 + - PGN-handle on success ( The handle numbers are starting with #HANDLE_AL_OFFSET \n + and will be incremented for every new RX or TX entry ) + - #HANDLE_UNVALID in case of an error ( PGN-handle not valid ) + + \par + If the callback function parameter rpfCbPgn is not NULL \n + and the received data are greater than the defined data buffer size, \n + the callback function uses the orignal TP buffer. \n + ( This buffer is only valid during the call...) + + \par + It is not allowed to use INVALID_HANDLE (-1) as source address (u16NmSource). \n + If needed use HANDLE_GLOBAL or ISO_GLOBAL_ADDRESS instead of INVALID_HANDLE. + +*/ +sint16 iso_AlPgnRxNew( sint16 s16NmHandle, + uint32 u32Pgn, + uint16 u16NmSource, + uint16 u16DaSize, + uint8* pu8PtrData, + uint8 u8Priority, + uint16 u16CtrlTime, + void (*rpfCbPgn)( PGNDAT_T* psPgnDat ) ); + +/***********************************************************************/ +/*! + \brief This function activates a PGN + + Activation of a PGN means: + - Receive PGN: Enable reception and (if initialised) time control + - Transmit PGN: Starts the cyclic sending with the initialised repetition rate + + \param[in] \wp{s16PgnHandle, sint16} + Handle of PGN assigned of iso_AlPgnTx/RxNew() + \retval sint16 + - #E_NO_ERR on success + - #E_PGN_UNKNOWN PGN not found + \note \par + (De-)Activation for Transmit PGNs means Off/On of transmitting. A PGN is anyway + responded if it is requested of the network. + */ + sint16 iso_AlPgnActivate( sint16 s16PgnHandle ); + +/* ********************************************************************* */ +/*! + \brief This function deactivates a PGN + Deactivation of a PGN means: + - Receive PGN: Disable reception and (if initialised) time control + - Transmit PGN: Stops the cyclic sending with the initialised repetition rate + + \param[in] \wp{s16PgnHandle, sint16} + Handle of PGN assigned of iso_AlPgnTx/Rx-New() + \retval sint16 + - #E_NO_ERR on success + - #E_PGN_UNKNOWN PGN not found + +*/ + sint16 iso_AlPgnDeactivate( sint16 s16PgnHandle ); + +/* ********************************************************************* */ +/* + \brief This function disables a PGN + + Disabling means a PGN stops activity completely + + \param[in] \wp{s16PgnHandle, sint16} + Handle of PGN assigned of iso_AlPgnTx/Rx-New() + \retval sint16 + - #E_NO_ERR on success + - #E_PGN_UNKNOWN PGN not found +*/ +sint16 iso_AlPgnDisable( sint16 s16PgnHandle ); + +/* ********************************************************************* */ +/*! + \brief This function changes the priority + + \param[in] \wp{s16PgnHandle, sint16} + Handle of PGN assigned of iso_AlPgnTxNew() + \param[in] \wp{u8Priority, uint8} + New priority of PGN + \retval sint16 + - #E_NO_ERR on success + - #E_PGN_UNKNOWN PGN not found +*/ +sint16 iso_AlPgnTxChangePriority( sint16 s16PgnHandle, uint8 u8Priority ); + +/* ******************************************************************** */ +/*! + \brief This function changes the data length of (variable) TX-PGNs + + \param[in] \wp{s16PgnHandle, sint16} + Handle of PGN assigned of iso_AlPgnTxNew() + \param[in] \wp{u16DataSize, uint16} + New data length of the PGN + + \retval sint16 + - #E_NO_ERR on success + - #E_PGN_UNKNOWN PGN not found + - #E_OVERFLOW data size for the internal buffer is limited to 8 bytes + \note \par + - This function can be used to adapt the data length of e. g. DM1, DM2 +*/ +sint16 iso_AlPgnTxChangeDataSize( sint16 s16PgnHandle, uint16 u16DataSize ); + +/* ********************************************************************* */ +/*! + \brief This function changes the destination or the source of a PGN + \param[in] \wp{rs16PgnHandle, sint16} + Handle of PGN assigned of iso_AlPgnTx/Rx-New() + \param[in] \wp{u16SrcDestination, uint16} + New Destination( TX ) or Source(RX) of this PGN + - 0 - 0xFC - SA of unclaimed network member + - ISO_GLOBAL_ADDRESS - broadcast + - Handle of extern network member + \retval sint16 + - #E_NO_ERR on success + - #E_PGN_UNKNOWN PGN not found + +*/ +sint16 iso_AlPgnChangeSrcDestination( sint16 rs16PgnHandle, uint16 u16SrcDestination ); + +/* ********************************************************************* */ +/*! + \brief This function sets a new transmission repetition rate + \param[in] \wp{s16PgnHandle, sint16} + Handle of PGN assigned of iso_AlPgnTxNew() + \param[in] \wp{u16RepetitionRateMs, uint16} + New repetition rate of this PGN, Range: 0 ... 0xFAFF ms + \retval sint16 + - #E_NO_ERR on success + - #E_PGN_UNKNOWN PGN not found + - #E_CONFIG there are no limits ( iso_AlPgnTxSetLimitsReqForRepet() not called ) + - #E_VALUE_WRONG New repetition rate is outside the limits + \note \par + Precondition: iso_AlPgnTxSetLimitsReqForRepet() must be called \n + Its not controlled if PGN handle is set as TX +*/ +sint16 iso_AlPgnTxSetRepetitionRateMs( sint16 s16PgnHandle, uint16 u16RepetitionRateMs ); + +/* ******************************************************************** */ +/*! + \brief This function reads the actual transmission repetition rate + \param[in] \wp{s16PgnHandle, sint16} + Handle of PGN assigned of iso_AlPgnTxNew() + \param[out] \wp{u16RepetitionRateMs, uint16*} + Value of the used repetition rate, Valid range: 0 ... 0xFAFF ms + \retval sint16 + - #E_NO_ERR on success + - #E_PGN_UNKNOWN PGN not found + - #E_RANGE u16RepetitionRateMs is NULL pointer + \note \par + Its not controlled if PGN handle is set as TX +*/ +sint16 iso_AlPgnTxGetRepetitionRateMs( sint16 s16PgnHandle, uint16* u16RepetitionRateMs ); + +/* ********************************************************************* */ +/*! + \brief This function sets the minimum and maximum transmission repetition rate for a TX PGN. + + Calling this function is necessary that the "Request for repetition rate" message is accepted. \n + The Request is only accepted for a cyclic TX PGN if the the destination address + ( set with iso_AlPgnRxNew() ) is the global address or the requester address. + + \param[in] \wp{rs16PgnHandle, sint16} + Handle of PGN assigned of iso_AlPgnTxNew() + \param[in] \wp{ru16TimeRepRateMinMs, uint16} + Minimum value for the repetition value of a Transmit PGN \n + Range: 0 ... 0xFAFF ms + \param[in] \wp{ru16TimeRepRateMaxMs, uint16} + Maximum value for the repetition value of a Transmit PGN \n + Range: 0 ... 0xFAFF ms, must be higher than minimum + \retval sint16 + - #E_NO_ERR on success + - #E_PGN_UNKNOWN PGN not found + - #E_VALUE_WRONG Parameter is unvalid see range, minimum higher than maximum .. +*/ +sint16 iso_AlPgnTxSetLimitsReqForRepet( sint16 rs16PgnHandle, + uint16 ru16TimeRepRateMinMs, + uint16 ru16TimeRepRateMaxMs ); + +/* ********************************************************************* */ +/*! + \brief This function releases a single request for a RX PGN + \param[in] \wp{rs16PgnHandle, sint16} + Handle of PGN assigned of iso_AlPgnRxNew() + \retval sint16 + - #E_NO_ERR on success + - #E_PGN_UNKNOWN PGN not found + \note \par + The destination address of the request is the source entry of the initialisation of this PGN +*/ +sint16 iso_AlPgnRxRequest( sint16 rs16PgnHandle ); + +/* ********************************************************************* */ +/*! + \brief This function releases the cyclic sending of requests for a RX PGN + \param[in] \wp{rs16PgnHandle, sint16} + Handle of PGN assigned of iso_AlPgnRXNew() + \param[in] \wp{ru16TimeMsCyclic, uint16} + Repetition time in ms for the requests, + - Valid Range: 10 ... 0xFAFF ms + \retval sint16 + - #E_NO_ERR on success + - #E_PGN_UNKNOWN PGN not found + - #E_VALUE_WRONG Time parameter is not in a valid range + \note \par + This function includes activation of this RX-PGN. +*/ +sint16 iso_AlPgnRxRequestCyclic( sint16 rs16PgnHandle, uint16 ru16TimeMsCyclic ); + +/* ********************************************************************* */ +/*! + \brief This function sends an acknowledgement + \param[in] \wp{reControl, ISO_ACK_E} + Control byte of acknowledgement (N)ACK message + \param[in] \wp{ru32ConcernPgn, uint32} + PGN which is (N)ACK + \param[in] \wp{u8GroupFunValue, uint8} + Group function value + \param[in] \wp{u8Byte5, uint8} + Byte 5 of acknowledgement message + \param[in] \wp{rs16HndSender, sint16} + Handle of sender + \param[in] \wp{rs16HndReceiver, sint16} + Handle of receiver ( or HANDLE_GLOBAL ) + \retval sint16 + - #E_NO_ERR on success +*/ +sint16 iso_AlPgnAcknowledge( ISO_ACK_E reControl, uint32 ru32ConcernPgn, + uint8 u8GroupFunValue, uint8 u8Byte5, + sint16 rs16HndSender, sint16 rs16HndReceiver ); + +/* ******************************************************************** */ +/*! + \brief This function sends a TX-PGN on the bus (manual sending) + \param[in] \wp{rs16PgnHandle, sint16} + Handle of PGN assigned of iso_AlPgnTxNew() + \retval sint16 + - #E_NO_ERR on success + - #E_PGN_UNKNOWN PGN not found + \note \par + This function sends a PGN regardless if activated or not after iso_AlPgnTxNew(). +*/ + + +sint16 iso_AlPgnTxSend( sint16 rs16PgnHandle ); + +/********************************************************************************/ +/*! + \brief Reading the key switch state for starting the implement + \param[in] \wp{u16CanNode, uint16} + CAN-bus number 0, 1, ... ( ISO_CAN_NODES - 1 ) + \retval uint8 + Key switch state ( DISABLED, ENABLED, ISO_ERROR_INDI_2Bit, ISO_NOT_AVAILABLE_2Bit ) +*/ +uint8 iso_AlKeySwitchStateRead( uint16 u16CanNode ); + +/*********************************************************************************/ +/*! + \brief Sending of PGNs with specific destination (Command, Response, Groupfun. A) + + This function starts the sending of a PGN to a specific receiver ("OneToOne") \n + In case of more than 8 bytes using of TP or ETP is included. + Not really necessary for new API, only for adaptions to old application interfaces. + + \param[in] \wp{u16CanNode, uint16} + CAN-bus number 0, 1, ... ( ISO_CAN_NODES - 1 ) + \param[in] \wp{u8Priori, byte} + Priority of PGN (normal default see J1939-71, ISO11783-7,8 ...) \n + Range: 0 - 7 + \param[in] \wp{u32Pgn, uint32} + PGN which shall be sended \n + Range: 0 ... 0x3FFFF + \param[in] \wp{u16DataLength, uint16} + Number of bytes which are sended + - 0 .. 8 : Single transport + - 9 .. 1785 : Transport protocol is automatic used + - 1786 .. 65536 : Extended transport protocal is automatic used + \param[in] \wpp{pu8Data, const #uint8[]} + Pointer to first byte of data which shall be sended + \param[in] \wp{u16SASender, uint16} + Sender source address generally own intern SA \n + Range: 0 - 253 + \param[in] \wp{u16SAReceiver, uint16} + Destination source address \n + Range: 0 - 253 + \retval sint + - #E_NO_ERR Transfer is started + - #E_OVERFLOW Transfers are busy (buffer full) + \note \par + - Attention: data >1785 bytes are not copied into the driver and must be static in appl. + - This function belongs to the data link layer. Therefore its not checked if + the sender of this message is full announced!! + If more than 8 bytes shall be transported (->(E)TP) sender and receiver + must be announced (-> Transport Layer! )\n + - Destination address ISO_GLOBAL_ADDRESS is not allowed \n + Exception: < 9 Bytes and PDU1 Format - One to many + - < 9 Bytes and PDU2 not allowed (PDU2 Specific field overwritten with receiver address!) +*/ +sint iso_AlPgnTxSpecificSend ( uint16 u16CanNode, + uint8 u8Priori, + uint32 u32Pgn, + uint16 u16DataLength, + const uint8 pu8Data[], + uint16 u16SASender, + uint16 u16SAReceiver + ); + +/* *********************************************************************/ + /*! + \brief Sending of PGNs to global destination (Broadcast, Groupfun. B) + + This function starts the sending of a PGN to a global destination ("OneToMany") \n + In case of more than 8 bytes using of BAM is included. \n + Not really necessary for new API, only for adaptions to old application interfaces. + + \param[in] \wp{u16CanNode, uint16} + CAN-bus number 0, 1, ... ( ISO_CAN_NODES - 1 ) + \param[in] \wp{u8Priori, uint8} + Priority of PGN (normal default see J1939-71, ISO11783-7,8 ...) \n + Range: 0 - 7 + \param[in] \wp{u32Pgn, uint32} + PGN which shall be sended \n + Range: 0 ... 0x3FFFF + \param[in] \wp{u16DataLength, uint16} + Number of bytes which are sended + - 0 .. 8 : Single transport + - 9 .. 1785 : BAM is automatic used + \param[in] \wp{u8Data, uint8*} + Pointer to first byte of data which shall be sended + \param[in] \wp{u16SASender, uint16} + Sender source address generally own intern SA \n + Range: 0 - 253 + \retval sint + - #E_NO_ERR Transfer is started + - #E_OVERFLOW Transfers are busy (buffer full) + \note \par + This function belongs to the data link layer. Therefore its not checked if + the sender of this message is full announced!! \n + If more than 8 bytes shall be transported (->(E)TP) sender and receiver + must be announced (-> Transport Layer! )\n +*/ +sint iso_AlPgnTxBroadcastSend( uint16 u16CanNode, + uint8 u8Priori, + uint32 u32Pgn, + uint16 u16DataLength, + const uint8 u8Data[], + uint16 u16SASender + ); + +/**@}*/ +/* Spn - Initialising, setting and reading of SPNs */ +/** \addtogroup spni SPN Support + \ingroup apla +*/ +/**@{*/ + + #ifndef NUMBERSPN_MAX + /** \brief Maximum number of SPNs - predefined with 20 + \details Number of SPNsNumber of PGNs which can be initialised in the revised + application layer which can be initialised in the revised application layer - + SPN-Support deactivation: NUMBERSPN_MAX = 0 -> IsoMnSpn.c must not be compiled */ + #define NUMBERSPN_MAX 20 + #endif /* NUMBERSPN_MAX */ + + /** \brief Enum in order to initialise the analyse of SPN data */ + typedef enum + { + SpnValStandard, /**< See Signal Ranges ISO 11783 Part 7 Tabel 1 - 3 */ + SpnValSpecial, + SpnValUndef + } SPNVALINT_e; + +/* ************************************************************************ */ +/*! + \brief This function initialises a SPN which belongs to a PGN handle. SPN see + parameter definitions in ISO11783-7 Annex A, J1939-71 Annex B and byte- and bitpositions + see ISO11783-7 Annex B, J1939-71 Annex C + + \param[in] \wp{rs16PgnHandle,sint16} + Handle of PGN assigned of iso_AlPgnTx(RX)New() + \param[in] \wp{ru32Spn,uint32} + SPN + \param[in] \wp{ru16BytePos,uint16} + Byteposition of data field of this PGN, 1...n + \param[in] \wp{ru8BitPos,uint8} + Bitposition of a byte of this PGN - allowed values 1 - 8 \n + For (Bit-)Length 8, 16, 24, 32 only bitposition 1 is allowed + \param[in] \wp{ru16BitLength,uint16} + (Bit-)Length of parameter - allowed values 1 - 10, 16, 24, 32 + \param[in] \wp{eSpnInterpret,SPNVALINT_e} + - SpnValStandard - normal interpretation of parameter \n + See Signal Ranges ISO 11783 Part 7 Tabel 1 - 3 + - SpnValSpecial - Error or NotAvailable detection switched off + \retval sint16 + - #E_NO_ERR on success + - #E_PGN_UNKNOWN PGN of SPN not found + - #E_RANGE Bytepos, Bitpos or Length not supported +*/ + sint16 iso_SpnDefineSpn( sint16 rs16PgnHandle, + uint32 ru32Spn, + uint16 ru16BytePos, + uint8 ru8BitPos, + uint16 ru16BitLength, + SPNVALINT_e eSpnInterpret + ); + +/* ************************************************************************** */ +/*! + \brief This function sets a parameter value of a SPN + + \param[in] \wp{rs16PgnHandle, sint16} + Handle of PGN assigned of iso_AlPgnTx(RX)New() + \param[in] \wp{ru32Spn, uint32} + SPN + \param[in] \wp{u32Write, uint16} + New parameter value + \retval sint16 + - #E_NO_ERR on success + - #E_PGN_UNKNOWN PGN of SPN not found + - #E_RANGE Bitlength is not supported +*/ +sint16 iso_SpnDataSet( sint16 rs16PgnHandle, uint32 ru32Spn, uint32 u32Write ); + + +/* ************************************************************************* */ +/*! + \brief This function reads a parameter value of a SPN + + \param[in] \wp{rs16PgnHandle, sint16} + Handle of PGN assigned of iso_AlPgnTx(RX)New() + \param[in] \wp{ru32Spn, uint32} + SPN + \param[out] \wp{u32Result, uint32*} + Value of a SPN + \retval sint + - Errorcodes: + - #E_PGN_UNKNOWN PGN of SPN not found + - #E_RANGE Bitlength is not supported + - Value information code: + - #E_NO_ERR OK, Value in valid range see Part 7 Table 1 - 3 + - #E_ERROR_INDI Value Error indicator see Part 7 Table 1 - 3 + - #E_NOT_AVAILABLE Value Not Available see Part 7 Table 1 - 3 +*/ + +sint16 iso_SpnDataRead( sint16 rs16PgnHandle, uint32 ru32Spn, uint32 *u32Result ); + +/* ************************************************************************ */ +/*! + \brief This function reads a parameter value direct with startbit and length + + This function reads parameter direct. It can be used e. g. when data are received in own callbackfunctions. + + \param[in] \wp{u8BitAdr, uint8} + StartBitaddress of the SPN - Range 0 - 63 + \param[in] \wp{u8BitLen, uint8} + Bitlength - Range: 0 - 32 + \param[in] \wpp{pau8Data, const uint8[]} + Pointer to data + \param[out] \wp{pu32Result, uint32*} + Value of a parameter (SPN) + \retval sint16 + - #E_NO_ERR on success + - #E_OVERFLOW Addressbit or length is wrong \n +*/ +sint16 iso_SpnDataReadCom( uint8 u8BitAdr, uint8 u8BitLen, const uint8 pau8Data[], uint32 *pu32Result ); + +/* ************************************************************************ */ +/*! + \brief DM1, DM2 support: Initialises an array for DM1 or DM2 messages + + \param[in] \wp{pau8Array, uint8[]} + Pointer to application array for DTCs + \param[in] \wp{s16ArraySize, sint16} + Size of array + \param[in] \wp{ps16NumbOfDTCs, sint16*} + +*/ + +void iso_SpnDMResetDTC( uint8 pau8Array[], sint16 s16ArraySize, sint16* ps16NumbOfDTCs ); + + /**************************************************************************/ + /*! + \brief DM1, DM2 support: Adding a DTC entry into an array + + \param[in] \wp{pau8Array, uint8[]} + Pointer to application array for DTCs + \param[in] \wp{s16ArraySize, sint16} + Size of array + \param[in] \wp{ps16NumbOfDTCs, sint16*} + Pointer to number of DTC entries + \param[in] \wp{u32Spn, uint32} + SPN of new entry + \param[in] \wp{u8FMI, uint8} + FMI of new entry + \param[in] \wp{u16OccurenceCount, uint16} + Occurence counter + \retval sint16 + - #E_NO_ERR on success + - #E_OVERFLOW DTC not entried because buffer is to small +*/ +sint16 iso_SpnDMAddDTC( uint8 pau8Array[], sint16 s16ArraySize, sint16* ps16NumbOfDTCs, + uint32 u32Spn, uint8 u8FMI, uint16 u16OccurenceCount ); + +/**@}*/ + +#ifdef __cplusplus +} /* end of extern "C" */ +#endif + +#endif /* DEF_MnApi_H */ ++======= + /****************************************************************************/ + /*! + \file IsoMnApi.h + \brief API for revised network management and application layer for versions from 4.80 + \author Hammerl Erwin + \date Created XX.07.11 + \copyright Competence Center ISOBUS e.V. + + \par History: + \par + 20.12.2011 - author E. Hammerl + - Added function iso_AlKeySwitchStateRead() for start over KeySwitchState of implements + + \par + 08.12.2011 - author E. Hammerl + - Input parameter for array size in functions iso_NmReadListOf...() added + + \par + 25.01.2012 - author E. Hammerl + - Added iso_AlPgnTxSpecificSend(), iso_AlPgnTxBroadcastSend(), iso_DlCanBusSet, + iso_SpnDataReadCom() + - REPRATE_DEF renamed in REPRATE_INACTIVE + - iso_NmMemberDelete renamed in iso_NmMemberLoggedOut + - Added functions for DM ( diagnostic messages ) + + \par + 30.03.2012 - author P. Wegscheider + - changes for Doxygen output generation + \par + 04.03.2013 - author P. Wegscheider + - internal base driver restructuring + - Function iso_DlCanBusSet() removed from multi CAN node API (Version 06.02.00) + \par + 25.04.2013 - author P. Wegscheider + - Added function iso_NmMbrExternAdd() + \par + 02.05.2013 - author P. Wegscheider + - Added function iso_NmGetMemHandleofName() + \par + 19.02.2014 - author E. Hammerl + - Added function iso_AlPgnDisable() for completely inactivation of PGNs + \par + 10.03.2015 - author P. Wegscheider + - Function iso_AlKeySwitchStateRead() replaced with iso_DlKeySwitchStateRead() + - Function iso_DlPgnAcknowledge() added + - Function iso_DlPgnSend() added + - Function iso_DlPgnRequest() added + \par + 08.04.2016 - author P. Wegscheider + - added external NIU interface + \par + 10.11.2016 - author P. Wegscheider + - Feature request ID 4510: can send should get a return value + - Changed iso_DlDrvCanInit() + - Added iso_DlGetSendMsgFiFoSize() + \par + 25.11.2016 - author P. Wegscheider + - Feature request ID 4205: iso_AlPgnTxNew() with an additional callback parameter + \par + 29.11.2016 - author P. Wegscheider + - Feature request ID 4690: Heartbeat Message for safety critical path + \par + 13.01.2017 - author P. Wegscheider + - Feature request ID 4690: Heartbeat Message for safety critical path + - Added optional #ISO_HBS_CbEvent_t event callback iso_HBServer_Install() + \par + 26.01.2017 - author P. Wegscheider + - Feature ID 4209: declare pointer parameter in functions as const* where applicable + - iso_NmMemberNew() - set callback functions parameters ISONETEVENT_T and ISO_TPINFO_T as const + - iso_AlPgnRxNew() - set callback functions parameter PGNDAT_T as const + \par + 04.04.2017 -author P.Wegscheider + - Added optional function iso_DlPgnSendEx() to send ETPs with a data size greater than 65KB \n + The function can be enabled with the IsoConf.h define ISO_DL_EXTENSION. + \par + 10.05.2017 -author P.Wegscheider + - Feature request ID 4114: Improved C++ support \n + Merged changes from v09-evaluation branch (optional define CCI_ISO_USE_USER_PARAM) + \par + 07.02.2018 - author P. Wegscheider + - Feature request ID 7504: Split Base Driver into "Core" and "Base" + - Moved data link and network management API functions from IsoMnApi.h to IsoCoreApi.h + - Moved external NIU API functions from IsoMnApi.h to IsoCoreApi.h + \par + 16.02.2018 - author P.Wegscheider + - Feature ID 7528: add user parameter to callback functions + \par + 06.05.2018 - author P.Wegscheider + - Feature ID 3910: header files should include header files they depend on + \par + 12.06.2018 -author P.Wegscheider + - Feature request ID 8459: use iso_u8 for ISOBUS addresses in API + - Replaced PGNDAT_T iso_u16 u16SAPGNSender with iso_u8 u8SAPGNSender + \par + 12.07.2018 -author P.Wegscheider + - Feature request ID 8000: updated external handle parameter to iso_s16 for iso_AlPgnTxNew(), iso_AlPgnRxNew() and iso_AlPgnChangeSrcDestination(). + \par + 10.08.2018 - author P. Wegscheider + - BugID 8581: add "namespace ISOBUSDRIVER" to header files + */ + + #ifndef DEF_MnApi_H + #define DEF_MnApi_H + + /* include configuration, driver standard types and common definitions */ + #include "IsoCommonDef.h" + + #ifdef __cplusplus + extern "C" { + #endif + + + /* Al - Application layer interface */ + /** \addtogroup apla Application Layer + */ + /**@{*/ + + #if defined(CCI_USE_NAMESPACE) && defined(__cplusplus) + #include "IsoMnApi.hpp" + #else /* not: defined(CCI_USE_NAMESPACE) && defined(__cplusplus) -> use C defines */ + + #define HANDLE_AL_OFFSET 0x1000 /**< Offset for first PGN handle value */ + #define REPRATE_INACTIVE 0xFFFFu /**< Repetition rate inactive */ + + #endif /* not: defined(CCI_USE_NAMESPACE) && defined(__cplusplus) */ + + /** \brief Typedef struct for controlling the receiption of PGNs */ + typedef struct + { + iso_s16 s16HandleOfSender; /**< Handle of sender or HANDLE_UNVALID */ + iso_u8 u8SAPGNSender; /**< SA of user which send data */ + iso_u32 u32PGN; /**< PGN of DATA */ + iso_u32 u32NumbofBytes; /**< Number of bytes recorded */ + iso_u8 HUGE_C *pau8Data; /**< Pointer on data buffer */ + iso_u8 bPgnPriority; /**< Priority of received Pgn */ + iso_bool qTimedOut; /**< True means cyclic PGN is not received timely */ + /* Added for V10.0 */ + iso_s16 s16PgnHandle; /**< \brief Identifier of this entry */ + iso_s16 s16HandleOfReceiver; /**< \brief Internal CF handle Global */ + iso_s16 s16OwnCfHnd; /**< \brief CF handle of the entry for which the callback is triggered ????? */ + ISO_USER_PARAM_T userParam; /**< \brief User parameter set with iso_AlPgnRxNew() */ + } PGNDAT_T; + + typedef PGNDAT_T *PGNDAT_t; /**< Pointer typedef for #PGNDAT_T */ + + /** \brief Typedef struct for send callback informations of PGNs */ + typedef struct + { + iso_s16 s16PgnHandle; /**< \brief Identifier of this entry */ + iso_s16 s16OwnCfHnd; /**< \brief Internal CF handle of the entry for which the callback is triggered ????? */ + ISO_USER_PARAM_T userParam; /**< \brief User parameter set with iso_AlPgnRxNew() */ + } ISO_AL_TX_INFO_Ts; + + /*! \brief Callback function pointer declaration for a function to manipulate the message data before sending. + + \param[in] \wpp{psTxInfo, const #ISO_AL_TX_INFO_Ts*} + Handle of the TxPGN entry + \param[in,out] \wp{pu16DataSize, iso_u16*} + Pointer to the message data length; \n + Pointer content value: + - [in] current data length + - [out] new or same data length + \param[in,out] \wp{pau8PtrData, iso_u8*[]} + Pointer to the data byte array + Pointer content value: + - [in] current data array pointer + - [out] new or same data array pointer + \param[in,out] \wp{pu8Priority, iso_u8*} + Pointer to the CAN priority for this PGN entry + Pointer content value: + - [in] current priority + - [out] new or same priority + + \retval iso_s16 + - #E_NO_ERR on success + - < 0 -> Don not send (if cyclic call again in next cyclic run, else skip) + + \par Hint: + The callback function can be set with iso_AlPgnTxNew(). \n + It is called on an external request, cyclic (if enabled) and from iso_AlPgnTxSend(). \n + The main goal of this function is to update the message data before sending. \n + It is also possible to change the data length, the array location and the message priority. + The changes are also stored in the entry and will be the defaults for the next call. + The application is responsible to make sure that the data length is not greater as the given data array. + + \par Sample callback function + \code{.c} + static iso_s16 CbIsoAlSetTxPgnData(const ISO_AL_TX_INFO_Ts* psTxInfo, iso_u16* pu16DataSize, iso_u8* pau8PtrData[], iso_u8* pu8Priority) + { + iso_s16 s16Ret = E_NO_ERR; + + if (psTxInfo->s16PgnHandle == s16MyPgnHandle) // check not needed if CB is only for one PGN entry + { + (*pu8Priority) = ((*pu8Priority) == 3u) ? 4u : 3u; + (*pu16DataSize) = u16MsgSize; + + if (u16MsgSize > 8u) + { // set our static array (else we could also use the internal 8 byte array) + *pau8PtrData = au8MsgData; + } + + if (u16MsgSize >= 2u) + { // add some data + (*pau8PtrData)[u16MsgSize - 2u] = 2u; + (*pau8PtrData)[u16MsgSize - 1u] = (iso_u8)u16MsgSize; + } + } + + return s16Ret; + } + \endcode + \par Sample for using iso_AlPgnTxNew() to set the callback function + \code{.c} + s16MyPgnHandle = iso_AlPgnTxNew( s16MyCfHandle, PGN_PDU1_PropA, s16CfHndDest, + 8u, 0, 3u, 2000u, userParam, CbIsoAlSetTxPgnData); + iso_AlPgnActivate(s16MyPgnHandle); + \endcode + */ + typedef iso_s16 (*ISO_AL_CbSetTxData_t)(const ISO_AL_TX_INFO_Ts* psTxInfo, iso_u16* pu16DataSize, iso_u8* pau8PtrData[], iso_u8* pu8Priority); + + + /* ******************************************************************** */ + /*! + \brief This function installs a Transmit PGN (TX) + + \param[in] \wp{s16NmHandle, iso_s16} + Handle of network member assigned of Network management + \param[in] \wp{u32Pgn, iso_u32} + PGN - Range: 0 - 0x3FFFF + \param[in] \wp{s16NmDestin, iso_s16} + Destination address of this (Transmit-) PGN + - 0 - 0xFD - SA of unclaimed network member + - ISO_GLOBAL_ADDRESS - broadcast + - Handle of extern network member + \param[in] \wp{u16DaSize, iso_u16} + Data length of this PGN ( if variable set new size with iso_AlPgnTxChangeDataSize ) + \param[in] \wp{pu8PtrData, iso_u8} + Pointer to data located in application ( must be used if > 8 bytes ) \n + <= 8 bytes driver intern storage should be used and this pointer shall be zero + \param[in] \wp{u8Priority, iso_u8} + Default priority of this PGN + \param[in] \wp{u16DefRepRate, iso_u16} + Default transmission repetition rate \n + Range: 0 ... 0xFDFF ms for time interval of cyclic transmission \n + Cyclic transmission is switched off with REPRATE_INACTIVE \n + -> Activation is then not possible + \param[in] \wpp{userParam, const #ISO_USER_PARAM_T} + User parameter value for the callback function calls. \n + Use #ISO_USER_PARAM_DEFAULT if not used/needed. + \param[in] \wp{pfCbSetTxData, ISO_AL_CbSetTxData_t} + NULL pointer or a pointer to a callback function which should be called before sending. \n + + \retval iso_s16 + - PGN-handle on success ( The handle numbers are starting with #HANDLE_AL_OFFSET \n + and will be incremented for every new RX or TX entry ) + - #HANDLE_UNVALID in case of an error ( PGN-handle not valid ) + + \par + It is possible to add more than one entry for a specific sender and pgn, + to send in parallel multiple Tx-messages with same PGN, specific dest. and repetition rate. \n + To use this functionality, make sure that at least the data buffer is different. + \par + PGNs created with iso_AlPgnTxNew() are disabled by default. That means they do not react to Requests. \n + Use the function iso_AlPgnDeactivate() to switch on the response to requests and iso_AlPgnActivate() + to additionally switch on the sending of the TX-PGN. + \par + It is not allowed to use HANDLE_UNVALID (-1) as destination address (u16NmDestin). \n + If needed use HANDLE_GLOBAL or ISO_GLOBAL_ADDRESS instead of HANDLE_UNVALID. + */ + + iso_s16 iso_AlPgnTxNew( iso_s16 s16NmHandle, + iso_u32 u32Pgn, + iso_s16 s16NmDestin, + iso_u16 u16DaSize, + iso_u8* pu8PtrData, + iso_u8 u8Priority, + iso_u16 u16DefRepRate, + const ISO_USER_PARAM_T userParam, + ISO_AL_CbSetTxData_t pfCbSetTxData); + + /* ********************************************************************* */ + /*! + \brief This function installs a Receive PGN (RX) + + \param[in] \wp{s16NmHandle, iso_s16} + Handle of network member assigned of Network management + \param[in] \wp{u32Pgn, iso_u32} + PGN - Range: 0 - 0x3FFFF + \param[in] \wp{s16NmSource, iso_s16} + Source of this PGN + - 0 - 0xFD - SA of unclaimed network member + - ISO_GLOBAL_ADDRESS - sender is don't care + - Handle of extern network member (specific sender) + \param[in] \wp{u16DaSize, iso_u16} + Data length of this PGN ( if variable maximum expected size must be entered ) + \param[in] \wp{pu8PtrData, iso_u8*} + Pointer to data located in application ( must be used if > 8 bytes and rpfCbPgn is the NULL pointer ) \n + <= 8 bytes driver intern storage should be used and this pointer shall be zero + \param[in] \wp{u8Priority, iso_u8} + Default priority of this PGN ( not used e. g. in order to filter PGNs ) + \param[in] \wp{u16CtrlTime, iso_u16} + Control time of a receive PGN \n + Range: 0 ... 0xFDFF ms \n + REPRATE_INACTIVE - time control is switched off + \param[in] \wpp{userParam, const #ISO_USER_PARAM_T} + User parameter value for the callback function calls. \n + Use #ISO_USER_PARAM_DEFAULT if not used/needed. + \param[in] \wpp{rpfCbPgn, void(*)(const #PGNDAT_T*)} + It can be installed a own callback function for this PGN, if this callback + is not used set this parameter to 0 (NULL) + + \retval iso_s16 + - PGN-handle on success ( The handle numbers are starting with #HANDLE_AL_OFFSET \n + and will be incremented for every new RX or TX entry ) + - #HANDLE_UNVALID in case of an error ( PGN-handle not valid ) + + \par + If the callback function parameter rpfCbPgn is not NULL \n + and the received data are greater than the defined data buffer size, \n + the callback function uses the original TP buffer. \n + ( This buffer is only valid during the call...) + + \par + It is not allowed to use HANDLE_UNVALID (-1) as source address (u16NmSource). \n + If needed use HANDLE_GLOBAL or ISO_GLOBAL_ADDRESS instead of HANDLE_UNVALID. + + */ + iso_s16 iso_AlPgnRxNew( iso_s16 s16NmHandle, + iso_u32 u32Pgn, + iso_s16 s16NmSource, + iso_u16 u16DaSize, + iso_u8* pu8PtrData, + iso_u8 u8Priority, + iso_u16 u16CtrlTime, + const ISO_USER_PARAM_T userParam, + void (*rpfCbPgn)( const PGNDAT_T* psPgnDat ) ); + + + /***********************************************************************/ + /*! + \brief This function activates a PGN + + Activation of a PGN means: + - Receive PGN: Enable reception and (if initialised) time control + - Transmit PGN: Starts the cyclic sending with the initialised repetition rate + + \param[in] \wp{s16PgnHandle, iso_s16} + Handle of PGN assigned of iso_AlPgnTx/RxNew() + \retval iso_s16 + - #E_NO_ERR on success + - #E_PGN_UNKNOWN PGN not found + \note \par + (De-)Activation for Transmit PGNs means Off/On of transmitting. A PGN is anyway + responded if it is requested of the network. + */ + iso_s16 iso_AlPgnActivate( iso_s16 s16PgnHandle ); + + /* ********************************************************************* */ + /*! + \brief This function deactivates a PGN + Deactivation of a PGN means: + - Receive PGN: Disable reception and (if initialised) time control + - Transmit PGN: Stops the cyclic sending with the initialised repetition rate + + \param[in] \wp{s16PgnHandle, iso_s16} + Handle of PGN assigned of iso_AlPgnTx/Rx-New() + \retval iso_s16 + - #E_NO_ERR on success + - #E_PGN_UNKNOWN PGN not found + + */ + iso_s16 iso_AlPgnDeactivate( iso_s16 s16PgnHandle ); + + /* ********************************************************************* */ + /*! + \brief This function disables a PGN + + Disabling means a PGN stops activity completely + + \param[in] \wp{s16PgnHandle, iso_s16} + Handle of PGN assigned of iso_AlPgnTx/Rx-New() + \retval iso_s16 + - #E_NO_ERR on success + - #E_PGN_UNKNOWN PGN not found + */ + iso_s16 iso_AlPgnDisable( iso_s16 s16PgnHandle ); + + /* ********************************************************************* */ + /*! + \brief This function changes the priority + + \param[in] \wp{s16PgnHandle, iso_s16} + Handle of PGN assigned of iso_AlPgnTxNew() + \param[in] \wp{u8Priority, iso_u8} + New priority of PGN + \retval iso_s16 + - #E_NO_ERR on success + - #E_PGN_UNKNOWN PGN not found + */ + iso_s16 iso_AlPgnTxChangePriority( iso_s16 s16PgnHandle, iso_u8 u8Priority ); + + /* ******************************************************************** */ + /*! + \brief This function changes the data length of (variable) TX-PGNs + + \param[in] \wp{s16PgnHandle, iso_s16} + Handle of PGN assigned of iso_AlPgnTxNew() + \param[in] \wp{u16DataSize, iso_u16} + New data length of the PGN + + \retval iso_s16 + - #E_NO_ERR on success + - #E_PGN_UNKNOWN PGN not found + - #E_OVERFLOW data size for the internal buffer is limited to 8 bytes + \note \par + - This function can be used to adapt the data length of e. g. DM1, DM2 + */ + iso_s16 iso_AlPgnTxChangeDataSize( iso_s16 s16PgnHandle, iso_u16 u16DataSize ); + + /* ********************************************************************* */ + /*! + \brief This function changes the destination or the source of a PGN + \param[in] \wp{rs16PgnHandle, iso_s16} + Handle of PGN assigned of iso_AlPgnTx/Rx-New() + \param[in] \wp{s16SrcDestination, iso_s16} + New Destination( TX ) or Source(RX) of this PGN + - 0 - 0xFC - SA of unclaimed network member + - ISO_GLOBAL_ADDRESS - broadcast + - Handle of extern network member + \retval iso_s16 + - #E_NO_ERR on success + - #E_PGN_UNKNOWN PGN not found + + */ + iso_s16 iso_AlPgnChangeSrcDestination( iso_s16 rs16PgnHandle, iso_s16 s16SrcDestination ); + + /* ********************************************************************* */ + /*! + \brief This function sets a new transmission repetition rate + \param[in] \wp{s16PgnHandle, iso_s16} + Handle of PGN assigned of iso_AlPgnTxNew() + \param[in] \wp{u16RepetitionRateMs, iso_u16} + New repetition rate of this PGN, Range: 0 ... 0xFAFF ms + \retval iso_s16 + - #E_NO_ERR on success + - #E_PGN_UNKNOWN PGN not found + - #E_CONFIG there are no limits ( iso_AlPgnTxSetLimitsReqForRepet() not called ) + - #E_VALUE_WRONG New repetition rate is outside the limits + \note \par + Precondition: iso_AlPgnTxSetLimitsReqForRepet() must be called \n + */ + iso_s16 iso_AlPgnTxSetRepetitionRateMs( iso_s16 s16PgnHandle, iso_u16 u16RepetitionRateMs ); + + /* ******************************************************************** */ + /*! + \brief This function reads the actual transmission repetition rate + \param[in] \wp{s16PgnHandle, iso_s16} + Handle of PGN assigned of iso_AlPgnTxNew() + \param[out] \wp{u16RepetitionRateMs, iso_u16*} + Value of the used repetition rate, Valid range: 0 ... 0xFAFF ms + \retval iso_s16 + - #E_NO_ERR on success + - #E_PGN_UNKNOWN PGN not found + - #E_RANGE u16RepetitionRateMs is NULL pointer + + */ + iso_s16 iso_AlPgnTxGetRepetitionRateMs( iso_s16 s16PgnHandle, iso_u16* u16RepetitionRateMs ); + + /* ********************************************************************* */ + /*! + \brief This function sets the minimum and maximum transmission repetition rate for a TX PGN. + + Calling this function is necessary that the "Request for repetition rate" message is accepted. \n + The Request is only accepted for a cyclic TX PGN if the the destination address + ( set with iso_AlPgnRxNew() ) is the global address or the requester address. + + \param[in] \wp{rs16PgnHandle, iso_s16} + Handle of PGN assigned of iso_AlPgnTxNew() + \param[in] \wp{ru16TimeRepRateMinMs, iso_u16} + Minimum value for the repetition value of a Transmit PGN \n + Range: 0 ... 0xFAFF ms + \param[in] \wp{ru16TimeRepRateMaxMs, iso_u16} + Maximum value for the repetition value of a Transmit PGN \n + Range: 0 ... 0xFAFF ms, must be higher than minimum + \retval iso_s16 + - #E_NO_ERR on success + - #E_PGN_UNKNOWN PGN not found + - #E_VALUE_WRONG Parameter is invalid see range, minimum higher than maximum .. + */ + iso_s16 iso_AlPgnTxSetLimitsReqForRepet( iso_s16 rs16PgnHandle, + iso_u16 ru16TimeRepRateMinMs, + iso_u16 ru16TimeRepRateMaxMs ); + + + /* ********************************************************************* */ + /*! + \brief This function sets a new alive timeout value + \param[in] \wp{s16PgnHandle, iso_s16} + Handle of PGN assigned of iso_AlPgnRxNew() + \param[in] \wp{u16TimeoutMs, iso_u16} + Time in ms to wait for next message \n + Range: 0 ... 0xFDFF ms \n + #REPRATE_INACTIVE - time control is switched off + \retval iso_s16 + - #E_NO_ERR on success + - #E_PGN_UNKNOWN PGN not found + - #E_VALUE_WRONG New timeout value is outside the limits + */ + iso_s16 iso_AlPgnRxSetAliveTimeoutMs( iso_s16 s16PgnHandle, iso_u16 u16TimeoutMs ); + + + /* ******************************************************************** */ + /*! + \brief This function reads the actual alive timeout value + \param[in] \wp{s16PgnHandle, iso_s16} + Handle of PGN assigned of iso_AlPgnRxNew() + \param[out] \wp{u16TimeoutMs, iso_u16*} + Value of the used alive timeout, Valid range: 0 ... 0xFAFF ms + \retval iso_s16 + - #E_NO_ERR on success + - #E_PGN_UNKNOWN PGN not found + - #E_RANGE u16TimeoutMs is NULL pointer + */ + iso_s16 iso_AlPgnRxGetAliveTimeOutMs( iso_s16 s16PgnHandle, iso_u16* u16TimeoutMs ); + + + /* ********************************************************************* */ + /*! + \brief This function releases a single request for a RX PGN + \param[in] \wp{rs16PgnHandle, iso_s16} + Handle of PGN assigned of iso_AlPgnRxNew() + \retval iso_s16 + - #E_NO_ERR on success + - #E_PGN_UNKNOWN PGN not found + \note \par + The destination address of the request is the source entry of the initialisation of this PGN + */ + iso_s16 iso_AlPgnRxRequest( iso_s16 rs16PgnHandle ); + + /* ********************************************************************* */ + /*! + \brief This function releases the cyclic sending of requests for a RX PGN + \param[in] \wp{rs16PgnHandle, iso_s16} + Handle of PGN assigned of iso_AlPgnRXNew() + \param[in] \wp{ru16TimeMsCyclic, iso_u16} + Repetition time in ms for the requests, + - Valid Range: 10 ... 0xFAFF ms + \retval iso_s16 + - #E_NO_ERR on success + - #E_PGN_UNKNOWN PGN not found + - #E_VALUE_WRONG Time parameter is not in a valid range + \note \par + This function includes activation of this RX-PGN. + */ + iso_s16 iso_AlPgnRxRequestCyclic( iso_s16 rs16PgnHandle, iso_u16 ru16TimeMsCyclic ); + + /* ******************************************************************** */ + /*! + \brief This function sends a TX-PGN on the bus (manual sending) + \param[in] \wp{rs16PgnHandle, iso_s16} + Handle of PGN assigned of iso_AlPgnTxNew() + \retval iso_s16 + - #E_NO_ERR on success + - #E_PGN_UNKNOWN PGN not found + \note \par + This function sends a PGN regardless if activated or not after iso_AlPgnTxNew(). + */ + iso_s16 iso_AlPgnTxSend( iso_s16 rs16PgnHandle ); + + + /* ********************************************************************* */ + /*! + \brief This function sends an acknowledgement + \param[in] \wp{reControl, ISO_ACK_E} + Control iso_u8 of acknowledgement (N)ACK message + \param[in] \wp{ru32ConcernPgn, iso_u32} + PGN which is (N)ACK + \param[in] \wp{u8GroupFunValue, iso_u8} + Group function value + \param[in] \wp{u8Byte5, iso_u8} + Byte 5 of acknowledgement message + \param[in] \wp{rs16HndSender, iso_s16} + Handle of sender + \param[in] \wp{rs16HndReceiver, iso_s16} + Handle of receiver ( or HANDLE_GLOBAL ) + \retval iso_s16 + - #E_NO_ERR on success + */ /* set ISO_DEPRECATED ??? */ + iso_s16 iso_AlPgnAcknowledge( ISO_ACK_E reControl, iso_u32 ru32ConcernPgn, + iso_u8 u8GroupFunValue, iso_u8 u8Byte5, + iso_s16 rs16HndSender, iso_s16 rs16HndReceiver ); + + /*********************************************************************************/ + /*! + \brief Sending of PGNs with specific destination (Command, Response, Groupfun. A) + + This function starts the sending of a PGN to a specific receiver ("OneToOne") \n + In case of more than 8 bytes using of TP or ETP is included. + Not really necessary for new API, only for adaptions to old application interfaces. + + For new applications use iso_DlPgnSend() to work with CF handles. + + \param[in] \wp{u16CanNode, iso_u16} + CAN-bus number 0, 1, ... ( ISO_CAN_NODES - 1 ) + \param[in] \wp{u8Priori, iso_u8} + Priority of PGN (normal default see J1939-71, ISO11783-7,8 ...) \n + Range: 0 - 7 + \param[in] \wp{u32Pgn, iso_u32} + PGN which shall be sended \n + Range: 0 ... 0x3FFFF + \param[in] \wp{u16DataLength, iso_u16} + Number of bytes which are sended + - 0 .. 8 : Single transport + - 9 .. 1785 : Transport protocol is automatic used + - 1786 .. 65536 : Extended transport protocal is automatic used + \param[in] \wpp{pu8Data, const #iso_u8[]} + Pointer to first iso_u8 of data which shall be sended + \param[in] \wp{u8SASender, iso_u8} + Sender source address generally own intern SA \n + Range: 0 - 253 + \param[in] \wp{u8SAReceiver, iso_u8} + Destination source address \n + Range: 0 - 253 + \retval iso_s16 + - #E_NO_ERR Transfer is started + - #E_OVERFLOW Transfers are busy (buffer full) + \note \par + - Attention: data >1785 bytes are not copied into the driver and must be static in appl. + - This function belongs to the data link layer. Therefore its not checked if + the sender of this message is full announced!! + If more than 8 bytes shall be transported (->(E)TP) sender and receiver + must be announced (-> Transport Layer! )\n + - Destination address ISO_GLOBAL_ADDRESS is not allowed \n + Exception: < 9 Bytes and PDU1 Format - One to many + - < 9 Bytes and PDU2 not allowed (PDU2 Specific field overwritten with receiver address!) + */ + ISO_DEPRECATED iso_s16 iso_AlPgnTxSpecificSend ( iso_u16 u16CanNode, + iso_u8 u8Priori, + iso_u32 u32Pgn, + iso_u16 u16DataLength, + const iso_u8 pu8Data[], + iso_u8 u8SASender, + iso_u8 u8SAReceiver + ); + + /* *********************************************************************/ + /*! + \brief Sending of PGNs to global destination (Broadcast, Groupfun. B) + + This function starts the sending of a PGN to a global destination ("OneToMany") \n + In case of more than 8 bytes using of BAM is included. \n + Not really necessary for new API, only for adaptions to old application interfaces. + + For new applications use iso_DlPgnSend() to work with CF handles. + + \param[in] \wp{u16CanNode, iso_u16} + CAN-bus number 0, 1, ... ( ISO_CAN_NODES - 1 ) + \param[in] \wp{u8Priori, iso_u8} + Priority of PGN (normal default see J1939-71, ISO11783-7,8 ...) \n + Range: 0 - 7 + \param[in] \wp{u32Pgn, iso_u32} + PGN which shall be sended \n + Range: 0 ... 0x3FFFF + \param[in] \wp{u16DataLength, iso_u16} + Number of bytes which are sended + - 0 .. 8 : Single transport + - 9 .. 1785 : BAM is automatic used + \param[in] \wp{u8Data, iso_u8*} + Pointer to first iso_u8 of data which shall be sended + \param[in] \wp{u8SASender, iso_u8} + Sender source address generally own intern SA \n + Range: 0 - 253 + \retval iso_s16 + - #E_NO_ERR Transfer is started + - #E_OVERFLOW Transfers are busy (buffer full) + \note \par + This function belongs to the data link layer. Therefore its not checked if + the sender of this message is full announced!! \n + If more than 8 bytes shall be transported (->(E)TP) sender and receiver + must be announced (-> Transport Layer! )\n + */ + ISO_DEPRECATED iso_s16 iso_AlPgnTxBroadcastSend( iso_u16 u16CanNode, + iso_u8 u8Priori, + iso_u32 u32Pgn, + iso_u16 u16DataLength, + const iso_u8 u8Data[], + iso_u8 u8SASender + ); + + /**@}*/ + /* Spn - Initialising, setting and reading of SPNs */ + /** \addtogroup spni SPN Support + \ingroup apla + */ + /**@{*/ + + #ifndef NUMBERSPN_MAX + /** \brief Maximum number of SPNs - predefined with 20 + \details Number of SPNsNumber of PGNs which can be initialised in the revised + application layer which can be initialised in the revised application layer - + SPN-Support deactivation: NUMBERSPN_MAX = 0 -> IsoMnSpn.c must not be compiled */ + #define NUMBERSPN_MAX 20 + #endif /* NUMBERSPN_MAX */ + + /** \brief Enum in order to initialise the analyse of SPN data */ + typedef enum + { + SpnValStandard, /**< See Signal Ranges ISO 11783 Part 7 Tabel 1 - 3 */ + SpnValSpecial, + SpnValUndef + } SPNVALINT_e; + + /* ************************************************************************ */ + /*! + \brief This function initialises a SPN which belongs to a PGN handle. SPN see + parameter definitions in ISO11783-7 Annex A, J1939-71 Annex B and iso_u8- and bitpositions + see ISO11783-7 Annex B, J1939-71 Annex C + + \param[in] \wp{rs16PgnHandle,iso_s16} + Handle of PGN assigned of iso_AlPgnTx(RX)New() + \param[in] \wp{ru32Spn,iso_u32} + SPN + \param[in] \wp{ru16BytePos,iso_u16} + Byteposition of data field of this PGN, 1...n + \param[in] \wp{ru8BitPos,iso_u8} + Bitposition of a iso_u8 of this PGN - allowed values 1 - 8 \n + For (Bit-)Length 8, 16, 24, 32 only bitposition 1 is allowed + \param[in] \wp{ru16BitLength,iso_u16} + (Bit-)Length of parameter - allowed values 1 - 10, 16, 24, 32 + \param[in] \wp{eSpnInterpret,SPNVALINT_e} + - SpnValStandard - normal interpretation of parameter \n + See Signal Ranges ISO 11783 Part 7 Tabel 1 - 3 + - SpnValSpecial - Error or NotAvailable detection switched off + \retval iso_s16 + - #E_NO_ERR on success + - #E_PGN_UNKNOWN PGN of SPN not found + - #E_RANGE Bytepos, Bitpos or Length not supported + */ + iso_s16 iso_SpnDefineSpn( iso_s16 rs16PgnHandle, + iso_u32 ru32Spn, + iso_u16 ru16BytePos, + iso_u8 ru8BitPos, + iso_u16 ru16BitLength, + SPNVALINT_e eSpnInterpret + ); + + /* ************************************************************************** */ + /*! + \brief This function sets a parameter value of a SPN + + \param[in] \wp{rs16PgnHandle, iso_s16} + Handle of PGN assigned of iso_AlPgnTx(RX)New() + \param[in] \wp{ru32Spn, iso_u32} + SPN + \param[in] \wp{u32Write, iso_u16} + New parameter value + \retval iso_s16 + - #E_NO_ERR on success + - #E_PGN_UNKNOWN PGN of SPN not found + - #E_RANGE Bitlength is not supported + */ + iso_s16 iso_SpnDataSet( iso_s16 rs16PgnHandle, iso_u32 ru32Spn, iso_u32 u32Write ); + + + /* ************************************************************************* */ + /*! + \brief This function reads a parameter value of a SPN + + \param[in] \wp{rs16PgnHandle, iso_s16} + Handle of PGN assigned of iso_AlPgnTx(RX)New() + \param[in] \wp{ru32Spn, iso_u32} + SPN + \param[out] \wp{u32Result, iso_u32*} + Value of a SPN + \retval iso_s16 + - Errorcodes: + - #E_PGN_UNKNOWN PGN of SPN not found + - #E_RANGE Bitlength is not supported + - Value information code: + - #E_NO_ERR OK, Value in valid range see Part 7 Table 1 - 3 + - #E_ERROR_INDI Value Error indicator see Part 7 Table 1 - 3 + - #E_NOT_AVAILABLE Value Not Available see Part 7 Table 1 - 3 + */ + + iso_s16 iso_SpnDataRead( iso_s16 rs16PgnHandle, iso_u32 ru32Spn, iso_u32 *u32Result ); + + /* ************************************************************************ */ + /*! + \brief This function reads a parameter value direct with startbit and length + + This function reads parameter direct. It can be used e. g. when data are received in own callbackfunctions. + + \param[in] \wp{u8BitAdr, iso_u8} + StartBitaddress of the SPN - Range 0 - 63 + \param[in] \wp{u8BitLen, iso_u8} + Bitlength - Range: 0 - 32 + \param[in] \wpp{pau8Data, const iso_u8[]} + Pointer to data + \param[out] \wp{pu32Result, iso_u32*} + Value of a parameter (SPN) + \retval iso_s16 + - #E_NO_ERR on success + - #E_OVERFLOW Addressbit or length is wrong \n + */ + iso_s16 iso_SpnDataReadCom( iso_u8 u8BitAdr, iso_u8 u8BitLen, const iso_u8 pau8Data[], iso_u32 *pu32Result ); + + /* ************************************************************************ */ + /*! + \brief DM1, DM2 support: Initialises an array for DM1 or DM2 messages + + \param[in] \wp{pau8Array, iso_u8[]} + Pointer to application array for DTCs + \param[in] \wp{s16ArraySize, iso_s16} + Size of array + \param[in] \wp{ps16NumbOfDTCs, iso_s16*} + + */ + + void iso_SpnDMResetDTC( iso_u8 pau8Array[], iso_s16 s16ArraySize, iso_s16* ps16NumbOfDTCs ); + + /* ************************************************************************ */ + /*! + \brief DM1, DM2 support: Adding a DTC entry into an array + + \param[in] \wp{pau8Array, iso_u8[]} + Pointer to application array for DTCs + \param[in] \wp{s16ArraySize, iso_s16} + Size of array + \param[in] \wp{ps16NumbOfDTCs, iso_s16*} + Pointer to number of DTC entries + \param[in] \wp{u32Spn, iso_u32} + SPN of new entry + \param[in] \wp{u8FMI, iso_u8} + FMI of new entry + \param[in] \wp{u16OccurenceCount, iso_u16} + Occurence counter + \retval iso_s16 + - #E_NO_ERR on success + - #E_OVERFLOW DTC not entried because buffer is to small + */ + iso_s16 iso_SpnDMAddDTC( iso_u8 pau8Array[], iso_s16 s16ArraySize, iso_s16* ps16NumbOfDTCs, + iso_u32 u32Spn, iso_u8 u8FMI, iso_u16 u16OccurenceCount ); + + /**@}*/ + + /* ************************************************************************ */ + /* Interface of the heartbeat client / server */ + /* ************************************************************************ */ + + /** \addtogroup hbapi Heartbeat Client / Server + @{ */ + + /* ************************************************************************ */ + /*! + \brief Enum Heartbeat client events + */ + typedef enum + { + IsoHBC_RequestTimeout, /*!< \brief Heartbeat (HB) server does not answer on request for repetition rate. \n + We do not try again (connection failed) */ + IsoHBC_MessageTimeout, /*!< \brief HB server communication error. \n + Next HB message was not received in time (ISO_HB_MSG_TIME_OUT_FACTOR * "repetition rate"). \n + Client will stay in running state and try to recover. */ + IsoHBC_SequenceError, /*!< \brief More than #ISO_HB_MISSMAX HB message sequence numbers missed. \n + Client will stay in running state and try to recover.*/ + IsoHBC_ServerReset, /*!< \brief HB message sequence number 251 received \n + Client will stay in running state.*/ + IsoHBC_TransmissionError, /*!< \brief HB message sequence number 254 received. \n + Client will stay in running state and try to recover.*/ + IsoHBC_GracefulShutdown, /*!< \brief HB message sequence number 255 received. \n + Client is stopped. */ + IsoHBC_SequenceOperational /*!< \brief HB server is valid */ + } ISO_HBC_EVENT_e; + + + /* ************************************************************************ */ + /*! + \brief Heartbeat client event callback information structure + */ + typedef struct + { + ISO_HBC_EVENT_e eClEvent; /**< \brief Heartbeat client event */ + iso_s16 s16CfHandleClient; /**< \brief CF handle of the internal client which has requested the HB server. */ + iso_s16 s16CfHandleServer; /**< \brief CF handle of the external heartbeat server */ + ISO_USER_PARAM_T userParam; /**< \brief User parameter set with iso_HBClient_Request() */ + } ISO_HBC_EVENT_DATA_Ts; + + /* ************************************************************************ */ + /*! + \brief Type definition of the heartbeat client event callback function. + \details This function must be implemented from the application and given to the HBC with iso_HBClient_Request(). + The function is called from the driver in case of a state change. + The event #IsoHBC_SequenceOperational signals that the requested HB server is valid. + \param[in] \wpp{psClientEventData, const #ISO_HBC_EVENT_DATA_Ts*} + Pointer to the event data / information. + */ + typedef void(*ISO_HBC_CbEvent_t)(const ISO_HBC_EVENT_DATA_Ts* psClientEventData); + + /* ************************************************************************ */ + /*! + \brief Enum Heartbeat server shutdown reason + */ + typedef enum + { + IsoHBS_Stop, /*!< \brief Stop sending heartbeat message immediately and disable server instance */ + IsoHBS_TransmissionError, /*!< \brief Send #ISO_HB_MISSMAX times heartbeat message with "error condition" before disabling the server instance */ + IsoHBS_GracefulShutdown /*!< \brief Send #ISO_HB_MISSMAX times heartbeat message with "not available" before disabling the server instance */ + } ISO_HBS_STOPMODE_e; + + /*! + \brief Enum Heartbeat server shutdown event + */ + typedef enum + { + IsoHBS_EvNone, /*!< \brief event source not used */ + IsoHBS_Stopped /*!< \brief Stopped sending heartbeat messages (server instance shutdown complete) */ + } ISO_HBS_EVENT_e; + + + /* ************************************************************************ */ + /*! + \brief Heartbeat server callback information structure + */ + typedef struct + { + ISO_HBS_EVENT_e eSrvEvent; /**< \brief Heartbeat server event */ + iso_s16 s16CfHandleServer; /**< \brief CF handle of the internal heartbeat server */ + ISO_USER_PARAM_T userParam; /**< \brief User parameter set with iso_HBServer_Install() */ + } ISO_HBS_DATA_Ts; + + + /* ************************************************************************ */ + /*! + \brief Type definition of the heartbeat server callback function. + \details This function can be implemented from the application and given to the HBS with iso_HBServer_Install(). + The function is called from the driver to get the next heartbeat sequence number value from the application. + The driver sends this value without any validations. + \param[in] \wpp{psServerData, const #ISO_HBS_DATA_Ts*} + Pointer to the server information. + \retval iso_u8 + - Heartbeat sequence number \n + Range: 0x00u - 0xFFu + */ + typedef iso_u8 (*ISO_HBS_CbGetSequenceNumber_t)(const ISO_HBS_DATA_Ts* psServerData); + + /* ************************************************************************ */ + /*! + \brief Type definition of the heartbeat server event callback function. + \details This function can be implemented from the application and given to the HBS with iso_HBServer_Install(). + The function is called from the driver to signal the in #ISO_HBS_EVENT_e defined events. + \param[in] \wpp{psServerData, const #ISO_HBS_DATA_Ts*} + Pointer to the server information. + */ + typedef void (*ISO_HBS_CbEvent_t)(const ISO_HBS_DATA_Ts* psServerData); + + /* ************************************************************************** */ + /*! + \brief Function to request the HB message of an external HB server + \details The client and server CF must be fully announced, before the function can be called. + \param[in] \wp{s16CfHandleInternal, iso_s16} + CF handle of the internal user/network member (client) + \param[in] \wp{s16CfHandleServer, iso_s16} + CF handle of an external heartbeat server + \param[in] \wp{u16CtrlInterval, iso_u16} + Needed interval for the heartbeat message in ms (should be 100) + \param[in] \wpp{userParam, const #ISO_USER_PARAM_T} + User parameter value for the callback function calls. \n + Use #ISO_USER_PARAM_DEFAULT if not used/needed. + \param[in] \wp{pfCbClEvent, ISO_HBC_CbEvent_t} + Event callback function, which should be triggered in case of a state change + \retval iso_s16 + - #E_NO_ERR on success + - #E_RANGE on a parameter error + - #E_USER_ERROR if one of the CF handles is invalid or not announced + - #E_OVERFLOW if HB client array is full (#ISO_HBC_MAX entries in use) + */ + iso_s16 iso_HBClient_Request(iso_s16 s16CfHandleInternal, iso_s16 s16CfHandleServer, iso_u16 u16CtrlInterval, + const ISO_USER_PARAM_T userParam, ISO_HBC_CbEvent_t pfCbClEvent); + + /* ************************************************************************** */ + /*! + \brief Function to remove a HB client-server entry + \details The function removes an entry, set with iso_HBClient_Request(), + immediately and independent from the HB client state. + The callback function is not triggered. + \param[in] \wp{s16CfHandleInternal, iso_s16} + CF handle of the internal user/network member (client) + \param[in] \wp{s16CfHandleServer, iso_s16} + CF handle of an external heartbeat server + + - #E_NO_ERR on success + - #E_RANGE on a parameter error + + \par Hints: + It is possible to use #HANDLE_GLOBAL as CF handle for the client and/or the server + to skip the equal check for the parameter. + */ + iso_s16 iso_HBClient_Remove(iso_s16 s16CfHandleInternal, iso_s16 s16CfHandleServer); + + /* ************************************************************************** */ + /*! + \brief Function to setup the heartbeat server functionality for an internal CF. + + \param[in] \wp{s16CfHandleInternal, iso_s16} + CF handle of the internal heartbeat server + \param[in] \wpp{userParam, const #ISO_USER_PARAM_T} + User parameter value for the callback function calls. \n + Use #ISO_USER_PARAM_DEFAULT if not used/needed. + \param[in] \wp{pfCbSvEvent, ISO_HBS_CbEvent_t} + Optional callback function to inform the application + about the #ISO_HBS_EVENT_e defined state changes + or NULL pointer. + \param[in] \wp{pfCbGetSeqNum, ISO_HBS_CbGetSequenceNumber_t} + Optional callback function to allow the application to set + the heartbeat sequence number before sending. + Use a NULL pointer to use the internal sequence number generator. + \param[in] \wp{qRestart, iso_bool} + - #ISO_TRUE if the HB server should be restarted + \retval iso_s16 + - E_NO_ERR on success + - #E_RANGE on a parameter error + - #E_USER_ERROR if s16CfHandleInternal is unknown or in an error state + - #E_OVERFLOW if HB server array is full (#ISO_HBS_MAX entries in use) + - #E_NOACT if shutdown is not finished + */ + iso_s16 iso_HBServer_Install(iso_s16 s16CfHandleInternal, const ISO_USER_PARAM_T userParam, + ISO_HBS_CbEvent_t pfCbSvEvent, ISO_HBS_CbGetSequenceNumber_t pfCbGetSeqNum, iso_bool qRestart); + + /* ************************************************************************** */ + /*! + \brief Function to stop the heartbeat server for an internal CF. + \param[in] \wp{s16CfHandleInternal, iso_s16} + CF handle of the internal heartbeat server + \param[in] \wp{eMode, ISO_HBS_STOPMODE_e} + Reason for stopping the HB server. + \retval iso_s16 + - #E_NO_ERR on success + - #E_RANGE on a parameter error + */ + iso_s16 iso_HBServer_Shutdown(iso_s16 s16CfHandleInternal, ISO_HBS_STOPMODE_e eMode); + + /**@}*/ + + + + /* ************************************************************************ */ + #ifdef __cplusplus + } /* end of extern "C" */ + #endif + + #endif /* DEF_MnApi_H */ + /* ************************************************************************ */ ++>>>>>>> rauch/jobrechner-import-20190607 diff --cc ptxdist/local_src/ecu-jobctl/extern/isobus/IsoMnNiuApi.h index dc9cb14,80cdebc..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-jobctl/extern/isobus/IsoMnNiuApi.h +++ b/ptxdist/local_src/ecu-jobctl/extern/isobus/IsoMnNiuApi.h @@@ -1,981 -1,1004 +1,1988 @@@ ++<<<<<<< HEAD +/* ************************************************************************ */ +/*! + \file + \brief Part 4 - API for the network interconnection unit (NIU) service management + \author Wegscheider Peter + \date Created XX.07.12 + + \copyright Copyright (c) WBZ-Engineering GmbH + + \par History: + \par + 17.07.2012 - author P. Wegscheider + - changes for Doxygen output generation + \par + 04.07.2013 - author P. Wegscheider + - SRL1 Lint code review updates + - Module version define VERSION_NIU added +*/ +/* ************************************************************************ */ + +#ifndef DEF_MnNiu_H + #define DEF_MnNiu_H + +#ifdef __cplusplus +extern "C" { +#endif + +/* ************************************************************************ */ +/*! \ingroup grp_versions + \brief Network Interconnection Unit Module Version +*/ +#define VERSION_NIU 1.1 + +/* ************************************************************************ */ +/* ************************************************************************ */ + +/*! \defgroup niuapi Network Interconnection Unit + \ingroup base + \brief Part 4 - Network interconnection unit service + + This part contains the NIU service configuration and management functions. + + For the module version see \ref grp_versions #VERSION_NIU +*/ + +/*! \defgroup niuconfig NIU-Service Configuration + \ingroup niuapi + \brief NIU-Service definitions for IsoConf.h +*/ + +/*! \defgroup niutypedef NIU-Service Type Definitions + \ingroup niuapi + \brief NIU-Service public defines, structure and enum definitions + + This part contains the structure, enum and type definitions for the NIU-Service management module. +*/ +/* ************************************************************************ */ +/* ************************************************************************ */ + +/* ************************************************************************ */ +/* ************************************************************************ */ +/*! \addtogroup niuapi + @{ + \name Enable NIU-Service Module in IsoConf.h + @{ */ +/* ************************************************************************ */ +#ifdef DOXYGEN +/*! \def _LAY4_ + \brief Add the define _LAY4_ to IsoConf.h to enable the NIU service functionality. + \n Use the defines in the \ref niuconfig "configuration" section to configure the service. +*/ +#define _LAY4_ +#endif +/* ************************************************************************ */ +/*! @} */ +/*! @} */ +/* ************************************************************************ */ +/* ************************************************************************ */ + +/* ************************************************************************ */ +/*! \addtogroup niuconfig + @{ */ +/* ************************************************************************ */ + +/*! \def NIU_MAX_CAN_PORTS + \brief Number of CAN ports, last port number ( default = ISO_CAN_NODES ) + \details Range: 2 .. 14 + The mapping of the NIU internal port numbers to the driver CAN node index is fix.\n + IsoNL_Port_1 has the CAN node index 0, IsoNL_Port_2 has the index 1, ...\n + Port range: IsoNL_Port_1 .. NIU_MAX_CAN_PORTS +*/ +#ifndef NIU_MAX_CAN_PORTS + #define NIU_MAX_CAN_PORTS (ISO_CAN_NODES) +#endif + +/*! \def NIU_MAX_PORT_BINDINGS + \brief Maximum number of possible bindings between CAN ports \n + This value depends on NIU_MAX_CAN_PORTS and can not be changed in the config file. +*/ +#define NIU_MAX_PORT_BINDINGS ( (NIU_MAX_CAN_PORTS * ( NIU_MAX_CAN_PORTS - 1 )) / 2 ) + +/*! \def NIU_MAX_FILTER_DBS + \brief Number of filter databases ( the default is NIU_MAX_PORT_BINDINGS * 2 ) + \details Range: 0 .. NIU_MAX_PORT_BINDINGS * 2 \n + The number of filter databases can not be greater than 182. +*/ +#ifndef NIU_MAX_FILTER_DBS + #define NIU_MAX_FILTER_DBS (NIU_MAX_PORT_BINDINGS * 2) +#endif + +/*! \def NIU_MAX_FILTER_PGN_ENTRIES + \brief Size of the PGN filter array ( the default is NIU_MAX_FILTER_DBS * 100 ) + \details Range: 0 .. 32000 \n + Since the number of PGN entries for a port pair should not be greater than 594, + +*/ +#ifndef NIU_MAX_FILTER_PGN_ENTRIES + #define NIU_MAX_FILTER_PGN_ENTRIES (NIU_MAX_FILTER_DBS * 100) +#endif + +/*! \def NIU_MAX_FILTER_PGN_NAME_ENTRIES + \brief Size of the PGN/Name filter array ( the default is NIU_MAX_FILTER_DBS * 10 ) + \details Range: 0 .. 32000 +*/ +#ifndef NIU_MAX_FILTER_PGN_NAME_ENTRIES + #define NIU_MAX_FILTER_PGN_NAME_ENTRIES (NIU_MAX_FILTER_DBS * 10) +#endif + +/*! \def NIU_MAX_ROUTER_CONNECTIONS + \brief Size of the routing connection array ( the default is NIU_MAX_PORT_BINDINGS * 5 ) +*/ +#ifndef NIU_MAX_ROUTER_CONNECTIONS + #define NIU_MAX_ROUTER_CONNECTIONS (NIU_MAX_PORT_BINDINGS * 5) +#endif + +/*! \def NIU_MAX_MSG_TRANSFERS + \brief Size of the CAN message transfer lookup array ( the default is NIU_MAX_PORT_BINDINGS * 20 ) + \details This array is also used for the PGN/Name max. transfer rate check. +*/ +#ifndef NIU_MAX_MSG_TRANSFERS + #define NIU_MAX_MSG_TRANSFERS (NIU_MAX_PORT_BINDINGS * 20) +#endif + + +/*! \def NIU_CYCLE_TIME + \brief Time in milliseconds between two calls of the NIU management cyclic run function. + \details Range: 0..1000 msec (default: 250). +*/ +#ifndef NIU_CYCLE_TIME + #define NIU_CYCLE_TIME (250L) +#endif + +/*! \def NL_CYCLE_TIME + \brief Time in milliseconds between two calls of the NIU service cyclic run function. + \details Range: 0..200 msec (default: 20). +*/ +#ifndef NL_CYCLE_TIME + #define NL_CYCLE_TIME (20L) +#endif + + +/*! \def NIU_MAX_RESPONSE_BUFFFER + \brief Maximum size of the byte array for building the request response. + \details Default: TP_SIZE_MAX (1785 bytes) +*/ +#ifndef NIU_MAX_RESPONSE_BUFFFER + #define NIU_MAX_RESPONSE_BUFFFER (0x06F9u) +#endif + +#ifdef DOXYGEN +/* Misra # undef NIU_PGN_NAME_MASK_KEY */ +/*! \def NIU_PGN_NAME_MASK_KEY + \brief (Optional) Use PGN && (Name & Mask) as the PGN/Name entry key (the default is PGN && Name). +*/ +#define NIU_PGN_NAME_MASK_KEY +#endif + +/* ************************************************************************ */ +/** \name Configuration parameter (group) + \brief Used with iso_NiuSetParam() and iso_NiuGetParam() +@{ +*/ + +/* ************************************************************************ */ +/** \def NIU_PARAM_BRIDGE_ALL + \brief Bridge: Transfer all CAN messages without checking desination address / port. + \details Default value: NIU_VAL_OFF \n + Set the value for this parameter to NIU_VAL_ON to transfer destination specefic CAN mesages \n + to all ports and not only to the port of the destination cf. Use this option if you want to see all messages on all bridget network segments. \n + If it set to NIU_VAL_OFF the destination specific messages between cf's of one port are not transfert to any other port \n + and destination specific messages between cf's located on two different ports are only transfert to the port of the destination cf. \n + This reduces the busload on the other ports. +*/ +#define NIU_PARAM_BRIDGE_ALL 0u + +/* ************************************************************************ */ +/** \def NIU_PARAM_ROUTE_GLOBAL + \brief Router: Transfer global CAN messages if the source address is a virtual CF on the destination port. + \details Default value: NIU_VAL_OFF \n + Set the value for this parameter to NIU_VAL_ON to transfer the global CAN mesages to the destination port. \n + Only global messages of a cf with a virtual cf on the destination port which have passed the filter for this port pair direction are transfered. \n + Enable this feature if the members of a connection use also PDU2 or other global destination messages for their communication. \n +*/ +#define NIU_PARAM_ROUTE_GLOBAL 1u + +/* ************************************************************************ */ +/** \def NIU_PARAM_ROUTE_FILTER + \brief Router: Filter specific CAN messages between connected CFs. + \details Default value: NIU_VAL_OFF \n + Set the value for this parameter to NIU_VAL_ON to filter CAN mesages between connection members before transfering them to the destination port. \n + If set to NIU_VAL_ON the filter database is also used to filter the destination specific messages for this connection. \n +*/ +#define NIU_PARAM_ROUTE_FILTER 2u + +/** @} */ + +/* ************************************************************************ */ +/** \name Configuration common values + \brief Used with iso_NiuSetParam() and iso_NiuGetParam() +@{ +*/ +#define NIU_VAL_OFF 0x00u /**< \brief Configuration value: 0 = off, disabled, ... */ +#define NIU_VAL_ON 0x01u /**< \brief Configuration value: 1 = on, enabled, ... */ +#define NIU_RET_ERROR 0xFFFFu /**< \brief Get return value: 0xFFFF = value not valid */ +/** @} */ + +/* ************************************************************************ */ +/*! @} */ /* END niuconfig */ +/* ************************************************************************ */ +/* ************************************************************************ */ + +/* ************************************************************************ */ +/** \addtogroup errorhand +@{ +*/ +/*! \name NIU Management specific error handler function numbers + \brief used with the error location numbers M_NIU + @{ */ +#define ISONIU_FUNCTION 0u +#define ISONIU_FN_INIT 1u +#define ISONIU_FN_PROCESS_REQUEST 2u +#define ISONIU_FN_CYCLIC_RUN 3u +/*! @} */ +/*! \name NIU Service specific error handler function numbers + \brief used with the error location numbers M_NL + @{ */ +#define ISONL_FUNCTION 0u +#define ISONL_FN_INIT 1u +#define ISONL_FN_PROCESS_CAN_MSG 2u +#define ISONL_FN_CYCLIC_RUN 3u +#define ISONL_FN_DO_BRIDGING 4u +#define ISONL_FN_DO_ROUTING 5u +#define ISONL_FN_FILTER_MSG 6u +#define ISONL_FN_TRANSMIT_MSG 7u +#define ISONL_FN_UPD_STAT 8u +#define ISONL_FN_TR_TABLE 9u +/*! @} */ +/*! @} */ +/* ************************************************************************ */ + + +/* ************************************************************************ */ +/* ************************************************************************ */ +/*! \addtogroup niutypedef + @{ */ +/* ************************************************************************ */ + + +/* ************************************************************************ */ +/*! \name NIU Mode + \brief NIU CAN message transfer mode between two CAN ports. + @{ */ +#define ISONL_NIU_Disabled 0x00u /**< \brief NIU services is disabled for this port pair. */ +#define ISONL_NIU_Bridge 0x01u /**< \brief NIU services is configured as bridge for this port pair. */ +#define ISONL_NIU_Router 0x02u /**< \brief NIU services is configured as connection router for this port pair. */ +#define ISONL_NIU_Autodetection 0x03u /**< \brief NIU services is configured to autodetect the mode for this port pair. */ +/*! @} */ + +/* ************************************************************************ */ +/*! \name NIU CAN Ports + \brief Part 4 chapter 6.5.3 Port numbers. + @{ */ +/** \def ISONL_Port_Local + \brief "alias" for the port number which receives the CAN message. + \details Used in requests if the external CF does not know the number of the connecting port. +*/ +#define ISONL_Port_Local 0x00u +#define ISONL_Port_1 0x01u /**< \brief NIU CAN port 1. */ +#define ISONL_Port_2 0x02u /**< \brief NIU CAN port 2. */ +#define ISONL_Port_3 0x03u /**< \brief NIU CAN port 3. */ +#define ISONL_Port_4 0x04u /**< \brief NIU CAN port 4. */ +#define ISONL_Port_5 0x05u /**< \brief NIU CAN port 5. */ +#define ISONL_Port_6 0x06u /**< \brief NIU CAN port 6. */ +#define ISONL_Port_7 0x07u /**< \brief NIU CAN port 7. */ +#define ISONL_Port_8 0x08u /**< \brief NIU CAN port 8. */ +#define ISONL_Port_9 0x09u /**< \brief NIU CAN port 9. */ +#define ISONL_Port_10 0x0Au /**< \brief NIU CAN port 10. */ +#define ISONL_Port_11 0x0Bu /**< \brief NIU CAN port 11. */ +#define ISONL_Port_12 0x0Cu /**< \brief NIU CAN port 12. */ +#define ISONL_Port_13 0x0Du /**< \brief NIU CAN port 13. */ +#define ISONL_Port_14 0x0Eu /**< \brief NIU CAN port 14. */ +#define ISONL_Port_Global 0x0Fu /**< \brief Do request for all (from or to) ports. */ +/*! @} */ + +/* ************************************************************************ */ +/*! \name NIU Port Options / Status Defines + \brief NIU data state flags. + @{ */ +#define ISONL_Port_Disabled 0x0000u /**< \brief NIU-Service management are not available for this port */ +#define ISONL_Port_Enabled 0x0001u /**< \brief NIU-Service management are available for this port. */ +/*! @} */ + +/* ************************************************************************ */ +/*! \name NIU States + \brief NIU data state flags. + @{ */ +#define ISONL_State_Active 0x00u /**< \brief Data entry is valid. */ +#define ISONL_State_Modified 0x01u /**< \brief Data entry is modified (added or updated). The entry is valid. */ +#define ISONL_State_Deleted 0x02u /**< \brief Data entry is not valid (marked for deletion). */ +#define ISONL_State_Invalid 0x03u /**< \brief Data entry is not valid. */ +#define ISONL_State_Inprogress 0x04u /**< \brief Data entry is currently not valid. */ +#define ISONL_State_Inactive 0x05u /**< \brief Data entry is disabled. */ +/*! @} */ + + +/* ************************************************************************ */ +/*! \name NIU Filter Modes + @{ */ +#define ISONL_FM_BLOCK_SPECIFIC 0x00u /**< \brief Filter mode: Block-secific PGNs (default = pass all)*/ +#define ISONL_FM_PASS_SPECIFIC 0x01u /**< \brief Filter mode: Pass-secific PGNs (default = block all)*/ +/*! @} */ + +/* ************************************************************************ */ +/*! \name NIU Filter Entry Types + @{ */ +#define ISONL_PGN_ENTRY 0x00u /**< \brief PGN filter DB entry*/ +#define ISONL_PGN_NAME_ENTRY 0x01u /**< \brief PGN/Name filter DB entry*/ +/*! @} */ + +/* ************************************************************************ */ +/*! \name NIU Port Pair Defines + @{ */ +#define ISONL_PP_NULL 0x00u /**< \brief port pair not valid */ +#define ISONL_PP_GLOBAL 0xFFu /**< \brief no specific port pair */ +/*! @} */ + +/* ************************************************************************ */ + +/* ************************************************************************ */ +/*! \name NIU Message Function Code Defines + @{ */ +#define ISONL_FC_REQ_FILTER_DB 0x00u /**< \brief Function code: Request a copy of filter database */ +#define ISONL_FC_RES_FILTER_DB 0x01u /**< \brief Function code: Response to a request for a copy of filter database */ +#define ISONL_FC_ADD_FILTER 0x02u /**< \brief Function code: Request to add an entry to the filter database */ +#define ISONL_FC_DEL_FILTER 0x03u /**< \brief Function code: Request to delete an entry from the filter database */ +#define ISONL_FC_CLEAR_FILTER_DB 0x04u /**< \brief Function code: Request to clear (delete) a filter database */ +#define ISONL_FC_CREATE_FILTER_DB 0x06u /**< \brief Function code: Request to create a filter database */ +#define ISONL_FC_ADD_NAME_FILTER 0x07u /**< \brief Function code: Request to add NAME qualified filter database entries */ + +#define ISONL_FC_REQ_SA_LIST 0x40u /**< \brief Function code: Request a source address list */ +#define ISONL_FC_RES_SA_LIST 0x41u /**< \brief Function code: Response to a request for a source address list */ +#define ISONL_FC_REQ_SA_NAME_LIST 0x42u /**< \brief Function code: Request a source address and NAME list */ +#define ISONL_FC_RES_SA_NAME_LIST 0x43u /**< \brief Function code: Response to a request for a source address and NAME list */ + +#define ISONL_FC_REQ_GENERAL_PARAM 0x80u /**< \brief Function code: Request NIU general parametrics */ +#define ISONL_FC_RES_GENERAL_PARAM 0x81u /**< \brief Function code: Response to a request for NIU general parametrics */ +#define ISONL_FC_RESET_GENERAL 0x82u /**< \brief Function code: Command to reset general statistic parametrics */ +#define ISONL_FC_REQ_SPECIFIC_PARAM 0x83u /**< \brief Function code: Request NIU specific parametrics */ +#define ISONL_FC_RES_SPECIFIC_PARAM 0x84u /**< \brief Function code: Response to a request for NIU specific parametrics */ +#define ISONL_FC_RESET_SPECIFIC 0x85u /**< \brief Function code: Command to reset specific statistic parametrics */ + +#define ISONL_FC_REQ_OPEN_CONN 0xC0u /**< \brief Function code: Request to open connection */ +#define ISONL_FC_RES_OPEN_CONN 0xC2u /**< \brief Function code: Response to request to open connection */ +#define ISONL_FC_REQ_CLOSE_CONN 0xC1u /**< \brief Function code: Request to close connection */ +#define ISONL_FC_RES_CLOSE_CONN 0xC3u /**< \brief Function code: Response to request to close connection */ + +#define ISONL_FC_NONE 0xFFu /**< \brief Function code is not valid */ + +/*! @} */ + +/* ************************************************************************ */ + +/* ************************************************************************ */ +/*! \name NIU Callback Return Value Defines + @{ */ +#define ISONL_RET_ACCEPT 0 /**< \brief Request execution is permitted */ +#define ISONL_RET_CANCEL 1 /**< \brief Request execution is not permitted */ +#define ISONL_RET_NOT_VALID 2 /**< \brief Request parameter are not valid */ +/*! @} */ + +/* ************************************************************************ */ +/*! \name NIU Callback Message Type Value Defines + @{ */ +#define ISONL_MSG_UNKOWN 0x00u /**< \brief message is not valid */ +#define ISONL_MSG_REQUEST 0x01u /**< \brief Request execution permission */ +#define ISONL_MSG_FINISHED 0x02u /**< \brief Request execution is finished */ +/*! @} */ + +/* ************************************************************************ */ +/*! \name NIU Prametric Identifier Defines + @{ */ +#define ISONL_PID_REQ_ALL 0x00u /**< \brief Used to request all statistic parameters */ +#define ISONL_PID_BUFFER_SIZE 0x01u /**< \brief Request buffer size (bytes) */ +#define ISONL_PID_MAX_DB_SIZE 0x02u /**< \brief Request maximum filter database size (bytes) */ +#define ISONL_PID_NO_DB_ENTRIES 0x03u /**< \brief Request number of filter database entries */ +#define ISONL_PID_MAX_MSG_RECEIVED 0x04u /**< \brief Request maximum number of messages, that can be received per second */ +#define ISONL_PID_MAX_MSG_FORWARDED 0x05u /**< \brief Request maximum number of messages, that can be forwarded per second */ +#define ISONL_PID_MAX_MSG_FILTERED 0x06u /**< \brief Request maximum number of messages, that can be filtered per second */ +#define ISONL_PID_MAX_TRANSIT_DELAY 0x07u /**< \brief Request maximum transit delay time (ms) */ +#define ISONL_PID_AVG_TRANSIT_DELAY 0x08u /**< \brief Request average transit delay time (ms) */ +#define ISONL_PID_NO_MSG_OVERFLOW 0x09u /**< \brief Request number of messages lost due to buffer overflow */ +#define ISONL_PID_NO_MSG_EXCESS_DELAY 0x0Au /**< \brief Request number of messages with excess transit delay */ +#define ISONL_PID_AVG_MSG_RECEIVED 0x0Bu /**< \brief Request average number of messages received per second */ +#define ISONL_PID_AVG_MSG_FORWARDED 0x0Cu /**< \brief Request average number of messages forwarded per second */ +#define ISONL_PID_AVG_MSG_FILTERED 0x0Du /**< \brief Request average number of messages filtered per second */ +#define ISONL_PID_UPTIME 0x0Eu /**< \brief Request uptime since last power on reset (seconds) */ +#define ISONL_PID_NO_PORTS 0x0Fu /**< \brief Request number of ports */ +#define ISONL_PID_NIU_TYPE 0x10u /**< \brief Request network interconnection unit type */ +/*! @} */ + +/* ************************************************************************ */ +/*! \name Miscellaneous NIU Defines + @{ */ + +#define ISONL_TR_NO_RATE 0xFFu /**< \brief no transfer rate reduction (PGN/Name filter entry)*/ + +/*! @} */ + +/* ************************************************************************ */ +/*! \brief Port pair status */ +typedef struct +{ + uint16 u16ModeOptions; /**< \brief NIU Mode - Bits 0..1: #ISONL_NIU_Disabled, #ISONL_NIU_Bridge, #ISONL_NIU_Router, #ISONL_NIU_Autodetection */ + uint16 u16Status; /**< \brief NIU Status Bits 0..1: #ISONL_NIU_Disabled, #ISONL_NIU_Bridge, #ISONL_NIU_Router */ + uint8 u8PortPair; /**< \brief Bits 0..3: lower port numer, Bits 4..7: higher port number */ +} ISO_NL_PORTPAIR_STATUS_T; + +/* ************************************************************************ */ +/*! \brief Filter database status */ +typedef struct +{ + uint8 u8State; /*!< \brief Filter database status: On of the NIU data state flags. */ + uint8 u8PortPair; /*!< \brief Bits 0..3: to port, Bits 4..7: from port */ + uint8 u8FilterMode; /**< \brief NIU Filter Mode: #ISONL_FM_BLOCK_SPECIFIC, #ISONL_FM_PASS_SPECIFIC */ + sint16 s16EntryCount; /*!< \brief Number of filter database entries (PGN and PGN/Name). */ +} ISO_NL_FILTER_DB_STATUS_T; + +/* ************************************************************************ */ +/*! \brief Filter database PGN/Name entry */ +typedef struct +{ + uint8 u8State; /*!< \brief Filter entry status: On of the NIU data state flags. */ + uint8 u8EntryType; /*!< \brief Filter entry type value: #ISONL_PGN_ENTRY or #ISONL_PGN_NAME_ENTRY */ + uint8 u8PortPair; /*!< \brief Bits 0..3: to port, Bits 4..7: from port */ + uint32 u32PGN; /*!< \brief PGN: Parameter group name */ + uint8 au8Name[8]; /*!< \brief CF network name */ + uint8 au8NameMask[8]; /*!< \brief CF network name mask */ + uint8 u8MaxTransferRate; /*!< \brief Max messages per second - Range: 1..255 (Default: #ISONL_TR_NO_RATE (255)) */ +} ISO_NL_FILTER_ENTRY_T; + +/* ************************************************************************ */ +/*! \brief Filter database entry */ +typedef struct +{ + uint8 u8State; /*!< \brief Filter database entry state: On of the NIU data state flags. */ + uint8 u8PortPair; /*!< \brief Bits 0..3: to port, Bits 4..7: from port */ + uint8 u8FilterMode; /**< \brief NIU Filter Mode: #ISONL_FM_BLOCK_SPECIFIC, #ISONL_FM_PASS_SPECIFIC */ + sint16 s16EntryCount; /*!< \brief Number of filter database entries (PGN and PGN/Name). */ + ISO_NL_FILTER_ENTRY_T* pasEntries; /*!< \brief Null pointer or pointer to a ISO_NL_FILTER_ENTRY_T array. */ +} ISO_NL_FILTER_DB_T; + + +/* ************************************************************************ */ +/*! \brief Typedef of the callback message data structure. + +*/ +typedef struct +{ + uint8 u8MsgType; /*!< \brief NIU callback message type \n (#ISONL_MSG_REQUEST, #ISONL_MSG_FINISHED) */ + uint8 u8MsgFunctionCode; /*!< \brief NIU message function code */ + uint8 u8PortPair; /*!< \brief Bits 0..3: to port, Bits 4..7: from port */ + + uint8 u8ReceiverPort; /*!< \brief CAN port on which the message received */ + + ISO_TPREP_E eTpStatus; /*!< \brief TP Status */ + ISO_TPINFO_T* psTpInfo; /*!< \brief Pointer to the TP message */ + +} ISO_NL_CBDATA_T; + +/* ************************************************************************ */ + +/* ************************************************************************ */ +/*! \brief Typedef call back function for notifying the application. + + The ISO_NL_CBDATA_t data pointer and the referenced data are only valid during the call back. + If the application return a value unequal to E_NO_ERR the service cancel the current action. + \param[in,out] \wp{psData, ISO_NL_CBDATA_T*} + Pointer to the callback message data. + \retval sint16 +*/ +typedef sint16 (*ISO_NL_CbAppFunc_t)( ISO_NL_CBDATA_T* psData ); + +/* ************************************************************************ */ +/*! \brief Typedef call back function for transmiting CAN Messages + + In the error case the application should return a value unequal to E_NO_ERR. + + \param[in] \wp{u16CanNode, uint16} + CAN node index \n + Range: 0 .. < ISO_CAN_NODES + \param[in] \wp{u32Id, uint32} + CAN message identifier + \param[in] \wp{pau8Data, uint8*} + Pointer to CAN message data array + \param[in] \wp{u8Length, uint8} + Number of CAN message data bytes \n + Range: 0 .. 8 + \retval sint16 + - E_NO_ERR + - E_UNKNOWN_ERR - sending is not possible +*/ +typedef sint16 (*ISO_NL_CbCanMsgSendFunc_t)( uint16 u16CanNode, uint32 u32Id, uint8* pau8Data, uint8 u8Length ); + +/* ************************************************************************ */ +/*! @} */ /* END niutypedef */ +/* ************************************************************************ */ +/* ************************************************************************ */ + +/* ************************************************************************ */ +/* ************************************************************************ */ +/*! \addtogroup niuapi + @{ + \name NIU-Service Initialization + + Use this functions to initialize the NIU Service + @{ +*/ +/* ************************************************************************ */ + +/* ************************************************************************ */ +/*! + \brief This function installs the necessary callback function + \param[in] \wp{pCbAppFunction, ISO_NL_CbAppFunc_t} + Pointer to (callback-)function for notifying the application. + \param[in] \wp{pCbCanMsgSendFunction, ISO_NL_CbCanMsgSendFunc_t} + Pointer to (callback-)function for sendung (transmiting) CAN messages to an other can network. \n + If NULL the standard CAN send callback functions are used. + \retval sint16 + - E_NO_ERR + - E_RANGE - pCbAppFunction is a NULL pointer + - E_CONFIG - NIU module not available + \details Call this function before using any other NIU function. +*/ +/* ************************************************************************ */ +sint16 iso_NiuInit( ISO_NL_CbAppFunc_t pCbAppFunction, ISO_NL_CbCanMsgSendFunc_t pCbCanMsgSendFunction ); + +/* ************************************************************************ */ +/*! \brief Use this function to configure the NIU behavior + \param[in] \wp{u16Param, uint16} + Configuration parameter. + \param[in] \wp{u16Value, uint16} + Configuration parameter value. + \retval sint16 + - E_NO_ERR + - E_RANGE - u16Param is not valid + - E_CONFIG - NIU module not available + + \par Sample: + \code + sint16 s16Ret = E_NO_ERR; + + s16Ret = iso_NiuSetParam( NIU_PARAM_BRIDGE_ALL, NIU_VAL_OFF ); + s16Ret = iso_NiuSetParam( NIU_PARAM_ROUTE_GLOBAL, NIU_VAL_ON ); + s16Ret = iso_NiuSetParam( NIU_PARAM_ROUTE_FILTER, NIU_VAL_OFF ); + \endcode +*/ +sint16 iso_NiuSetParam( uint16 u16Param, uint16 u16Value ); + +/* ************************************************************************ */ +/*! \brief This function returns the configured value for given parameter + \param[in] \wp{u16Param, uint16} + Configuration parameter. + \retval uint16 + - NIU_RET_ERROR in case of an error (u16Param is not valid) + - Configuration parameter value +*/ +uint16 iso_NiuGetParam( uint16 u16Param ); + + +/* ************************************************************************ */ +/*! @} */ +/*! @} */ +/* ************************************************************************ */ +/* ************************************************************************ */ + +/* ************************************************************************ */ +/* ************************************************************************ */ +/*! \addtogroup niuapi + @{ + \name NIU-Service Configuration + + Use this functions to configure the NIU Service ports and bindings + @{ +*/ +/* ************************************************************************ */ + +/* ************************************************************************ */ +/*! \brief Configure the binding between two NIU CAN ports + \param[in] \wp{u8PortPair, uint8} + Valid port pair. + \param[in] \wp{u16ModeOptions, uint16} + NIU type for this binding - Values: + - ISONL_NIU_Disabled + - ISONL_NIU_Bridge + - ISONL_NIU_Router + - ISONL_NIU_Autodetection + \retval sint16 E_NO_ERR or E_RANGE + + \details Use this function to enable the NIU functionality between two CAN ports. \n + The port binding between two ports has no direction. \n + The binding between #ISONL_Port_2 and #ISONL_Port_1 is equal to \n + the binding between #ISONL_Port_1 and #ISONL_Port_2. + + \par Sample: + Configure the binding between the CAN ports ISONL_Port_1 and ISONL_Port_2 + as bridge without message filtering ("Repeater Mode"): + \code + sint16 s16Ret; + uint16 u16ModeOptions; + uint8 u8PortPair; + ISO_NL_FILTER_DB_T sFilterDB; + + u8PortPair = iso_NiuBuildPortPair( ISONL_Port_2, ISONL_Port_1 ); + u16ModeOptions = ISONL_NIU_Bridge; + s16Ret = iso_NiuSetPortBinding( u8PortPair, u16ModeOptions ); + if( s16Ret == E_NO_ERR ) + { + u8PortPair = iso_NiuBuildPortPair( ISONL_Port_1, ISONL_Port_2 ); + s16Ret = iso_NiuBuildFilterDB( & sFilterDB, u8PortPair, ISONL_FM_BLOCK_SPECIFIC ); + s16Ret |= iso_NiuSetFilterDB( & sFilterDB ); + + u8PortPair = iso_NiuBuildPortPair( ISONL_Port_2, ISONL_Port_1 ); + s16Ret |= iso_NiuBuildFilterDB( & sFilterDB, u8PortPair, ISONL_FM_BLOCK_SPECIFIC ); + s16Ret |= iso_NiuSetFilterDB( & sFilterDB ); + + if( s16Ret != E_NO_ERR ) + { + s16Ret = iso_NiuSetPortBinding( u8PortPair, ISONL_NIU_Disabled ); + } + } + \endcode +*/ +sint16 iso_NiuSetPortBinding( uint8 u8PortPair, uint16 u16ModeOptions); + +/* ************************************************************************ */ +/*! \brief Get the status of the binding between two NIU CAN ports + \param[in] \wp{u8PortPair, uint8} + Valid port pair. + \param[in,out] \wp{psStatus, ISO_NL_PORTPAIR_STATUS_T*} + Pointer to the status structure + \retval sint16 E_NO_ERR or E_RANGE +*/ +sint16 iso_NiuGetStatus( uint8 u8PortPair, ISO_NL_PORTPAIR_STATUS_T* psStatus ); + + +/* ************************************************************************ */ +/*! \brief Set the NIU-Service management member (CF) for a valid port + + \param[in] \wp{u8Port, uint8} + Valid port pair. + \param[in] \wp{u16Options, uint16} + #ISONL_Port_Enabled, #ISONL_Port_Disabled + \param[in] \wp{u16WishedSA, uint16} + CF source address + \param[in] \wpp{pau8Name, const #uint8 []} + Pointer to the CF name ( 8 byte array ) + + \retval sint16 E_NO_ERR, E_RANGE or E_OVERFLOW if the user list is full + + \details The function enables the external NIU management for a port. \n + The NIU also announce the CF on the network. + +*/ +sint16 iso_NiuSetPortMember( uint8 u8Port, uint16 u16Options, uint16 u16WishedSA, const uint8 pau8Name[] ); + +/* ************************************************************************ */ +/*! \brief Set the NIU-Service management member (CF) for a valid port + \param[in] \wp{u8Port, uint8} + Valid port pair. + \param[in] \wp{u16Options, uint16} + #ISONL_Port_Enabled, #ISONL_Port_Disabled + \param[in] \wp{s16MnHandle, sint16} + Valid CF member handle + \retval sint16 E_NO_ERR or E_RANGE + + \details The function enables the external NIU management for a port. \n + The CF must be already announced. +*/ +sint16 iso_NiuSetPortToMember( uint8 u8Port, uint16 u16Options, sint16 s16MnHandle ); + +/* ************************************************************************ */ +/*! \brief Returns the NIU-Service management member handle for a given port + \param[in] \wp{u8Port, uint8} + Valid port. +\retval sint16 CAN network member handle or HANDLE_UNVALID in case of an error +*/ +sint16 iso_NiuGetPortMember( uint8 u8Port ); + +/* ************************************************************************ */ +/*! @} */ +/*! @} */ +/* ************************************************************************ */ +/* ************************************************************************ */ + +/* ************************************************************************ */ +/* ************************************************************************ */ +/*! \addtogroup niuapi + @{ + \name NIU-Service Filter Management Functions + \brief Use this functions to manage the filter databases + \details Make shure that you setup always two filter databases + for one port binding (One for each direction). + + @{ +*/ +/* ************************************************************************ */ + +/* ************************************************************************ */ +/*! \brief Get the filter database entry for a valid port pair + \param[in] \wp{u8PortPair, uint8} + Valid port pair. + \param[out] \wp{psFilterDB, ISO_NL_FILTER_DB_T*} + Pointer to a filter DB entry structure. + \retval sint16 E_NO_ERR or E_RANGE + + \details The function fills a ISO_NL_FILTER_DB_T structure with the current filter DB settings for the given port pair. + + \par Sample: + Get the filter database settings for filtering CAN message from ISONL_Port_2 to ISONL_Port_1 + \code + sint16 s16Ret; + uint8 u8PortPair; + ISO_NL_FILTER_DB_T sFilterDB; + + u8PortPair = iso_NiuBuildPortPair( ISONL_Port_2, ISONL_Port_1 ); + s16Ret = iso_NiuGetFilterDB( u8PortPair, & sFilterDB ); + if( s16Ret == E_NO_ERR ) + { + app_SaveNiuFilterDB( & sFilterDB ); + } + \endcode + +*/ +sint16 iso_NiuGetFilterDB( uint8 u8PortPair, ISO_NL_FILTER_DB_T* psFilterDB); + +/* ************************************************************************ */ +/*! \brief Get the current number of filter database entries. + \retval sint16 Number of filter database entries or E_CONFIG. +*/ +sint16 iso_NiuGetFilterDBCount( void ); + +/* ************************************************************************ */ +/*! \brief Get the filter database entry for a valid index + \param[in] \wp{s16Index, sint16} + Valid array index. \n + Range: 0 .. iso_NiuGetFilterDBCount() - 1 + \param[out] \wp{psFilterDB, ISO_NL_FILTER_DB_T*} + Pointer to a filter DB entry structure. + \retval sin16 E_NO_ERR or E_RANGE + + \details The function fills a ISO_NL_FILTER_DB_T structure with the current filter DB settings for the given port pair. + + \par Sample: + Get all filter databases for saving... + \code + sint16 s16I, s16C, s16Ret; + ISO_NL_FILTER_DB_T sDB; + + s16C = iso_NiuGetFilterDBCount(); + for( s16I=0; s16I < s16C; i++ ) + { + sDB. pasEntries = ISO_NULL_PTR; + s16Ret = iso_NiuGetFilterDBfromIndex( s16I, & sDB ); + if( s16Ret == E_NO_ERR ) + { + app_SaveNiuFilterDB( & sDB ); + } + } + \endcode +*/ +sint16 iso_NiuGetFilterDBfromIndex( sint16 s16Index, ISO_NL_FILTER_DB_T* psFilterDB); + +/* ************************************************************************ */ +/*! \brief Get the filter database status for a valid port pair + \param[in] \wp{u8PortPair, uint8} + Valid port pair. + \param[out] \wp{psStatus, ISO_NL_FILTER_DB_STATUS_T*} + Pointer to a filter DB status structure. + \retval sint16 E_NO_ERR or E_RANGE +*/ +sint16 iso_NiuGetFilterDBStatus( uint8 u8PortPair, ISO_NL_FILTER_DB_STATUS_T* psStatus); + +/* ************************************************************************ */ +/*! \brief Set the filter database entry for a valid port pair + \param[in] \wpp{psFilterDB, const #ISO_NL_FILTER_DB_T*} + Pointer to a filter DB entry structure. + \retval sint16 E_NO_ERR, E_RANGE, E_CONFIG + + \details This function configures the filter database settings for the given port pair. + See iso_NiuSetPortBinding() for a simple exsample. + +*/ +sint16 iso_NiuSetFilterDB( const ISO_NL_FILTER_DB_T* psFilterDB); + +/* ************************************************************************ */ + +/* ************************************************************************ */ +/*! \brief Get the PGN or PGN/Name filter entry for a valid index + \param[in] \wp{u8PortPair, uint8} + Valid port pair or ISONL_PP_GLOBAL. + \param[in] \wp{s16Index, sint16} + Index of the PGN filter entry. \n + Range: 0 <= s16Index < iso_NiuGetFilterEntryCount( u8PortPair ) + \param[out] \wp{psFilterEntry, ISO_NL_FILTER_ENTRY_T*} + Pointer to a PGN filter entry structure. + \retval sint16 E_NO_ERR, E_RANGE or E_CONFIG + + \details todo... + +*/ +sint16 iso_NiuGetFilterEntry( uint8 u8PortPair, sint16 s16Index, ISO_NL_FILTER_ENTRY_T* psFilterEntry); + +/* ************************************************************************ */ +/*! \brief Returns the current number of filter entries in the PGN table for a given port pair. + \param[in] \wp{u8PortPair, uint8} + Valid port pair or ISONL_PP_GLOBAL to get the number of all entries. + \retval sint16 Number of PGN and PGN/Name filter entries or E_RANGE. +*/ +sint16 iso_NiuGetFilterEntryCount( uint8 u8PortPair); + +/* ************************************************************************ */ +/*! \brief Set a PGN or PGN/Name filter entry for a valid port pair + \param[in] \wpp{psFilterEntry, const #ISO_NL_FILTER_ENTRY_T*} + Pointer to a vaild PGN filter entry structure. + \retval sint16 + - E_RANGE or E_CONFIG in case of an error + - 0 Entry updated or already deleted + - 1 Entry created or deleted +*/ +sint16 iso_NiuSetFilterEntry( const ISO_NL_FILTER_ENTRY_T* psFilterEntry); + +/* ************************************************************************ */ +/*! @} */ +/*! @} */ +/* ************************************************************************ */ +/* ************************************************************************ */ + +/* ************************************************************************ */ +/* ************************************************************************ */ +/*! \addtogroup niuapi + @{ + \name NIU-Service Parametrics Management Functions + \brief Use this functions to manage the status and statistics values. + @{ +*/ +/* ************************************************************************ */ + +/* ************************************************************************ */ +/*! \brief Get the statistic value of a prametric identifier for a given port pair + \param[in] \wp{u8PortPair, uint8} + Valid port pair or #ISONL_PP_GLOBAL. + \param[in] \wp{u8ParamID, uint8} + Valid prametric identifier (#ISONL_PID_REQ_ALL is not allowed). + + \retval uint32 Value of the parametric identifier or 0xFFFFFFFFuL if not available. +*/ +uint32 iso_NiuGetStatistic( uint8 u8PortPair, uint8 u8ParamID); + +/* ************************************************************************ */ +/*! \brief Set the statistic value of a prametric identifier for a given port pair + \param[in] \wp{u8PortPair, uint8} + Valid port pair or #ISONL_PP_GLOBAL. + \param[in] \wp{u8ParamID, uint8} + Valid prametric identifier (#ISONL_PID_REQ_ALL is not allowed). + \param[in] \wp{u32Value, uint32} + Value of the parametric identifier. + + \retval sint16 E_NO_ERR or ISONL_RET_NOT_VALID +*/ +sint16 iso_NiuSetStatistic( uint8 u8PortPair, uint8 u8ParamID, uint32 u32Value); + +/* ************************************************************************ */ +/*! \brief Reset the reset able statistic values for a given port pair + \param[in] \wp{u8PortPair, uint8} + Valid port pair. + + \retval sint16 E_NO_ERR or ISONL_RET_NOT_VALID +*/ +sint16 iso_NiuResetStatistic( uint8 u8PortPair ); + +/* ************************************************************************ */ +/*! @} */ +/*! @} */ +/* ************************************************************************ */ +/* ************************************************************************ */ + +/* ************************************************************************ */ +/* ************************************************************************ */ +/*! \addtogroup niuapi + @{ + \name NIU-Helper Functions + \ingroup niuapi + @{ +*/ +/* ************************************************************************ */ + +/* ************************************************************************ */ +/*! \brief Build the port pair value for the two CAN ports numbers. + \param[in] \wp{fromPort, uint8} + Valid source port number. + \param[in] \wp{toPort, uint8} + Valid destination port number. + \retval uint8 port pair +*/ +uint8 iso_NiuBuildPortPair( uint8 fromPort, uint8 toPort ); + +/* ************************************************************************ */ +/*! \brief Build / Intialize the filter database entry structue + \param[in,out] \wp{psFilterDB, ISO_NL_FILTER_DB_T*} + Pointer to a filter DB entry structure. + \param[in] \wp{u8PortPair, uint8} + Valid port pair. + \param[in] \wp{u8FilterMode, uint8} + #ISONL_FM_BLOCK_SPECIFIC or #ISONL_FM_PASS_SPECIFIC. + \retval sint16 E_NO_ERR, E_RANGE +*/ +sint16 iso_NiuBuildFilterDB( ISO_NL_FILTER_DB_T* psFilterDB, uint8 u8PortPair, uint8 u8FilterMode ); + +/* ************************************************************************ */ +/*! \brief Build / Intialize a PGN filter entry sturcture. + \param[in,out] \wp{psFilterEntry, ISO_NL_FILTER_ENTRY_T*} + Pointer to a vaild PGN filter entry structure. + \param[in] \wp{u8PortPair, uint8} + Valid port pair. + \param[in] \wp{u32PGN, uint32} + Valid parameter group number . + \retval sint16 E_NO_ERR +*/ +sint16 iso_NiuBuildPGNEntry(ISO_NL_FILTER_ENTRY_T* psFilterEntry, uint8 u8PortPair, uint32 u32PGN); + +/* ************************************************************************ */ +/*! \brief Build / Intialize a PGN/Name filter entry sturcture. + \param[in,out] \wp{psFilterEntry, ISO_NL_FILTER_ENTRY_T*} + Pointer to a vaild PGN filter entry structure. + \param[in] \wp{u8PortPair, uint8} + Valid port pair. + \param[in] \wp{u32PGN, uint32} + Valid parameter group number. + \param[in] \wpp{pau8Name, const uint8 []} + Pointer to a valid CF NAME array. + \param[in] \wpp{pau8Mask, const uint8 []} + Pointer to a valid NAME mask array. + \retval sint16 E_NO_ERR +*/ +sint16 iso_NiuBuildPGNNameEntry( ISO_NL_FILTER_ENTRY_T* psFilterEntry, uint8 u8PortPair, uint32 u32PGN, + const uint8 pau8Name[], const uint8 pau8Mask[]); + + +/* ************************************************************************ */ +/*! @} */ +/*! @} */ +/* ************************************************************************ */ +/* ************************************************************************ */ + +#ifdef __cplusplus +} /* end of extern "C" */ +#endif + +#endif /* DEF_MnNiu_H */ + +/* ************************************************************************ */ ++======= + /* ************************************************************************ */ + /*! + \file + \brief Part 4 - API for the network interconnection unit (NIU) service management + \author Wegscheider Peter + \date Created XX.07.12 + + \copyright Competence Center ISOBUS e.V. + + \par History: + \par + 17.07.2012 - author P. Wegscheider + - changes for Doxygen output generation + \par + 04.07.2013 - author P. Wegscheider + - SRL1 Lint code review updates + - Module version define VERSION_NIU added + \par + 06.05.2018 - author P.Wegscheider + - Feature ID 3910: header files should include header files they depend on + \par + 12.06.2018 -author P.Wegscheider + - Feature request ID 8459: use iso_u8 for ISOBUS addresses in API + \par + 14.06.2018 -author P.Wegscheider + - Feature request ID 8424: use ISO_CF_NAME_T in API functions + \par + 10.08.2018 - author P. Wegscheider + - BugID 8581: add "namespace ISOBUSDRIVER" to header files + */ + /* ************************************************************************ */ + + #ifndef DEF_MnNiu_H + #define DEF_MnNiu_H + + /* include configuration, driver standard types and common definitions */ + #include "IsoCommonDef.h" + + #ifdef __cplusplus + extern "C" { + #endif + + /* ************************************************************************ */ + /*! \ingroup grp_versions + \brief Network Interconnection Unit Module Version + */ + #define VERSION_NIU 1.2 /* changed for v09.00 */ + + /* ************************************************************************ */ + /* ************************************************************************ */ + + /*! \defgroup niuapi Network Interconnection Unit + \ingroup core + \brief Part 4 - Network interconnection unit service + + This part contains the NIU service configuration and management functions. + + For the module version see \ref grp_versions #VERSION_NIU + */ + + /*! \defgroup niuconfig NIU-Service Configuration + \ingroup niuapi + \brief NIU-Service definitions for IsoConf.h + */ + + /*! \defgroup niutypedef NIU-Service Type Definitions + \ingroup niuapi + \brief NIU-Service public defines, structure and enum definitions + + This part contains the structure, enum and type definitions for the NIU-Service management module. + */ + /* ************************************************************************ */ + /* ************************************************************************ */ + + /* ************************************************************************ */ + /* ************************************************************************ */ + /*! \addtogroup niuapi + @{ + \name Enable NIU-Service Module in IsoConf.h + @{ */ + /* ************************************************************************ */ + #ifdef DOXYGEN + /*! \def _LAY4_ + \brief Add the define _LAY4_ to IsoConf.h to enable the NIU service functionality. + \n Use the defines in the \ref niuconfig "configuration" section to configure the service. + */ + #define _LAY4_ + #endif + /* ************************************************************************ */ + /*! @} */ + /*! @} */ + /* ************************************************************************ */ + /* ************************************************************************ */ + + /* ************************************************************************ */ + /*! \addtogroup niuconfig + @{ */ + /* ************************************************************************ */ + + /*! \def NIU_MAX_CAN_PORTS + \brief Number of CAN ports, last port number ( default = ISO_CAN_NODES ) + \details Range: 2 .. 14 + The mapping of the NIU internal port numbers to the driver CAN node index is fix.\n + IsoNL_Port_1 has the CAN node index 0, IsoNL_Port_2 has the index 1, ...\n + Port range: IsoNL_Port_1 .. NIU_MAX_CAN_PORTS + */ + #ifndef NIU_MAX_CAN_PORTS + #define NIU_MAX_CAN_PORTS (ISO_CAN_NODES) + #endif + + /*! \def NIU_MAX_PORT_BINDINGS + \brief Maximum number of possible bindings between CAN ports \n + This value depends on NIU_MAX_CAN_PORTS and can not be changed in the config file. + */ + #define NIU_MAX_PORT_BINDINGS ( (NIU_MAX_CAN_PORTS * ( NIU_MAX_CAN_PORTS - 1 )) / 2 ) + + /*! \def NIU_MAX_FILTER_DBS + \brief Number of filter databases ( the default is NIU_MAX_PORT_BINDINGS * 2 ) + \details Range: 0 .. NIU_MAX_PORT_BINDINGS * 2 \n + The number of filter databases can not be greater than 182. + */ + #ifndef NIU_MAX_FILTER_DBS + #define NIU_MAX_FILTER_DBS (NIU_MAX_PORT_BINDINGS * 2) + #endif + + /*! \def NIU_MAX_FILTER_PGN_ENTRIES + \brief Size of the PGN filter array ( the default is NIU_MAX_FILTER_DBS * 100 ) + \details Range: 0 .. 32000 \n + Since the number of PGN entries for a port pair should not be greater than 594, + + */ + #ifndef NIU_MAX_FILTER_PGN_ENTRIES + #define NIU_MAX_FILTER_PGN_ENTRIES (NIU_MAX_FILTER_DBS * 100) + #endif + + /*! \def NIU_MAX_FILTER_PGN_NAME_ENTRIES + \brief Size of the PGN/Name filter array ( the default is NIU_MAX_FILTER_DBS * 10 ) + \details Range: 0 .. 32000 + */ + #ifndef NIU_MAX_FILTER_PGN_NAME_ENTRIES + #define NIU_MAX_FILTER_PGN_NAME_ENTRIES (NIU_MAX_FILTER_DBS * 10) + #endif + + /*! \def NIU_MAX_ROUTER_CONNECTIONS + \brief Size of the routing connection array ( the default is NIU_MAX_PORT_BINDINGS * 5 ) + */ + #ifndef NIU_MAX_ROUTER_CONNECTIONS + #define NIU_MAX_ROUTER_CONNECTIONS (NIU_MAX_PORT_BINDINGS * 5) + #endif + + /*! \def NIU_MAX_MSG_TRANSFERS + \brief Size of the CAN message transfer lookup array ( the default is NIU_MAX_PORT_BINDINGS * 20 ) + \details This array is also used for the PGN/Name max. transfer rate check. + */ + #ifndef NIU_MAX_MSG_TRANSFERS + #define NIU_MAX_MSG_TRANSFERS (NIU_MAX_PORT_BINDINGS * 20) + #endif + + + /*! \def NIU_CYCLE_TIME + \brief Time in milliseconds between two calls of the NIU management cyclic run function. + \details Range: 0..1000 msec (default: 250). + */ + #ifndef NIU_CYCLE_TIME + #define NIU_CYCLE_TIME (250L) + #endif + + /*! \def NL_CYCLE_TIME + \brief Time in milliseconds between two calls of the NIU service cyclic run function. + \details Range: 0..200 msec (default: 20). + */ + #ifndef NL_CYCLE_TIME + #define NL_CYCLE_TIME (20L) + #endif + + + /*! \def NIU_MAX_RESPONSE_BUFFFER + \brief Maximum size of the iso_u8 array for building the request response. + \details Default: TP_SIZE_MAX (1785 bytes) + */ + #ifndef NIU_MAX_RESPONSE_BUFFFER + #define NIU_MAX_RESPONSE_BUFFFER (0x06F9u) + #endif + + #ifdef DOXYGEN + /* Misra # undef NIU_PGN_NAME_MASK_KEY */ + /*! \def NIU_PGN_NAME_MASK_KEY + \brief (Optional) Use PGN && (Name & Mask) as the PGN/Name entry key (the default is PGN && Name). + */ + #define NIU_PGN_NAME_MASK_KEY + #endif + + /* ************************************************************************ */ + /** \name Configuration parameter (group) + \brief Used with iso_NiuSetParam() and iso_NiuGetParam() + @{ + */ + + /* ************************************************************************ */ + /** \def NIU_PARAM_BRIDGE_ALL + \brief Bridge: Transfer all CAN messages without checking desination address / port. + \details Default value: NIU_VAL_OFF \n + Set the value for this parameter to NIU_VAL_ON to transfer destination specefic CAN mesages \n + to all ports and not only to the port of the destination cf. Use this option if you want to see all messages on all bridget network segments. \n + If it set to NIU_VAL_OFF the destination specific messages between cf's of one port are not transfert to any other port \n + and destination specific messages between cf's located on two different ports are only transfert to the port of the destination cf. \n + This reduces the busload on the other ports. + */ + #define NIU_PARAM_BRIDGE_ALL 0u + + /* ************************************************************************ */ + /** \def NIU_PARAM_ROUTE_GLOBAL + \brief Router: Transfer global CAN messages if the source address is a virtual CF on the destination port. + \details Default value: NIU_VAL_OFF \n + Set the value for this parameter to NIU_VAL_ON to transfer the global CAN mesages to the destination port. \n + Only global messages of a cf with a virtual cf on the destination port which have passed the filter for this port pair direction are transfered. \n + Enable this feature if the members of a connection use also PDU2 or other global destination messages for their communication. \n + */ + #define NIU_PARAM_ROUTE_GLOBAL 1u + + /* ************************************************************************ */ + /** \def NIU_PARAM_ROUTE_FILTER + \brief Router: Filter specific CAN messages between connected CFs. + \details Default value: NIU_VAL_OFF \n + Set the value for this parameter to NIU_VAL_ON to filter CAN mesages between connection members before transfering them to the destination port. \n + If set to NIU_VAL_ON the filter database is also used to filter the destination specific messages for this connection. \n + */ + #define NIU_PARAM_ROUTE_FILTER 2u + + /** @} */ + + /* ************************************************************************ */ + /** \name Configuration common values + \brief Used with iso_NiuSetParam() and iso_NiuGetParam() + @{ + */ + #define NIU_VAL_OFF 0x00u /**< \brief Configuration value: 0 = off, disabled, ... */ + #define NIU_VAL_ON 0x01u /**< \brief Configuration value: 1 = on, enabled, ... */ + #define NIU_RET_ERROR 0xFFFFu /**< \brief Get return value: 0xFFFF = value not valid */ + /** @} */ + + /* ************************************************************************ */ + /*! @} */ /* END niuconfig */ + /* ************************************************************************ */ + /* ************************************************************************ */ + #if defined(CCI_USE_NAMESPACE) && defined(__cplusplus) + #include "IsoMnNiuApi.hpp" + #else /* not: defined(CCI_USE_NAMESPACE) && defined(__cplusplus) -> use C defines */ + + /* ************************************************************************ */ + /** \addtogroup errorhand + @{ + */ + /*! \name NIU Management specific error handler function numbers + \brief used with the error location numbers M_NIU + @{ */ + #define ISONIU_FUNCTION 0u + #define ISONIU_FN_INIT 1u + #define ISONIU_FN_PROCESS_REQUEST 2u + #define ISONIU_FN_CYCLIC_RUN 3u + /*! @} */ + /*! \name NIU Service specific error handler function numbers + \brief used with the error location numbers M_NL + @{ */ + #define ISONL_FUNCTION 0u + #define ISONL_FN_INIT 1u + #define ISONL_FN_PROCESS_CAN_MSG 2u + #define ISONL_FN_CYCLIC_RUN 3u + #define ISONL_FN_DO_BRIDGING 4u + #define ISONL_FN_DO_ROUTING 5u + #define ISONL_FN_FILTER_MSG 6u + #define ISONL_FN_TRANSMIT_MSG 7u + #define ISONL_FN_UPD_STAT 8u + #define ISONL_FN_TR_TABLE 9u + /*! @} */ + /*! @} */ + /* ************************************************************************ */ + #endif /* not: defined(CCI_USE_NAMESPACE) && defined(__cplusplus) */ + + + /* ************************************************************************ */ + /* ************************************************************************ */ + /*! \addtogroup niutypedef + @{ */ + /* ************************************************************************ */ + #if defined(CCI_USE_NAMESPACE) && defined(__cplusplus) + /* IsoMnNiuApi.hpp is already included above */ + #else /* not: defined(CCI_USE_NAMESPACE) && defined(__cplusplus) -> use C defines */ + + /* ************************************************************************ */ + /*! \name NIU Mode + \brief NIU CAN message transfer mode between two CAN ports. + @{ */ + #define ISONL_NIU_Disabled 0x00u /**< \brief NIU services is disabled for this port pair. */ + #define ISONL_NIU_Bridge 0x01u /**< \brief NIU services is configured as bridge for this port pair. */ + #define ISONL_NIU_Router 0x02u /**< \brief NIU services is configured as connection router for this port pair. */ + #define ISONL_NIU_Autodetection 0x03u /**< \brief NIU services is configured to autodetect the mode for this port pair. */ + /*! @} */ + + /* ************************************************************************ */ + /*! \name NIU CAN Ports + \brief Part 4 chapter 6.5.3 Port numbers. + @{ */ + /** \def ISONL_Port_Local + \brief "alias" for the port number which receives the CAN message. + \details Used in requests if the external CF does not know the number of the connecting port. + */ + #define ISONL_Port_Local 0x00u + #define ISONL_Port_1 0x01u /**< \brief NIU CAN port 1. */ + #define ISONL_Port_2 0x02u /**< \brief NIU CAN port 2. */ + #define ISONL_Port_3 0x03u /**< \brief NIU CAN port 3. */ + #define ISONL_Port_4 0x04u /**< \brief NIU CAN port 4. */ + #define ISONL_Port_5 0x05u /**< \brief NIU CAN port 5. */ + #define ISONL_Port_6 0x06u /**< \brief NIU CAN port 6. */ + #define ISONL_Port_7 0x07u /**< \brief NIU CAN port 7. */ + #define ISONL_Port_8 0x08u /**< \brief NIU CAN port 8. */ + #define ISONL_Port_9 0x09u /**< \brief NIU CAN port 9. */ + #define ISONL_Port_10 0x0Au /**< \brief NIU CAN port 10. */ + #define ISONL_Port_11 0x0Bu /**< \brief NIU CAN port 11. */ + #define ISONL_Port_12 0x0Cu /**< \brief NIU CAN port 12. */ + #define ISONL_Port_13 0x0Du /**< \brief NIU CAN port 13. */ + #define ISONL_Port_14 0x0Eu /**< \brief NIU CAN port 14. */ + #define ISONL_Port_Global 0x0Fu /**< \brief Do request for all (from or to) ports. */ + /*! @} */ + + /* ************************************************************************ */ + /*! \name NIU Port Options / Status Defines + \brief NIU data state flags. + @{ */ + #define ISONL_Port_Disabled 0x0000u /**< \brief NIU-Service management are not available for this port */ + #define ISONL_Port_Enabled 0x0001u /**< \brief NIU-Service management are available for this port. */ + /*! @} */ + + /* ************************************************************************ */ + /*! \name NIU States + \brief NIU data state flags. + @{ */ + #define ISONL_State_Active 0x00u /**< \brief Data entry is valid. */ + #define ISONL_State_Modified 0x01u /**< \brief Data entry is modified (added or updated). The entry is valid. */ + #define ISONL_State_Deleted 0x02u /**< \brief Data entry is not valid (marked for deletion). */ + #define ISONL_State_Invalid 0x03u /**< \brief Data entry is not valid. */ + #define ISONL_State_Inprogress 0x04u /**< \brief Data entry is currently not valid. */ + #define ISONL_State_Inactive 0x05u /**< \brief Data entry is disabled. */ + /*! @} */ + + + /* ************************************************************************ */ + /*! \name NIU Filter Modes + @{ */ + #define ISONL_FM_BLOCK_SPECIFIC 0x00u /**< \brief Filter mode: Block-secific PGNs (default = pass all)*/ + #define ISONL_FM_PASS_SPECIFIC 0x01u /**< \brief Filter mode: Pass-secific PGNs (default = block all)*/ + /*! @} */ + + /* ************************************************************************ */ + /*! \name NIU Filter Entry Types + @{ */ + #define ISONL_PGN_ENTRY 0x00u /**< \brief PGN filter DB entry*/ + #define ISONL_PGN_NAME_ENTRY 0x01u /**< \brief PGN/Name filter DB entry*/ + /*! @} */ + + /* ************************************************************************ */ + /*! \name NIU Port Pair Defines + @{ */ + #define ISONL_PP_NULL 0x00u /**< \brief port pair not valid */ + #define ISONL_PP_GLOBAL 0xFFu /**< \brief no specific port pair */ + /*! @} */ + + /* ************************************************************************ */ + + /* ************************************************************************ */ + /*! \name NIU Message Function Code Defines + @{ */ + #define ISONL_FC_REQ_FILTER_DB 0x00u /**< \brief Function code: Request a copy of filter database */ + #define ISONL_FC_RES_FILTER_DB 0x01u /**< \brief Function code: Response to a request for a copy of filter database */ + #define ISONL_FC_ADD_FILTER 0x02u /**< \brief Function code: Request to add an entry to the filter database */ + #define ISONL_FC_DEL_FILTER 0x03u /**< \brief Function code: Request to delete an entry from the filter database */ + #define ISONL_FC_CLEAR_FILTER_DB 0x04u /**< \brief Function code: Request to clear (delete) a filter database */ + #define ISONL_FC_CREATE_FILTER_DB 0x06u /**< \brief Function code: Request to create a filter database */ + #define ISONL_FC_ADD_NAME_FILTER 0x07u /**< \brief Function code: Request to add NAME qualified filter database entries */ + + #define ISONL_FC_REQ_SA_LIST 0x40u /**< \brief Function code: Request a source address list */ + #define ISONL_FC_RES_SA_LIST 0x41u /**< \brief Function code: Response to a request for a source address list */ + #define ISONL_FC_REQ_SA_NAME_LIST 0x42u /**< \brief Function code: Request a source address and NAME list */ + #define ISONL_FC_RES_SA_NAME_LIST 0x43u /**< \brief Function code: Response to a request for a source address and NAME list */ + + #define ISONL_FC_REQ_GENERAL_PARAM 0x80u /**< \brief Function code: Request NIU general parametrics */ + #define ISONL_FC_RES_GENERAL_PARAM 0x81u /**< \brief Function code: Response to a request for NIU general parametrics */ + #define ISONL_FC_RESET_GENERAL 0x82u /**< \brief Function code: Command to reset general statistic parametrics */ + #define ISONL_FC_REQ_SPECIFIC_PARAM 0x83u /**< \brief Function code: Request NIU specific parametrics */ + #define ISONL_FC_RES_SPECIFIC_PARAM 0x84u /**< \brief Function code: Response to a request for NIU specific parametrics */ + #define ISONL_FC_RESET_SPECIFIC 0x85u /**< \brief Function code: Command to reset specific statistic parametrics */ + + #define ISONL_FC_REQ_OPEN_CONN 0xC0u /**< \brief Function code: Request to open connection */ + #define ISONL_FC_RES_OPEN_CONN 0xC2u /**< \brief Function code: Response to request to open connection */ + #define ISONL_FC_REQ_CLOSE_CONN 0xC1u /**< \brief Function code: Request to close connection */ + #define ISONL_FC_RES_CLOSE_CONN 0xC3u /**< \brief Function code: Response to request to close connection */ + + #define ISONL_FC_NONE 0xFFu /**< \brief Function code is not valid */ + + /*! @} */ + + /* ************************************************************************ */ + + /* ************************************************************************ */ + /*! \name NIU Callback Return Value Defines + @{ */ + #define ISONL_RET_ACCEPT 0 /**< \brief Request execution is permitted */ + #define ISONL_RET_CANCEL 1 /**< \brief Request execution is not permitted */ + #define ISONL_RET_NOT_VALID 2 /**< \brief Request parameter are not valid */ + /*! @} */ + + /* ************************************************************************ */ + /*! \name NIU Callback Message Type Value Defines + @{ */ + #define ISONL_MSG_UNKOWN 0x00u /**< \brief message is not valid */ + #define ISONL_MSG_REQUEST 0x01u /**< \brief Request execution permission */ + #define ISONL_MSG_FINISHED 0x02u /**< \brief Request execution is finished */ + /*! @} */ + + /* ************************************************************************ */ + /*! \name NIU Prametric Identifier Defines + @{ */ + #define ISONL_PID_REQ_ALL 0x00u /**< \brief Used to request all statistic parameters */ + #define ISONL_PID_BUFFER_SIZE 0x01u /**< \brief Request buffer size (bytes) */ + #define ISONL_PID_MAX_DB_SIZE 0x02u /**< \brief Request maximum filter database size (bytes) */ + #define ISONL_PID_NO_DB_ENTRIES 0x03u /**< \brief Request number of filter database entries */ + #define ISONL_PID_MAX_MSG_RECEIVED 0x04u /**< \brief Request maximum number of messages, that can be received per second */ + #define ISONL_PID_MAX_MSG_FORWARDED 0x05u /**< \brief Request maximum number of messages, that can be forwarded per second */ + #define ISONL_PID_MAX_MSG_FILTERED 0x06u /**< \brief Request maximum number of messages, that can be filtered per second */ + #define ISONL_PID_MAX_TRANSIT_DELAY 0x07u /**< \brief Request maximum transit delay time (ms) */ + #define ISONL_PID_AVG_TRANSIT_DELAY 0x08u /**< \brief Request average transit delay time (ms) */ + #define ISONL_PID_NO_MSG_OVERFLOW 0x09u /**< \brief Request number of messages lost due to buffer overflow */ + #define ISONL_PID_NO_MSG_EXCESS_DELAY 0x0Au /**< \brief Request number of messages with excess transit delay */ + #define ISONL_PID_AVG_MSG_RECEIVED 0x0Bu /**< \brief Request average number of messages received per second */ + #define ISONL_PID_AVG_MSG_FORWARDED 0x0Cu /**< \brief Request average number of messages forwarded per second */ + #define ISONL_PID_AVG_MSG_FILTERED 0x0Du /**< \brief Request average number of messages filtered per second */ + #define ISONL_PID_UPTIME 0x0Eu /**< \brief Request uptime since last power on reset (seconds) */ + #define ISONL_PID_NO_PORTS 0x0Fu /**< \brief Request number of ports */ + #define ISONL_PID_NIU_TYPE 0x10u /**< \brief Request network interconnection unit type */ + /*! @} */ + + /* ************************************************************************ */ + /*! \name Miscellaneous NIU Defines + @{ */ + + #define ISONL_TR_NO_RATE 0xFFu /**< \brief no transfer rate reduction (PGN/Name filter entry)*/ + + /*! @} */ + + #endif /* not: defined(CCI_USE_NAMESPACE) && defined(__cplusplus) */ + + /* ************************************************************************ */ + /*! \brief Port pair status */ + typedef struct + { + iso_u16 u16ModeOptions; /**< \brief NIU Mode - Bits 0..1: #ISONL_NIU_Disabled, #ISONL_NIU_Bridge, #ISONL_NIU_Router, #ISONL_NIU_Autodetection */ + iso_u16 u16Status; /**< \brief NIU Status Bits 0..1: #ISONL_NIU_Disabled, #ISONL_NIU_Bridge, #ISONL_NIU_Router */ + iso_u8 u8PortPair; /**< \brief Bits 0..3: lower port numer, Bits 4..7: higher port number */ + } ISO_NL_PORTPAIR_STATUS_T; + + /* ************************************************************************ */ + /*! \brief Filter database status */ + typedef struct + { + iso_u8 u8State; /*!< \brief Filter database status: On of the NIU data state flags. */ + iso_u8 u8PortPair; /*!< \brief Bits 0..3: to port, Bits 4..7: from port */ + iso_u8 u8FilterMode; /**< \brief NIU Filter Mode: #ISONL_FM_BLOCK_SPECIFIC, #ISONL_FM_PASS_SPECIFIC */ + iso_s16 s16EntryCount; /*!< \brief Number of filter database entries (PGN and PGN/Name). */ + } ISO_NL_FILTER_DB_STATUS_T; + + /* ************************************************************************ */ + /*! \brief Filter database PGN/Name entry */ + typedef struct + { + iso_u8 u8State; /*!< \brief Filter entry status: On of the NIU data state flags. */ + iso_u8 u8EntryType; /*!< \brief Filter entry type value: #ISONL_PGN_ENTRY or #ISONL_PGN_NAME_ENTRY */ + iso_u8 u8PortPair; /*!< \brief Bits 0..3: to port, Bits 4..7: from port */ + iso_u32 u32PGN; /*!< \brief PGN: Parameter group name */ + iso_u8 au8Name[8]; /*!< \brief CF network name */ + iso_u8 au8NameMask[8]; /*!< \brief CF network name mask */ + iso_u8 u8MaxTransferRate; /*!< \brief Max messages per second - Range: 1..255 (Default: #ISONL_TR_NO_RATE (255)) */ + } ISO_NL_FILTER_ENTRY_T; + + /* ************************************************************************ */ + /*! \brief Filter database entry */ + typedef struct + { + iso_u8 u8State; /*!< \brief Filter database entry state: On of the NIU data state flags. */ + iso_u8 u8PortPair; /*!< \brief Bits 0..3: to port, Bits 4..7: from port */ + iso_u8 u8FilterMode; /**< \brief NIU Filter Mode: #ISONL_FM_BLOCK_SPECIFIC, #ISONL_FM_PASS_SPECIFIC */ + iso_s16 s16EntryCount; /*!< \brief Number of filter database entries (PGN and PGN/Name). */ + ISO_NL_FILTER_ENTRY_T* pasEntries; /*!< \brief Null pointer or pointer to a ISO_NL_FILTER_ENTRY_T array. */ + } ISO_NL_FILTER_DB_T; + + + /* ************************************************************************ */ + /*! \brief Typedef of the callback message data structure. + + */ + typedef struct + { + iso_u8 u8MsgType; /*!< \brief NIU callback message type \n (#ISONL_MSG_REQUEST, #ISONL_MSG_FINISHED) */ + iso_u8 u8MsgFunctionCode; /*!< \brief NIU message function code */ + iso_u8 u8PortPair; /*!< \brief Bits 0..3: to port, Bits 4..7: from port */ + + iso_u8 u8ReceiverPort; /*!< \brief CAN port on which the message received */ + + ISO_TPREP_E eTpStatus; /*!< \brief TP Status */ + ISO_TPINFO_T* psTpInfo; /*!< \brief Pointer to the TP message */ + + } ISO_NL_CBDATA_T; + + /* ************************************************************************ */ + + /* ************************************************************************ */ + /*! \brief Typedef call back function for notifying the application. + + The ISO_NL_CBDATA_t data pointer and the referenced data are only valid during the call back. + If the application return a value unequal to E_NO_ERR the service cancel the current action. + \param[in,out] \wp{psData, ISO_NL_CBDATA_T*} + Pointer to the callback message data. + \retval iso_s16 + */ + typedef iso_s16 (*ISO_NL_CbAppFunc_t)( ISO_NL_CBDATA_T* psData ); + + /* ************************************************************************ */ + /*! \brief Typedef call back function for transmiting CAN Messages + + In the error case the application should return a value unequal to E_NO_ERR. + + \param[in] \wp{u16CanNode, iso_u16} + CAN node index \n + Range: 0 .. < ISO_CAN_NODES + \param[in] \wp{u32Id, iso_u32} + CAN message identifier + \param[in] \wp{pau8Data, iso_u8*} + Pointer to CAN message data array + \param[in] \wp{u8Length, iso_u8} + Number of CAN message data bytes \n + Range: 0 .. 8 + \retval iso_s16 + - E_NO_ERR + - E_UNKNOWN_ERR - sending is not possible + */ + typedef iso_s16 (*ISO_NL_CbCanMsgSendFunc_t)( iso_u16 u16CanNode, iso_u32 u32Id, iso_u8* pau8Data, iso_u8 u8Length ); + + /* ************************************************************************ */ + /*! @} */ /* END niutypedef */ + /* ************************************************************************ */ + /* ************************************************************************ */ + + /* ************************************************************************ */ + /* ************************************************************************ */ + /*! \addtogroup niuapi + @{ + \name NIU-Service Initialization + + Use this functions to initialize the NIU Service + @{ + */ + /* ************************************************************************ */ + + /* ************************************************************************ */ + /*! + \brief This function installs the necessary callback function + \param[in] \wp{pCbAppFunction, ISO_NL_CbAppFunc_t} + Pointer to (callback-)function for notifying the application. + \param[in] \wp{pCbCanMsgSendFunction, ISO_NL_CbCanMsgSendFunc_t} + Pointer to (callback-)function for sendung (transmiting) CAN messages to an other can network. \n + If NULL the standard CAN send callback functions are used. + \retval iso_s16 + - E_NO_ERR + - E_RANGE - pCbAppFunction is a NULL pointer + - E_CONFIG - NIU module not available + \details Call this function before using any other NIU function. + */ + /* ************************************************************************ */ + iso_s16 iso_NiuInit( ISO_NL_CbAppFunc_t pCbAppFunction, ISO_NL_CbCanMsgSendFunc_t pCbCanMsgSendFunction ); + + /* ************************************************************************ */ + /*! \brief Use this function to configure the NIU behavior + \param[in] \wp{u16Param, iso_u16} + Configuration parameter. + \param[in] \wp{u16Value, iso_u16} + Configuration parameter value. + \retval iso_s16 + - E_NO_ERR + - E_RANGE - u16Param is not valid + - E_CONFIG - NIU module not available + + \par Sample: + \code + iso_s16 s16Ret = E_NO_ERR; + + s16Ret = iso_NiuSetParam( NIU_PARAM_BRIDGE_ALL, NIU_VAL_OFF ); + s16Ret = iso_NiuSetParam( NIU_PARAM_ROUTE_GLOBAL, NIU_VAL_ON ); + s16Ret = iso_NiuSetParam( NIU_PARAM_ROUTE_FILTER, NIU_VAL_OFF ); + \endcode + */ + iso_s16 iso_NiuSetParam( iso_u16 u16Param, iso_u16 u16Value ); + + /* ************************************************************************ */ + /*! \brief This function returns the configured value for given parameter + \param[in] \wp{u16Param, iso_u16} + Configuration parameter. + \retval iso_u16 + - NIU_RET_ERROR in case of an error (u16Param is not valid) + - Configuration parameter value + */ + iso_u16 iso_NiuGetParam( iso_u16 u16Param ); + + + /* ************************************************************************ */ + /*! @} */ + /*! @} */ + /* ************************************************************************ */ + /* ************************************************************************ */ + + /* ************************************************************************ */ + /* ************************************************************************ */ + /*! \addtogroup niuapi + @{ + \name NIU-Service Configuration + + Use this functions to configure the NIU Service ports and bindings + @{ + */ + /* ************************************************************************ */ + + /* ************************************************************************ */ + /*! \brief Configure the binding between two NIU CAN ports + \param[in] \wp{u8PortPair, iso_u8} + Valid port pair. + \param[in] \wp{u16ModeOptions, iso_u16} + NIU type for this binding - Values: + - ISONL_NIU_Disabled + - ISONL_NIU_Bridge + - ISONL_NIU_Router + - ISONL_NIU_Autodetection + \retval iso_s16 E_NO_ERR or E_RANGE + + \details Use this function to enable the NIU functionality between two CAN ports. \n + The port binding between two ports has no direction. \n + The binding between #ISONL_Port_2 and #ISONL_Port_1 is equal to \n + the binding between #ISONL_Port_1 and #ISONL_Port_2. + + \par Sample: + Configure the binding between the CAN ports ISONL_Port_1 and ISONL_Port_2 + as bridge without message filtering ("Repeater Mode"): + \code + iso_s16 s16Ret; + iso_u16 u16ModeOptions; + iso_u8 u8PortPair; + ISO_NL_FILTER_DB_T sFilterDB; + + u8PortPair = iso_NiuBuildPortPair( ISONL_Port_2, ISONL_Port_1 ); + u16ModeOptions = ISONL_NIU_Bridge; + s16Ret = iso_NiuSetPortBinding( u8PortPair, u16ModeOptions ); + if( s16Ret == E_NO_ERR ) + { + u8PortPair = iso_NiuBuildPortPair( ISONL_Port_1, ISONL_Port_2 ); + s16Ret = iso_NiuBuildFilterDB( & sFilterDB, u8PortPair, ISONL_FM_BLOCK_SPECIFIC ); + s16Ret |= iso_NiuSetFilterDB( & sFilterDB ); + + u8PortPair = iso_NiuBuildPortPair( ISONL_Port_2, ISONL_Port_1 ); + s16Ret |= iso_NiuBuildFilterDB( & sFilterDB, u8PortPair, ISONL_FM_BLOCK_SPECIFIC ); + s16Ret |= iso_NiuSetFilterDB( & sFilterDB ); + + if( s16Ret != E_NO_ERR ) + { + s16Ret = iso_NiuSetPortBinding( u8PortPair, ISONL_NIU_Disabled ); + } + } + \endcode + */ + iso_s16 iso_NiuSetPortBinding( iso_u8 u8PortPair, iso_u16 u16ModeOptions); + + /* ************************************************************************ */ + /*! \brief Get the status of the binding between two NIU CAN ports + \param[in] \wp{u8PortPair, iso_u8} + Valid port pair. + \param[in,out] \wp{psStatus, ISO_NL_PORTPAIR_STATUS_T*} + Pointer to the status structure + \retval iso_s16 E_NO_ERR or E_RANGE + */ + iso_s16 iso_NiuGetStatus( iso_u8 u8PortPair, ISO_NL_PORTPAIR_STATUS_T* psStatus ); + + + /* ************************************************************************ */ + /*! \brief Set the NIU-Service management member (CF) for a valid port + + \param[in] \wp{u8Port, iso_u8} + Valid port pair. + \param[in] \wp{u16Options, iso_u16} + #ISONL_Port_Enabled, #ISONL_Port_Disabled + \param[in] \wp{u8WishedSA, iso_u8} + CF source address + \param[in] \wpp{pau8Name, const #ISO_CF_NAME_T*} + Pointer to the CF name ( 8 iso_u8 array ) + + \retval iso_s16 E_NO_ERR, E_RANGE or E_OVERFLOW if the user list is full + + \details The function enables the external NIU management for a port. \n + The NIU also announce the CF on the network. + + */ + iso_s16 iso_NiuSetPortMember( iso_u8 u8Port, iso_u16 u16Options, iso_u8 u8WishedSA, const ISO_CF_NAME_T* pau8Name ); + + /* ************************************************************************ */ + /*! \brief Set the NIU-Service management member (CF) for a valid port + \param[in] \wp{u8Port, iso_u8} + Valid port pair. + \param[in] \wp{u16Options, iso_u16} + #ISONL_Port_Enabled, #ISONL_Port_Disabled + \param[in] \wp{s16MnHandle, iso_s16} + Valid CF member handle + \retval iso_s16 E_NO_ERR or E_RANGE + + \details The function enables the external NIU management for a port. \n + The CF must be already announced. + */ + iso_s16 iso_NiuSetPortToMember( iso_u8 u8Port, iso_u16 u16Options, iso_s16 s16MnHandle ); + + /* ************************************************************************ */ + /*! \brief Returns the NIU-Service management member handle for a given port + \param[in] \wp{u8Port, iso_u8} + Valid port. + \retval iso_s16 CAN network member handle or HANDLE_UNVALID in case of an error + */ + iso_s16 iso_NiuGetPortMember( iso_u8 u8Port ); + + /* ************************************************************************ */ + /*! @} */ + /*! @} */ + /* ************************************************************************ */ + /* ************************************************************************ */ + + /* ************************************************************************ */ + /* ************************************************************************ */ + /*! \addtogroup niuapi + @{ + \name NIU-Service Filter Management Functions + \brief Use this functions to manage the filter databases + \details Make shure that you setup always two filter databases + for one port binding (One for each direction). + + @{ + */ + /* ************************************************************************ */ + + /* ************************************************************************ */ + /*! \brief Get the filter database entry for a valid port pair + \param[in] \wp{u8PortPair, iso_u8} + Valid port pair. + \param[out] \wp{psFilterDB, ISO_NL_FILTER_DB_T*} + Pointer to a filter DB entry structure. + \retval iso_s16 E_NO_ERR or E_RANGE + + \details The function fills a ISO_NL_FILTER_DB_T structure with the current filter DB settings for the given port pair. + + \par Sample: + Get the filter database settings for filtering CAN message from ISONL_Port_2 to ISONL_Port_1 + \code + iso_s16 s16Ret; + iso_u8 u8PortPair; + ISO_NL_FILTER_DB_T sFilterDB; + + u8PortPair = iso_NiuBuildPortPair( ISONL_Port_2, ISONL_Port_1 ); + s16Ret = iso_NiuGetFilterDB( u8PortPair, & sFilterDB ); + if( s16Ret == E_NO_ERR ) + { + app_SaveNiuFilterDB( & sFilterDB ); + } + \endcode + + */ + iso_s16 iso_NiuGetFilterDB( iso_u8 u8PortPair, ISO_NL_FILTER_DB_T* psFilterDB); + + /* ************************************************************************ */ + /*! \brief Get the current number of filter database entries. + \retval iso_s16 Number of filter database entries or E_CONFIG. + */ + iso_s16 iso_NiuGetFilterDBCount( void ); + + /* ************************************************************************ */ + /*! \brief Get the filter database entry for a valid index + \param[in] \wp{s16Index, iso_s16} + Valid array index. \n + Range: 0 .. iso_NiuGetFilterDBCount() - 1 + \param[out] \wp{psFilterDB, ISO_NL_FILTER_DB_T*} + Pointer to a filter DB entry structure. + \retval sin16 E_NO_ERR or E_RANGE + + \details The function fills a ISO_NL_FILTER_DB_T structure with the current filter DB settings for the given port pair. + + \par Sample: + Get all filter databases for saving... + \code + iso_s16 s16I, s16C, s16Ret; + ISO_NL_FILTER_DB_T sDB; + + s16C = iso_NiuGetFilterDBCount(); + for( s16I=0; s16I < s16C; i++ ) + { + sDB. pasEntries = ISO_NULL_PTR; + s16Ret = iso_NiuGetFilterDBfromIndex( s16I, & sDB ); + if( s16Ret == E_NO_ERR ) + { + app_SaveNiuFilterDB( & sDB ); + } + } + \endcode + */ + iso_s16 iso_NiuGetFilterDBfromIndex( iso_s16 s16Index, ISO_NL_FILTER_DB_T* psFilterDB); + + /* ************************************************************************ */ + /*! \brief Get the filter database status for a valid port pair + \param[in] \wp{u8PortPair, iso_u8} + Valid port pair. + \param[out] \wp{psStatus, ISO_NL_FILTER_DB_STATUS_T*} + Pointer to a filter DB status structure. + \retval iso_s16 E_NO_ERR or E_RANGE + */ + iso_s16 iso_NiuGetFilterDBStatus( iso_u8 u8PortPair, ISO_NL_FILTER_DB_STATUS_T* psStatus); + + /* ************************************************************************ */ + /*! \brief Set the filter database entry for a valid port pair + \param[in] \wpp{psFilterDB, const #ISO_NL_FILTER_DB_T*} + Pointer to a filter DB entry structure. + \retval iso_s16 E_NO_ERR, E_RANGE, E_CONFIG + + \details This function configures the filter database settings for the given port pair. + See iso_NiuSetPortBinding() for a simple exsample. + + */ + iso_s16 iso_NiuSetFilterDB( const ISO_NL_FILTER_DB_T* psFilterDB); + + /* ************************************************************************ */ + + /* ************************************************************************ */ + /*! \brief Get the PGN or PGN/Name filter entry for a valid index + \param[in] \wp{u8PortPair, iso_u8} + Valid port pair or ISONL_PP_GLOBAL. + \param[in] \wp{s16Index, iso_s16} + Index of the PGN filter entry. \n + Range: 0 <= s16Index < iso_NiuGetFilterEntryCount( u8PortPair ) + \param[out] \wp{psFilterEntry, ISO_NL_FILTER_ENTRY_T*} + Pointer to a PGN filter entry structure. + \retval iso_s16 E_NO_ERR, E_RANGE or E_CONFIG + + \details todo... + + */ + iso_s16 iso_NiuGetFilterEntry( iso_u8 u8PortPair, iso_s16 s16Index, ISO_NL_FILTER_ENTRY_T* psFilterEntry); + + /* ************************************************************************ */ + /*! \brief Returns the current number of filter entries in the PGN table for a given port pair. + \param[in] \wp{u8PortPair, iso_u8} + Valid port pair or ISONL_PP_GLOBAL to get the number of all entries. + \retval iso_s16 Number of PGN and PGN/Name filter entries or E_RANGE. + */ + iso_s16 iso_NiuGetFilterEntryCount( iso_u8 u8PortPair); + + /* ************************************************************************ */ + /*! \brief Set a PGN or PGN/Name filter entry for a valid port pair + \param[in] \wpp{psFilterEntry, const #ISO_NL_FILTER_ENTRY_T*} + Pointer to a vaild PGN filter entry structure. + \retval iso_s16 + - E_RANGE or E_CONFIG in case of an error + - 0 Entry updated or already deleted + - 1 Entry created or deleted + */ + iso_s16 iso_NiuSetFilterEntry( const ISO_NL_FILTER_ENTRY_T* psFilterEntry); + + /* ************************************************************************ */ + /*! @} */ + /*! @} */ + /* ************************************************************************ */ + /* ************************************************************************ */ + + /* ************************************************************************ */ + /* ************************************************************************ */ + /*! \addtogroup niuapi + @{ + \name NIU-Service Parametrics Management Functions + \brief Use this functions to manage the status and statistics values. + @{ + */ + /* ************************************************************************ */ + + /* ************************************************************************ */ + /*! \brief Get the statistic value of a prametric identifier for a given port pair + \param[in] \wp{u8PortPair, iso_u8} + Valid port pair or #ISONL_PP_GLOBAL. + \param[in] \wp{u8ParamID, iso_u8} + Valid prametric identifier (#ISONL_PID_REQ_ALL is not allowed). + + \retval iso_u32 Value of the parametric identifier or 0xFFFFFFFFuL if not available. + */ + iso_u32 iso_NiuGetStatistic( iso_u8 u8PortPair, iso_u8 u8ParamID); + + /* ************************************************************************ */ + /*! \brief Set the statistic value of a prametric identifier for a given port pair + \param[in] \wp{u8PortPair, iso_u8} + Valid port pair or #ISONL_PP_GLOBAL. + \param[in] \wp{u8ParamID, iso_u8} + Valid prametric identifier (#ISONL_PID_REQ_ALL is not allowed). + \param[in] \wp{u32Value, iso_u32} + Value of the parametric identifier. + + \retval iso_s16 E_NO_ERR or ISONL_RET_NOT_VALID + */ + iso_s16 iso_NiuSetStatistic( iso_u8 u8PortPair, iso_u8 u8ParamID, iso_u32 u32Value); + + /* ************************************************************************ */ + /*! \brief Reset the reset able statistic values for a given port pair + \param[in] \wp{u8PortPair, iso_u8} + Valid port pair. + + \retval iso_s16 E_NO_ERR or ISONL_RET_NOT_VALID + */ + iso_s16 iso_NiuResetStatistic( iso_u8 u8PortPair ); + + /* ************************************************************************ */ + /*! @} */ + /*! @} */ + /* ************************************************************************ */ + /* ************************************************************************ */ + + /* ************************************************************************ */ + /* ************************************************************************ */ + /*! \addtogroup niuapi + @{ + \name NIU-Helper Functions + \ingroup niuapi + @{ + */ + /* ************************************************************************ */ + + /* ************************************************************************ */ + /*! \brief Build the port pair value for the two CAN ports numbers. + \param[in] \wp{fromPort, iso_u8} + Valid source port number. + \param[in] \wp{toPort, iso_u8} + Valid destination port number. + \retval iso_u8 port pair + */ + iso_u8 iso_NiuBuildPortPair( iso_u8 fromPort, iso_u8 toPort ); + + /* ************************************************************************ */ + /*! \brief Build / Intialize the filter database entry structue + \param[in,out] \wp{psFilterDB, ISO_NL_FILTER_DB_T*} + Pointer to a filter DB entry structure. + \param[in] \wp{u8PortPair, iso_u8} + Valid port pair. + \param[in] \wp{u8FilterMode, iso_u8} + #ISONL_FM_BLOCK_SPECIFIC or #ISONL_FM_PASS_SPECIFIC. + \retval iso_s16 E_NO_ERR, E_RANGE + */ + iso_s16 iso_NiuBuildFilterDB( ISO_NL_FILTER_DB_T* psFilterDB, iso_u8 u8PortPair, iso_u8 u8FilterMode ); + + /* ************************************************************************ */ + /*! \brief Build / Intialize a PGN filter entry sturcture. + \param[in,out] \wp{psFilterEntry, ISO_NL_FILTER_ENTRY_T*} + Pointer to a vaild PGN filter entry structure. + \param[in] \wp{u8PortPair, iso_u8} + Valid port pair. + \param[in] \wp{u32PGN, iso_u32} + Valid parameter group number . + \retval iso_s16 E_NO_ERR + */ + iso_s16 iso_NiuBuildPGNEntry(ISO_NL_FILTER_ENTRY_T* psFilterEntry, iso_u8 u8PortPair, iso_u32 u32PGN); + + /* ************************************************************************ */ + /*! \brief Build / Intialize a PGN/Name filter entry sturcture. + \param[in,out] \wp{psFilterEntry, ISO_NL_FILTER_ENTRY_T*} + Pointer to a vaild PGN filter entry structure. + \param[in] \wp{u8PortPair, iso_u8} + Valid port pair. + \param[in] \wp{u32PGN, iso_u32} + Valid parameter group number. + \param[in] \wpp{pau8Name, const iso_u8 []} + Pointer to a valid CF NAME array. + \param[in] \wpp{pau8Mask, const iso_u8 []} + Pointer to a valid NAME mask array. + \retval iso_s16 E_NO_ERR + */ + iso_s16 iso_NiuBuildPGNNameEntry( ISO_NL_FILTER_ENTRY_T* psFilterEntry, iso_u8 u8PortPair, iso_u32 u32PGN, + const iso_u8 pau8Name[], const iso_u8 pau8Mask[]); + + + /* ************************************************************************ */ + /*! @} */ + /*! @} */ + /* ************************************************************************ */ + /* ************************************************************************ */ + + #ifdef __cplusplus + } /* end of extern "C" */ + #endif + + #endif /* DEF_MnNiu_H */ + + /* ************************************************************************ */ ++>>>>>>> rauch/jobrechner-import-20190607 diff --cc ptxdist/local_src/ecu-jobctl/extern/isobus/IsoPgnDef.h index b8943b9,de335c0..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-jobctl/extern/isobus/IsoPgnDef.h +++ b/ptxdist/local_src/ecu-jobctl/extern/isobus/IsoPgnDef.h @@@ -1,779 -1,1094 +1,1876 @@@ ++<<<<<<< HEAD +/****************************************************************************/ +/*! + \file IsoPgnDef.h + \brief PGN and SPN definitions and data for initialising of SPNs in application + + \author Hammerl Erwin + \date Created 12.07.2011 + + Copyright (c) WBZ-Engineering GmbH + + \par HISTORY: + \par + 16.03.2012 - author P. Wegscheider + - FMI defines updated + +*/ +#ifndef DEF_ISOPGNDEF_H + #define DEF_ISOPGNDEF_H + +/* ************************************************************************ */ +/** \addtogroup isopgns +@{ +*/ +/* ************************************************************************ */ +/* PGNs PDU1 and Group Functions */ +/* ************************************************************************ */ + +#define PGN_TORQUE_SPEED_CONTROL1 (0x0000UL) /**< 00000 - TSC1 */ +#define PGN_TRANSMISSION_CONTROL1 (0x0100UL) /**< 00256 - TC1 */ +#define PGN_SCC_TO_SCM (0x8D00UL) /**< 36096 - SCC - Sequence Control Annex B.1.a */ +#define PGN_SCM_TO_SCC (0x8E00UL) /**< 36352 - SCM - Sequence Control Annex B.1.a*/ +#define PGN_NAME_MANAGEMENT (0x9300UL) /**< 37632 - NAME management (NM) message Part-5:2011(E)*/ + +#define PGN_FSC_TO_FS (0xAA00UL) /**< 43520 - FSC - Part 13 File Server Annex C.1.1.b */ +#define PGN_FS_TO_FSC (0xAB00UL) /**< 43776 - FS - Part 13 File Server Annex C.1.1.a */ + +#define PGN_GUIDANCE_MACHINE_STATUS (0xAC00UL) /**< 44032 - GMS */ +#define PGN_GUIDANCE_SYSTEM_COMMAND_MSG (0xAD00UL) /**< 44288 - GMC - see Part 7 - B.27.1 */ +#define PGN_GENPURPOSE_VALVE_COMMAND (0xC400UL) /**< 50176 - */ +#define PGN_GENPURPOSE_VALVE_MEASFLOW (0xC500UL) /**< 50432 - */ +#define PGN_GENPURPOSE_VALVE_ESTIMFLOW (0xC600UL) /**< 50688 - */ +#define PGN_ETP_DT (0xC700UL) /**< 50944 - ETP_DT - extended data transport */ +#define PGN_ETP_CM (0xC800UL) /**< 51200 - ETP_CM - connection managem. for ETP */ +#define PGN_REQUEST2_PGN (0xC900UL) /**< 51456 - REQUEST2 */ +#define PGN_TRANSFER_PGN (0xCA00UL) /**< 51712 - TRANSFER */ +#define PGN_PROCESS_DATA (0xCB00UL) /**< 51968 - Process data */ +#define PGN_REQ_FOR_REP_RATE (0xCC00UL) /**< 52224 - Request for repetition rate */ +#define PGN_CONTINUOUSTORQUE (0xCF00UL) /**< 52992 - CTL */ +#define PGN_CAB_ILLUMINATION (0xD000UL) /**< 53248 - CL */ +#define PGN_AIRSUSPENSION_CONTROL6 (0xD100UL) /**< 53504 */ +#define PGN_AIRSUSPENSION_CONTROL2 (0xD200UL) /**< 53760 */ +#define PGN_CALIBRATION_INFORMATION (0xD300UL) /**< 54016 - DM19 */ +#define PGN_DATA_SECURITY (0xD500UL) /**< 54528 - DM18 */ +#define PGN_BOOT_LOAD_DATA (0xD600UL) /**< 54784 - DM17 */ +#define PGN_BINARY_DATA_TRANSFER (0xD700UL) /**< 55040 - DM16 */ +#define PGN_MEMORY_ACCESS_RESPONSE (0xD800UL) /**< 55296 - DM15 */ +#define PGN_MEMORY_ACCESS_REQUEST (0xD900UL) /**< 55552 - DM14 */ +#define PGN_ANTI_SHEFT_STATUS (0xDC00UL) /**< 56320 - ATS */ +#define PGN_ANTI_SHEFT_REQUEST (0xDD00UL) /**< 56576 - ATR */ +#define PGN_RESET (0xDE00UL) /**< 56832 - RESET */ +#define PGN_STOP_START_BROADCAST (0xDF00UL) /**< 57088 - DM13 */ +#define PGN_CAB_MESSAGE1 (0xE000UL) /**< 57344 - CM1 */ +#define PGN_CMD_NONCONTIN_MONITOR (0xE300UL) /**< 58112 - DM7 */ + +/* Virtual Terminal - 11783-6 */ +#define PGN_VTtoECU (0xE600UL) /**< 58880 - VT to ECU */ +#define PGN_ECUtoVT (0xE700UL) /**< 59136 - ECU to VT */ + +/* Data Link Layer - 11783-3 */ +#define PGN_N_ACK (0xE800UL) /**< 59392 - ACKM */ +#define PGN_REQUEST_PGN (0xEA00UL) /**< 59904 - RQST */ +#define PGN_TP_DT (0xEB00UL) /**< 60160 - TP_DT - J1939 PGN data transport */ +#define PGN_TP_CM (0xEC00UL) /**< 60416 - TP_CM - connection managem. for TP */ + +/* Network Layer - 11783-4 */ +#define PGN_NETWORK_LAYER (0xED00UL) /**< 60672 - NIU - Part 4 network message */ + +/* Network management - 11783-5 */ +#define PGN_ADDRESS_CLAIMED (0xEE00UL) /**< 60928 - AC */ +#define PGN_CANNOT_CLAIM_SA (0xEE00UL) /**< 60928 - AC */ + +/* PDU2 - Application Layer ( vehicle, implement, diagnostic ) */ +#define PGN_PDU1_PropA (0xEF00UL) /**< 61184 - PDU1 manufacturer proprietary */ +#define PGN_PDU2_240_X (0xF000UL) /**< 61440 - see J1939-71, 73, 75, ISO 11783-8 */ +#define PGN_PDU2_254_Y (0xFE00UL) /**< 65024 - see J1939-71, 73, 75, ISO 11783-7 */ +#define PGN_PDU2_PropB (0xFF00UL) /**< 65280 - PDU2 proprietary */ + +/* ************************************************************************ */ +/* PGNs PDU2 */ +/* ************************************************************************ */ + +/* J1939-71 - Vehicle Application layer */ +#define PGN_ELEC_RETARDER_CONTROLLER (0xF000UL) /**< 61440 - ERC1 */ +#define PGN_ELEC_BRAKE_CONTROLLER (0xF001UL) /**< 61441 - EBC1 */ +#define PGN_ELEC_TRANSMISS_CONTROLLER_1 (0xF002UL) /**< 61442 - ETC1 */ +#define PGN_ELEC_ENGINE_CONTROLLER_2 (0xF003UL) /**< 61443 - EEC2 */ +#define PGN_ELEC_ENGINE_CONTROLLER_1 (0xF004UL) /**< 61444 - EEC1 */ +#define PGN_ELEC_TRANSMISS_CONTROLLER_2 (0xF005UL) /**< 61445 - ETC2 */ +#define PGN_ELEC_AXLE_CONTROLLER_1 (0xF006UL) /**< 61446 - EAC1 */ +#define PGN_FORW_LANE_IMAGE_URGENT_MSG (0xF007UL) /**< 61447 - FLI1 */ +#define PGN_HYDRAULIC_PRESS_GOVER_INFO (0xF008UL) /**< 61448 - HPG */ +#define PGN_VEHICLE_DYN_STAB_CTRL_2 (0xF009UL) /**< 61449 - VDC2 */ +#define PGN_MACHINE_SELECTED_SPEED (0xF022UL) /**< 61474 - 11783-7, B.28.1 */ +#define PGN_ENGINE_GAS_FLOW_RATE (0xF00AUL) /**< 61450 - EGF1 */ +#define PGN_PRODUCT_IDENTIFICATION (0xFC8DUL) /**< 64653 - */ +#define PGN_FUNCTIONALI_CHARACTERISTICS (0xFC8EUL) /**< 64654 - */ +#define PGN_STOP_BUTTON (0xFD02UL) /**< 64770 - */ +#define PGN_IMPLEMENT_OPERATING_STATE (0xFD03UL) /**< 64771 - 11783-7, B.29 */ +#define PGN_ECU_DIAGNOSTIC_PROTOCOL (0xFD32UL) /**< 64818 - 11783-12, B.5 */ +#define PGN_ISOBUS_COMPLIANCE_CERTIFICA (0xFD42UL) /**< 64834 - 11783-7, B.28 */ +#define PGN_MACHINE_SELECT_SPEED_CMD (0xFD43UL) /**< 64835 - 11783-7, B.28.2 */ +#define PGN_ECU_IDENTIFICATION_INFO (0xFDC5UL) /**< 64965 - 11783-12, B.1 */ +#define PGN_OFFHIGHW_ENGINE_CTRL_SELECT (0xFDCBUL) /**< 64971 - OHECS */ +#define PGN_FMS_STANDARD_INTERFAC_IDENT (0xFDD1UL) /**< 64977 - FMS */ +#define PGN_ECU_PERFORMANCE (0xFDD2UL) /**< 64978 - EP */ +#define PGN_TURBOCHARGER_INFORMATION_6 (0xFDD3UL) /**< 64979 - TCI6 */ +#define PGN_CAB_MESSAGE_3 (0xFDD4UL) /**< 64980 - CM3 */ +#define PGN_ELEC_ENGINE_CONTROLLER_5 (0xFDD5UL) /**< 64981 - EEC5 */ +#define PGN_BASIC_JOYSTICK_MESSAGE_1 (0xFDD6UL) /**< 64982 - BJM1 */ +#define PGN_EXTENDED_JOYSTICK_MESSAGE_1 (0xFDD7UL) /**< 64983 - EJM1 */ +#define PGN_BASIC_JOYSTICK_MESSAGE_2 (0xFDD8UL) /**< 64984 - BJM2 */ +#define PGN_EXTENDED_JOYSTICK_MESSAGE_2 (0xFDD9UL) /**< 64985 - EJM2 */ +#define PGN_BASIC_JOYSTICK_MESSAGE_3 (0xFDDAUL) /**< 64986 - BJM3 */ +#define PGN_EXTENDED_JOYSTICK_MESSAGE_3 (0xFDDBUL) /**< 64987 - EJM1 */ +#define PGN_MARINE_CONTROL_INFORMATION (0xFDDCUL) /**< 64988 - MCI */ +#define PGN_AMBIENT_CONDITIONS_2 (0xFDDEUL) /**< 64992 - AMB2 */ +#define PGN_CAB_A_C_CLIMATE_SYST_INFO (0xFDE1UL) /**< 64993 - CACI */ +#define PGN_SUPPLY_PRESSURE_DEMAND (0xFDE2UL) /**< 64994 - SPR */ +#define PGN_EQUIPM_OPERATION_AND_CONTR (0xFDE3UL) /**< 64995 - EOAC */ +#define PGN_EQUIPMENT_PERFORMANCE_DATA (0xFDE4UL) /**< 64996 - EPD */ +#define PGN_MAX_VEHIC_SPEED_LIMIT_STAT (0xFDE5UL) /**< 64997 - MVS */ +#define PGN_HYDRAULIC_BRAKING_SYSTEM (0xFDE6UL) /**< 64998 - HBS */ +/* 64999 - 65030 J1939-75, see later */ +#define PGN_EXHAUST_TEMPERATURE (0xFE07UL) /**< 65031 - ET */ +/* ISO 11783 - Part 7 */ +#define PGN_REQUIRED_TRACTOR_FACILITIES (0xFE08UL) /**< 65032 - RTF */ +#define PGN_TRACTOR_FACILITIES_RESPONSE (0xFE09UL) /**< 65033 - TFR */ +#define PGN_IMP_REMOTE_CMD_TRACTOR_RESP (0xFE0AUL) /**< 65033 - IRCR */ +#define PGN_IMPLEMENT_REMOTE_CONTR_CMD (0xFE0BUL) /**< 65035 - IRC */ +#define PGN_WORKING_SET_MEMBER (0xFE0CUL) /**< 65036 - WSMEM */ +#define PGN_WORKING_SET_MASTER (0xFE0DUL) /**< 65037 - WSMSTR */ +#define PGN_RESP_FOR_REPETITION_RATE (0xFE0EUL) /**< 65038 - RESRR */ +#define PGN_LANGUAGE_COMMAND (0xFE0FUL) /**< 65039 - LC*/ +#define PGN_AUX_VALVE_0_EST_FLOW (0xFE10UL) /**< 65040 - AV00EF */ +#define PGN_AUX_VALVE_0_MEAS_FLOW (0xFE20UL) /**< 65056 - AV00MF */ +#define PGN_AUX_VALVE_0_COMMAND (0xFE30UL) /**< 65072 - AV00C */ +#define PGN_AUX_VALVE_1_EST_FLOW (0xFE11UL) /**< 65041 - AV01EF */ +#define PGN_AUX_VALVE_1_MEAS_FLOW (0xFE21UL) /**< 65057 - AV01MF */ +#define PGN_AUX_VALVE_1_COMMAND (0xFE31UL) /**< 65073 - AV01C */ +#define PGN_AUX_VALVE_2_EST_FLOW (0xFE12UL) /**< 65042 - AV02EF */ +#define PGN_AUX_VALVE_2_MEAS_FLOW (0xFE22UL) /**< 65058 - AV02MF */ +#define PGN_AUX_VALVE_2_COMMAND (0xFE32UL) /**< 65074 - AV02C */ +#define PGN_AUX_VALVE_3_EST_FLOW (0xFE13UL) /**< 65043 - AV03EF */ +#define PGN_AUX_VALVE_3_MEAS_FLOW (0xFE23UL) /**< 65059 - AV03MF */ +#define PGN_AUX_VALVE_3_COMMAND (0xFE33UL) /**< 65075 - AV03C */ +#define PGN_AUX_VALVE_4_EST_FLOW (0xFE14UL) /**< 65044 - AV04EF */ +#define PGN_AUX_VALVE_4_MEAS_FLOW (0xFE24UL) /**< 65060 - AV04MF */ +#define PGN_AUX_VALVE_4_COMMAND (0xFE34UL) /**< 65076 - AV04C */ +#define PGN_AUX_VALVE_5_EST_FLOW (0xFE15UL) /**< 65045 - AV05EF */ +#define PGN_AUX_VALVE_5_MEAS_FLOW (0xFE25UL) /**< 65061 - AV05MF */ +#define PGN_AUX_VALVE_5_COMMAND (0xFE35UL) /**< 65077 - AV05C */ +#define PGN_AUX_VALVE_6_EST_FLOW (0xFE16UL) /**< 65046 - AV06EF */ +#define PGN_AUX_VALVE_6_MEAS_FLOW (0xFE26UL) /**< 65062 - AV06MF */ +#define PGN_AUX_VALVE_6_COMMAND (0xFE36UL) /**< 65078 - AV06C */ +#define PGN_AUX_VALVE_7_EST_FLOW (0xFE17UL) /**< 65047 - AV07EF */ +#define PGN_AUX_VALVE_7_MEAS_FLOW (0xFE27UL) /**< 65063 - AV07MF */ +#define PGN_AUX_VALVE_7_COMMAND (0xFE37UL) /**< 65079 - AV07C */ +#define PGN_AUX_VALVE_8_EST_FLOW (0xFE18UL) /**< 65048 - AV08EF */ +#define PGN_AUX_VALVE_8_MEAS_FLOW (0xFE28UL) /**< 65064 - AV08MF */ +#define PGN_AUX_VALVE_8_COMMAND (0xFE38UL) /**< 65080 - AV08C */ +#define PGN_AUX_VALVE_9_EST_FLOW (0xFE19UL) /**< 65049 - AV09EF */ +#define PGN_AUX_VALVE_9_MEAS_FLOW (0xFE29UL) /**< 65065 - AV09MF */ +#define PGN_AUX_VALVE_9_COMMAND (0xFE39UL) /**< 65081 - AV09C */ +#define PGN_AUX_VALVE_10_EST_FLOW (0xFE1AUL) /**< 65050 - AV10EF */ +#define PGN_AUX_VALVE_10_MEAS_FLOW (0xFE2AUL) /**< 65066 - AV10MF */ +#define PGN_AUX_VALVE_10_COMMAND (0xFE3AUL) /**< 65082 - AV10C */ +#define PGN_AUX_VALVE_11_EST_FLOW (0xFE1BUL) /**< 65051 - AV11EF */ +#define PGN_AUX_VALVE_11_MEAS_FLOW (0xFE2BUL) /**< 65067 - AV11MF */ +#define PGN_AUX_VALVE_11_COMMAND (0xFE3BUL) /**< 65083 - AV11C */ +#define PGN_AUX_VALVE_12_EST_FLOW (0xFE1CUL) /**< 65052 - AV12EF */ +#define PGN_AUX_VALVE_12_MEAS_FLOW (0xFE2CUL) /**< 65068 - AV12MF */ +#define PGN_AUX_VALVE_12_COMMAND (0xFE3CUL) /**< 65084 - AV12C */ +#define PGN_AUX_VALVE_13_EST_FLOW (0xFE1DUL) /**< 65053 - AV13EF */ +#define PGN_AUX_VALVE_13_MEAS_FLOW (0xFE2DUL) /**< 65069 - AV13MF */ +#define PGN_AUX_VALVE_13_COMMAND (0xFE3DUL) /**< 65085 - AV13C */ +#define PGN_AUX_VALVE_14_EST_FLOW (0xFE1EUL) /**< 65054 - AV14EF */ +#define PGN_AUX_VALVE_14_MEAS_FLOW (0xFE2EUL) /**< 65070 - AV14MF */ +#define PGN_AUX_VALVE_14_COMMAND (0xFE3EUL) /**< 65086 - AV14C */ +#define PGN_AUX_VALVE_15_EST_FLOW (0xFE1FUL) /**< 65055 - AV15EF */ +#define PGN_AUX_VALVE_15_MEAS_FLOW (0xFE2FUL) /**< 65071 - AV15MF */ +#define PGN_AUX_VALVE_15_COMMAND (0xFE3FUL) /**< 65087 - AV15C */ +/* Lighting data and command in J1939 and ISO */ +#define PGN_LIGHTING_DATA (0xFE40UL) /**< 65088 - LD */ +#define PGN_LIGHTING_COMMAND (0xFE41UL) /**< 65089 - LC */ +#define PGN_COMMAND_HITCH_PTO (0xFE42UL) /**< 65090 - HPTOC */ +#define PGN_REAR_PTO (0xFE43UL) /**< 65091 - RPTO */ +#define PGN_FRONT_PTO (0xFE44UL) /**< 65092 - FPTO */ +#define PGN_REAR_HITCH (0xFE45UL) /**< 65093 - RHS */ +#define PGN_FRONT_HITCH (0xFE46UL) /**< 65094 - FHS */ +#define PGN_MAINTAIN_POWER (0xFE47UL) /**< 65095 - MP */ +#define PGN_WHEEL_BASED_SPEED (0xFE48UL) /**< 65096 - WBSD */ +#define PGN_GROUND_BASED_SPEED (0xFE49UL) /**< 65097 - GBSD */ +/* ISO 11783 - Part 7 - end */ +#define PGN_TRANSMISSIONG_CONFIG_2 (0xFE4BUL) /**< 65099 - TCFG2 */ +#define PGN_MILITARY_LIGHTING_COMMAND (0xFE4CUL) /**< 65100 - ML */ +#define PGN_TOTAL_AVERAGED_INFORMATION (0xFE4DUL) /**< 65101 - TAVG */ +#define PGN_DOOR_CONTROL (0xFE4EUL) /**< 65102 - DC */ +#define PGN_VEHICLE_DYN_STAB_CTRL_1 (0xFE4FUL) /**< 61103 - VDC1 */ +#define PGN_BATTERY_TEMPERATURE (0xFE50UL) /**< 65104 - BT1 */ +#define PGN_ADAPT_CRUISE_CONTR_OPER_INP (0xFE51UL) /**< 65105 - ACC2 */ +#define PGN_VEHICLE_ELECTRICAL_POWER_3 (0xFE52UL) /**< 65106 - VP3 */ +#define PGN_RETARD_TORQUE_SPEED_LIMIT (0xFE53UL) /**< 65107 - RTC1 */ +#define PGN_ENGINE_TORQUE_SPEED_LIMIT (0xFE54UL) /**< 65108 - ETC1 */ +#define PGN_GASEOUS_FUEL_PROPERTIES (0xFE55UL) /**< 65109 - GFD */ +#define PGN_TANK_INFORMATION_1 (0xFE56UL) /**< 65110 - TI1 */ +#define PGN_AIR_SUSPENSION_CONTROL_5 (0xFE57UL) /**< 65111 - ASC5 */ +#define PGN_AIR_SUSPENSION_CONTROL_4 (0xFE58UL) /**< 65112 - ASC4 */ +#define PGN_AIR_SUSPENSION_CONTROL_3 (0xFE59UL) /**< 65113 - ASC3 */ +#define PGN_AIR_SUSPENSION_CONTROL_1 (0xFE5AUL) /**< 65114 - ASC1 */ +#define PGN_FORWARD_LANE_IMAGE (0xFE5BUL) /**< 65115 - FLI2 */ +#define PGN_BATTERY_MAIN_SWITCH_INFO (0xFE66UL) /**< 65126 - BM */ +#define PGN_CLIMATE_CONTR_CONFIGURATION (0xFE67UL) /**< 65127 - CCC */ +#define PGN_VEHICLE_FLUIDS (0xFE68UL) /**< 65128 - VF */ +#define PGN_ENGINE_TEMPERATURE_3 (0xFE69UL) /**< 65129 - ET3 */ +#define PGN_ENGINE_FUEL_LUBE_SYSTEMS (0xFE6AUL) /**< 65130 - EFS */ +#define PGN_DRIVERS_IDENTIFICATION (0xFE6BUL) /**< 65131 - DI */ +#define PGN_TACHOGRAPH (0xFE6CUL) /**< 65132 - TCO1 */ +#define PGN_HEATER_INFORMATION (0xFE6DUL) /**< 65133 - HTR */ +#define PGN_HIGH_RESOLUTION_WHEEL_SPEED (0xFE6EUL) /**< 65134 - HRW */ +#define PGN_ADAPTIVE_CRUISE_CONTROL (0xFE6FUL) /**< 65135 - ACC1 */ +#define PGN_COMBINATION_VEHICLE_WEIGHT (0xFE70UL) /**< 65136 - CVW */ +#define PGN_LASER_TRACER_POSITION (0xFE71UL) /**< 65137 - LTP */ +#define PGN_LASER_LEVEL_SYS_BLADE_CONTR (0xFE72UL) /**< 65138 - LBC */ +#define PGN_LASER_RECEIVER_MAST_POS (0xFE73UL) /**< 65139 - LMP */ +#define PGN_MODIFY_LEVEL_CTRL_SET_POINT (0xFE74UL) /**< 65140 - LSP */ +#define PGN_LASER_LVL_SYS_VERTIC_DEVIAT (0xFE75UL) /**< 65141 - LVD */ +#define PGN_LASER_LVL_SYS_POS_DISP_DATA (0xFE76UL) /**< 65142 - LVDD */ +#define PGN_AUXILIARY_PRESSURES (0xFE77UL) /**< 65143 - AP */ +#define PGN_TIRE_PRESS_CONTR_UNIT_STAT (0xFE78UL) /**< 65144 - TP1 */ +#define PGN_TIRE_PRESS_CTRL_TARGET_PRES (0xFE79UL) /**< 65145 - TP2 */ +#define PGN_TIRE_PRESS_UNIT_CURR_PRESS (0xFE7AUL) /**< 65146 - TP3 */ +#define PGN_COMBUSTION_TIME_1 (0xFE7BUL) /**< 65147 - CT1 */ +#define PGN_COMBUSTION_TIME_2 (0xFE7CUL) /**< 65148 - CT2 */ +#define PGN_COMBUSTION_TIME_3 (0xFE7DUL) /**< 65149 - CT3 */ +#define PGN_COMBUSTION_TIME_4 (0xFE7EUL) /**< 65150 - CT4 */ +#define PGN_COMBUSTION_TIME_5 (0xFE7FUL) /**< 65151 - CT5 */ +#define PGN_COMBUSTION_TIME_6 (0xFE80UL) /**< 65152 - CT6 */ +#define PGN_FUEL_INFORMATION_2 (0xFE81UL) /**< 65153 - GFI2 */ +#define PGN_IGNITION_TIMING_1 (0xFE82UL) /**< 65154 - IT1 */ +#define PGN_IGNITION_TIMING_2 (0xFE83UL) /**< 65155 - IT2 */ +#define PGN_IGNITION_TIMING_3 (0xFE84UL) /**< 65156 - IT3 */ +#define PGN_IGNITION_TIMING_4 (0xFE85UL) /**< 65157 - IT4 */ +#define PGN_IGNITION_TIMING_5 (0xFE86UL) /**< 65158 - IT5 */ +#define PGN_IGNITION_TIMING_6 (0xFE87UL) /**< 65159 - IT6 */ +#define PGN_IGNITION_TRANSF_SECOND_OP1 (0xFE88UL) /**< 65160 - ISO1 */ +#define PGN_IGNITION_TRANSF_SECOND_OP2 (0xFE89UL) /**< 65161 - ISO2 */ +#define PGN_IGNITION_TRANSF_SECOND_OP3 (0xFE8AUL) /**< 65162 - ISO3 */ +#define PGN_GASEOUS_FUEL_PRESSURE (0xFE8BUL) /**< 65163 - GFP */ +#define PGN_AUXILIARY_ANALOG_INFO (0xFE8CUL) /**< 65164 - AAI */ +#define PGN_VEHICLE_ELECTRICAL_POWER_2 (0xFE8DUL) /**< 65165 - VP2 */ +#define PGN_SERVICE_2 (0xFE8EUL) /**< 65166 - S2 */ +#define PGN_SUPPLY_PRESSURE_2 (0xFE8FUL) /**< 65167 - SP2 */ +#define PGN_ENGINE_TORQUE_HISTORY (0xFE90UL) /**< 65168 - ETH */ +#define PGN_FUEL_LEAKAGE (0xFE91UL) /**< 65169 - FL */ +#define PGN_ENGINE_INFORMATION (0xFE92UL) /**< 65170 - EI */ +#define PGN_ENGINE_ELECTR_SYST_MOD_INFO (0xFE93UL) /**< 65171 - EES */ +#define PGN_ENGINE_AUXILIARY_COOLANT (0xFE94UL) /**< 65172 - EAC */ +#define PGN_REBUILD_INFORMATION (0xFE95UL) /**< 65173 - RBI */ +#define PGN_TURBOCHARGER_WASTEGATE (0xFE96UL) /**< 65174 - TCW */ +#define PGN_TURBOCHARGER_INFORMATION_5 (0xFE97UL) /**< 65175 - TCI5 */ +#define PGN_TURBOCHARGER_INFORMATION_4 (0xFE98UL) /**< 65176 - TCI4 */ +#define PGN_TURBOCHARGER_INFORMATION_3 (0xFE99UL) /**< 65177 - TCI3 */ +#define PGN_TURBOCHARGER_INFORMATION_2 (0xFE9AUL) /**< 65178 - TCI2 */ +#define PGN_TURBOCHARGER_INFORMATION_1 (0xFE9BUL) /**< 65179 - TCI1 */ +#define PGN_MAIN_BEARING_TEMPERATURE_3 (0xFE9CUL) /**< 65180 - MBT3 */ +#define PGN_MAIN_BEARING_TEMPERATURE_2 (0xFE9DUL) /**< 65181 - MBT2 */ +#define PGN_MAIN_BEARING_TEMPERATURE_1 (0xFE9EUL) /**< 65182 - MBT1 */ +#define PGN_EXHAUST_PORT_TEMPERATURE_5 (0xFE9FUL) /**< 65183 - EPT5 */ +#define PGN_EXHAUST_PORT_TEMPERATURE_4 (0xFEA0UL) /**< 65184 - EPT4 */ +#define PGN_EXHAUST_PORT_TEMPERATURE_3 (0xFEA1UL) /**< 65185 - EPT3 */ +#define PGN_EXHAUST_PORT_TEMPERATURE_2 (0xFEA2UL) /**< 65186 - EPT2 */ +#define PGN_EXHAUST_PORT_TEMPERATURE_1 (0xFEA3UL) /**< 65187 - EPT1 */ +#define PGN_ENGINE_TEMPERATURE_2 (0xFEA4UL) /**< 65188 - ET2 */ +#define PGN_INTAKE_MANIFOLD_INFO_2 (0xFEA5UL) /**< 65189 - IMT2 */ +#define PGN_INTAKE_MANIFOLD_INFO_1 (0xFEA6UL) /**< 65190 - IMT1 */ +#define PGN_ALTERNATOR_TEMPEATURE (0xFEA7UL) /**< 65191 - AT */ +#define PGN_ARTICULATION_CONTROL (0xFEA8UL) /**< 65192 - AC */ +#define PGN_EXHAUST_OXYGEN_1 (0xFEA9UL) /**< 65193 - EO1 */ +#define PGN_ALTERNATE_FUEL_2 (0xFEA6UL) /**< 65194 - AF2 */ +#define PGN_ELECTRONIC_TRANSM_CONTR_6 (0xFEABUL) /**< 65195 - ETC6 */ +#define PGN_WHEEL_BRAKE_LIN_REMAIN_INFO (0xFEACUL) /**< 65196 - EBC4 */ +#define PGN_WHEEL_APPL_PRESS_HI_RGE_INF (0xFEADUL) /**< 65197 - EBC3 */ +#define PGN_AIR_SUPPLY_PRESSURE (0xFEAEUL) /**< 65198 - AIR1 */ +#define PGN_FUEL_CONSUMPTION_GASEOUS (0xFEAFUL) /**< 65199 - GFC */ +#define PGN_TRIP_TIME_INFORMATON_2 (0xFEB0UL) /**< 65200 - TTI2 */ +#define PGN_ECU_HISTORY (0xFEB1UL) /**< 65201 - EH */ +#define PGN_FUEL_INFORMATION_1_GASEOUS (0xFEB2UL) /**< 65202 - GFI1 */ +#define PGN_FUEL_INFORMATION_LIQUID (0xFEB3UL) /**< 65203 - LFI */ +#define PGN_TRIP_TIME_INFORMATION_1 (0xFEB4UL) /**< 65204 - TTI1 */ +#define PGN_TRIP_SHUTDOWN_INFORMATION (0xFEB5UL) /**< 65205 - TSI */ +#define PGN_TRIP_VEHIC_SPEED_DIST_INFO (0xFEB6UL) /**< 65206 - TVI */ +#define PGN_ENGINE_SPEED_LOAD_FAC_INFO (0xFEB7UL) /**< 65207 - LF */ +#define PGN_TRIP_FUEL_INFO_GASEOUS (0xFEB8UL) /**< 65208 - GTFI */ +#define PGN_TRIP_FUEL_INFO_LIQUID (0xFEB9UL) /**< 65209 - LTFI */ +#define PGN_TRIP_DISTANCE_INFO (0xFEBAUL) /**< 65210 - TDI */ +#define PGN_TRIP_FAN_INFO (0xFEBBUL) /**< 65211 - TFI */ +#define PGN_COMPRES_SERVICE_BRAKE_INFO (0xFEBCUL) /**< 65212 - CBI */ +#define PGN_FAN_DRIVE (0xFEBDUL) /**< 65213 - FD */ +#define PGN_ELECTRONIC_ENGIN_CONTROL_4 (0xFEBEUL) /**< 65214 - EEC4 */ +#define PGN_WHEEL_SPEED_INFORMATION (0xFEBFUL) /**< 65215 - EBC2 */ +#define PGN_SERVICE_INFORMATION (0xFEC0UL) /**< 65216 - SERV */ +#define PGN_HIGH_RESOLUTION_VEHIC_DIST (0xFEC1UL) /**< 65217 - VDHR */ +#define PGN_ELEC_RETARDER_CONTROLLER_2 (0xFEC2UL) /**< 65218 - ERC2 */ +#define PGN_ELEC_TRANSMISSION_CONTR_5 (0xFEC3UL) /**< 65219 - ETC5 */ +#define PGN_ELEC_TRANSMISSION_CONTR_4 (0xFEC5UL) /**< 65221 - ETC4 */ +#define PGN_ELEC_TRANSMISSION_CONTR_3 (0xFEC7UL) /**< 65223 - ETC3 */ + +/* 65226 - 65236 - J1939-73, see later */ +#define PGN_ALTERNATOR_SPEEED (0xFED5UL) /**< 65237 - AS */ +#define PGN_COMMANDED_ADDRESS (0xFED8UL) /**< 65240 - CA */ +#define PGN_AUXIL_INPUT_OUTP_STATUS (0xFED9UL) /**< 65241 - AUXIO */ +#define PGN_SOFTWARE_IDENTIFICATION (0xFEDAUL) /**< 65242 - SOFT */ +#define PGN_ENGIN_FLUID_LEV_PRESSURE_2 (0xFEDBUL) /**< 65243 - EFL_P2 */ +#define PGN_IDLE_OPERATION (0xFEDCUL) /**< 65244 - IO */ +#define PGN_TURBOCHARGER (0xFEDDUL) /**< 65245 - TC */ +#define PGN_AIR_START_PRESSURE (0xFEDEUL) /**< 65246 - AIR2 */ +#define PGN_ELEC_ENGINE_CONTROLLER_3 (0xFEDFUL) /**< 65247 - EEC3 */ +#define PGN_VEHICLE_DISTANCE (0xFEE0UL) /**< 65248 - VD */ +#define PGN_RETARDER_CONFIGURATION (0xFEE1UL) /**< 65249 - RC */ +#define PGN_TRANSMISSION_CONFIGURATION (0xFEE2UL) /**< 65250 - TCFG */ +#define PGN_ENGINE_CONFIGURATION (0xFEE3UL) /**< 65251 - EC */ +#define PGN_SHUTDOWN (0xFEE4UL) /**< 65252 - SHUTDOWN */ +#define PGN_ENGINE_HOURS_REVOLUTIONS (0xFEE5UL) /**< 65253 - HOURS */ +#define PGN_TIME_DATA (0xFEE6UL) /**< 65254 - TD */ +#define PGN_VEHICLE_HOURS (0xFEE7UL) /**< 65255 - VH */ +#define PGN_VEHICLE_DIRETION_SPEED (0xFEE8UL) /**< 65256 - VDS */ +#define PGN_FUEL_CONSUMPTION_LIQUID (0xFEE9UL) /**< 65257 - LFC */ +#define PGN_VEHICLE_WEIGHT (0xFEEAUL) /**< 65258 - VW */ +#define PGN_COMPONENT_IDENTIFICATION (0xFEEBUL) /**< 65259 - CI */ +#define PGN_VEHICLE_IDENTIFICATION (0xFEECUL) /**< 65260 - VI */ +#define PGN_CRUIS_CTR_VEHIC_SPEED_SETUP (0xFEEDUL) /**< 65261 - CCSS */ +#define PGN_ENGINE_TEMPERATURE_1 (0xFEEEUL) /**< 65262 - ET1 */ +#define PGN_ENGINE_FLUID_LEVEL_PRESS_1 (0xFEEFUL) /**< 65263 - EFL_P1 */ +#define PGN_POWER_TAKEOFF_INFORMATION (0xFEF0UL) /**< 65264 - PTO */ +#define PGN_CRUISE_CONTROL_VEHIC_SPEED (0xFEF1UL) /**< 65265 - CCVS */ +#define PGN_FUEL_ECONOMY_LIQUID (0xFEF2UL) /**< 65266 - LFE */ +#define PGN_VEHICLE_POSITION (0xFEF3UL) /**< 65267 - VP */ +#define PGN_TIRE_CONDITION (0xFEF4UL) /**< 65268 - TIRE */ +#define PGN_AMBIENT_CONDITIONS (0xFEF5UL) /**< 65269 - AMB */ +#define PGN_INLET_EXHAUST_CONDITIONS_1 (0xFEF6UL) /**< 65270 - IC1 */ +#define PGN_VEHICLE_ELECTRICAL_POWER (0xFEF7UL) /**< 65271 - VEP1 */ +#define PGN_TRANSMISSION_FLUIDS (0xFEF8UL) /**< 65272 - TF */ +#define PGN_AXLE_INFORMATION (0xFEF9UL) /**< 65273 - AI */ +#define PGN_BRAKES (0xFEFAUL) /**< 65274 - B */ +#define PGN_RETARDER_FLUIDS (0xFEFBUL) /**< 65275 - RF */ +#define PGN_DASH_DISPLAY (0xFEFCUL) /**< 65276 - DD */ +#define PGN_ALTERNATE_FUEL_1 (0xFEFDUL) /**< 65277 - A1 */ +#define PGN_AUXIL_WATER_PUMP_PRESS (0xFEFEUL) /**< 65278 - AWPP */ +#define PGN_WATER_IN_FUEL_INDICATOR (0xFEFFUL) /**< 65279 - WFI */ + +/* J1939-73 / 11783-12, B.x - Application layer - Diagnostics */ +#define PGN_ACTIVE_DIAG_TROUBLE_CODES (0xFECAUL) /**< 65226 - DM1 */ +#define PGN_PREV_ACTIV_DIAG_TROUBLE_COD (0xFECBUL) /**< 65227 - DM2 */ +#define PGN_DIAGNOSTIC_DATA_CLEAR (0xFECCUL) /**< 65228 - DM3 */ +#define PGN_FREEZE_FRAME_PARAMETERS (0xFECDUL) /**< 65229 - DM4 */ +#define PGN_DIAGNOSTIC_READINESS (0xFECEUL) /**< 65230 - DM5 */ +#define PGN_CONTIN_MONI_SYST_TEST_RESUL (0xFECFUL) /**< 65231 - DM6 */ +#define PGN_TEST_RESUL_NON_CONT_MONITOR (0xFED0UL) /**< 65232 - DM8 */ +#define PGN_NON_CONTIN_MONITOR_SYS_TEST (0xFED2UL) /**< 65234 - DM10 */ +#define PGN_DIAG_DATA_CLEAR_ACTIV_DTC (0xFED3UL) /**< 65235 - DM11 */ +#define PGN_EMISS_RELAT_ACT_DIAG_TROUB (0xFED4UL) /**< 65236 - DM12 */ + +/* J1939-75 - Application layer - Generator Sets and Industrial */ +#define PGN_BUS_1_UTIL_SYNC_CHECK_STATU (0xFDE7UL) /**< 64999 - BUSC */ +#define PGN_BUS_1_GENERA_SYNC_CH_STAT (0xFDE8UL) /**< 65000 - BGSC */ +#define PGN_BUS_1_PHASE_C_BASIC_AC_QUAN (0xFDE9UL) /**< 65001 - BPCAC */ +#define PGN_BUS_1_PHASE_B_BASIC_AC_QUAN (0xFDEAUL) /**< 65002 - BPBAC */ +#define PGN_BUS_1_PHASE_A_BASIC_AC_QUAN (0xFDEBUL) /**< 65003 - BPAAC */ +#define PGN_BUS_1_AVERAGE_BASIC_AC_QUAN (0xFDECUL) /**< 65004 - BAAC */ +#define PGN_UTIL_TOTAL_AC_ENERGY (0xFDEDUL) /**< 65005 - UTACE */ +#define PGN_UTIL_PHASE_C_AC_REACT_POWER (0xFDEEUL) /**< 65006 - UPCACR */ +#define PGN_UTIL_PHASE_C_AC_POWER (0xFDEFUL) /**< 65007 - UPCACP */ +#define PGN_UTIL_PHASE_C_AC_BASIC_QUANT (0xFDF0UL) /**< 65008 - UPCAC */ +#define PGN_UTIL_PHASE_B_AC_REACT_POWER (0xFDF1UL) /**< 65009 - UPBACR */ +#define PGN_UTIL_PHASE_B_AC_POWER (0xFDF2UL) /**< 65010 - UPBACP */ +#define PGN_UTIL_PHASE_B_AC_BASIC_QUANT (0xFDF3UL) /**< 65011 - UPBAC */ +#define PGN_UTIL_PHASE_A_AC_REACT_POWER (0xFDF4UL) /**< 65012 - UPAACR */ +#define PGN_UTIL_PHASE_A_AC_POWER (0xFDF5UL) /**< 65013 - UPAACP */ +#define PGN_UTIL_PHASE_A_AC_BASIC_QUANT (0xFDF6UL) /**< 65014 - UPAAC */ +#define PGN_UTIL_AC_REACTIVE_POWER (0xFDF7UL) /**< 65015 - UTACR */ +#define PGN_UTIL_TOTAL_AC_POWER (0xFDF8UL) /**< 65016 - UTACP */ +#define PGN_UTIL_AVERACE_BASIC_AC_QUANT (0xFDF9UL) /**< 65017 - UAAC */ +#define PGN_GENERATOR_TOTAL_AC_ENERGY (0xFDFAUL) /**< 65018 - GTACE */ +#define PGN_GENERA_PHAS_C_AC_REACT_PWR (0xFDFBUL) /**< 65019 - GPCACR */ +#define PGN_GENERATOR_PHASE_C_AC_POWER (0xFDFCUL) /**< 65020 - GPCACP */ +#define PGN_GENERA_PHASE_C_BAS_AC_QUANT (0xFDFDUL) /**< 65021 - GPCAC */ +#define PGN_GENERA_PHASE_B_AC_REACT_PWR (0xFDFEUL) /**< 65022 - GPBACR */ +#define PGN_GENERATOR_PHASE_B_AC_POWER (0xFDFFUL) /**< 65023 - GPBACP */ +#define PGN_GENERA_PHASE_B_BAS_AC_QUANT (0xFE00UL) /**< 65024 - GPBAC */ +#define PGN_GENERA_PHASE_A_AC_REACT_PWR (0xFE01UL) /**< 65025 - GPAACR */ +#define PGN_GENERATOR_PHASE_A_AC_POWER (0xFE02UL) /**< 65026 - GPAACP */ +#define PGN_GENERA_PHASE_A_BAS_AC_QUANT (0xFE03UL) /**< 65027 - GPAAC */ +#define PGN_GENERA_TOTAL_AC_REACT_POWER (0xFE04UL) /**< 65028 - GTACR */ +#define PGN_GENERATOR_TOTAL_AC_POWER (0xFE05UL) /**< 65029 - GTACP */ +#define PGN_GENERA_TOTAL_BAS_AC_QUANTI (0xFE06UL) /**< 65030 - GAAC */ + +/* NMEA */ +#define PGN_NMEA_REQCMDACKGROUPFUNCION (0x1ED00UL) /**< 126208 - SF NO */ +#define PGN_PGNLIST_GROUPFUNCTION (0x1EE00UL) /**< 126464 - SF NO */ +#define PGN_SYTEMTIME (0x1F010UL) /**< 126992 - SF YES */ +#define PGN_PRODUKTINFORMATION (0x1F014UL) /**< 126996 - SF NO */ +#define PGN_CONFIGURATIONINFORMATION (0x1F016UL) /**< 126998 - SF NO */ +#define PGN_HEADING_TRACKCONTROL (0x1F105UL) /**< 127237 - SF NO */ +#define PGN_RUDDER (0x1F10DUL) /**< 127245 - SF YES */ +#define PGN_VESSEL_HEADING (0x1F112UL) /**< 127250 - SF YES */ +#define PGN_RATE_OF_TURN (0x1F113UL) /**< 127251 - SF YES */ +#define PGN_ATTITUDE (0x1F119UL) /**< 127257 - SF YES */ +#define PGN_MAGNETIC_VARIATION (0x1F11AUL) /**< 127258 - SF YES */ +#define PGN_ENGINE_PARA_RAPID_UPDATE (0x1F200UL) /**< 127488 - SF YES */ +#define PGN_ENGINE_PARA_DYNAMIC (0x1F201UL) /**< 127489 - SF NO */ +#define PGN_TRANSMISSION_PARA_DYNAMIC (0x1F205UL) /**< 127493 - SF YES */ +#define PGN_TRIP_PARAMETERS_VESSEL (0x1F208UL) /**< 127496 - SF NO */ +#define PGN_TRIP_PARAMETERS_ENGINE (0x1F209UL) /**< 127497 - SF NO */ +#define PGN_ENGINE_PARAMETERS_STATIC (0x1F20AUL) /**< 127498 - SF NO */ +#define PGN_BINARY_SWITCH_BANK_STATUS (0x1F20DUL) /**< 127501 - SF YES */ +#define PGN_SWITCH_BANK_CONTROL (0x1F20EUL) /**< 127502 - SF YES */ +#define PGN_AC_INPUT_STATUS (0x1F20FUL) /**< 127503 - SF NO */ +#define PGN_AC_OUTPUT_STATUS (0x1F210UL) /**< 127504 - SF NO */ +#define PGN_FLUID_LEVEL (0x1F211UL) /**< 127505 - SF YES */ +#define PGN_DCDETAILED_STATUS (0x1F212UL) /**< 127506 - SF NO */ +#define PGN_CHARGER_STATUS (0x1F213UL) /**< 127507 - SF NO */ +#define PGN_BATTERY_STATUS (0x1F214UL) /**< 127508 - SF YES */ +#define PGN_INVERTER_STATUS (0x1F215UL) /**< 127509 - SF NO */ +#define PGN_CHARGER_CONFIG_STATUS (0x1F216UL) /**< 127510 - SF NO */ +#define PGN_INVERTER_CONFIG_STATUS (0x1F217UL) /**< 127511 - SF NO */ +#define PGN_AGS_CONFIG_STATUS (0x1F218UL) /**< 127512 - SF NO */ +#define PGN_BATTERY_CONFIG_STATUS (0x1F219UL) /**< 127513 - SF NO */ +#define PGN_AGS_STATUS (0x1F21AUL) /**< 127514 - SF NO */ +#define PGN_SPEED_WATERREF (0x1F503UL) /**< 128259 - SF YES */ +#define PGN_WATER_DEPTH (0x1F216UL) /**< 127510 - SF YES */ +#define PGN_DISTANCED_LOG (0x1F513UL) /**< 128275 - SF NO */ +#define PGN_TRACKED_TARGET_DATA (0x1F608UL) /**< 128520 - SF NO */ +#define PGN_POSITION_RAPID_UPDATE (0x1F801UL) /**< 129025 - SF YES */ +#define PGN_COG_SOG_RAPID_UPDATE (0x1F802UL) /**< 129026 - SF YES */ +#define PGN_POSITION_DELTA_HP_RAPID_UPD (0x1F803UL) /**< 129027 - SF YES */ +#define PGN_ALTITUDE_DELTA_HP_RAPID_UPD (0x1F804UL) /**< 129028 - SF YES */ +#define PGN_GNSS_POSITION_DATA (0x1F805UL) /**< 129029 - SF NO */ +#define PGN_NMEA_TIME_DATE (0x1F809UL) /**< 129033 - SF YES */ +#define PGN_AIS_CLASSA_POSITION_REPORT (0x1F80EUL) /**< 129038 - SF NO */ +#define PGN_AIS_CLASSB_POSITION_REPORT (0x1F80FUL) /**< 129039 - SF NO */ +#define PGN_AIS_CLASSB_EXTPOS_REPORT (0x1F810UL) /**< 129040 - SF NO */ +#define PGN_DATUM (0x1F814UL) /**< 129044 - SF NO */ +#define PGN_USER_DATUM_SETTINGS (0x1F815UL) /**< 129045 - SF NO */ +#define PGN_CROSS_TRACK_ERROR (0x1F903UL) /**< 129283 - SF YES */ +#define PGN_NAVIGATION_DATA (0x1F904UL) /**< 129284 - SF NO */ +#define PGN_NAVIGATION_ROUTEWP_INFO (0x1F905UL) /**< 129285 - SF NO */ +#define PGN_SET_DRIFT_RAPID_UPDATE (0x1F90BUL) /**< 129291 - SF YES */ +#define PGN_TIME_TOFROM_MARK (0x1F915UL) /**< 129301 - SF NO */ +#define PGN_BEARING_DIST_BET_TWO_MARKS (0x1F916UL) /**< 129302 - SF NO */ +#define PGN_GNSS_CONTROL_STATUS (0x1FA02UL) /**< 129538 - SF NO */ +#define PGN_GNSS_DOPS (0x1FA03UL) /**< 129539 - SF YES */ +#define PGN_GNSS_SATS_IN_VIEW (0x1FA04UL) /**< 129540 - SF NO */ +#define PGN_ALMANAC_DATA (0x1FA05UL) /**< 129541 - SF NO */ +#define PGN_GNSS_PSEUDOOR_NOISE_STATIST (0x1FA06UL) /**< 129542 - SF NO */ +#define PGN_GNSS_RAIM_OUTPUT (0x1FA09UL) /**< 129545 - SF NO */ +#define PGN_GNSS_RAIM_SETTINGS (0x1FA0AUL) /**< 129546 - SF YES */ +#define PGN_GNSS_PSEUDOOR_ERROR_STATIST (0x1FA0BUL) /**< 129547 - SF NO */ +#define PGN_DGNSS_CORRECTIONS (0x1FA0DUL) /**< 129549 - SF NO */ +#define PGN_GNSS_DIFF_CORR_RECEI_INTERF (0x1FA0EUL) /**< 129550 - SF YES */ +#define PGN_GNSS_DIFF_CORR_RECEIVE_SIGN (0x1FA0FUL) /**< 129551 - SF NO */ +#define PGN_GLONASS_ALMANAC_DATA (0x1FA14UL) /**< 129556 - SF NO */ +/* AIS */ +#define PGN_AIS_DGNSS_BROADC_BIN_MESSAG (0x1FB00UL) /**< 129792 - SF NO */ +#define PGN_AIS_UTC_AND_DATE_REPORT (0x1FB01UL) /**< 129793 - SF NO */ +#define PGN_AIS_CLASS_A_STAT_VOYAGE_DAT (0x1FB02UL) /**< 129794 - SF NO */ +#define PGN_AIS_ADDRESSED_BINARY_MESSAG (0x1FB03UL) /**< 129795 - SF NO */ +#define PGN_AIS_ACKNOWLEDGE (0x1FB04UL) /**< 129796 - SF NO */ +#define PGN_AIS_BINARY_BROADCAST_MESSAG (0x1FB05UL) /**< 129797 - SF NO */ +#define PGN_AIS_SAR_AIRCRAFT_POS_REPORT (0x1FB06UL) /**< 129798 - SF NO */ +#define PGN_RADIO_FREQUENCY_MODE_POWER (0x1FB07UL) /**< 129799 - SF NO */ +#define PGN_AIS_UTC_DATE_INQUIRY (0x1FB08UL) /**< 129800 - SF NO */ +#define PGN_AIS_ADDRESS_SAFE_REL_MESSAG (0x1FB09UL) /**< 129801 - SF NO */ +#define PGN_AIS_SAFE_RELD_BROADC_MESSAG (0x1FB0AUL) /**< 129802 - SF NO */ +#define PGN_AIS_INTERROGATION (0x1FB0BUL) /**< 129803 - SF NO */ +#define PGN_AIS_ASSIGNMENT_MODE_COMMAND (0x1FB0CUL) /**< 129804 - SF NO */ +#define PGN_DSC_CALL_INFORMATION (0x1FB10UL) /**< 129808 - SF NO */ +#define PGN_LORAN_C_TD_DATA (0x1FC04UL) /**< 130052 - SF NO */ +#define PGN_LORAN_C_RANGE_DATA (0x1FC05UL) /**< 130053 - SF NO */ +#define PGN_LORAN_C_SIGNAL_DATA (0x1FC06UL) /**< 130054 - SF NO */ +#define PGN_ROUTE_WP_SERVICE_DB_LIST (0x1FC10UL) /**< 130064 - SF NO */ +#define PGN_ROUTE_WP_SERVICE_ROUTE_LIST (0x1FC11UL) /**< 130065 - SF NO */ +#define PGN_ROUTE_WP_SERVICE_WP_ATTRIB (0x1FC12UL) /**< 130066 - SF NO */ +#define PGN_ROUTE_WP_SERVICE_WP_NAM_POS (0x1FC13UL) /**< 130067 - SF NO */ +#define PGN_ROUTE_WP_SERVICE_QP_NAME (0x1FC14UL) /**< 130068 - SF NO */ +#define PGN_ROUTE_WP_SERVICE_XTE_LIMIT (0x1FC15UL) /**< 130069 - SF NO */ +#define PGN_ROUTE_WP_SERVICE_WP_COMMENT (0x1FC16UL) /**< 130070 - SF NO */ +#define PGN_ROUTE_WP_SERVICE_ROUTE_COM (0x1FC17UL) /**< 130071 - SF NO */ +#define PGN_ROUTE_WP_SERVICE_DB_COMMENT (0x1FC18UL) /**< 130072 - SF NO */ +#define PGN_ROUTE_WP_SERVICE_RADIU_TURN (0x1FC19UL) /**< 130073 - SF NO */ +#define PGN_ROUTE_WP_SERVICE_WP_LIS_NAM (0x1FC1AUL) /**< 130074 - SF NO */ +#define PGN_WIND_DATA (0x1FD02UL) /**< 130306 - SF YES */ +#define PGN_ENVIRONMENT_PARAMETERS (0x1FD06UL) /**< 130310 - SF YES */ +#define PGN_ENVIRONMENT_PARAMETERS_2 (0x1FD07UL) /**< 130311 - SF YES */ +#define PGN_TEMPERATURE (0x1FD08UL) /**< 130312 - SF YES */ +#define PGN_HUMIDITY (0x1FD09UL) /**< 130313 - SF YES */ +#define PGN_ACTUAL_PRESSURE (0x1FD0AUL) /**< 130314 - SF YES */ +#define PGN_SET_PRESSURE (0x1FD0BUL) /**< 130315 - SF YES */ +#define PGN_TIDE_STATION_DATA (0x1FD10UL) /**< 130320 - SF NO */ +#define PGN_SALINITY_STATION_DATA (0x1FD11UL) /**< 130321 - SF NO */ +#define PGN_CURRENT_STATION_DATA (0x1FD12UL) /**< 130322 - SF NO */ +#define PGN_METEOROLOGICAL_STATION_DATA (0x1FD13UL) /**< 130323 - SF NO */ +#define PGN_MOORED_BUOY_STATION_DATA (0x1FD14UL) /**< 130324 - SF NO */ +#define PGN_SMALL_CRAFT_STATUS (0x1FE10UL) /**< 130576 - SF YES */ +#define PGN_DIRECTION_DATA (0x1FE11UL) /**< 130577 - SF NO */ +#define PGN_VESSEL_SPEED_COMPONENTS (0x1FE12UL) /**< 130578 - SF NO */ + +/** @} */ /* END isopgns */ + + +/* ************************************************************************ */ +/** \addtogroup isospns +*/ +/**@{*/ + +#ifndef NO_SPN_DEFINES /* use the SPN defines of the ECU Driver */ + +/* Electronic engine controller */ + #define SPN_ENGINESPEED (190UL) /**< \brief Part 8 App B */ + /* iso_SpnDefineSpn( x, SPN_ENGINESPEED, 4u, 1u, 16u, SpnValStandard ); */ + +/* Ground-based speed and distance */ + #define SPN_GROUNDBASEDMACHINESPEED (1859UL) /**< \brief Part 7 A.5 */ + #define SPN_GROUNDBASEDMACHINEDISTANCE (1860UL) /**< \brief Part 7 A.6 */ + #define SPN_GROUNDBASEDMACHIINEDIRECT (1861UL) /**< \brief Part 7 A.7 */ + + /* iso_SpnDefineSpn( x, SPN_GROUNDBASEDMACHINESPEED, 1u, 1u, 16u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_GROUNDBASEDMACHINEDISTANCE, 3u, 1u, 32u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_GROUNDBASEDMACHIINEDIRECT, 8u, 1u, 2u, SpnValStandard ); */ + +/* Wheel-based speed and distance */ + #define SPN_WHEELBASEDMACHINESPEED (1862UL) /**< \brief Part 7 A.8 */ + #define SPN_WHEELBASEDMACHINEDISTANCE (1863UL) /**< \brief Part 7 A.9 */ + #define SPN_WHEELBASEDMACHIINEDIRECTION (1864UL) /**< \brief Part 7 A.10 */ + #define SPN_KEYSWITCHSTATE (1865UL) /**< \brief Part 7 A.11 */ + #define SPN_MAXI_TIMEOFTRACPOWER (1866UL) /**< \brief Part 7 A.12 */ + + /* iso_SpnDefineSpn( x, SPN_WHEELBASEDMACHINESPEED, 1u, 1u, 16u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_WHEELBASEDMACHINEDISTANCE, 3u, 1u, 32u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_WHEELBASEDMACHIINEDIRECTION, 8u, 1u, 2u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_KEYSWITCHSTATE, 8u, 3u, 2u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_MAXI_TIMEOFTRACPOWER, 7u, 1u, 8u, SpnValStandard ); */ + +/* Machine selected speed */ + #define SPN_SELECTEDMACHINESPEED (4305UL) /**< \brief Part 7 A.30.1 */ + #define SPN_SELECTEDMACHINEDISTANCE (4306UL) /**< \brief Part 7 A.30.2 */ + #define SPN_SELECTEDMACHINELIMITSTATUS (4307UL) /**< \brief Part 7 A.30.8 */ + #define SPN_SELECTEDMACHINESOURCE (4308UL) /**< \brief Part 7 A.30.4 */ + #define SPN_SELECTEDTMACHINEDIRECTION (4309UL) /**< \brief Part 7 A.30.3 */ + /* iso_SpnDefineSpn( x, SPN_SELECTEDMACHINESPEED, 1u, 1u, 16u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_SELECTEDMACHINEDISTANCE, 3u, 1u, 32u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_SELECTEDTMACHINEDIRECTION, 8u, 1u, 2u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_SELECTEDMACHINESOURCE, 8u, 3u, 3u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_SELECTEDMACHINELIMITSTATUS, 8u, 6u, 3u, SpnValStandard ); */ + +/* Maintain power */ + #define SPN_MAINTAIN_ECUPOWER (1867UL) /**< \brief Part 7 A.13 */ + #define SPN_MAINTAIN_ACTUATORPOWER (1868UL) /**< \brief Part 7 A.14 */ + #define SPN_IMPLEMENT_TRANSPORTSTATE (1869UL) /**< \brief Part 7 A.15 */ + + /* iso_SpnDefineSpn( x, SPN_MAINTAIN_ECUPOWER, 1u, 7u, 2u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_MAINTAIN_ACTUATORPOWER, 1u, 5u, 2u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_IMPLEMENT_TRANSPORTSTATE, 2u, 7u, 2u, SpnValStandard ); */ + +/* Lighting command */ + + #define SPN_BACKUPLIGHT_ALARMHORNCMD (2391UL) /**< J1939-71 */ + /* iso_SpnDefineSpn( x, SPN_BACKUPLIGHT_ALARMHORNCMD, 3u, 1u, 2u, SpnValStandard ); */ + +/* Implement operating state command */ + #define SPN_IMPLEMENT_OPSTATECOMMAND (5139UL) /**< Part 7 A.25.1 */ + /* iso_SpnDefineSpn( x, SPN_IMPLEMENT_OPSTATECOMMAND, 8u, 1u, 2u, SpnValStandard ); */ + +/* Secondary or front hitch status */ + #define SPN_FRONT_HITCH_POSITION (1872UL) /**< \brief Part 7 A.19.1 */ + #define SPN_FRONT_HITCH_WORK_INDICATION (1876UL) /**< \brief Part 7 A.19.5 */ + #define SPN_FRONT_DRAFT (1878UL) /**< \brief Part 7 A.19.7 */ + + /* iso_SpnDefineSpn( x, SPN_FRONT_HITCH_POSITION, 1u, 1u, 8u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_FRONT_HITCH_WORK_INDICATION, 2u, 7u, 2u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_FRONT_DRAFT, 4u, 1u, 16u, SpnValStandard ); */ + +/* Primary or rear hitch status */ + #define SPN_REAR_HITCH_POSITION (1873UL) /**< \brief Part 7 A.19.2 */ + #define SPN_REAR_HITCH_WORK_INDICATION (1877UL) /**< \brief Part 7 A.19.6 */ + #define SPN_REAR_DRAFT (1879UL) /**< \brief Part 7 A.19.8 */ + + /* iso_SpnDefineSpn( x, SPN_REAR_HITCH_POSITION, 1u, 1u, 8u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_REAR_HITCH_WORK_INDICATION, 2u, 7u, 2u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_REAR_DRAFT, 4u, 1u, 16u, SpnValStandard ); */ + +/* Secondary or front PTO output shaft */ + #define SPN_FRONT_PTO_OUTP_SHAFT_SPEED (1882UL) /**< \brief Part 7 A.20.1 */ + #define SPN_FRONT_PTO_OUTP_SH_SPEED_SET (1884UL) /**< \brief Part 7 A.20.3 */ + #define SPN_FRONT_PTO_ENGAGEMENT (1888UL) /**< \brief Part 7 A.20.7 */ + #define SPN_FRONT_PTO_MODE (1889UL) /**< \brief Part 7 A.20.9 */ + #define SPN_FRONT_PTO_ECONOMY_MODE (1891UL) /**< \brief Part 7 A.20.11 */ + #define SPN_FRONT_PTO_ENGAGEMENT_REQ (5152UL) /**< \brief Part 7 A.20.19 */ + + /* iso_SpnDefineSpn( x, SPN_FRONT_PTO_OUTP_SHAFT_SPEED, 1u, 1u, 16u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_FRONT_PTO_OUTP_SH_SPEED_SET, 3u, 1u, 16u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_FRONT_PTO_NGAGEMENT, 5u, 7u, 2u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_FRONT_PTO_MODE, 5u, 5u, 2u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_FRONT_PTO_ECONOMY_MODE , 5u, 3u, 2u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_FRONT_PTO_OUTP_ENGAGEMENT, 5u, 1u, 2u, SpnValStandard ); */ + +/* Primary or rear PTO output shaft */ + #define SPN_REAR_PTO_OUTP_SHAFT_SPEED (1883UL) /**< \brief Part 7 A.20.2 */ + #define SPN_REAR_PTO_OUTP_SH_SPEED_SET (1885UL) /**< \brief Part 7 A.20.4 */ + #define SPN_REAR_PTO_ENGAGEMENT (2408UL) /**< \brief Part 7 A.20.8 */ + #define SPN_REAR_PTO_MODE (1890UL) /**< \brief Part 7 A.20.10 */ + #define SPN_REAR_PTO_ECONOMY_MODE (1892UL) /**< \brief Part 7 A.20.12 */ + #define SPN_REAR_PTO_ENGAGEMENT_REQ (5156UL) /**< \brief Part 7 A.20.23 */ + + /* iso_SpnDefineSpn( x, SPN_REAR_PTO_OUTP_SHAFT_SPEED, 1u, 1u, 16u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_REAR_PTO_OUTP_SH_SPEED_SET, 3u, 1u, 16u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_REAR_PTO_ENGAGEMENT, 5u, 7u, 2u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_REAR_PTO_MODE, 5u, 5u, 2u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_REAR_PTO_ECONOMY_MODE , 5u, 3u, 2u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_REAR_PTO_ENGAGEMENT_REQ, 5u, 1u, 2u, SpnValStandard ); */ + +/* Hitch and PTO commands */ + #define SPN_FRONT_HITCH_POS_COMMAND (1874UL) /**< \brief Part 7 A.19.3 */ + #define SPN_REAR_HITCH_POS_COMMAND (1875UL) /**< \brief Part 7 A.19.4 */ + #define SPN_FRONT_OUTP_SH_SPEED_SET_CMD (1886UL) /**< \brief Part 7 A.20.5 */ + #define SPN_REAR_OUTP_SH_SPEED_SET_CMD (1887UL) /**< \brief Part 7 A.20.6 */ + #define SPN_FRONT_PTO_ENGAGEMENT_CMD (1893UL) /**< \brief Part 7 A.20.13 */ + #define SPN_REAR_PTO_ENGAGEMEN_CMDT (1894UL) /**< \brief Part 7 A.20.14 */ + + /* iso_SpnDefineSpn( x, SPN_FRONT_HITCH_POS_COMMAND, 1u, 1u, 8u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_REAR_HITCH_POS_COMMAND, 2u, 1u, 8u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_FRONT_OUTP_SH_SPEED_SET, 3u, 1u, 16u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_REAR_OUTP_SH_SPEED_SET, 5u, 1u, 16u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_FRONT_PTO_ENGAGEMENT, 7u, 7u, 2u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_REAR_PTO_ENGAGEMENT, 7u, 5u, 2u, SpnValStandard ); */ + + +/* Auxiliary valve estimated flow */ + #define SPN_AUX_VALVE_EXT_EST_FLOW (2337UL) /**< \brief Part 7 A.21.19 */ + #define SPN_AUX_VALVE_RET_EST_FLOW (2338UL) /**< \brief Part 7 A.21.20 */ + #define SPN_AUX_VALVE_FAIL_SAFE_MOD (2346UL) /**< \brief Part 7 A.21.28 */ + #define SPN_AUX_VALVE_VALVE_STATE (2339UL) /**< \brief Part 7 A.21.21 */ + #define SPN_AUX_VALVE_ESTIM_LIMIT (5192UL) /**< \brief Part 7 A.21.47 */ + + /* iso_SpnDefineSpn( x, SPN_AUX_VALVE_EXT_EST_FLOW, 1u, 1u, 8u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_AUX_VALVE_RET_EST_FLOW, 2u, 1u, 8u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_AUX_VALVE_FAIL_SAFE_MOD, 3u, 7u, 2u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_AUX_VALVE_VALVE_STATE, 3u, 1u, 4u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_AUX_VALVE_ESTIM_LIMIT, 4u, 6u, 3u, SpnValStandard ); */ + + +/* Auxiliary valve command */ + #define SPN_AUX_VALVE_STATE_COMMAND (2334UL) /**< \brief Part 7 A.21.26 */ + /* iso_SpnDefineSpn( x, SPN_AUX_VALVE_15_STATE_COMMAND, 3u, 1u, 4u, SpnValStandard ); */ + +/* Auxiliary valve measured flow */ + #define SPN_AUX_VALVE_LIMITSTATUS (5190UL) /**< \brief Part 7 A.21.29 */ + /* iso_SpnDefineSpn( x, SPN_AUX_VALVE_LIMITSTATUS, 8u, 6u, 3u, SpnValStandard ); */ + +/* Guidance system command */ + #define SPN_CURVATURE_COMMAND (5237UL) /**< \brief Part 7 A.28.1 */ + #define SPN_CURVATURE_COMMAND_STATUS (5239UL) /**< \brief Part 7 A.28.3 */ + + /* iso_SpnDefineSpn( x, SPN_CURVATURE_COMMAND, 1u, 1u, 16u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_CURVATURE_COMMAND_STATUS, 3u, 1u, 2u, SpnValStandard ); */ + +/* Guidance machine status */ + #define SPN_ESTIMATED_CURVATURE (5238UL) /**< \brief Part 7 A.28.2 */ + #define SPN_REQUEST_RESET_COMM_STATUS (5240UL) /**< \brief Part 7 A.28.4 */ + #define SPN_STEERING_INP_POS_STATUS (5241UL) /**< \brief Part 7 A.28.5 */ + #define SPN_SYSTEM_READINESS (5242UL) /**< \brief Part 7 A.28.6 */ + #define SPN_MECHANICAL_SYSTEM_LOCKOUT (5243UL) /**< \brief Part 7 A.28.7 */ + + /* iso_SpnDefineSpn( x, SPN_ESTIMATED_CURVATURE , 1u, 1u, 16u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_REQUEST_RESET_COMM_STATUS, 3u, 7u, 2u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_STEERING_INP_POS_STATUS, 3u, 5u, 2u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_SYSTEM_READINESS, 3u, 3u, 2u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_MECHANICAL_SYSTEM_LOCKOUT, 3u, 1u, 2u, SpnValStandard ); */ + +#endif /* ifndef NO_SPN_DEFINES */ + +/**@}*/ /* end group SPNs */ + +/* ************************************************************************ */ +/** \addtogroup isofmis +*/ +/**@{*/ + + #define FMI_DATA_VALID_ABOVE_NORMAL (0u) /**< \brief Data Valid But Above Normal Operational Range - Most Severe Level */ + #define FMI_DATA_VALID_BELOW_NORMAL (1u) /**< \brief Data Valid But Below Normal Operational Range - Most Severe Level */ + #define FMI_DATA_ERRATIC (2u) /**< \brief Data Erratic, Intermittent Or Incorrect */ + #define FMI_VOLTAGE_ABOVE_NORMAL (3u) /**< \brief Voltage Above Normal, Or Shorted To High Source */ + #define FMI_VOLTAGE_BELOW_NORMAL (4u) /**< \brief Voltage Below Normal, Or Shorted To Low Source */ + #define FMI_CURRENT_ABOVE_NORMAL (5u) /**< \brief Current Below Normal Or Open Circuit */ + #define FMI_CURRENT_BELOW_NORMAL (6u) /**< \brief Current Above Normal Or Grounded Circuit */ + #define FMI_MECH_SYSTEM_NOT_RESPONDING (7u) /**< \brief Mechanical System Not Responding Or Out of Adjustment */ + #define FMI_ABNORMAL_FREQUENCY (8u) /**< \brief Abnormal Frequency Or Pulse Width Or Period */ + #define FMI_ABNORMAL_UPDATERATE (9u) /**< \brief Abnormal Update Rate */ + #define FMI_ABNORMAL_RATEOFCHANGE (10u) /**< \brief Abnormal Rate Of Change */ + #define FMI_ROOT_CAUSE_NOT_KNOWN (11u) /**< \brief Root Cause Not Known */ + #define FMI_BAD_INTELLIGENT_DEVICE (12u) /**< \brief Bad Intelligent Device Or Component */ + #define FMI_OUT_OF_CALIBRATION (13u) /**< \brief Out Of Calibration */ + #define FMI_SPECIAL_INSTRUCTIONS (14u) /**< \brief Special Instructions */ + #define FMI_DATA_ABOVE_NORM_LEAST_SEVER (15u) /**< \brief Data Valid But Above Normal Operating Range - Least Severe Level */ + #define FMI_DATA_ABOVE_NORMAL_MOD_SEVER (16u) /**< \brief Data Valid But Above Normal Operating Range - Moderately Severe Level */ + #define FMI_DATA_BELOW_NORMAL_LEAST_SEV (17u) /**< \brief Data Valid But Below Normal Operational Range - Least Severe Level */ + #define FMI_DATA_BELOW_NORMAL_MOD_SEVER (18u) /**< \brief Data Valid But Below Normal Operational Range - Moderately Severe Level */ + #define FMI_RECEIV_NETW_DATA_IN_ERROR (19u) /**< \brief Received Network Data in Error */ + /* 20-30, */ /* Reserved for future assignment */ + #define FMI_CONDITION_EXISTS (31u) /**< \brief Condition Exists */ + +/**@}*/ /* end group FMIs */ + +/* ************************************************************************ */ +/** \addtogroup isodefslayer78 +*/ +/**@{*/ + /* Common definitions for LAYER 7, 8 */ +#define REVERSE ( 0x0u ) /**< Direction reverse */ +#define DISABLED ( 0x0u ) /**< Not enabled */ +#define DISENGAGED ( 0x0u ) /**< Switched off */ +#define FORWARD ( 0x1u ) /**< Direction forward */ +#define ENABLED ( 0x1u ) /**< Enabled */ +#define ENGAGED ( 0x1u ) /**< Switched on */ +#define ISO_ERROR_INDI_2Bit ( 0x2u ) /**< 2 bit error indicator */ +#define ISO_NOT_AVAILABLE_2Bit ( 0x3u ) /**< 2 bit not available */ +#define ISO_DONT_CARE_2bit ( 0x3u ) /**< 2 bit dont care */ +#define ISO_ERROR_INDI_3Bit ( 0x6u ) /**< 3 bit error indicator */ +#define ISO_NOT_AVAILABLE_3Bit ( 0x7u ) /**< 3 bit not available */ +#define ISO_DONT_CARE_3bit ( 0x7u ) /**< 3 bit dont care */ + +#define ISO_ERROR_INDI_4bit ( 0xEu ) /**< 4 bit error indicator */ +#define ISO_NOT_AVAILABLE_4bit ( 0xFu ) /**< 4 bit not available */ +#define ISO_DONT_CARE_4bit ( 0xFu ) /**< 4 bit dont care */ + +#define ISO_VALID_SIGNAL_B ( 0xFAu ) /**< 8 bit max value of valid signal */ +#define ERROR_INDI_B ( 0xFEu ) /**< 8 bit error indicator */ +#define NOT_AVAILABLE_B ( 0xFFu ) /**< 8 bit not available */ +#define ISO_DONT_CARE_B ( 0xFFu ) /**< 8 bit dont care */ + +#define ISO_VALID_SIGNAL_W ( 0xFAFFu ) /**< 16 bit max value of valid signal */ +#define ISO_ERROR_INDI_W ( 0xFE00u ) /**< 16 bit error indicator min */ +#define ISO_NOT_AVAILABLE_W ( 0xFF00u ) /**< 16 bit not available min */ +#define ISO_ERROR_INDI_WM ( 0xFEFFu ) /**< 16 bit error indicator max */ +#define ISO_NOT_AVAILABLE_WM ( 0xFFFFu ) /**< 16 bit not available max */ +#define ISO_DONT_CARE_W ( 0xFFFFu ) /**< 16 bit dont care */ + +#define ISO_VALID_SIGNAL_DW ( 0xFAFFFFFFuL ) /**< 32 bit max value of valid signal */ +#define ISO_ERROR_INDI_DW ( 0xFE000000uL ) /**< 32 bit error indicator min */ +#define ISO_NOT_AVAILABLE_DW ( 0xFF000000uL ) /**< 32 bit not available min */ +#define ISO_ERROR_INDI_DWM ( 0xFEFFFFFFuL ) /**< 32 bit error indicator max */ +#define ISO_NOT_AVAILABLE_DM ( 0xFFFFFFFFuL ) /**< 32 bit not available max */ + + +#define ISO_LIMIT_MAX ( 0x7FFFFFFFL ) /**< Threshold limit signed long max */ +#define ISO_LIMIT_MIN ( -0x7FFFFFFFL ) /**< Threshold limit signed long min */ + +#define NMEA_ERROR_INDI_B ( (byte) 0xFE ) /**< NMEA Error indicator for 8 bit value */ +#define NMEA_ERROR_INDI_W ( 0xFFFEu ) /**< NMEA Error indicator for 16 bit value */ +#define NMEA_ERROR_INDI_DW ( 0xFFFFFFFEuL ) /**< NMEA Error indicator for 32 bit value */ +#define NMEA_ERROR_INDI_ULL ( 0xFFFFFFFFFFFFFFFEuLL ) /**< NMEA Error indicator for 64 bit value */ +#define NMEA_NOT_AVAILABLE_B ( (byte) 0xFF ) /**< NMEA Not available for 8 bit value */ +#define NMEA_NOT_AVAILABLE_W ( 0xFFFFu ) /**< NMEA Not available for 16 bit value */ +#define NMEA_NOT_AVAILABLE_DW ( 0xFFFFFFFFuL ) /**< NMEA Not available for 32 bit value */ +#define NMEA_NOT_AVAILABLE_ULL ( 0xFFFFFFFFFFFFFFFFuLL ) /**< NMEA Not available for 64 bit value */ + +/**@}*/ /* end group Common definitions for LAYER 7, 8 */ + + +#endif /* DEF_ISOPGNDEF_H */ ++======= + /****************************************************************************/ + /*! + \file IsoPgnDef.h + \brief PGN and SPN definitions and data for initialising of SPNs in application + + \author Hammerl Erwin + \date Created 12.07.2011 + + \copyright Competence Center ISOBUS e.V. + + \par HISTORY: + \par + 16.03.2012 - author P. Wegscheider + - FMI defines updated + \par + 16.10.2014 - author E. Hammerl + - Added SPN defines of ISO11783-8 ( provided of Eric ) + \par + 13.05.2015 - author E. Hammerl + - Added PGN defines for TIM + \par + 29.11.2016 - author P. Wegscheider + - Added PGN define for heartbeat message + \par + 09.03.2018 - author P. Wegscheider + - BugID 8519: Replace Defines XY with ISO_XY + \par + 10.07.2018 - author P. Wegscheider + - BugID 8581: add "namespace ISOBUSDRIVER" to header files \n + removed 64-bit defines NMEA_ERROR_INDI_ULL and NMEA_NOT_AVAILABLE_ULL + */ + #ifndef DEF_ISOPGNDEF_H + #define DEF_ISOPGNDEF_H + + /* ************************************************************************ */ + /** \addtogroup isopgns + @{ + */ + /* ************************************************************************ */ + /* PGNs PDU1 and Group Functions */ + /* ************************************************************************ */ + + #define PGN_TORQUE_SPEED_CONTROL1 (0x0000UL) /**< 00000 - TSC1 */ + #define PGN_TRANSMISSION_CONTROL1 (0x0100UL) /**< 00256 - TC1 */ + #define PGN_TIMS_TO_TIMC (0x2300UL) /**< 08960 - TIM server to client */ + #define PGN_TIMC_TO_TIMS (0x2400UL) /**< 09216 - TIM client to server */ + #define PGN_AUTC_TO_AUTS (0x6F00UL) /**< 28416 - Auth client to server */ + #define PGN_AUTS_TO_AUTC (0x7000UL) /**< 28672 - Auth server to client */ + #define PGN_SCC_TO_SCM (0x8D00UL) /**< 36096 - SCC - Sequence Control Annex B.1.a */ + #define PGN_SCM_TO_SCC (0x8E00UL) /**< 36352 - SCM - Sequence Control Annex B.1.a*/ + #define PGN_NAME_MANAGEMENT (0x9300UL) /**< 37632 - NAME management (NM) message Part-5:2011(E)*/ + + #define PGN_AUX_IO_STATUS_2 (0xA700UL) /**< 42752 - AUXIO2 */ + #define PGN_FSC_TO_FS (0xAA00UL) /**< 43520 - FSC - Part 13 File Server Annex C.1.1.b */ + #define PGN_FS_TO_FSC (0xAB00UL) /**< 43776 - FS - Part 13 File Server Annex C.1.1.a */ + + #define PGN_GUIDANCE_MACHINE_STATUS (0xAC00UL) /**< 44032 - GMS */ + #define PGN_GUIDANCE_SYSTEM_COMMAND_MSG (0xAD00UL) /**< 44288 - GMC - see Part 7 - B.27.1 */ + #define PGN_GENPURPOSE_VALVE_COMMAND (0xC400UL) /**< 50176 - */ + #define PGN_GENPURPOSE_VALVE_MEASFLOW (0xC500UL) /**< 50432 - */ + #define PGN_GENPURPOSE_VALVE_ESTIMFLOW (0xC600UL) /**< 50688 - */ + #define PGN_ETP_DT (0xC700UL) /**< 50944 - ETP_DT - extended data transport */ + #define PGN_ETP_CM (0xC800UL) /**< 51200 - ETP_CM - connection managem. for ETP */ + #define PGN_REQUEST2_PGN (0xC900UL) /**< 51456 - REQUEST2 */ + #define PGN_TRANSFER_PGN (0xCA00UL) /**< 51712 - TRANSFER */ + #define PGN_PROCESS_DATA (0xCB00UL) /**< 51968 - Process data */ + #define PGN_REQ_FOR_REP_RATE (0xCC00UL) /**< 52224 - Request for repetition rate */ + #define PGN_DoCAN_MIXED_FUNCTIONAL (0xCD00UL) /**< 52480 - DoCAN3 - ISO15765 */ + #define PGN_DoCAN_MIXED_PHYSICAL (0xCE00UL) /**< 52736 - DoCAN4 - ISO15765 */ + #define PGN_CONTINUOUSTORQUE (0xCF00UL) /**< 52992 - CTL */ + #define PGN_CAB_ILLUMINATION (0xD000UL) /**< 53248 - CL */ + #define PGN_AIRSUSPENSION_CONTROL6 (0xD100UL) /**< 53504 */ + #define PGN_AIRSUSPENSION_CONTROL2 (0xD200UL) /**< 53760 */ + #define PGN_CALIBRATION_INFORMATION (0xD300UL) /**< 54016 - DM19 */ + #define PGN_DATA_SECURITY (0xD500UL) /**< 54528 - DM18 */ + #define PGN_BOOT_LOAD_DATA (0xD600UL) /**< 54784 - DM17 */ + #define PGN_BINARY_DATA_TRANSFER (0xD700UL) /**< 55040 - DM16 */ + #define PGN_MEMORY_ACCESS_RESPONSE (0xD800UL) /**< 55296 - DM15 */ + #define PGN_MEMORY_ACCESS_REQUEST (0xD900UL) /**< 55552 - DM14 */ + #define PGN_DoCAN_NORMAL_PHYSICAL (0xDA00UL) /**< 55808 - DoCAN1 - ISO15765 */ + #define PGN_DoCAN_NORMAL_FUNCTIONAL (0xDB00UL) /**< 56064 - DoCAN2 - ISO15765 */ + #define PGN_ANTI_SHEFT_STATUS (0xDC00UL) /**< 56320 - ATS */ + #define PGN_ANTI_SHEFT_REQUEST (0xDD00UL) /**< 56576 - ATR */ + #define PGN_RESET (0xDE00UL) /**< 56832 - RESET */ + #define PGN_STOP_START_BROADCAST (0xDF00UL) /**< 57088 - DM13 */ + #define PGN_CAB_MESSAGE1 (0xE000UL) /**< 57344 - CM1 */ + #define PGN_CMD_NONCONTIN_MONITOR (0xE300UL) /**< 58112 - DM7 */ + + /* Virtual Terminal - 11783-6 */ + #define PGN_VTtoECU (0xE600UL) /**< 58880 - VT to ECU */ + #define PGN_ECUtoVT (0xE700UL) /**< 59136 - ECU to VT */ + + /* Data Link Layer - 11783-3 */ + #define PGN_N_ACK (0xE800UL) /**< 59392 - ACKM */ + #define PGN_REQUEST_PGN (0xEA00UL) /**< 59904 - RQST */ + #define PGN_TP_DT (0xEB00UL) /**< 60160 - TP_DT - J1939 PGN data transport */ + #define PGN_TP_CM (0xEC00UL) /**< 60416 - TP_CM - connection managem. for TP */ + + /* Network Layer - 11783-4 */ + #define PGN_NETWORK_LAYER (0xED00UL) /**< 60672 - NIU - Part 4 network message */ + + /* Network management - 11783-5 */ + #define PGN_ADDRESS_CLAIMED (0xEE00UL) /**< 60928 - AC */ + #define PGN_CANNOT_CLAIM_SA (0xEE00UL) /**< 60928 - AC */ + + /* PDU2 - Application Layer ( vehicle, implement, diagnostic ) */ + #define PGN_PDU1_PropA (0xEF00UL) /**< 61184 - PDU1 manufacturer proprietary */ + #define PGN_PDU1_PropA2 (0x1EF00UL) /**< 126720 - PDU1 manufacturer proprietary */ + #define PGN_PDU2_240_X (0xF000UL) /**< 61440 - see J1939-71, 73, 75, ISO 11783-8 */ + #define PGN_PDU2_254_Y (0xFE00UL) /**< 65024 - see J1939-71, 73, 75, ISO 11783-7 */ + #define PGN_PDU2_PropB (0xFF00UL) /**< 65280 - PDU2 proprietary */ + + + + /* ************************************************************************ */ + /* PGNs PDU2 */ + /* ************************************************************************ */ + + /* J1939-71 - Vehicle Application layer */ + #define PGN_ELEC_RETARDER_CONTROLLER (0xF000UL) /**< 61440 - ERC1 */ + #define PGN_ELEC_BRAKE_CONTROLLER (0xF001UL) /**< 61441 - EBC1 */ + #define PGN_ELEC_TRANSMISS_CONTROLLER_1 (0xF002UL) /**< 61442 - ETC1 */ + #define PGN_ELEC_ENGINE_CONTROLLER_2 (0xF003UL) /**< 61443 - EEC2 */ + #define PGN_ELEC_ENGINE_CONTROLLER_1 (0xF004UL) /**< 61444 - EEC1 */ + #define PGN_ELEC_TRANSMISS_CONTROLLER_2 (0xF005UL) /**< 61445 - ETC2 */ + #define PGN_ELEC_AXLE_CONTROLLER_1 (0xF006UL) /**< 61446 - EAC1 */ + #define PGN_FORW_LANE_IMAGE_URGENT_MSG (0xF007UL) /**< 61447 - FLI1 */ + #define PGN_HYDRAULIC_PRESS_GOVER_INFO (0xF008UL) /**< 61448 - HPG */ + #define PGN_VEHICLE_DYN_STAB_CTRL_2 (0xF009UL) /**< 61449 - VDC2 */ + #define PGN_MACHINE_SELECTED_SPEED (0xF022UL) /**< 61474 - 11783-7, B.28.1 */ + #define PGN_ENGINE_GAS_FLOW_RATE (0xF00AUL) /**< 61450 - EGF1 */ + #define PGN_HEARTBEAT (0xF0E4UL) /**< 61668 - Heartbeat message PGN */ + #define PGN_PRODUCT_IDENTIFICATION (0xFC8DUL) /**< 64653 - */ + #define PGN_FUNCTIONALI_CHARACTERISTICS (0xFC8EUL) /**< 64654 - */ + #define PGN_STOP_BUTTON (0xFD02UL) /**< 64770 - */ + #define PGN_IMPLEMENT_OPERATING_STATE (0xFD03UL) /**< 64771 - 11783-7, B.29 */ + #define PGN_ECU_DIAGNOSTIC_PROTOCOL (0xFD32UL) /**< 64818 - 11783-12, B.5 */ + #define PGN_ISOBUS_COMPLIANCE_CERTIFICA (0xFD42UL) /**< 64834 - 11783-7, B.28 */ + #define PGN_MACHINE_SELECT_SPEED_CMD (0xFD43UL) /**< 64835 - 11783-7, B.28.2 */ + #define PGN_ENGINE_OPERATING_INFORMATIO (0xFD92UL) /**< 64914 - EOI */ + #define PGN_ECU_IDENTIFICATION_INFO (0xFDC5UL) /**< 64965 - 11783-12, B.1 */ + #define PGN_COLD_START_AIDS (0xFDC6UL) /**< 64966 - CSA */ + #define PGN_OFFHIGHW_ENGINE_CTRL_SELECT (0xFDCBUL) /**< 64971 - OHECS */ + #define PGN_FMS_STANDARD_INTERFAC_IDENT (0xFDD1UL) /**< 64977 - FMS */ + #define PGN_ECU_PERFORMANCE (0xFDD2UL) /**< 64978 - EP */ + #define PGN_TURBOCHARGER_INFORMATION_6 (0xFDD3UL) /**< 64979 - TCI6 */ + #define PGN_CAB_MESSAGE_3 (0xFDD4UL) /**< 64980 - CM3 */ + #define PGN_ELEC_ENGINE_CONTROLLER_5 (0xFDD5UL) /**< 64981 - EEC5 */ + #define PGN_BASIC_JOYSTICK_MESSAGE_1 (0xFDD6UL) /**< 64982 - BJM1 */ + #define PGN_EXTENDED_JOYSTICK_MESSAGE_1 (0xFDD7UL) /**< 64983 - EJM1 */ + #define PGN_BASIC_JOYSTICK_MESSAGE_2 (0xFDD8UL) /**< 64984 - BJM2 */ + #define PGN_EXTENDED_JOYSTICK_MESSAGE_2 (0xFDD9UL) /**< 64985 - EJM2 */ + #define PGN_BASIC_JOYSTICK_MESSAGE_3 (0xFDDAUL) /**< 64986 - BJM3 */ + #define PGN_EXTENDED_JOYSTICK_MESSAGE_3 (0xFDDBUL) /**< 64987 - EJM1 */ + #define PGN_MARINE_CONTROL_INFORMATION (0xFDDCUL) /**< 64988 - MCI */ + #define PGN_AMBIENT_CONDITIONS_2 (0xFDDEUL) /**< 64992 - AMB2 */ + #define PGN_CAB_A_C_CLIMATE_SYST_INFO (0xFDE1UL) /**< 64993 - CACI */ + #define PGN_SUPPLY_PRESSURE_DEMAND (0xFDE2UL) /**< 64994 - SPR */ + #define PGN_EQUIPM_OPERATION_AND_CONTR (0xFDE3UL) /**< 64995 - EOAC */ + #define PGN_EQUIPMENT_PERFORMANCE_DATA (0xFDE4UL) /**< 64996 - EPD */ + #define PGN_MAX_VEHIC_SPEED_LIMIT_STAT (0xFDE5UL) /**< 64997 - MVS */ + #define PGN_HYDRAULIC_BRAKING_SYSTEM (0xFDE6UL) /**< 64998 - HBS */ + /* 64999 - 65030 J1939-75, see later */ + #define PGN_EXHAUST_TEMPERATURE (0xFE07UL) /**< 65031 - ET */ + /* ISO 11783 - Part 7 */ + #define PGN_REQUIRED_TRACTOR_FACILITIES (0xFE08UL) /**< 65032 - RTF */ + #define PGN_TRACTOR_FACILITIES_RESPONSE (0xFE09UL) /**< 65033 - TFR */ + #define PGN_IMP_REMOTE_CMD_TRACTOR_RESP (0xFE0AUL) /**< 65033 - IRCR */ + #define PGN_IMPLEMENT_REMOTE_CONTR_CMD (0xFE0BUL) /**< 65035 - IRC */ + #define PGN_WORKING_SET_MEMBER (0xFE0CUL) /**< 65036 - WSMEM */ + #define PGN_WORKING_SET_MASTER (0xFE0DUL) /**< 65037 - WSMSTR */ + #define PGN_RESP_FOR_REPETITION_RATE (0xFE0EUL) /**< 65038 - RESRR */ + #define PGN_LANGUAGE_COMMAND (0xFE0FUL) /**< 65039 - LC*/ + #define PGN_AUX_VALVE_0_EST_FLOW (0xFE10UL) /**< 65040 - AV00EF */ + #define PGN_AUX_VALVE_0_MEAS_FLOW (0xFE20UL) /**< 65056 - AV00MF */ + #define PGN_AUX_VALVE_0_COMMAND (0xFE30UL) /**< 65072 - AV00C */ + #define PGN_AUX_VALVE_1_EST_FLOW (0xFE11UL) /**< 65041 - AV01EF */ + #define PGN_AUX_VALVE_1_MEAS_FLOW (0xFE21UL) /**< 65057 - AV01MF */ + #define PGN_AUX_VALVE_1_COMMAND (0xFE31UL) /**< 65073 - AV01C */ + #define PGN_AUX_VALVE_2_EST_FLOW (0xFE12UL) /**< 65042 - AV02EF */ + #define PGN_AUX_VALVE_2_MEAS_FLOW (0xFE22UL) /**< 65058 - AV02MF */ + #define PGN_AUX_VALVE_2_COMMAND (0xFE32UL) /**< 65074 - AV02C */ + #define PGN_AUX_VALVE_3_EST_FLOW (0xFE13UL) /**< 65043 - AV03EF */ + #define PGN_AUX_VALVE_3_MEAS_FLOW (0xFE23UL) /**< 65059 - AV03MF */ + #define PGN_AUX_VALVE_3_COMMAND (0xFE33UL) /**< 65075 - AV03C */ + #define PGN_AUX_VALVE_4_EST_FLOW (0xFE14UL) /**< 65044 - AV04EF */ + #define PGN_AUX_VALVE_4_MEAS_FLOW (0xFE24UL) /**< 65060 - AV04MF */ + #define PGN_AUX_VALVE_4_COMMAND (0xFE34UL) /**< 65076 - AV04C */ + #define PGN_AUX_VALVE_5_EST_FLOW (0xFE15UL) /**< 65045 - AV05EF */ + #define PGN_AUX_VALVE_5_MEAS_FLOW (0xFE25UL) /**< 65061 - AV05MF */ + #define PGN_AUX_VALVE_5_COMMAND (0xFE35UL) /**< 65077 - AV05C */ + #define PGN_AUX_VALVE_6_EST_FLOW (0xFE16UL) /**< 65046 - AV06EF */ + #define PGN_AUX_VALVE_6_MEAS_FLOW (0xFE26UL) /**< 65062 - AV06MF */ + #define PGN_AUX_VALVE_6_COMMAND (0xFE36UL) /**< 65078 - AV06C */ + #define PGN_AUX_VALVE_7_EST_FLOW (0xFE17UL) /**< 65047 - AV07EF */ + #define PGN_AUX_VALVE_7_MEAS_FLOW (0xFE27UL) /**< 65063 - AV07MF */ + #define PGN_AUX_VALVE_7_COMMAND (0xFE37UL) /**< 65079 - AV07C */ + #define PGN_AUX_VALVE_8_EST_FLOW (0xFE18UL) /**< 65048 - AV08EF */ + #define PGN_AUX_VALVE_8_MEAS_FLOW (0xFE28UL) /**< 65064 - AV08MF */ + #define PGN_AUX_VALVE_8_COMMAND (0xFE38UL) /**< 65080 - AV08C */ + #define PGN_AUX_VALVE_9_EST_FLOW (0xFE19UL) /**< 65049 - AV09EF */ + #define PGN_AUX_VALVE_9_MEAS_FLOW (0xFE29UL) /**< 65065 - AV09MF */ + #define PGN_AUX_VALVE_9_COMMAND (0xFE39UL) /**< 65081 - AV09C */ + #define PGN_AUX_VALVE_10_EST_FLOW (0xFE1AUL) /**< 65050 - AV10EF */ + #define PGN_AUX_VALVE_10_MEAS_FLOW (0xFE2AUL) /**< 65066 - AV10MF */ + #define PGN_AUX_VALVE_10_COMMAND (0xFE3AUL) /**< 65082 - AV10C */ + #define PGN_AUX_VALVE_11_EST_FLOW (0xFE1BUL) /**< 65051 - AV11EF */ + #define PGN_AUX_VALVE_11_MEAS_FLOW (0xFE2BUL) /**< 65067 - AV11MF */ + #define PGN_AUX_VALVE_11_COMMAND (0xFE3BUL) /**< 65083 - AV11C */ + #define PGN_AUX_VALVE_12_EST_FLOW (0xFE1CUL) /**< 65052 - AV12EF */ + #define PGN_AUX_VALVE_12_MEAS_FLOW (0xFE2CUL) /**< 65068 - AV12MF */ + #define PGN_AUX_VALVE_12_COMMAND (0xFE3CUL) /**< 65084 - AV12C */ + #define PGN_AUX_VALVE_13_EST_FLOW (0xFE1DUL) /**< 65053 - AV13EF */ + #define PGN_AUX_VALVE_13_MEAS_FLOW (0xFE2DUL) /**< 65069 - AV13MF */ + #define PGN_AUX_VALVE_13_COMMAND (0xFE3DUL) /**< 65085 - AV13C */ + #define PGN_AUX_VALVE_14_EST_FLOW (0xFE1EUL) /**< 65054 - AV14EF */ + #define PGN_AUX_VALVE_14_MEAS_FLOW (0xFE2EUL) /**< 65070 - AV14MF */ + #define PGN_AUX_VALVE_14_COMMAND (0xFE3EUL) /**< 65086 - AV14C */ + #define PGN_AUX_VALVE_15_EST_FLOW (0xFE1FUL) /**< 65055 - AV15EF */ + #define PGN_AUX_VALVE_15_MEAS_FLOW (0xFE2FUL) /**< 65071 - AV15MF */ + #define PGN_AUX_VALVE_15_COMMAND (0xFE3FUL) /**< 65087 - AV15C */ + /* Lighting data and command in J1939 and ISO */ + #define PGN_LIGHTING_DATA (0xFE40UL) /**< 65088 - LD */ + #define PGN_LIGHTING_COMMAND (0xFE41UL) /**< 65089 - LC */ + #define PGN_COMMAND_HITCH_PTO (0xFE42UL) /**< 65090 - HPTOC */ + #define PGN_REAR_PTO (0xFE43UL) /**< 65091 - RPTO */ + #define PGN_FRONT_PTO (0xFE44UL) /**< 65092 - FPTO */ + #define PGN_REAR_HITCH (0xFE45UL) /**< 65093 - RHS */ + #define PGN_FRONT_HITCH (0xFE46UL) /**< 65094 - FHS */ + #define PGN_MAINTAIN_POWER (0xFE47UL) /**< 65095 - MP */ + #define PGN_WHEEL_BASED_SPEED (0xFE48UL) /**< 65096 - WBSD */ + #define PGN_GROUND_BASED_SPEED (0xFE49UL) /**< 65097 - GBSD */ + /* ISO 11783 - Part 7 - end */ + #define PGN_TRANSMISSIONG_CONFIG_2 (0xFE4BUL) /**< 65099 - TCFG2 */ + #define PGN_MILITARY_LIGHTING_COMMAND (0xFE4CUL) /**< 65100 - ML */ + #define PGN_TOTAL_AVERAGED_INFORMATION (0xFE4DUL) /**< 65101 - TAVG */ + #define PGN_DOOR_CONTROL (0xFE4EUL) /**< 65102 - DC */ + #define PGN_VEHICLE_DYN_STAB_CTRL_1 (0xFE4FUL) /**< 61103 - VDC1 */ + #define PGN_BATTERY_TEMPERATURE (0xFE50UL) /**< 65104 - BT1 */ + #define PGN_ADAPT_CRUISE_CONTR_OPER_INP (0xFE51UL) /**< 65105 - ACC2 */ + #define PGN_VEHICLE_ELECTRICAL_POWER_3 (0xFE52UL) /**< 65106 - VP3 */ + #define PGN_RETARD_TORQUE_SPEED_LIMIT (0xFE53UL) /**< 65107 - RTC1 */ + #define PGN_ENGINE_TORQUE_SPEED_LIMIT (0xFE54UL) /**< 65108 - ETC1 */ + #define PGN_GASEOUS_FUEL_PROPERTIES (0xFE55UL) /**< 65109 - GFD */ + #define PGN_TANK_INFORMATION_1 (0xFE56UL) /**< 65110 - TI1 */ + #define PGN_AIR_SUSPENSION_CONTROL_5 (0xFE57UL) /**< 65111 - ASC5 */ + #define PGN_AIR_SUSPENSION_CONTROL_4 (0xFE58UL) /**< 65112 - ASC4 */ + #define PGN_AIR_SUSPENSION_CONTROL_3 (0xFE59UL) /**< 65113 - ASC3 */ + #define PGN_AIR_SUSPENSION_CONTROL_1 (0xFE5AUL) /**< 65114 - ASC1 */ + #define PGN_FORWARD_LANE_IMAGE (0xFE5BUL) /**< 65115 - FLI2 */ + #define PGN_BATTERY_MAIN_SWITCH_INFO (0xFE66UL) /**< 65126 - BM */ + #define PGN_CLIMATE_CONTR_CONFIGURATION (0xFE67UL) /**< 65127 - CCC */ + #define PGN_VEHICLE_FLUIDS (0xFE68UL) /**< 65128 - VF */ + #define PGN_ENGINE_TEMPERATURE_3 (0xFE69UL) /**< 65129 - ET3 */ + #define PGN_ENGINE_FUEL_LUBE_SYSTEMS (0xFE6AUL) /**< 65130 - EFS */ + #define PGN_DRIVERS_IDENTIFICATION (0xFE6BUL) /**< 65131 - DI */ + #define PGN_TACHOGRAPH (0xFE6CUL) /**< 65132 - TCO1 */ + #define PGN_HEATER_INFORMATION (0xFE6DUL) /**< 65133 - HTR */ + #define PGN_HIGH_RESOLUTION_WHEEL_SPEED (0xFE6EUL) /**< 65134 - HRW */ + #define PGN_ADAPTIVE_CRUISE_CONTROL (0xFE6FUL) /**< 65135 - ACC1 */ + #define PGN_COMBINATION_VEHICLE_WEIGHT (0xFE70UL) /**< 65136 - CVW */ + #define PGN_LASER_TRACER_POSITION (0xFE71UL) /**< 65137 - LTP */ + #define PGN_LASER_LEVEL_SYS_BLADE_CONTR (0xFE72UL) /**< 65138 - LBC */ + #define PGN_LASER_RECEIVER_MAST_POS (0xFE73UL) /**< 65139 - LMP */ + #define PGN_MODIFY_LEVEL_CTRL_SET_POINT (0xFE74UL) /**< 65140 - LSP */ + #define PGN_LASER_LVL_SYS_VERTIC_DEVIAT (0xFE75UL) /**< 65141 - LVD */ + #define PGN_LASER_LVL_SYS_POS_DISP_DATA (0xFE76UL) /**< 65142 - LVDD */ + #define PGN_AUXILIARY_PRESSURES (0xFE77UL) /**< 65143 - AP */ + #define PGN_TIRE_PRESS_CONTR_UNIT_STAT (0xFE78UL) /**< 65144 - TP1 */ + #define PGN_TIRE_PRESS_CTRL_TARGET_PRES (0xFE79UL) /**< 65145 - TP2 */ + #define PGN_TIRE_PRESS_UNIT_CURR_PRESS (0xFE7AUL) /**< 65146 - TP3 */ + #define PGN_COMBUSTION_TIME_1 (0xFE7BUL) /**< 65147 - CT1 */ + #define PGN_COMBUSTION_TIME_2 (0xFE7CUL) /**< 65148 - CT2 */ + #define PGN_COMBUSTION_TIME_3 (0xFE7DUL) /**< 65149 - CT3 */ + #define PGN_COMBUSTION_TIME_4 (0xFE7EUL) /**< 65150 - CT4 */ + #define PGN_COMBUSTION_TIME_5 (0xFE7FUL) /**< 65151 - CT5 */ + #define PGN_COMBUSTION_TIME_6 (0xFE80UL) /**< 65152 - CT6 */ + #define PGN_FUEL_INFORMATION_2 (0xFE81UL) /**< 65153 - GFI2 */ + #define PGN_IGNITION_TIMING_1 (0xFE82UL) /**< 65154 - IT1 */ + #define PGN_IGNITION_TIMING_2 (0xFE83UL) /**< 65155 - IT2 */ + #define PGN_IGNITION_TIMING_3 (0xFE84UL) /**< 65156 - IT3 */ + #define PGN_IGNITION_TIMING_4 (0xFE85UL) /**< 65157 - IT4 */ + #define PGN_IGNITION_TIMING_5 (0xFE86UL) /**< 65158 - IT5 */ + #define PGN_IGNITION_TIMING_6 (0xFE87UL) /**< 65159 - IT6 */ + #define PGN_IGNITION_TRANSF_SECOND_OP1 (0xFE88UL) /**< 65160 - ISO1 */ + #define PGN_IGNITION_TRANSF_SECOND_OP2 (0xFE89UL) /**< 65161 - ISO2 */ + #define PGN_IGNITION_TRANSF_SECOND_OP3 (0xFE8AUL) /**< 65162 - ISO3 */ + #define PGN_GASEOUS_FUEL_PRESSURE (0xFE8BUL) /**< 65163 - GFP */ + #define PGN_AUXILIARY_ANALOG_INFO (0xFE8CUL) /**< 65164 - AAI */ + #define PGN_VEHICLE_ELECTRICAL_POWER_2 (0xFE8DUL) /**< 65165 - VP2 */ + #define PGN_SERVICE_2 (0xFE8EUL) /**< 65166 - S2 */ + #define PGN_SUPPLY_PRESSURE_2 (0xFE8FUL) /**< 65167 - SP2 */ + #define PGN_ENGINE_TORQUE_HISTORY (0xFE90UL) /**< 65168 - ETH */ + #define PGN_FUEL_LEAKAGE (0xFE91UL) /**< 65169 - FL */ + #define PGN_ENGINE_INFORMATION (0xFE92UL) /**< 65170 - EI */ + #define PGN_ENGINE_ELECTR_SYST_MOD_INFO (0xFE93UL) /**< 65171 - EES */ + #define PGN_ENGINE_AUXILIARY_COOLANT (0xFE94UL) /**< 65172 - EAC */ + #define PGN_REBUILD_INFORMATION (0xFE95UL) /**< 65173 - RBI */ + #define PGN_TURBOCHARGER_WASTEGATE (0xFE96UL) /**< 65174 - TCW */ + #define PGN_TURBOCHARGER_INFORMATION_5 (0xFE97UL) /**< 65175 - TCI5 */ + #define PGN_TURBOCHARGER_INFORMATION_4 (0xFE98UL) /**< 65176 - TCI4 */ + #define PGN_TURBOCHARGER_INFORMATION_3 (0xFE99UL) /**< 65177 - TCI3 */ + #define PGN_TURBOCHARGER_INFORMATION_2 (0xFE9AUL) /**< 65178 - TCI2 */ + #define PGN_TURBOCHARGER_INFORMATION_1 (0xFE9BUL) /**< 65179 - TCI1 */ + #define PGN_MAIN_BEARING_TEMPERATURE_3 (0xFE9CUL) /**< 65180 - MBT3 */ + #define PGN_MAIN_BEARING_TEMPERATURE_2 (0xFE9DUL) /**< 65181 - MBT2 */ + #define PGN_MAIN_BEARING_TEMPERATURE_1 (0xFE9EUL) /**< 65182 - MBT1 */ + #define PGN_EXHAUST_PORT_TEMPERATURE_5 (0xFE9FUL) /**< 65183 - EPT5 */ + #define PGN_EXHAUST_PORT_TEMPERATURE_4 (0xFEA0UL) /**< 65184 - EPT4 */ + #define PGN_EXHAUST_PORT_TEMPERATURE_3 (0xFEA1UL) /**< 65185 - EPT3 */ + #define PGN_EXHAUST_PORT_TEMPERATURE_2 (0xFEA2UL) /**< 65186 - EPT2 */ + #define PGN_EXHAUST_PORT_TEMPERATURE_1 (0xFEA3UL) /**< 65187 - EPT1 */ + #define PGN_ENGINE_TEMPERATURE_2 (0xFEA4UL) /**< 65188 - ET2 */ + #define PGN_INTAKE_MANIFOLD_INFO_2 (0xFEA5UL) /**< 65189 - IMT2 */ + #define PGN_INTAKE_MANIFOLD_INFO_1 (0xFEA6UL) /**< 65190 - IMT1 */ + #define PGN_ALTERNATOR_TEMPEATURE (0xFEA7UL) /**< 65191 - AT */ + #define PGN_ARTICULATION_CONTROL (0xFEA8UL) /**< 65192 - AC */ + #define PGN_EXHAUST_OXYGEN_1 (0xFEA9UL) /**< 65193 - EO1 */ + #define PGN_ALTERNATE_FUEL_2 (0xFEA6UL) /**< 65194 - AF2 */ + #define PGN_ELECTRONIC_TRANSM_CONTR_6 (0xFEABUL) /**< 65195 - ETC6 */ + #define PGN_WHEEL_BRAKE_LIN_REMAIN_INFO (0xFEACUL) /**< 65196 - EBC4 */ + #define PGN_WHEEL_APPL_PRESS_HI_RGE_INF (0xFEADUL) /**< 65197 - EBC3 */ + #define PGN_AIR_SUPPLY_PRESSURE (0xFEAEUL) /**< 65198 - AIR1 */ + #define PGN_FUEL_CONSUMPTION_GASEOUS (0xFEAFUL) /**< 65199 - GFC */ + #define PGN_TRIP_TIME_INFORMATON_2 (0xFEB0UL) /**< 65200 - TTI2 */ + #define PGN_ECU_HISTORY (0xFEB1UL) /**< 65201 - EH */ + #define PGN_FUEL_INFORMATION_1_GASEOUS (0xFEB2UL) /**< 65202 - GFI1 */ + #define PGN_FUEL_INFORMATION_LIQUID (0xFEB3UL) /**< 65203 - LFI */ + #define PGN_TRIP_TIME_INFORMATION_1 (0xFEB4UL) /**< 65204 - TTI1 */ + #define PGN_TRIP_SHUTDOWN_INFORMATION (0xFEB5UL) /**< 65205 - TSI */ + #define PGN_TRIP_VEHIC_SPEED_DIST_INFO (0xFEB6UL) /**< 65206 - TVI */ + #define PGN_ENGINE_SPEED_LOAD_FAC_INFO (0xFEB7UL) /**< 65207 - LF */ + #define PGN_TRIP_FUEL_INFO_GASEOUS (0xFEB8UL) /**< 65208 - GTFI */ + #define PGN_TRIP_FUEL_INFO_LIQUID (0xFEB9UL) /**< 65209 - LTFI */ + #define PGN_TRIP_DISTANCE_INFO (0xFEBAUL) /**< 65210 - TDI */ + #define PGN_TRIP_FAN_INFO (0xFEBBUL) /**< 65211 - TFI */ + #define PGN_COMPRES_SERVICE_BRAKE_INFO (0xFEBCUL) /**< 65212 - CBI */ + #define PGN_FAN_DRIVE (0xFEBDUL) /**< 65213 - FD */ + #define PGN_ELECTRONIC_ENGIN_CONTROL_4 (0xFEBEUL) /**< 65214 - EEC4 */ + #define PGN_WHEEL_SPEED_INFORMATION (0xFEBFUL) /**< 65215 - EBC2 */ + #define PGN_SERVICE_INFORMATION (0xFEC0UL) /**< 65216 - SERV */ + #define PGN_HIGH_RESOLUTION_VEHIC_DIST (0xFEC1UL) /**< 65217 - VDHR */ + #define PGN_ELEC_RETARDER_CONTROLLER_2 (0xFEC2UL) /**< 65218 - ERC2 */ + #define PGN_ELEC_TRANSMISSION_CONTR_5 (0xFEC3UL) /**< 65219 - ETC5 */ + #define PGN_ELEC_TRANSMISSION_CONTR_4 (0xFEC5UL) /**< 65221 - ETC4 */ + #define PGN_ELEC_TRANSMISSION_CONTR_3 (0xFEC7UL) /**< 65223 - ETC3 */ + + /* 65226 - 65236 - J1939-73, see later */ + #define PGN_ALTERNATOR_SPEEED (0xFED5UL) /**< 65237 - AS */ + #define PGN_COMMANDED_ADDRESS (0xFED8UL) /**< 65240 - CA */ + #define PGN_AUXIL_INPUT_OUTP_STATUS (0xFED9UL) /**< 65241 - AUXIO */ + #define PGN_SOFTWARE_IDENTIFICATION (0xFEDAUL) /**< 65242 - SOFT */ + #define PGN_ENGIN_FLUID_LEV_PRESSURE_2 (0xFEDBUL) /**< 65243 - EFL_P2 */ + #define PGN_IDLE_OPERATION (0xFEDCUL) /**< 65244 - IO */ + #define PGN_TURBOCHARGER (0xFEDDUL) /**< 65245 - TC */ + #define PGN_AIR_START_PRESSURE (0xFEDEUL) /**< 65246 - AIR2 */ + #define PGN_ELEC_ENGINE_CONTROLLER_3 (0xFEDFUL) /**< 65247 - EEC3 */ + #define PGN_VEHICLE_DISTANCE (0xFEE0UL) /**< 65248 - VD */ + #define PGN_RETARDER_CONFIGURATION (0xFEE1UL) /**< 65249 - RC */ + #define PGN_TRANSMISSION_CONFIGURATION (0xFEE2UL) /**< 65250 - TCFG */ + #define PGN_ENGINE_CONFIGURATION (0xFEE3UL) /**< 65251 - EC */ + #define PGN_SHUTDOWN (0xFEE4UL) /**< 65252 - SHUTDOWN */ + #define PGN_ENGINE_HOURS_REVOLUTIONS (0xFEE5UL) /**< 65253 - HOURS */ + #define PGN_TIME_DATA (0xFEE6UL) /**< 65254 - TD */ + #define PGN_VEHICLE_HOURS (0xFEE7UL) /**< 65255 - VH */ + #define PGN_VEHICLE_DIRETION_SPEED (0xFEE8UL) /**< 65256 - VDS */ + #define PGN_FUEL_CONSUMPTION_LIQUID (0xFEE9UL) /**< 65257 - LFC */ + #define PGN_VEHICLE_WEIGHT (0xFEEAUL) /**< 65258 - VW */ + #define PGN_COMPONENT_IDENTIFICATION (0xFEEBUL) /**< 65259 - CI */ + #define PGN_VEHICLE_IDENTIFICATION (0xFEECUL) /**< 65260 - VI */ + #define PGN_CRUIS_CTR_VEHIC_SPEED_SETUP (0xFEEDUL) /**< 65261 - CCSS */ + #define PGN_ENGINE_TEMPERATURE_1 (0xFEEEUL) /**< 65262 - ET1 */ + #define PGN_ENGINE_FLUID_LEVEL_PRESS_1 (0xFEEFUL) /**< 65263 - EFL_P1 */ + #define PGN_POWER_TAKEOFF_INFORMATION (0xFEF0UL) /**< 65264 - PTO */ + #define PGN_CRUISE_CONTROL_VEHIC_SPEED (0xFEF1UL) /**< 65265 - CCVS */ + #define PGN_FUEL_ECONOMY_LIQUID (0xFEF2UL) /**< 65266 - LFE */ + #define PGN_VEHICLE_POSITION (0xFEF3UL) /**< 65267 - VP */ + #define PGN_TIRE_CONDITION (0xFEF4UL) /**< 65268 - TIRE */ + #define PGN_AMBIENT_CONDITIONS (0xFEF5UL) /**< 65269 - AMB */ + #define PGN_INLET_EXHAUST_CONDITIONS_1 (0xFEF6UL) /**< 65270 - IC1 */ + #define PGN_VEHICLE_ELECTRICAL_POWER (0xFEF7UL) /**< 65271 - VEP1 */ + #define PGN_TRANSMISSION_FLUIDS (0xFEF8UL) /**< 65272 - TF */ + #define PGN_AXLE_INFORMATION (0xFEF9UL) /**< 65273 - AI */ + #define PGN_BRAKES (0xFEFAUL) /**< 65274 - B */ + #define PGN_RETARDER_FLUIDS (0xFEFBUL) /**< 65275 - RF */ + #define PGN_DASH_DISPLAY (0xFEFCUL) /**< 65276 - DD */ + #define PGN_ALTERNATE_FUEL_1 (0xFEFDUL) /**< 65277 - A1 */ + #define PGN_AUXIL_WATER_PUMP_PRESS (0xFEFEUL) /**< 65278 - AWPP */ + #define PGN_WATER_IN_FUEL_INDICATOR (0xFEFFUL) /**< 65279 - WFI */ + + /* J1939-73 / 11783-12, B.x - Application layer - Diagnostics */ + #define PGN_ACTIVE_DIAG_TROUBLE_CODES (0xFECAUL) /**< 65226 - DM1 */ + #define PGN_PREV_ACTIV_DIAG_TROUBLE_COD (0xFECBUL) /**< 65227 - DM2 */ + #define PGN_DIAGNOSTIC_DATA_CLEAR (0xFECCUL) /**< 65228 - DM3 */ + #define PGN_FREEZE_FRAME_PARAMETERS (0xFECDUL) /**< 65229 - DM4 */ + #define PGN_DIAGNOSTIC_READINESS (0xFECEUL) /**< 65230 - DM5 */ + #define PGN_CONTIN_MONI_SYST_TEST_RESUL (0xFECFUL) /**< 65231 - DM6 */ + #define PGN_TEST_RESUL_NON_CONT_MONITOR (0xFED0UL) /**< 65232 - DM8 */ + #define PGN_NON_CONTIN_MONITOR_SYS_TEST (0xFED2UL) /**< 65234 - DM10 */ + #define PGN_DIAG_DATA_CLEAR_ACTIV_DTC (0xFED3UL) /**< 65235 - DM11 */ + #define PGN_EMISS_RELAT_ACT_DIAG_TROUB (0xFED4UL) /**< 65236 - DM12 */ + + /* J1939-75 - Application layer - Generator Sets and Industrial */ + #define PGN_BUS_1_UTIL_SYNC_CHECK_STATU (0xFDE7UL) /**< 64999 - BUSC */ + #define PGN_BUS_1_GENERA_SYNC_CH_STAT (0xFDE8UL) /**< 65000 - BGSC */ + #define PGN_BUS_1_PHASE_C_BASIC_AC_QUAN (0xFDE9UL) /**< 65001 - BPCAC */ + #define PGN_BUS_1_PHASE_B_BASIC_AC_QUAN (0xFDEAUL) /**< 65002 - BPBAC */ + #define PGN_BUS_1_PHASE_A_BASIC_AC_QUAN (0xFDEBUL) /**< 65003 - BPAAC */ + #define PGN_BUS_1_AVERAGE_BASIC_AC_QUAN (0xFDECUL) /**< 65004 - BAAC */ + #define PGN_UTIL_TOTAL_AC_ENERGY (0xFDEDUL) /**< 65005 - UTACE */ + #define PGN_UTIL_PHASE_C_AC_REACT_POWER (0xFDEEUL) /**< 65006 - UPCACR */ + #define PGN_UTIL_PHASE_C_AC_POWER (0xFDEFUL) /**< 65007 - UPCACP */ + #define PGN_UTIL_PHASE_C_AC_BASIC_QUANT (0xFDF0UL) /**< 65008 - UPCAC */ + #define PGN_UTIL_PHASE_B_AC_REACT_POWER (0xFDF1UL) /**< 65009 - UPBACR */ + #define PGN_UTIL_PHASE_B_AC_POWER (0xFDF2UL) /**< 65010 - UPBACP */ + #define PGN_UTIL_PHASE_B_AC_BASIC_QUANT (0xFDF3UL) /**< 65011 - UPBAC */ + #define PGN_UTIL_PHASE_A_AC_REACT_POWER (0xFDF4UL) /**< 65012 - UPAACR */ + #define PGN_UTIL_PHASE_A_AC_POWER (0xFDF5UL) /**< 65013 - UPAACP */ + #define PGN_UTIL_PHASE_A_AC_BASIC_QUANT (0xFDF6UL) /**< 65014 - UPAAC */ + #define PGN_UTIL_AC_REACTIVE_POWER (0xFDF7UL) /**< 65015 - UTACR */ + #define PGN_UTIL_TOTAL_AC_POWER (0xFDF8UL) /**< 65016 - UTACP */ + #define PGN_UTIL_AVERACE_BASIC_AC_QUANT (0xFDF9UL) /**< 65017 - UAAC */ + #define PGN_GENERATOR_TOTAL_AC_ENERGY (0xFDFAUL) /**< 65018 - GTACE */ + #define PGN_GENERA_PHAS_C_AC_REACT_PWR (0xFDFBUL) /**< 65019 - GPCACR */ + #define PGN_GENERATOR_PHASE_C_AC_POWER (0xFDFCUL) /**< 65020 - GPCACP */ + #define PGN_GENERA_PHASE_C_BAS_AC_QUANT (0xFDFDUL) /**< 65021 - GPCAC */ + #define PGN_GENERA_PHASE_B_AC_REACT_PWR (0xFDFEUL) /**< 65022 - GPBACR */ + #define PGN_GENERATOR_PHASE_B_AC_POWER (0xFDFFUL) /**< 65023 - GPBACP */ + #define PGN_GENERA_PHASE_B_BAS_AC_QUANT (0xFE00UL) /**< 65024 - GPBAC */ + #define PGN_GENERA_PHASE_A_AC_REACT_PWR (0xFE01UL) /**< 65025 - GPAACR */ + #define PGN_GENERATOR_PHASE_A_AC_POWER (0xFE02UL) /**< 65026 - GPAACP */ + #define PGN_GENERA_PHASE_A_BAS_AC_QUANT (0xFE03UL) /**< 65027 - GPAAC */ + #define PGN_GENERA_TOTAL_AC_REACT_POWER (0xFE04UL) /**< 65028 - GTACR */ + #define PGN_GENERATOR_TOTAL_AC_POWER (0xFE05UL) /**< 65029 - GTACP */ + #define PGN_GENERA_TOTAL_BAS_AC_QUANTI (0xFE06UL) /**< 65030 - GAAC */ + + /* NMEA */ + #define PGN_NMEA_REQCMDACKGROUPFUNCION (0x1ED00UL) /**< 126208 - SF NO */ + #define PGN_PGNLIST_GROUPFUNCTION (0x1EE00UL) /**< 126464 - SF NO */ + #define PGN_SYTEMTIME (0x1F010UL) /**< 126992 - SF YES */ + #define PGN_PRODUKTINFORMATION (0x1F014UL) /**< 126996 - SF NO */ + #define PGN_CONFIGURATIONINFORMATION (0x1F016UL) /**< 126998 - SF NO */ + #define PGN_HEADING_TRACKCONTROL (0x1F105UL) /**< 127237 - SF NO */ + #define PGN_RUDDER (0x1F10DUL) /**< 127245 - SF YES */ + #define PGN_VESSEL_HEADING (0x1F112UL) /**< 127250 - SF YES */ + #define PGN_RATE_OF_TURN (0x1F113UL) /**< 127251 - SF YES */ + #define PGN_ATTITUDE (0x1F119UL) /**< 127257 - SF YES */ + #define PGN_MAGNETIC_VARIATION (0x1F11AUL) /**< 127258 - SF YES */ + #define PGN_ENGINE_PARA_RAPID_UPDATE (0x1F200UL) /**< 127488 - SF YES */ + #define PGN_ENGINE_PARA_DYNAMIC (0x1F201UL) /**< 127489 - SF NO */ + #define PGN_TRANSMISSION_PARA_DYNAMIC (0x1F205UL) /**< 127493 - SF YES */ + #define PGN_TRIP_PARAMETERS_VESSEL (0x1F208UL) /**< 127496 - SF NO */ + #define PGN_TRIP_PARAMETERS_ENGINE (0x1F209UL) /**< 127497 - SF NO */ + #define PGN_ENGINE_PARAMETERS_STATIC (0x1F20AUL) /**< 127498 - SF NO */ + #define PGN_BINARY_SWITCH_BANK_STATUS (0x1F20DUL) /**< 127501 - SF YES */ + #define PGN_SWITCH_BANK_CONTROL (0x1F20EUL) /**< 127502 - SF YES */ + #define PGN_AC_INPUT_STATUS (0x1F20FUL) /**< 127503 - SF NO */ + #define PGN_AC_OUTPUT_STATUS (0x1F210UL) /**< 127504 - SF NO */ + #define PGN_FLUID_LEVEL (0x1F211UL) /**< 127505 - SF YES */ + #define PGN_DCDETAILED_STATUS (0x1F212UL) /**< 127506 - SF NO */ + #define PGN_CHARGER_STATUS (0x1F213UL) /**< 127507 - SF NO */ + #define PGN_BATTERY_STATUS (0x1F214UL) /**< 127508 - SF YES */ + #define PGN_INVERTER_STATUS (0x1F215UL) /**< 127509 - SF NO */ + #define PGN_CHARGER_CONFIG_STATUS (0x1F216UL) /**< 127510 - SF NO */ + #define PGN_INVERTER_CONFIG_STATUS (0x1F217UL) /**< 127511 - SF NO */ + #define PGN_AGS_CONFIG_STATUS (0x1F218UL) /**< 127512 - SF NO */ + #define PGN_BATTERY_CONFIG_STATUS (0x1F219UL) /**< 127513 - SF NO */ + #define PGN_AGS_STATUS (0x1F21AUL) /**< 127514 - SF NO */ + #define PGN_SPEED_WATERREF (0x1F503UL) /**< 128259 - SF YES */ + #define PGN_WATER_DEPTH (0x1F216UL) /**< 127510 - SF YES */ + #define PGN_DISTANCED_LOG (0x1F513UL) /**< 128275 - SF NO */ + #define PGN_TRACKED_TARGET_DATA (0x1F608UL) /**< 128520 - SF NO */ + #define PGN_POSITION_RAPID_UPDATE (0x1F801UL) /**< 129025 - SF YES */ + #define PGN_COG_SOG_RAPID_UPDATE (0x1F802UL) /**< 129026 - SF YES */ + #define PGN_POSITION_DELTA_HP_RAPID_UPD (0x1F803UL) /**< 129027 - SF YES */ + #define PGN_ALTITUDE_DELTA_HP_RAPID_UPD (0x1F804UL) /**< 129028 - SF YES */ + #define PGN_GNSS_POSITION_DATA (0x1F805UL) /**< 129029 - SF NO */ + #define PGN_NMEA_TIME_DATE (0x1F809UL) /**< 129033 - SF YES */ + #define PGN_AIS_CLASSA_POSITION_REPORT (0x1F80EUL) /**< 129038 - SF NO */ + #define PGN_AIS_CLASSB_POSITION_REPORT (0x1F80FUL) /**< 129039 - SF NO */ + #define PGN_AIS_CLASSB_EXTPOS_REPORT (0x1F810UL) /**< 129040 - SF NO */ + #define PGN_DATUM (0x1F814UL) /**< 129044 - SF NO */ + #define PGN_USER_DATUM_SETTINGS (0x1F815UL) /**< 129045 - SF NO */ + #define PGN_CROSS_TRACK_ERROR (0x1F903UL) /**< 129283 - SF YES */ + #define PGN_NAVIGATION_DATA (0x1F904UL) /**< 129284 - SF NO */ + #define PGN_NAVIGATION_ROUTEWP_INFO (0x1F905UL) /**< 129285 - SF NO */ + #define PGN_SET_DRIFT_RAPID_UPDATE (0x1F90BUL) /**< 129291 - SF YES */ + #define PGN_TIME_TOFROM_MARK (0x1F915UL) /**< 129301 - SF NO */ + #define PGN_BEARING_DIST_BET_TWO_MARKS (0x1F916UL) /**< 129302 - SF NO */ + #define PGN_GNSS_CONTROL_STATUS (0x1FA02UL) /**< 129538 - SF NO */ + #define PGN_GNSS_DOPS (0x1FA03UL) /**< 129539 - SF YES */ + #define PGN_GNSS_SATS_IN_VIEW (0x1FA04UL) /**< 129540 - SF NO */ + #define PGN_ALMANAC_DATA (0x1FA05UL) /**< 129541 - SF NO */ + #define PGN_GNSS_PSEUDOOR_NOISE_STATIST (0x1FA06UL) /**< 129542 - SF NO */ + #define PGN_GNSS_RAIM_OUTPUT (0x1FA09UL) /**< 129545 - SF NO */ + #define PGN_GNSS_RAIM_SETTINGS (0x1FA0AUL) /**< 129546 - SF YES */ + #define PGN_GNSS_PSEUDOOR_ERROR_STATIST (0x1FA0BUL) /**< 129547 - SF NO */ + #define PGN_DGNSS_CORRECTIONS (0x1FA0DUL) /**< 129549 - SF NO */ + #define PGN_GNSS_DIFF_CORR_RECEI_INTERF (0x1FA0EUL) /**< 129550 - SF YES */ + #define PGN_GNSS_DIFF_CORR_RECEIVE_SIGN (0x1FA0FUL) /**< 129551 - SF NO */ + #define PGN_GLONASS_ALMANAC_DATA (0x1FA14UL) /**< 129556 - SF NO */ + /* AIS */ + #define PGN_AIS_DGNSS_BROADC_BIN_MESSAG (0x1FB00UL) /**< 129792 - SF NO */ + #define PGN_AIS_UTC_AND_DATE_REPORT (0x1FB01UL) /**< 129793 - SF NO */ + #define PGN_AIS_CLASS_A_STAT_VOYAGE_DAT (0x1FB02UL) /**< 129794 - SF NO */ + #define PGN_AIS_ADDRESSED_BINARY_MESSAG (0x1FB03UL) /**< 129795 - SF NO */ + #define PGN_AIS_ACKNOWLEDGE (0x1FB04UL) /**< 129796 - SF NO */ + #define PGN_AIS_BINARY_BROADCAST_MESSAG (0x1FB05UL) /**< 129797 - SF NO */ + #define PGN_AIS_SAR_AIRCRAFT_POS_REPORT (0x1FB06UL) /**< 129798 - SF NO */ + #define PGN_RADIO_FREQUENCY_MODE_POWER (0x1FB07UL) /**< 129799 - SF NO */ + #define PGN_AIS_UTC_DATE_INQUIRY (0x1FB08UL) /**< 129800 - SF NO */ + #define PGN_AIS_ADDRESS_SAFE_REL_MESSAG (0x1FB09UL) /**< 129801 - SF NO */ + #define PGN_AIS_SAFE_RELD_BROADC_MESSAG (0x1FB0AUL) /**< 129802 - SF NO */ + #define PGN_AIS_INTERROGATION (0x1FB0BUL) /**< 129803 - SF NO */ + #define PGN_AIS_ASSIGNMENT_MODE_COMMAND (0x1FB0CUL) /**< 129804 - SF NO */ + #define PGN_DSC_CALL_INFORMATION (0x1FB10UL) /**< 129808 - SF NO */ + #define PGN_LORAN_C_TD_DATA (0x1FC04UL) /**< 130052 - SF NO */ + #define PGN_LORAN_C_RANGE_DATA (0x1FC05UL) /**< 130053 - SF NO */ + #define PGN_LORAN_C_SIGNAL_DATA (0x1FC06UL) /**< 130054 - SF NO */ + #define PGN_ROUTE_WP_SERVICE_DB_LIST (0x1FC10UL) /**< 130064 - SF NO */ + #define PGN_ROUTE_WP_SERVICE_ROUTE_LIST (0x1FC11UL) /**< 130065 - SF NO */ + #define PGN_ROUTE_WP_SERVICE_WP_ATTRIB (0x1FC12UL) /**< 130066 - SF NO */ + #define PGN_ROUTE_WP_SERVICE_WP_NAM_POS (0x1FC13UL) /**< 130067 - SF NO */ + #define PGN_ROUTE_WP_SERVICE_QP_NAME (0x1FC14UL) /**< 130068 - SF NO */ + #define PGN_ROUTE_WP_SERVICE_XTE_LIMIT (0x1FC15UL) /**< 130069 - SF NO */ + #define PGN_ROUTE_WP_SERVICE_WP_COMMENT (0x1FC16UL) /**< 130070 - SF NO */ + #define PGN_ROUTE_WP_SERVICE_ROUTE_COM (0x1FC17UL) /**< 130071 - SF NO */ + #define PGN_ROUTE_WP_SERVICE_DB_COMMENT (0x1FC18UL) /**< 130072 - SF NO */ + #define PGN_ROUTE_WP_SERVICE_RADIU_TURN (0x1FC19UL) /**< 130073 - SF NO */ + #define PGN_ROUTE_WP_SERVICE_WP_LIS_NAM (0x1FC1AUL) /**< 130074 - SF NO */ + #define PGN_WIND_DATA (0x1FD02UL) /**< 130306 - SF YES */ + #define PGN_ENVIRONMENT_PARAMETERS (0x1FD06UL) /**< 130310 - SF YES */ + #define PGN_ENVIRONMENT_PARAMETERS_2 (0x1FD07UL) /**< 130311 - SF YES */ + #define PGN_TEMPERATURE (0x1FD08UL) /**< 130312 - SF YES */ + #define PGN_HUMIDITY (0x1FD09UL) /**< 130313 - SF YES */ + #define PGN_ACTUAL_PRESSURE (0x1FD0AUL) /**< 130314 - SF YES */ + #define PGN_SET_PRESSURE (0x1FD0BUL) /**< 130315 - SF YES */ + #define PGN_TIDE_STATION_DATA (0x1FD10UL) /**< 130320 - SF NO */ + #define PGN_SALINITY_STATION_DATA (0x1FD11UL) /**< 130321 - SF NO */ + #define PGN_CURRENT_STATION_DATA (0x1FD12UL) /**< 130322 - SF NO */ + #define PGN_METEOROLOGICAL_STATION_DATA (0x1FD13UL) /**< 130323 - SF NO */ + #define PGN_MOORED_BUOY_STATION_DATA (0x1FD14UL) /**< 130324 - SF NO */ + #define PGN_SMALL_CRAFT_STATUS (0x1FE10UL) /**< 130576 - SF YES */ + #define PGN_DIRECTION_DATA (0x1FE11UL) /**< 130577 - SF NO */ + #define PGN_VESSEL_SPEED_COMPONENTS (0x1FE12UL) /**< 130578 - SF NO */ + + /** @} */ /* END isopgns */ + + + /* ************************************************************************ */ + /** \addtogroup isospns + */ + /**@{*/ + + #ifndef NO_SPN_DEFINES /* use the SPN defines of the ECU Driver */ + + /* ************************************************************************ */ + /* SPN DEFINES for ISO11783-8 */ + + /* Off-Highway Engine Control Selection (to Engine) */ + #define SPN_ALTERNATE_LOW_IDLE_SWITCH (2883UL) + /* iso_SpnDefineSpn( x, SPN_ALTERNATE_LOW_IDLE_SWITCH , 1u, 5u, 2u, SpnValStandard ); */ + + /* Torque/Speed Control (to Engine) */ + #define SPN_OVERRIDE_CONTROL_MODE (695UL) /**< \brief Part 8 App B */ + #define SPN_ENGINE_REQU_SPEED_CONTR_CON (696UL) + #define SPN_OVERRIDE_CONTR_MODE_PRIORIT (897UL) + #define SPN_ENGINE_REQU_SPEED_LIMIT (898UL) + #define SPN_ENGINE_REQU_TORQUE_LIMIT (518UL) + /* iso_SpnDefineSpn( x, SPN_OVERRIDE_CONTROL_MODE, 1u, 1u, 2u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_ENGINE_REQU_SPEED_CONTR_CON, 1u, 3u, 2u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_OVERRIDE_CONTR_MODE_PRIORIT , 1u, 5u, 2u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_ENGINE_REQU_SPEED_LIMIT , 2u, 1u, 16u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_ENGINE_REQU_TORQUE_LIMIT , 4u, 1u, 8u, SpnValStandard ); */ + + /* Electronic Engine Controller */ + #define SPN_ENGINE_TORQUE_MODE (899UL) /**< \brief Part 8 App B */ + #define SPN_DRIVERS_DEMAND_ENGINE (512UL) + #define SPN_ACTUAL_ENGINETORQUE (513UL) + #define SPN_ENGINESPEED (190UL) + #define SPN_SOURCE_ADDRESS_CONTR_DEVICE (1483UL) + #define SPN_ENGINE_DEMAND (2432UL) + /* iso_SpnDefineSpn( x, SPN_ENGINE_TORQUE_MODE, 1u, 1u, 4u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_DRIVERS_DEMAND_ENGINE, 2u, 1u, 8u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_ACTUAL_ENGINETORQUE, 3u, 1u, 8u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_ENGINESPEED, 4u, 1u, 16u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_SOURCE_ADDRESS_CONTR_DEVICE, 6u, 1u, 8u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_ENGINE_DEMAND, 8u, 1u, 8u, SpnValStandard ); */ + + /* Software Identification */ + #define SPN_NUMBER_SW_IDENTIFICATION (965UL) /**< \brief Part 8 App B */ + #define SPN_SW_IDENT_SW_VERSION (234UL) + #define SPN_SW_IDENT_SPECIAL_SW_VERSION (234UL) + #define SPN_SW_IDENT_SUB1 (234UL) + #define SPN_SW_IDENT_SUB2 (234UL) + #define SPN_SW_IDENT_DELIMITER (234UL) + /* iso_SpnDefineSpn( x, SPN_NUMBER_SW_IDENTIFICATION, 1u, 1u, 8u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_SW_IDENT_SW_VERSION, 3u, 1u, 16u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_SW_IDENT_SPECIAL_SW_VERSION, 5u, 1u, 16u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_SW_IDENT_SUB1, 6u, 1u, 8u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_SW_IDENT_SUB2, 7u, 1u, 8u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_SW_IDENT_DELIMITER, 8u, 1u, 8u, SpnValStandard ); */ + + /* Engine Configuration */ + #define SPN_ENGINE_SPEED_AT_IDLE_POINT1 (188UL) /**< \brief Part 8 App B */ + #define SPN_ENGINE_PERCENT_TORQUE_POIN1 (539UL) + #define SPN_ENGINE_SPEED_AT_POINT2 (528UL) + #define SPN_ENGINE_PERCENT_TORQUE_POIN2 (540UL) + #define SPN_ENGINE_SPEED_AT_POINT3 (529UL) + #define SPN_ENGINE_PERCENT_TORQUE_POIN3 (541UL) + #define SPN_ENGINE_SPEED_AT_POINT4 (530UL) + #define SPN_ENGINE_PERCENT_TORQUE_POIN4 (542UL) + #define SPN_ENGINE_SPEED_AT_POINT5 (531UL) + #define SPN_ENGINE_PERCENT_TORQUE_POIN5 (543UL) + #define SPN_ENGINE_SPEED_HIGH_POINT6 (532UL) + #define SPN_ENGINE_REFERENCE_TORQUE (544UL) + #define SPN_ENGINE_MAX_MOMENT_OV_SPEED (533UL) + #define SPN_ENGINE_MAX_OVER_TIME_LIMIT (534UL) + #define SPN_ENGINE_MOMENT_INERTIA (1794UL) + /* iso_SpnDefineSpn( x, SPN_ENGINE_SPEED_AT_IDLE_POINT1, 1u, 1u, 16u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_ENGINE_PERCENT_TORQUE_POIN1, 3u, 1u, 8u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_ENGINE_SPEED_AT_POINT2, 4u, 1u, 16u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_ENGINE_PERCENT_TORQUE_POIN2, 6u, 1u, 8u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_ENGINE_SPEED_AT_POINT3, 7u, 1u, 16, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_ENGINE_PERCENT_TORQUE_POIN3, 9u, 1u, 8u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_ENGINE_SPEED_AT_POINT4, 10u, 1u, 16u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_ENGINE_PERCENT_TORQUE_POIN4, 12u, 1u, 8u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_ENGINE_SPEED_AT_POINT5, 13u, 1u, 16u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_ENGINE_PERCENT_TORQUE_POIN5, 15u, 1u, 8u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_ENGINE_SPEED_HIGH_POINT6, 16u, 1u, 16u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_ENGINE_REFERENCE_TORQUE, 20u, 1u, 16u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_ENGINE_MAX_MOMENT_OV_SPEED, 22u, 1u, 16u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_ENGINE_MAX_OVER_TIME_LIMIT, 24u, 1u, 8u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_ENGINE_MOMENT_INERTIA, 31u, 1u, 16u, SpnValStandard ); */ + + /* Engine Hours */ + #define SPN_ENGINE_TOTAL_HOURS (247UL) /**< \brief Part 8 App B */ + /* iso_SpnDefineSpn( x, SPN_ENGINE_TOTAL_HOURS, 1u, 1u, 32u, SpnValStandard ); */ + + /* Fuel Consumption */ + #define SPN_ENGINE_TRIP_FLUEL (182UL) /**< \brief Part 8 App B */ + #define SPN_ENGINE_TOTAL_FLUEL_USED (250UL) + /* iso_SpnDefineSpn( x, SPN_ENGINE_TRIP_FLUEL, 1u, 1u, 32u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_TOTAL_FLUEL_USE, 5u, 1u, 32u, SpnValStandard ); */ + + /* Engine temperature ET1 - PGN_ENGINE_TEMPERATURE_1 */ + #define SPN_ENGINE_COOLANT_TEMPERATURE (110UL) + #define SPN_ENGINE_FUEL_TEMPERATURE (174UL) + #define SPN_ENGINE_OIL_TEMPERATURE (175UL) + /* iso_SpnDefineSpn( x, SPN_ENGINE_COOLANT_TEMPERATURE, 1u, 1u, 8u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_FUEL_TEMPERATURE, 2u, 1u, 8u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_ENGINE_OIL_TEMPERATURE, 3u, 1u, 16u, SpnValStandard ); */ + + /* Engine Fluid Level */ + #define SPN_ENGINE_OIL_LEVEL (98UL) + #define SPN_ENGINE_OIL_PRESSURE (100UL) + #define SPN_ENGINE_COOLANT_LEVEL (111UL) + /* iso_SpnDefineSpn( x, SPN_ENGINE_OIL_LEVEL, 3u, 1u, 8u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_OIL_PRESSURE, 4u, 1u, 8u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_ENGINE_COOLANT_LEVEL, 7u, 1u, 8u, SpnValStandard ); */ + + /* Fuel Economy Liquid */ + #define SPN_ENGINE_FUEL_RATE (183UL) + #define SPN_ENGINE_INSTANT_FUEL_ECONOMY (184UL) + #define SPN_ENGINE_AVERAGE_FUEL_ECONOMY (185UL) + #define SPN_ENGINE_THROTTLE_POSITION (51UL) + #define SPN_ENGINE_THROTTLE_2_POSITON (3673UL) + /* iso_SpnDefineSpn( x, SPN_ENGINE_FUEL_RATE, 1u, 1u, 16u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_ENGINE_INSTANTANEOUS_FUEL_ECO, 3u, 1u, 16u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_ENGINE_AVERAGE_FUEL_ECONOMY, 5u, 1u, 16u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_ENGINE_THROTTLE_POSITION, 7u, 1u, 8u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_ENGINE_THROTTLE_2_POSITON, 8u, 1u, 8u, SpnValStandard ); */ + + /* Inlet/Exhaust Conditions */ + #define SPN_ENGINTAKEMANI_1PRESSURE (102UL) + #define SPN_ENGINTAKEMANI_1TEMPERATURE (105UL) + /* iso_SpnDefineSpn( x, SPN_ENGINTAKEMANI_1PRESSURE, 2u, 1u, 8u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_ENGINTAKEMANI_1TEMPERATURE, 3u, 1u, 8u, SpnValStandard ); */ + + /* Vehicle Electrical Power */ + #define SPN_BATTERY_POTENTIAL (168UL) + #define SPN_KEYSWITCH_BATTERY_POTENTIAL (158UL) + /* iso_SpnDefineSpn( x, SPN_BATTERY_POTENTIAL, 5u, 1u, 16u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_KEYSWITCH_BATTERY_POTENTIAL, 7u, 1u, 16u, SpnValStandard ); */ + + /* Electronic engine controller 2 */ + #define SPN_ENGINELOAD (92UL) /**< Part 8 App B */ + /* iso_SpnDefineSpn( x, SPN_ENGINELOAD, 3u, 1u, 8u, SpnValStandard ); */ + + /* Dash Display */ + #define SPN_FUELLEVEL1 (96UL) /**< Part 8 App B */ + /* iso_SpnDefineSpn( x, SPN_FUELLEVEL1, 2u, 1u, 8u, SpnValStandard ); */ + + /* Engine Hours, Revolutions */ + #define SPN_ENGINEHOURS (247UL) /**< Part 8 App B */ + /* iso_SpnDefineSpn( x, SPN_ENGINEHOURS, 1u, 1u, 32u, SpnValStandard ); */ + + /* Electronic engine controller 2 */ + #define SPN_TRANSMISSION_CURRENTGEAR (523UL) /**< Part 8 App B */ + /* iso_SpnDefineSpn( x, SPN_TRANSMISSION_CURRENTGEAR, 4u, 1u, 8u, SpnValStandard ); */ + + /* Aftertreatment 1 SCR Reagent Tank 1 Information */ + #define SPN_SCR_CATALYST_TANKLEVEL (1761UL) /**< Part 8 App B */ + /* iso_SpnDefineSpn( x, SPN_SCR_CATALYST_TANKLEVEL, 1u, 1u, 8u, SpnValStandard ); */ + + /* Auxiliary I/O #22 */ + #define SPN_AUX_IO_22 (3845UL) /**< \brief J1939-71 */ + /* iso_SpnDefineSpn( x, SPN_AUX_IO_22, 2u, 5u, 2u, SpnValStandard ); */ + + /* ************************************************************************ */ + /* SPN DEFINES for ISO11783-7 */ + + /* Ground-based speed and distance */ + #define SPN_GROUNDBASEDMACHINESPEED (1859UL) /**< \brief Part 7 A.5 */ + #define SPN_GROUNDBASEDMACHINEDISTANCE (1860UL) /**< \brief Part 7 A.6 */ + #define SPN_GROUNDBASEDMACHINEDIRECT (1861UL) /**< \brief Part 7 A.7 */ + /* iso_SpnDefineSpn( x, SPN_GROUNDBASEDMACHINESPEED, 1u, 1u, 16u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_GROUNDBASEDMACHINEDISTANCE, 3u, 1u, 32u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_GROUNDBASEDMACHINEDIRECT, 8u, 1u, 2u, SpnValStandard ); */ + + /* Wheel-based speed and distance */ + #define SPN_WHEELBASEDMACHINESPEED (1862UL) /**< \brief Part 7 A.8 */ + #define SPN_WHEELBASEDMACHINEDISTANCE (1863UL) /**< \brief Part 7 A.9 */ + #define SPN_WHEELBASEDMACHINEDIRECTION (1864UL) /**< \brief Part 7 A.10 */ + #define SPN_KEYSWITCHSTATE (1865UL) /**< \brief Part 7 A.11 */ + #define SPN_MAXI_TIMEOFTRACPOWER (1866UL) /**< \brief Part 7 A.12 */ + #define SPN_OPERATOR_DIREC_REVERSED (5244UL) + #define SPN_START_STOP_STATE (5203UL) + /* iso_SpnDefineSpn( x, SPN_WHEELBASEDMACHINESPEED, 1u, 1u, 16u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_WHEELBASEDMACHINEDISTANCE, 3u, 1u, 32u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_WHEELBASEDMACHINEDIRECTION, 8u, 1u, 2u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_KEYSWITCHSTATE, 8u, 3u, 2u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_MAXI_TIMEOFTRACPOWER, 7u, 1u, 8u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_OPERATOR_DIREC_REVERSED, 8u, 7u, 2u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_START_STOP_STATE, 8u, 5u, 8u, SpnValStandard ); */ + + /* Machine selected speed */ + #define SPN_SELECTEDMACHINESPEED (4305UL) /**< \brief Part 7 A.30.1 */ + #define SPN_SELECTEDMACHINEDISTANCE (4306UL) /**< \brief Part 7 A.30.2 */ + #define SPN_SELECTEDMACHINELIMITSTATUS (4307UL) /**< \brief Part 7 A.30.8 */ + #define SPN_SELECTEDMACHINESOURCE (4308UL) /**< \brief Part 7 A.30.4 */ + #define SPN_SELECTEDMACHINEDIRECTION (4309UL) /**< \brief Part 7 A.30.3 */ + #define SPN_SELECTEDMACHINE_EXIT_REASON_CODE (5818UL) /**< \brief Part 7 A.30.9 */ + /* iso_SpnDefineSpn( x, SPN_SELECTEDMACHINESPEED, 1u, 1u, 16u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_SELECTEDMACHINEDISTANCE, 3u, 1u, 32u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_SELECTEDMACHINE_EXIT_REASON_CODE, 7u, 1u, 8u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_SELECTEDTMACHINEDIRECTION, 8u, 1u, 2u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_SELECTEDMACHINESOURCE, 8u, 3u, 3u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_SELECTEDMACHINELIMITSTATUS, 8u, 6u, 3u, SpnValStandard ); */ + + /* Machine selected speed command */ + #define SPN_SELECTED_SPEED_SETPOINT_CMD (4310UL) + #define SPN_SELECTED_SPEED_SETPOINT_LIMIT_CMD (4311UL) + #define SPN_SELECTED_DIRECTION_CMD (4312UL) + /* iso_SpnDefineSpn( x, SPN_SELECTED_SPEED_SETPOINT_CMD, 1u, 1u, 16u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_SELECTED_SPEED_SETPOINT_LIMIT_CMD, 3u, 1u, 16u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_SELECTED_DIRECTION_CMD, 8u, 1u, 2u, SpnValStandard ); */ + + /* Maintain power */ + #define SPN_MAINTAIN_ECUPOWER (1867UL) /**< \brief Part 7 A.13 */ + #define SPN_MAINTAIN_ACTUATORPOWER (1868UL) /**< \brief Part 7 A.14 */ + #define SPN_IMPLEMENT_TRANSPORTSTATE (1869UL) /**< \brief Part 7 A.15 */ + #define SPN_IMPLEMENT_PARKSTATE (1870UL) /**< \brief Part 7 A.16 */ + #define SPN_IMPLEMENT_WORKSTATE (1871UL) /**< \brief Part 7 A.17 */ + /* iso_SpnDefineSpn( x, SPN_MAINTAIN_ECUPOWER, 1u, 7u, 2u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_MAINTAIN_ACTUATORPOWER, 1u, 5u, 2u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_IMPLEMENT_TRANSPORTSTATE, 2u, 7u, 2u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_IMPLEMENT_PARKSTATE, 2u, 5u, 2u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_IMPLEMENT_WORKSTATE, 2u, 3u, 2u, SpnValStandard ); */ + + /* Lighting command */ + #define SPN_BACKUPLIGHT_ALARMHORNCMD (2391UL) /**< \brief J1939-71 */ + /* iso_SpnDefineSpn( x, SPN_BACKUPLIGHT_ALARMHORNCMD, 3u, 1u, 2u, SpnValStandard ); */ + + /* Implement operating state command */ + #define SPN_IMPLEMENT_OPSTATECOMMAND (5139UL) /**< Part 7 A.25.1 */ + /* iso_SpnDefineSpn( x, SPN_IMPLEMENT_OPSTATECOMMAND, 8u, 1u, 2u, SpnValStandard ); */ + + /* Secondary or front hitch status */ + #define SPN_FRONT_HITCH_POSITION (1872UL) /**< \brief Part 7 A.19.1 */ + #define SPN_FRONT_HITCH_WORK_INDICATION (1876UL) /**< \brief Part 7 A.19.5 */ + #define SPN_FRONT_HITCH_POS_LIMIT_STATUS (5150UL) + #define SPN_FRONT_HITCH_NOMINAL_LOWER_LINK_FORCE (1880UL) + #define SPN_FRONT_HITCH_DRAFT (1878UL) /**< \brief Part 7 A.19.7 */ + #define SPN_FRONT_HITCH_EXIT_REASON_CODE (5816UL) + /* iso_SpnDefineSpn( x, SPN_FRONT_HITCH_POSITION, 1u, 1u, 8u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_FRONT_HITCH_WORK_INDICATION, 2u, 7u, 2u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_FRONT_HTICH_POS_LIMIT_STATUS, 2u, 4u, 3u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_FRONT_NOMINAL_LOWER_LINK_FORCE, 3u, 1u, 8u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_FRONT_DRAFT, 4u, 1u, 16u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_FRONT_HITCH_EXIT_REASEON_CODE, 6u, 1u, 8u, SpnValStandard ); */ + + /* Primary or rear hitch status */ + #define SPN_REAR_HITCH_POSITION (1873UL) /**< \brief Part 7 A.19.2 */ + #define SPN_REAR_HITCH_WORK_INDICATION (1877UL) /**< \brief Part 7 A.19.6 */ + #define SPN_REAR_HITCH_POS_LIMIT_STATUS (5151UL) + #define SPN_REAR_HITCH_NOMINAL_LOWER_LINK_FORCE (1881UL) + #define SPN_REAR_HITCH_DRAFT (1879UL) /**< \brief Part 7 A.19.8 */ + #define SPN_REAR_HITCH_EXIT_REASON_CODE (5819UL) + /* iso_SpnDefineSpn( x, SPN_REAR_HITCH_POSITION, 1u, 1u, 8u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_REAR_HITCH_WORK_INDICATION, 2u, 7u, 2u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_REAR_HTICH_POS_LIMIT_STATUS, 2u, 4u, 3u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_REAR_HITCH_NOMINAL_LOWER_LINK_FORCE, 3u, 1u, 8u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_REAR_HITCH_DRAFT, 4u, 1u, 16u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_REAR_HITCH_EXIT_REASEON_CODE, 6u, 1u, 8u, SpnValStandard ); */ + + + /* Secondary or front PTO output shaft */ + #define SPN_FRONT_PTO_OUTP_SHAFT_SPEED (1882UL) /**< \brief Part 7 A.20.1 */ + #define SPN_FRONT_PTO_OUTP_SH_SPEED_SET (1884UL) /**< \brief Part 7 A.20.3 */ + #define SPN_FRONT_PTO_ENGAGEMENT (1888UL) /**< \brief Part 7 A.20.7 */ + #define SPN_FRONT_PTO_MODE (1889UL) /**< \brief Part 7 A.20.9 */ + #define SPN_FRONT_PTO_ECONOMY_MODE (1891UL) /**< \brief Part 7 A.20.11 */ + #define SPN_FRONT_PTO_ENGAGEMENT_REQ (5152UL) /**< \brief Part 7 A.20.19 */ + #define SPN_FRONT_PTO_MODE_REQ_STATUS (5153UL) + #define SPN_FRONT_PTO_ECONOMY_MODE_REQ_STAT (5154UL) + #define SPN_FRONT_PTO_SH_SPEED_LIMIT_STAT (5155UL) + #define SPN_FRONT_PTO_EXIT_REASON_CODE (5817UL) + /* iso_SpnDefineSpn( x, SPN_FRONT_PTO_OUTP_SHAFT_SPEED, 1u, 1u, 16u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_FRONT_PTO_OUTP_SH_SPEED_SET, 3u, 1u, 16u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_FRONT_PTO_NGAGEMENT, 5u, 7u, 2u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_FRONT_PTO_MODE, 5u, 5u, 2u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_FRONT_PTO_ECONOMY_MODE , 5u, 3u, 2u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_FRONT_PTO_ENGAGEMENT_REQ, 5u, 1u, 2u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_FRONT_PTO_MODE_REQ_STATUS, 6u, 7u, 2u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_FRONT_PTO_ECONOMY_MODE_REQ_STAT, 6u, 5u, 2u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_FRONT_PTO_SH_SPEED_LIMIT_STAT, 6u, 2u, 3u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_FRONT_PTO_EXIT_REASON_CODE, 7u, 1u, 8u, SpnValStandard ); */ + + /* Primary or rear PTO output shaft */ + #define SPN_REAR_PTO_OUTP_SHAFT_SPEED (1883UL) /**< \brief Part 7 A.20.2 */ + #define SPN_REAR_PTO_OUTP_SH_SPEED_SET (1885UL) /**< \brief Part 7 A.20.4 */ + #define SPN_REAR_PTO_ENGAGEMENT (2408UL) /**< \brief Part 7 A.20.8 */ + #define SPN_REAR_PTO_MODE (1890UL) /**< \brief Part 7 A.20.10 */ + #define SPN_REAR_PTO_ECONOMY_MODE (1892UL) /**< \brief Part 7 A.20.12 */ + #define SPN_REAR_PTO_ENGAGEMENT_REQ (5156UL) /**< \brief Part 7 A.20.23 */ + #define SPN_REAR_PTO_MODE_REQ_STATUS (5157UL) + #define SPN_REAR_PTO_ECONOMY_MODE_REQ_STAT (5158UL) + #define SPN_REAR_PTO_SH_SPEED_LIMIT_STAT (5159UL) + #define SPN_REAR_PTO_EXIT_REASON_CODE (5820UL) + /* iso_SpnDefineSpn( x, SPN_REAR_PTO_OUTP_SHAFT_SPEED, 1u, 1u, 16u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_REAR_PTO_OUTP_SH_SPEED_SET, 3u, 1u, 16u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_REAR_PTO_ENGAGEMENT, 5u, 7u, 2u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_REAR_PTO_MODE, 5u, 5u, 2u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_REAR_PTO_ECONOMY_MODE , 5u, 3u, 2u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_REAR_PTO_ENGAGEMENT_REQ, 5u, 1u, 2u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_REAR_PTO_MODE_REQ_STATUS, 6u, 7u, 2u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_REAR_PTO_ECONOMY_MODE_REQ_STAT, 6u, 5u, 2u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_REAR_PTO_SH_SPEED_LIMIT_STAT, 6u, 2u, 3u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_REAR_PTO_EXIT_REASON_CODE, 7u, 1u, 8u, SpnValStandard ); */ + + /* Hitch and PTO commands */ + #define SPN_FRONT_HITCH_POS_COMMAND (1874UL) /**< \brief Part 7 A.19.3 */ + #define SPN_REAR_HITCH_POS_COMMAND (1875UL) /**< \brief Part 7 A.19.4 */ + #define SPN_FRONT_OUTP_SH_SPEED_SET_CMD (1886UL) /**< \brief Part 7 A.20.5 */ + #define SPN_REAR_OUTP_SH_SPEED_SET_CMD (1887UL) /**< \brief Part 7 A.20.6 */ + #define SPN_FRONT_PTO_ENGAGEMENT_CMD (1893UL) /**< \brief Part 7 A.20.13 */ + #define SPN_REAR_PTO_ENGAGEMEN_CMDT (1894UL) /**< \brief Part 7 A.20.14 */ + /* iso_SpnDefineSpn( x, SPN_FRONT_HITCH_POS_COMMAND, 1u, 1u, 8u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_REAR_HITCH_POS_COMMAND, 2u, 1u, 8u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_FRONT_OUTP_SH_SPEED_SET, 3u, 1u, 16u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_REAR_OUTP_SH_SPEED_SET, 5u, 1u, 16u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_FRONT_PTO_ENGAGEMENT, 7u, 7u, 2u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_REAR_PTO_ENGAGEMENT, 7u, 5u, 2u, SpnValStandard ); */ + + + /* Auxiliary valve estimated flow */ + #define SPN_AUX_VALVE_EXT_EST_FLOW (2337UL) /**< \brief Part 7 A.21.19 */ + #define SPN_AUX_VALVE_RET_EST_FLOW (2338UL) /**< \brief Part 7 A.21.20 */ + #define SPN_AUX_VALVE_FAIL_SAFE_MOD (2346UL) /**< \brief Part 7 A.21.28 */ + #define SPN_AUX_VALVE_VALVE_STATE (2339UL) /**< \brief Part 7 A.21.21 */ + #define SPN_AUX_VALVE_ESTIM_LIMIT (5192UL) /**< \brief Part 7 A.21.47 */ + #define SPN_AUX_VALVE_EXIT_REASON_CODE (5815UL) + /* iso_SpnDefineSpn( x, SPN_AUX_VALVE_EXT_EST_FLOW, 1u, 1u, 8u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_AUX_VALVE_RET_EST_FLOW, 2u, 1u, 8u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_AUX_VALVE_FAIL_SAFE_MOD, 3u, 7u, 2u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_AUX_VALVE_VALVE_STATE, 3u, 1u, 4u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_AUX_VALVE_ESTIM_LIMIT, 4u, 6u, 3u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_AUX_VALVE_EXIT_REASON_CODE, 5u, 1u, 8u, SpnValStandard ); */ + + + /* Auxiliary valve command */ + #define SPN_AUX_VALVE_PORT_FLOW_COMMAND (2343UL) + #define SPN_AUX_VALVE_STATE_COMMAND (2344UL) /**< \brief Part 7 A.21.26 */ + #define SPN_AUX_VALVE_FAIL_SAFE_MODE_COMMAND (2345UL) + /* iso_SpnDefineSpn( x, SPN_AUX_VALVE_PORT_FLOW_COMMAND, 1u, 1u, 8u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_AUX_VALVE_15_STATE_COMMAND, 3u, 1u, 4u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_AUX_VALVE_FAIL_SAFE_MODE_COMMAND, 3u, 7u, 2u, SpnValStandard ); */ + + /* Auxiliary valve measured flow */ + #define SPN_AUX_VALVE_LIMITSTATUS (5190UL) /**< \brief Part 7 A.21.29 */ + /* iso_SpnDefineSpn( x, SPN_AUX_VALVE_LIMITSTATUS, 8u, 6u, 3u, SpnValStandard ); */ + + /* Guidance system command */ + #define SPN_CURVATURE_COMMAND (5237UL) /**< \brief Part 7 A.28.1 */ + #define SPN_CURVATURE_COMMAND_STATUS (5239UL) /**< \brief Part 7 A.28.3 */ + /* iso_SpnDefineSpn( x, SPN_CURVATURE_COMMAND, 1u, 1u, 16u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_CURVATURE_COMMAND_STATUS, 3u, 1u, 2u, SpnValStandard ); */ + + /* Guidance machine status */ + #define SPN_ESTIMATED_CURVATURE (5238UL) /**< \brief Part 7 A.28.2 */ + #define SPN_REQUEST_RESET_COMM_STATUS (5240UL) /**< \brief Part 7 A.28.4 */ + #define SPN_STEERING_INP_POS_STATUS (5241UL) /**< \brief Part 7 A.28.5 */ + #define SPN_SYSTEM_READINESS (5242UL) /**< \brief Part 7 A.28.6 */ + #define SPN_MECHANICAL_SYSTEM_LOCKOUT (5243UL) /**< \brief Part 7 A.28.7 */ + #define SPN_GUIDANCE_LIMIT_STATUS (5726UL) + #define SPN_GUID_SYS_COM_EXIT_REASON_CODE (5725UL) + /* iso_SpnDefineSpn( x, SPN_ESTIMATED_CURVATURE , 1u, 1u, 16u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_REQUEST_RESET_COMM_STATUS, 3u, 7u, 2u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_STEERING_INP_POS_STATUS, 3u, 5u, 2u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_SYSTEM_READINESS, 3u, 3u, 2u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_MECHANICAL_SYSTEM_LOCKOUT, 3u, 1u, 2u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_GUIDANCE_LIMIT_STATUS, 4u, 6u, 3u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_GUID_SYS_COM_EXIT_REASON_CODE, 5u, 1u, 6u, SpnValStandard ); */ + + /* Vehicle hours */ + #define SPN_TOTAL_VEHICLE_HOURS (246UL) + #define SPN_TOTAL_POWER_TAKEOFF_HOURS (248UL) + /* iso_SpnDefineSpn( x, SPN_TOTAL_VEHICLE_HOURS, 1u, 1u, 32u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_TOTAL_POWER_TAKEOFF_HOURS, 5u, 1u, 32u, SpnValStandard ); */ + + /* Tire Condition */ + #define SPN_TIRE_LOCATION (929UL) + #define SPN_TIRE_PRESSURE (241UL) + #define SPN_TIRE_TEMPERATURE (242UL) + #define SPN_CTI_WHEEL_SENSOR_STATUS (1699UL) + #define SPN_CTI_TIRE_STATUS (1698UL) + #define SPN_WHEEL_END_ELECTRICAL_FAULT (1697UL) + #define SPN_TIRE_LEAKAGE_RATE (2586UL) + #define SPN_TIRE_PRESSURE_THRESHOLD_DETECTION (2587UL), + /* iso_SpnDefineSpn( x, SPN_TIRE_LOCATION, 1u, 1u, 8u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_TIRE_PRESSURE, 2u, 1u, 8u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_TIRE_TEMPERATURE, 3u, 1u, 16u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_CTI_WHEEL_SENSOR_STATUS, 5u, 1u, 2u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_CTI_TIRE_STATUS, 5u, 3u, 2u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_WHEEL_END_ELECTRICAL_FAULT, 5u, 5u, 2u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_TIRE_LEAKAGE_RATE, 6u, 1u, 16u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_TIRE_PRESSURE_THRESHOLD_DETECTION, 8u, 6u, 2u, SpnValStandard ); */ + + /* Language Command */ + #define SPN_LANGUAGE_CMD_1 (2410UL) + #define SPN_LANGUAGE_CMD_2 (2411UL) + /* #define SPN_DECIMAL_SYMBOL (2411UL) + #define SPN_DATE_FORMAT (2412UL) + #define SPN_TIME_FORMAT (2413UL) + #define SPN_DISTANCE_UNITS (2414UL) + #define SPN_AREA_UNITS (2415UL) + #define SPN_VOLUME_UNITS (2416UL) + #define SPN_MASS_UNITS (2417UL) + #define SPN_TEMPERATURE_UNITS (5194UL) + #define SPN_PRESSURE_UNITS (5195UL) + #define SPN_FORCE_UNITS (5196UL) + #define SPN_UNITS_SYSTEM (5197UL) */ + /* iso_SpnDefineSpn( x, SPN_LANGUAGE_CODE, 1u, 1u, 16u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_TIME_FORMAT, 3u, 5u, 2u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_DECIMAL_SYMBOL, 3u, 7u, 2u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_DATE_FORMAT, 4u, 1u, 8u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_MASS_UNITS, 5u, 1u, 2u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_VOLUME_UNITS, 5u, 3u, 2u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_AREA_UNITS, 5u, 5u, 2u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_DISTANCE_UNITS, 5u, 7u, 2u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_UNITS_SYSTEM, 6u, 1u, 2u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_FORCE_UNITS, 6u, 3u, 2u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_PRESSURE_UNITS, 6u, 5u, 2u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_TEMPERATURE_UNITS, 6u, 7u, 2u, SpnValStandard ); */ + + /* Time / Date */ + #define SPN_TIME_SECOND (959UL) + #define SPN_TIME_MINUTE (960UL) + #define SPN_TIME_HOUR (961UL) + #define SPN_DATE_MONTH (963UL) + #define SPN_DATE_DAY (962UL) + #define SPN_DATE_YEAR (964UL) + #define SPN_LOCAL_MINUTE_OFFSET (1601UL) + #define SPN_LOCAL_HOUR_OFFSET (1602UL) + /* iso_SpnDefineSpn( x, SPN_TIME_SECOND, 1u, 1u, 8u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_TIME_MINUTE, 2u, 1u, 8u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_TIME_HOUR, 3u, 1u, 8u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_DATE_MONTH, 4u, 1u, 8u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_DATE_DAY, 5u, 1u, 8u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_DATE_YEAR, 6u, 1u, 8u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_LOCAL_MINUTE_OFFSET, 7u, 1u, 8u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_LOCAL_HOUR_OFFSET, 8u, 1u, 8u, SpnValStandard ); */ + + /* Lighting Command & Lighting Data */ + #define SPN_LIGHTING_DATA_1 (2347UL) + #define SPN_LIGHTING_DATA_2 (2371UL) + #define SPN_LIGHTING_DATA_3 (2361UL) + #define SPN_LIGHTING_DATA_4 (2597UL) + #define SPN_RIGHT_TURN_SIGNAL_CMD (2369UL) + #define SPN_LEFT_TURN_SIGNAL_CMD (2367UL) + #define SPN_RIGHT_TURN_LIGHTS (2370UL) + #define SPN_LEFT_TURN_LIGHTS (2368UL) + /* iso_SpnDefineSpn( x, SPN_LIGHTING_DATA_1, 1u, 1u, 16u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_LIGHTING_DATA_2, 3u, 1u, 16u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_LIGHTING_DATA_3, 5u, 1u, 16u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_LIGHTING_DATA_4, 7u, 1u, 16u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_RIGHT_TURN_SIGNAL_CMD, 2u, 5u, 2u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_LEFT_TURN_SIGNAL_CMD, 2u, 7u, 2u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_RIGHT_TURN_LIGHTS, 2u, 5u, 2u, SpnValStandard ); */ + /* iso_SpnDefineSpn( x, SPN_LEFT_TURN_LIGHTS, 2u, 5u, 2u, SpnValStandard ); */ + + + #endif /* ifndef NO_SPN_DEFINES */ + + /**@}*/ /* end group SPNs */ + + /* ************************************************************************ */ + /** \addtogroup isofmis + */ + /**@{*/ + + #define FMI_DATA_VALID_ABOVE_NORMAL (0u) /**< \brief Data Valid But Above Normal Operational Range - Most Severe Level */ + #define FMI_DATA_VALID_BELOW_NORMAL (1u) /**< \brief Data Valid But Below Normal Operational Range - Most Severe Level */ + #define FMI_DATA_ERRATIC (2u) /**< \brief Data Erratic, Intermittent Or Incorrect */ + #define FMI_VOLTAGE_ABOVE_NORMAL (3u) /**< \brief Voltage Above Normal, Or Shorted To High Source */ + #define FMI_VOLTAGE_BELOW_NORMAL (4u) /**< \brief Voltage Below Normal, Or Shorted To Low Source */ + #define FMI_CURRENT_ABOVE_NORMAL (5u) /**< \brief Current Below Normal Or Open Circuit */ + #define FMI_CURRENT_BELOW_NORMAL (6u) /**< \brief Current Above Normal Or Grounded Circuit */ + #define FMI_MECH_SYSTEM_NOT_RESPONDING (7u) /**< \brief Mechanical System Not Responding Or Out of Adjustment */ + #define FMI_ABNORMAL_FREQUENCY (8u) /**< \brief Abnormal Frequency Or Pulse Width Or Period */ + #define FMI_ABNORMAL_UPDATERATE (9u) /**< \brief Abnormal Update Rate */ + #define FMI_ABNORMAL_RATEOFCHANGE (10u) /**< \brief Abnormal Rate Of Change */ + #define FMI_ROOT_CAUSE_NOT_KNOWN (11u) /**< \brief Root Cause Not Known */ + #define FMI_BAD_INTELLIGENT_DEVICE (12u) /**< \brief Bad Intelligent Device Or Component */ + #define FMI_OUT_OF_CALIBRATION (13u) /**< \brief Out Of Calibration */ + #define FMI_SPECIAL_INSTRUCTIONS (14u) /**< \brief Special Instructions */ + #define FMI_DATA_ABOVE_NORM_LEAST_SEVER (15u) /**< \brief Data Valid But Above Normal Operating Range - Least Severe Level */ + #define FMI_DATA_ABOVE_NORMAL_MOD_SEVER (16u) /**< \brief Data Valid But Above Normal Operating Range - Moderately Severe Level */ + #define FMI_DATA_BELOW_NORMAL_LEAST_SEV (17u) /**< \brief Data Valid But Below Normal Operational Range - Least Severe Level */ + #define FMI_DATA_BELOW_NORMAL_MOD_SEVER (18u) /**< \brief Data Valid But Below Normal Operational Range - Moderately Severe Level */ + #define FMI_RECEIV_NETW_DATA_IN_ERROR (19u) /**< \brief Received Network Data in Error */ + /* 20-30, */ /* Reserved for future assignment */ + #define FMI_CONDITION_EXISTS (31u) /**< \brief Condition Exists */ + + /**@}*/ /* end group FMIs */ + + /* ************************************************************************ */ + /** \addtogroup isodefslayer78 + */ + /**@{*/ + /* Common definitions for LAYER 7, 8 */ + #define ISO_REVERSE ( 0x0u ) /**< Direction reverse */ + #define ISO_DISABLED ( 0x0u ) /**< Not enabled */ + #define ISO_DISENGAGED ( 0x0u ) /**< Switched off */ + #define ISO_FORWARD ( 0x1u ) /**< Direction forward */ + #define ISO_ENABLED ( 0x1u ) /**< Enabled */ + #define ISO_ENGAGED ( 0x1u ) /**< Switched on */ + + #define ISO_ERROR_INDI_2Bit ( 0x2u ) /**< 2 bit error indicator */ + #define ISO_NOT_AVAILABLE_2Bit ( 0x3u ) /**< 2 bit not available */ + #define ISO_DONT_CARE_2bit ( 0x3u ) /**< 2 bit dont care */ + #define ISO_ERROR_INDI_3Bit ( 0x6u ) /**< 3 bit error indicator */ + #define ISO_NOT_AVAILABLE_3Bit ( 0x7u ) /**< 3 bit not available */ + #define ISO_DONT_CARE_3bit ( 0x7u ) /**< 3 bit dont care */ + + #define ISO_ERROR_INDI_4bit ( 0xEu ) /**< 4 bit error indicator */ + #define ISO_NOT_AVAILABLE_4bit ( 0xFu ) /**< 4 bit not available */ + #define ISO_DONT_CARE_4bit ( 0xFu ) /**< 4 bit dont care */ + + #define ISO_VALID_SIGNAL_B ( 0xFAu ) /**< 8 bit max value of valid signal */ + #define ISO_ERROR_INDI_B ( 0xFEu ) /**< 8 bit error indicator */ + #define ISO_NOT_AVAILABLE_B ( 0xFFu ) /**< 8 bit not available */ + #define ISO_DONT_CARE_B ( 0xFFu ) /**< 8 bit dont care */ + + #define ISO_VALID_SIGNAL_W ( 0xFAFFu ) /**< 16 bit max value of valid signal */ + #define ISO_ERROR_INDI_W ( 0xFE00u ) /**< 16 bit error indicator min */ + #define ISO_NOT_AVAILABLE_W ( 0xFF00u ) /**< 16 bit not available min */ + #define ISO_ERROR_INDI_WM ( 0xFEFFu ) /**< 16 bit error indicator max */ + #define ISO_NOT_AVAILABLE_WM ( 0xFFFFu ) /**< 16 bit not available max */ + #define ISO_DONT_CARE_W ( 0xFFFFu ) /**< 16 bit dont care */ + + #define ISO_VALID_SIGNAL_DW ( 0xFAFFFFFFuL ) /**< 32 bit max value of valid signal */ + #define ISO_ERROR_INDI_DW ( 0xFE000000uL ) /**< 32 bit error indicator min */ + #define ISO_NOT_AVAILABLE_DW ( 0xFF000000uL ) /**< 32 bit not available min */ + #define ISO_ERROR_INDI_DWM ( 0xFEFFFFFFuL ) /**< 32 bit error indicator max */ + #define ISO_NOT_AVAILABLE_DM ( 0xFFFFFFFFuL ) /**< 32 bit not available max */ + + + #define ISO_LIMIT_MAX ( 0x7FFFFFFFL ) /**< Threshold limit signed long max */ + #define ISO_LIMIT_MIN ( -0x7FFFFFFFL ) /**< Threshold limit signed long min */ + + #define NMEA_ERROR_INDI_B ( 0xFEu ) /**< NMEA Error indicator for 8 bit value */ + #define NMEA_ERROR_INDI_W ( 0xFFFEu ) /**< NMEA Error indicator for 16 bit value */ + #define NMEA_ERROR_INDI_DW ( 0xFFFFFFFEuL ) /**< NMEA Error indicator for 32 bit value */ + /* not used #define NMEA_ERROR_INDI_ULL ( 0xFFFFFFFFFFFFFFFEuLL ) NMEA Error indicator for 64 bit value */ + #define NMEA_NOT_AVAILABLE_B ( 0xFFu ) /**< NMEA Not available for 8 bit value */ + #define NMEA_NOT_AVAILABLE_W ( 0xFFFFu ) /**< NMEA Not available for 16 bit value */ + #define NMEA_NOT_AVAILABLE_DW ( 0xFFFFFFFFuL ) /**< NMEA Not available for 32 bit value */ + /* not used #define NMEA_NOT_AVAILABLE_ULL ( 0xFFFFFFFFFFFFFFFFuLL ) NMEA Not available for 64 bit value */ + + /**@}*/ /* end group Common definitions for LAYER 7, 8 */ + + #endif /* DEF_ISOPGNDEF_H */ ++>>>>>>> rauch/jobrechner-import-20190607 diff --cc ptxdist/local_src/ecu-jobctl/extern/isobus/IsoSccApi.h index a4df2d3,fc5f119..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-jobctl/extern/isobus/IsoSccApi.h +++ b/ptxdist/local_src/ecu-jobctl/extern/isobus/IsoSccApi.h @@@ -1,593 -1,628 +1,1224 @@@ ++<<<<<<< HEAD +/* ************************************************************************ */ +/*! + \file + \brief ECU Driver SC Client Api Header File + \author Wegscheider Peter + \date Created XX.07.13 + + \copyright Copyright (c) WBZ-Engineering GmbH + + \par History: + \par + 04.07.2013 - author P. Wegscheider + - API declarations moved to this file + - Module version define added + \par + 05.09.2013 - author E. Hammerl + - Event IsoSCMNotAlive added, SsInactiv corrected + \par + 08.05.2014 - author E. Hammerl + - Added IsoSC_SetSCCVersion() and SCM font parameter +*/ +/* ************************************************************************ */ +#ifndef DEF_IsoSccApi_H + #define DEF_IsoSccApi_H + +#ifdef __cplusplus +extern "C" { +#endif +/* ************************************************************************ */ + +/* ************************************************************************ */ +/*! \ingroup grp_versions + \brief Sequence Control Client Module Version +*/ +#define VERSION_SCC 1.1 + + +/* ************************************************************************ */ +/** \addtogroup sequencectrl SC-Client + \ingroup clients + \brief Part 14 - Sequence Control Client +*/ +/* ************************************************************************ */ +/** \addtogroup sequencectrl +@{ +*/ +/* ************************************************************************ */ + +/* ************** IsoScCtrl.c, IsoScLogin.c, IsoScWork.c ( Sequenz Control Iso 11783-14 )******* */ + + /* Versions */ + #define SC_DIS (0u) /**< Draft international standard */ + #define SC_FDIS (1u) /**< Final draft international standard */ + #define SQC_IS_1 (2u) /**< First edition as international standard - default */ + + /** \brief + Enum of command for login (setting the device description) or logout the SC client + */ + typedef enum + { + IsoScOpenSCD, /**< Open an new SC Client instance */ + IsoScCloseSCD, /**< Finish the SCD initialisation */ + IsoScLogOut /**< Resets (deletes) a SC Client */ + } ISO_SC_CMD_e; + + /** \brief + + */ + typedef enum + { + IsoTimeBased = 0x1, + IsoDistanceBased = 0x2, + IsoDontCare = 0xFF + } PrefTrig_te; + + /** \brief + + */ + typedef enum + { + SsReserved = 0x00, /* */ + SsReady = 0x01, /* */ + SsRecording = 0x02, + SsRecordingCompletion = 0x03, + SsPlayBack = 0x04, + SsAbort = 0x05, + SsInactiv = 0xFF + } StateSeq_te; + + /** \brief + Enum which indicates the kind of SC callback calling + */ + typedef enum + { + IsoSCLoginFinished, /**< Login of VT and SC finished -> SCOP objects manipulation possible*/ + IsoSCRecordingCompletion, /**< SCM is entried in sequence state "Recording Completion" */ + IsoSCMExeCmd, /**< SCM execution command received */ + IsoRespToExeInd, /**< Response to SC execution indication received */ + IsoRespToExeStatus, /**< Response to SC execution status received */ + IsoClAbort, /**< Abort of SCM received, SCC or own SCClientAbort */ + IsoSCMNotAlive, /**< SCM status message not received */ + IsoSCtoAppLast + } ISO_SCAPP_e; + + /** \brief + Enum of possible execution states + */ + typedef enum + { + IsoFuncExeStartedCompleted, /**< */ + IsoFuncExeStarted, /**< */ + IsoFuncExeCompleted, + IsoFuncExeError, + IsoFuncExeLast + } ISO_SCEXST_e; + + /** \brief + + */ + typedef enum + { + FuNoErr = 0x0, /**< No error */ + FuOneTimeErr = 0x1, /**< One time error */ + FuPermanentErr = 0x2, /**< Permanent error */ + FuCFLocked = 0x3, /**< Client function is locked */ + FuCFDeactive = 0x4, /**< Client function deactivated at the SCC by the operator */ + FuAnyOtherErr = 0xF /**< Any other error */ + } FuncErrSta_te; + + /** \brief + Errorcodes for SCExecutionExecutionStatus(E7) + */ + typedef enum + { + IsoNoErr = 0, + IsoErrInTheFunction = 1, /**< */ + IsoExeOperatorInteract = 2, + IsoConditionSCCnoExecut = 3, + IsoExeAnyOtherError = 0xFF + } ISO_SCEXEERR_e; + + /** \brief + Errorcodes for SCClientAbort(E3) + */ + typedef enum + { + IsoReserved = 0, + IsoTimeoutOnStatusMsg = 1, /**< */ + IsoOperatorInteraction = 2, + IsoErrorDuringFuncExecut = 3, + IsoAnyOtherError = 0xFF + } ISO_SCABORTERR_e; + + /** \brief + Enum of status info + */ + typedef enum + { + SCC_STATEOFANNOUNCING, /**< See intern state machine of login */ + SCC_SEQUENCESTATE, /**< SCC acutal Sequence state */ + SCC_VERSION, /**< SCC used standard version */ + SCM_ACTIVE_ALIVE, /**< SCM status message ok? */ + SCM_ACTIVE_SOURCEADDRESS, /**< SCM Source address */ + SCM_SEQUENCESTATE, /**< SCM actual Sequence state */ + SCM_CAP_PIXELXAXIS, /**< SCM Number of pixels X-axis for grafic objects */ + SCM_CAP_PIXELYAXIS, /**< SCM Number of pixels Y-axis for grafic objects */ + SCM_CAP_MAXCHARSTR, /**< SCM Number of characters for design. strings */ + SCM_FONTCOLOUR, /**< SCM font colour */ + SCM_FONTSIZE, /**< SCM font size */ + SCM_FONTTYPE, /**< SCM font type */ + SCM_FONTSTYLE, /**< SCM font style */ + SCM_VERSION, /**< SCM Version */ + SCD_NUMBERFUN, /**< SCD Number of SCD function objects */ + SCD_NUMBERSTATE, /**< SCD Number of SCD state objects */ + SCD_EXTOBJDEFID /**< Object ID of external object definition object ID */ + } ISOSC_STATUS_e; + + /** \brief + Struct which is used as interface to the application + */ + typedef struct + { + ISO_SCAPP_e eScCmd; /**< Kind of SC callback calling */ + byte bFuncID; /**< Function ID */ + byte bStateID; /**< State ID */ + ISO_SCEXST_e eScExeSta; /**< Execution state */ + dword dwFunctVal; /**< Function value */ + byte bErrorCode; /**< ErrorCode */ + } ISO_SCLINK_T, *ISO_SCLINK_t ; + + + /* Functions for sequenz control initialisation */ +/**************************************************************************************/ +/*! + \brief Initialisation of a sequenz controller instance + + This function controls the initialisation of a device description and has the ability + to find a SC Client instance. + + \param[in] \wpp{rpbWorkSetMasterName, const #byte[] } + Pointer to working set master NAME (ISO11783 - 5) \n + NAME of working which uses a TC Client + \param[in] \wp{rpfScCall, void*(ISO_SCLINK_T * psScLink) } + Communication interface with SCM (Callbackfun.) + \param[in] \wp{eCommand, ISO_SC_CMD_e } + Command - what shall this function do? + - IsoScOpenSCD - Open an new SC Client instance and + starts the initialisation of a SCD + - IsoScCloseSCD - Finish the SCD + - IsoScGetPointOfInst - Returns the number of a SC Client instance + - IsoScLogOut - Shut down a SC client ( delete) + \retval sint + - 0 ... ( WORKING_SETS - 1 ) + - E_NO_INSTANCE - error - instance not found +*/ +sint IsoSC_InstCmd ( const byte rpbWorkSetMasterName[], + void (*rpfScCall)( ISO_SCLINK_T * psScLink ), + ISO_SC_CMD_e eCommand + ); + +/**************************************************************************/ +/*! + \brief Setting the version supported of this SC client + + \param[in] \wp{iScInst, sint} + (Valid) Return value of IsoSC_InstCmd( ... IsoScOpenSCD ) + \param[in] \wp{bSCVersion, byte} + New Standard Version supported of this SC client + \retval sint + - #E_NO_ERR - OK + - #E_NO_INSTANCE - SCC instance not found +*/ +sint IsoSC_SetSCCVersion( sint iScInst, byte bSCVersion ); + +/**************************************************************************/ +/*! + \brief Initialisation of the SCOP basic object + + This function initialises the basic object of a SCOP. + + \param[in] \wp{iScInst, sint} + (Valid) Return value of IsoSC_InstCmd( ... IsoScOpenSCD ) + \param[in] \wp{rwObjectId, word} + Object ID of basic object + \param[in] \wpp{rpabNameMask, const #byte[]} + Mask for NAME used of SCM for filtering SCCs \n + NAME see ISO11783 - 5 + \param[in] \wp{rwSCDDesign, byte*} + Object ID of textual representation in the referenced SCOP + \param[in] \wp{rwSCDGrafic, word} + Object ID of graphical respresentation in the referenced SCOP + \param[in] \wpp{racVersion, const #schar[]} + Pointer to SCD version label \n + Range: 1 - 64 charakters + \param[in] \wpp{racConfig, const #schar[]} + Pointer to configuration label \n + Range: 1 - 64 charakters + \param[in] \wp{rbNumbFuncObj, byte} + Number of functions to follow + \param[in] \wpp{rpwListFuncObj, const #word[]} + Pointer to array of objects to follow ( list of function objects ) + \note \par + - There is only one basic object in a SCOP + - Calling this function is only allowed between IsoSC_InstCmd( IsoScOpenSCD ) + and IsoSC_InstCmd( IsoScCloseSCD ) +*/ +void IsoSC_BasicObjSet( sint iScInst, word rwObjectId, const byte rpabNameMask[], + word rwSCDDesign, word rwSCDGrafic, + const schar racVersion[], const schar racConfig[], + byte rbNumbFuncObj, const word rpwListFuncObj[] ); + +/*************************************************************************/ +/*! + \brief Initialisation of the SCD (client) function object + + This function initialises a function object of a SCOP and must be called for every function. + + \param[in] \wp{iScInst, sint} + (Valid) Return value of IsoSC_InstCmd( ... IsoScOpenSCD ) + \param[in] \wp{rwObjectId, word} + Object ID of function object + \param[in] \wp{rbFuncID, byte} + Unique Function ID (used as reference in CAN messages) + Range: 0 - 255 + \param[in] \wp{rePrefTrigger, PrefTrig_te} + Preferred trigger of this SCD function \n + IsoTimeBased, IsoDistanceBased or IsoDontCare + \param[in] \wp{rbAttribute, byte} + Additional attributes see SCD function object \n + see ISO 11783 - 14 - A.4 + \param[in] \wp{rwObjIdDesig, word} + Object ID of textual representation in the referenced SCOP + \param[in] \wp{rwObjIdGraph, word} + Object ID of graphical respresentation in the referenced SCOP + \param[in] \wp{rbNumbStateObj, byte} + Number of state objects of this client function \n + Range: 0 - 64 + \param[in] \wpp{rpwListStateObj, const #word[] } + Pointer to array of objects to follow ( list of state objects ) + \retval sint + - #E_NO_ERR - OK + - #E_OVERFLOW - Array for functions is to small + - #E_NO_INSTANCE - SCC instance not found + \note \par + - This function must called for a function before IsoSC_FunctValueSet()! + - Calling this function is only allowed between IsoSC_InstCmd( IsoScOpenSCD ) + and IsoSC_InstCmd( IsoScCloseSCD ) +*/ +sint IsoSC_FunctionObjSet( sint iScInst, word rwObjectId, byte rbFuncID, PrefTrig_te rePrefTrigger, + byte rbAttribute, word rwObjIdDesig, word rwObjIdGraph, + byte rbNumbStateObj, const word rpwListStateObj[] + ); + +/************************************************************************/ +/*! + \brief Initialisation of the function value of a function + + This function initialises the function value of a SCD function + + \param[in] \wp{iScInst, sint} + (Valid) Return value of IsoSC_InstCmd( ... IsoScOpenSCD ) + \param[in] \wp{rbFuncId, byte} + SCD Function ID + \param[in] \wp{rdwFuncValMin, dword} + Minimum numeric function value \n + Range: 0 - 2^32 -1 + \param[in] \wp{rdwFuncValMax, dword} + Maximum numeric function value \n + Range: 0 - 2^32 -1 + \param[in] \wp{rlFuncOffset, slong} + Numeric function value offset \n + Range: -2^31 - 2^31-1 \n + Set to FFFFFFFF when the numeric function value representation in the attributes + is set to 00 + \param[in] \wp{rfFuncScale, sfloat} + Numeric function value scale factor \n + Set to FFFFFFFF when the numeric function value representation in the attributes + is set to 00 + \param[in] \wp{rbNumbDec, byte} + Number of decimals of numeric function value to display after the decimal point \n + Range: 0 - 7 + \param[in] \wp{rwObjIdUnitStr, word} + Object ID of referenced VT string object containing the unit string for display + with the numeric function value. \n + Set to FFFF when the numeric function value representation in the attributes is + set to 00. + \retval sint + - E_NO_ERR - OK + - E_RANGE - Function ID not found + - #E_NO_INSTANCE - SCC instance not found + \note \par + Corresponding SCD function have to be initialised before +*/ +sint IsoSC_FunctValueSet( sint iScInst, byte rbFuncId, dword rdwFuncValMin, dword rdwFuncValMax, + slong rlFuncOffset, sfloat rfFuncScale, byte rbNumbDec, word rwObjIdUnitStr + ); + +/*****************************************************************************/ +/*! + \brief Initialisation of a SCD state object + + This function initialises a SCD state object + + \param[in] \wp{iScInst, sint} + (Valid) Return value of IsoSC_InstCmd( ... IsoScOpenSCD ) + \param[in] \wp{rwObjIDSta, word} + Object ID of state object + \param[in] \wp{rbStateID, byte} + State ID, Range 0 - 63 + \param[in] \wp{rwObjIdDesig, word} + Object ID of textual representation in the referenced SCOP + \param[in] \wp{rwObjIdGraph, word} + Object ID of graphical respresentation in the referenced SCOP + \retval sint + - #E_NO_ERR - OK + - #E_OVERFLOW - Array for states is to small + - #E_NO_INSTANCE - SCC instance not found + \par + - Calling this function is only allowed between IsoSC_InstCmd( IsoScOpenSCD ) + and IsoSC_InstCmd( IsoScCloseSCD ) +*/ + +sint IsoSC_StateObjSet( sint iScInst, word rwObjIDSta, byte rbStateID, word rwObjIdDesig, word rwObjIdGraph ); + +/**************************************************************************/ +/*! + \brief This function sets the external object definition object of this client + + \param[in] \wp{iScInst, sint} + (Valid) Return value of IsoSC_InstCmd( ... IsoScOpenSCD ) + \param[in] \wp{wExternalObjDefObj, word} + Object ID of external object definition object + + \retval sint + - #E_NO_ERR - OK + - #E_NO_INSTANCE - SCC instance not found + \par + There is only one external object definition object for SC allowed +*/ + +sint IsoSC_ExternalObjDefSet( sint iScInst, word wExternalObjDefObj ); + +/* Functions for sequenz control operations */ +/*********************************************************************************/ +/*! + \brief Command "SC Execution Indication" + + \param[in] \wp{rwSA, word} + Source address of SC Client + \param[in] \wp{rbFuncID, byte} + (Client)Function ID \n + Range: 0 - 255 + \param[in] \wp{rbStateID, byte} + State ID \n + Range: 0 - 63 + \param[in] \wp{reExeSta, ISO_SCEXST_e} + (Function)-Execution state \n + IsoFuncExeStartedCompleted, IsoFuncExeStarted, IsoFuncExeCompleted, IsoFuncExeError + \param[in] \wp{rdwFuncVal, dword} + Function value \n + Range: 0 - 2^32 -1 + \retval sint + - #E_NO_ERR - OK + - #E_VALUE_WRONG - Function ID or State ID not valid + - #E_USER_ERROR - there is no SC instance for this SA + - #E_NOACT - SC Client is in the wrong (sequence)-state +*/ +sint IsoSC_ExecutionIndication( word rwSA, byte rbFuncID, byte rbStateID, ISO_SCEXST_e reExeSta, dword rdwFuncVal ); + +/*************************************************************************/ +/*! + \brief Sending Client command response to SC Master Execution Command + + \param[in] \wp{rwSA, word} + Source address of SC Client + \param[in] \wp{rbFuncID, byte} + (Client)Function ID \n + Range: 0 - 255 + \param[in] \wp{rbStateID, byte} + State ID \n + Range: 0 - 63 + \param[in] \wp{reExeSta, ISO_SCEXST_e} + (Function)-Execution state \n + IsoFuncExeStartedCompleted, IsoFuncExeStarted, IsoFuncExeCompleted, IsoFuncExeError + \param[in] \wp{eErrorCode, ISO_SCEXEERR_e} + Error codes of SCClientExecutionStatus \n + IsoNoErr, IsoErrInTheFunction, IsoExeOperatorInteract, IsoConditionSCCnoExecut, + IsoExeAnyOtherError + \retval sint + - #E_NO_ERR - OK + - #E_VALUE_WRONG - Function ID or State ID not valid + - #E_NOACT - SC Client is in the wrong (sequence)-state + - #E_USER_ERROR - there is no SC instance for this SA +*/ +sint IsoSC_ExecutionStatus( word rwSA, byte rbFuncID, byte rbStateID, ISO_SCEXST_e reExeSta, ISO_SCEXEERR_e eErrorCode ); + +/******************************************************************************************/ +/*! + \brief Sending SC Client Abort as broadcastmessage + + \param[in] \wp{rwSA, word} + Source address of sending SCC + \param[in] \wp{eErrorCode, ISO_SCABORTERR_e} + Specific errorcode of SC Client Abort \n + IsoTimeoutOnStatusMsg, IsoOperatorInteraction, IsoErrorDuringFuncExecut, + IsoAnyOtherError + \retval sint + - #E_NO_ERR - OK + - #E_NOACT - SC Client is in the wrong (sequence)-state + +*/ +sint IsoSC_ClientAbort( word rwSA, ISO_SCABORTERR_e eErrorCode ); + +/*********************************************************************************************/ +/*! + \brief Setting a error state for a client function + + \param[in] \wp{rwSA, word} + Source address of SC Client + \param[in] \wp{rbFuncID, byte} + SCD Function ID + \param[in] \wp{eFunErrCode, FuncErrSta_te} + Specific errorcode of client functions \n + FuNoErr, FuOneTimeErr, FuPermanentErr, FuCFLocked, FuCFDeactive, FuAnyOtherErr + + \retval sint + - E_NO_ERR - OK + - E_VALUE_WRONG - Function ID is not available + - E_USER_ERROR - there is no SC instance for this SA +*/ +sint IsoSC_FunErrorStatusSet( word rwSA, byte rbFuncID, FuncErrSta_te eFunErrCode ); + +/***************************************************************************/ +/*! + \brief Reading the error state for a client function + + This function reads the actual error state of a SCD (client) function + + \param[in] \wp{rwSA, word} + Source address of SC Client + \param[in] \wp{rbFuncID, byte} + SCD Function ID of client function \n + Range: 0 - 255 + \retval FuncErrSta_te + - Actual function error state + FuNoErr, FuOneTimeErr, FuPermanentErr, FuCFLocked, FuCFDeactive, FuAnyOtherErr +*/ +FuncErrSta_te IsoSC_FunErrorStatusRead( word rwSA, byte rbFuncID ); + +/**********************************************************************/ +/*! + \brief Setting trigger mode for a function ID + + This function sets the trigger mode for a SCD function + + \param[in] \wp{rwSA, word} + Source address of SC Client + \param[in] \wp{rbFuncID, byte} + Function ID of client function getting a new trigger mode + \param[in] \wp{eTrigger, PrefTrig_te} + New trigger for a function \n + IsoTimeBased, IsoDistanceBased or IsoDontCare + + \retval sint + - E_NO_ERR - OK + - E_RANGE - Function or SA not valid +*/ +sint IsoSC_FunTriggerSet( word rwSA, byte rbFuncID, PrefTrig_te eTrigger ); + +/****************************************************************************/ +/*! + \brief Get some informations of sequence control + + This function serves for the request of informations of the SC + + \param[in] \wp{wSAofSCC, word} + - Source address of sequence controller client \n + Range: 0 .. 253 + \param[in] \wp{eSCInfo, ISOVT_STATUS_e} + Enum of wished information of VT + - SCC_STATEOFANNOUNCING - See intern state machine (SubLogin_te) + - SCC_SEQUENCESTATE - Sequence state of SCC + - SCC_VERSION - Client Standard Version + - SCM_ACTIVE_ALIVE - SCM status message ok? + - SCM_ACTIVE_SOURCEADDRESS - Source address of active SCM + - SCM_SEQUENCESTATE - Sequence state of SCM + - SCM_CAP_PIXELXAXIS - Number of Pixels X-axis + - SCM_CAP_PIXELYAXIS - Number of Pixels X-axis + - SCM_CAP_MAXCHARSTR - Max. number of char of strings + - SCM_FONTCOLOUR - SCM font colour + - SCM_FONTSIZE -SCM font size + - SCM_FONTTYPE - SCM font type + - SCM_FONTSTYLE - SCM font style + - SCM_VERSION - Version of supported SC Standard + - SCD_NUMBERFUN - SCD function objects + - SCD_NUMBERSTATE - SCD state objectsn + - SCD_EXTOBJDEFID - External object definition object ID + \retval slong + Value of requested info: + - SCC_STATEOFANNOUNCING - Number of SubLogin_te + - SCC_SEQUENCESTATE - See StateSeq_te + - SCC_VERSION - Standard Version used of this client + - SCM_ACTIVE_ALIVE - TRUE means TC status msg is active, FALSE not + - SCM_ACTIVE_SOURCEADDRESS - Source address of SCM or ISO_NULL_ADDRESS + - SCM_SEQUENCESTATE - See StateSeq_te + - SCM_CAP_PIXELXAXIS - Number pixel X-axis or ISO_NOT_AVAILABLE_DM + - SCM_CAP_PIXELYAXIS - Number pixel Y-axis or ISO_NOT_AVAILABLE_DM + - SCM_CAP_MAXCHARSTR - Number char or ISO_NOT_AVAILABLE_DM + - SCM_FONTCOLOUR - SCM font colour (0xFF default likely not received) + - SCM_FONTSIZE -SCM font size (0xFF default likely not received) + - SCM_FONTTYPE - SCM font type (0xFF default likely not received) + - SCM_FONTSTYLE - SCM font style (0xFF default likely not received) + - SCM_VERSION - Number of Version see Part 14 - C3 + - SCD_NUMBERFUN - Number of SCD function objects + - SCD_NUMBERSTATE - Number of SCD state objects + - SCD_EXTOBJDEFID - Object ID of external object definition object + \note \par + All SCM_FONT_.. set to 0xFF means that its very unlikely that data receiced of SCM. +*/ +slong IsoSC_StatusInfoGet( word wSAofSCC, ISOSC_STATUS_e eSCInfo ); + +/* ************************************************************************ */ +/** @} */ /* END sequencectrl */ +/* ************************************************************************ */ + + +/* ************************************************************************ */ +#ifdef __cplusplus +} /* end of extern "C" */ +#endif + +#endif /* DEF_IsoSccApi_H */ +/* ************************************************************************ */ ++======= + /* ************************************************************************ */ + /*! + \file + \brief ECU Driver SC Client API Header File + \author Wegscheider Peter + \date Created XX.07.13 + + \copyright Competence Center ISOBUS e.V. + + \par History: + \par + 04.07.2013 - author P. Wegscheider + - API declarations moved to this file + - Module version define added + \par + 05.09.2013 - author E. Hammerl + - Event IsoSCMNotAlive added, SsInactiv corrected + \par + 08.05.2014 - author E. Hammerl + - Added IsoSC_SetSCCVersion() and SCM font parameter + 28.09.2015 - author P. Wegscheider + - Feature request ID 1711: Resolve typdef conflicts with ISO_TRUE;ISO_FALSE and types definitions + \par + 14.12.2016 - author P. Wegscheider + - Replaced source address parameter with CF handle in functions + IsoSC_ExecutionIndication(), IsoSC_ExecutionStatus(), IsoSC_ClientAbort(), + IsoSC_FunErrorStatusSet(), IsoSC_FunErrorStatusRead(), IsoSC_FunTriggerSet() + and IsoSC_StatusInfoGet(). + \par + 21.02.2017 - author P. Wegscheider + - Feature ID 6003: client interfaces should only use handles (rather then ISOBUS NAME) \n + Replaced IsoSC_InstCmd() parameter rpbWorkSetMasterName with s16CfHandleMaster + \par + 19.02.2018 -author P.Wegscheider + - Feature ID 7528: add user parameter to callback functions + \par + 06.05.2018 - author P.Wegscheider + - Feature ID 3910: header files should include header files they depend on + \par + 10.08.2018 - author P. Wegscheider + - BugID 8581: add "namespace ISOBUSDRIVER" to header files + */ + /* ************************************************************************ */ + #ifndef DEF_IsoSccApi_H + #define DEF_IsoSccApi_H + + /* include configuration, driver standard types and common definitions */ + #include "IsoCommonDef.h" + + #ifdef __cplusplus + extern "C" { + #endif + /* ************************************************************************ */ + + /* ************************************************************************ */ + /*! \ingroup grp_versions + \brief Sequence Control Client Module Version + */ + #define VERSION_SCC 1.4 /* changed for v10.00 */ + + + /* ************************************************************************ */ + /** \addtogroup sequencectrl SC-Client + \ingroup clients + \brief Part 14 - Sequence Control Client + */ + /* ************************************************************************ */ + /** \addtogroup sequencectrl + @{ + */ + /* ************************************************************************ */ + #if defined(CCI_USE_NAMESPACE) && defined(__cplusplus) + #include "IsoSccApi.hpp" + #else /* not: defined(CCI_USE_NAMESPACE) && defined(__cplusplus) -> use C defines */ + + /* ************** IsoScCtrl.c, IsoScLogin.c, IsoScWork.c ( Sequenz Control Iso 11783-14 )******* */ + + /* Versions */ + #define SC_DIS (0u) /**< Draft international standard */ + #define SC_FDIS (1u) /**< Final draft international standard */ + #define SQC_IS_1 (2u) /**< First edition as international standard - default */ + + #endif /* not: defined(CCI_USE_NAMESPACE) && defined(__cplusplus) */ + + /** \brief + Enum of command for login (setting the device description) or logout the SC client + */ + typedef enum + { + IsoScOpenSCD, /**< Open an new SC Client instance */ + IsoScCloseSCD, /**< Finish the SCD initialisation */ + IsoScLogOut /**< Resets (deletes) a SC Client */ + } ISO_SC_CMD_e; + + /** \brief + + */ + typedef enum + { + IsoTimeBased = 0x1, + IsoDistanceBased = 0x2, + IsoDontCare = 0xFF + } PrefTrig_te; + + /** \brief + + */ + typedef enum + { + SsReserved = 0x00, /* */ + SsReady = 0x01, /* */ + SsRecording = 0x02, + SsRecordingCompletion = 0x03, + SsPlayBack = 0x04, + SsAbort = 0x05, + SsInactiv = 0xFF + } StateSeq_te; + + /** \brief + Enum which indicates the kind of SC callback calling + */ + typedef enum + { + IsoSCLoginFinished, /**< Login of VT and SC finished -> SCOP objects manipulation possible*/ + IsoSCRecordingCompletion, /**< SCM is entried in sequence state "Recording Completion" */ + IsoSCMExeCmd, /**< SCM execution command received */ + IsoRespToExeInd, /**< Response to SC execution indication received */ + IsoRespToExeStatus, /**< Response to SC execution status received */ + IsoClAbort, /**< Abort of SCM received, SCC or own SCClientAbort */ + IsoSCMNotAlive, /**< SCM status message not received */ + IsoSCtoAppLast + } ISO_SCAPP_e; + + /** \brief + Enum of possible execution states + */ + typedef enum + { + IsoFuncExeStartedCompleted, /**< */ + IsoFuncExeStarted, /**< */ + IsoFuncExeCompleted, + IsoFuncExeError, + IsoFuncExeLast + } ISO_SCEXST_e; + + /** \brief + + */ + typedef enum + { + FuNoErr = 0x0, /**< No error */ + FuOneTimeErr = 0x1, /**< One time error */ + FuPermanentErr = 0x2, /**< Permanent error */ + FuCFLocked = 0x3, /**< Client function is locked */ + FuCFDeactive = 0x4, /**< Client function deactivated at the SCC by the operator */ + FuAnyOtherErr = 0xF /**< Any other error */ + } FuncErrSta_te; + + /** \brief + Errorcodes for SCExecutionExecutionStatus(E7) + */ + typedef enum + { + IsoNoErr = 0, + IsoErrInTheFunction = 1, /**< */ + IsoExeOperatorInteract = 2, + IsoConditionSCCnoExecut = 3, + IsoExeAnyOtherError = 0xFF + } ISO_SCEXEERR_e; + + /** \brief + Errorcodes for SCClientAbort(E3) + */ + typedef enum + { + IsoReserved = 0, + IsoTimeoutOnStatusMsg = 1, /**< */ + IsoOperatorInteraction = 2, + IsoErrorDuringFuncExecut = 3, + IsoAnyOtherError = 0xFF + } ISO_SCABORTERR_e; + + /** \brief + Enum of status info + */ + typedef enum + { + SCC_STATEOFANNOUNCING, /**< See intern state machine of login */ + SCC_SEQUENCESTATE, /**< SCC acutal Sequence state */ + SCC_VERSION, /**< SCC used standard version */ + SCM_ACTIVE_ALIVE, /**< SCM status message ok? */ + SCM_ACTIVE_SOURCEADDRESS, /**< SCM Source address */ + SCM_ACTIVE_CFHND, /**< SCM CF handle */ + SCM_SEQUENCESTATE, /**< SCM actual Sequence state */ + SCM_CAP_PIXELXAXIS, /**< SCM Number of pixels X-axis for grafic objects */ + SCM_CAP_PIXELYAXIS, /**< SCM Number of pixels Y-axis for grafic objects */ + SCM_CAP_MAXCHARSTR, /**< SCM Number of characters for design. strings */ + SCM_FONTCOLOUR, /**< SCM font colour */ + SCM_FONTSIZE, /**< SCM font size */ + SCM_FONTTYPE, /**< SCM font type */ + SCM_FONTSTYLE, /**< SCM font style */ + SCM_VERSION, /**< SCM Version */ + SCD_NUMBERFUN, /**< SCD Number of SCD function objects */ + SCD_NUMBERSTATE, /**< SCD Number of SCD state objects */ + SCD_EXTOBJDEFID /**< Object ID of external object definition object ID */ + } ISOSC_STATUS_e; + + /** \brief + Struct which is used as interface to the application + */ + typedef struct + { + ISO_SCAPP_e eScCmd; /**< Kind of SC callback calling */ + iso_u8 bFuncID; /**< Function ID */ + iso_u8 bStateID; /**< State ID */ + ISO_SCEXST_e eScExeSta; /**< Execution state */ + iso_u32 dwFunctVal; /**< Function value */ + iso_u8 bErrorCode; /**< ErrorCode */ + ISO_USER_PARAM_T userParam; /*!< \brief User parameter set with IsoSC_InstCmd() */ + } ISO_SCLINK_T, *ISO_SCLINK_t ; + + + /* Functions for sequenz control initialisation */ + /**************************************************************************************/ + /*! + \brief Initialisation of a sequenz controller instance + + This function controls the initialisation of a device description and has the ability + to find a SC Client instance. + + \param[in] \wp{s16CfHandleMaster, iso_s16 } + CF handle of the client + \param[in] \wpp{userParam, const #ISO_USER_PARAM_T} + User parameter value for the callback function calls. \n + \param[in] \wpp{rpfScCall, void*(#ISO_SCLINK_T * psScLink) } + Communication interface with SCM (Callbackfun.) + \param[in] \wp{eCommand, ISO_SC_CMD_e } + Command - what shall this function do? + - IsoScOpenSCD - Open an new SC Client instance and + starts the initialisation of a SCD + - IsoScCloseSCD - Finish the SCD + - IsoScGetPointOfInst - Returns the number of a SC Client instance + - IsoScLogOut - Shut down a SC client ( delete) + \retval iso_s16 + - 0 ... ( WORKING_SETS - 1 ) + - E_NO_INSTANCE - error - instance not found + */ + iso_s16 IsoSC_InstCmd ( iso_s16 s16CfHandleMaster, + const ISO_USER_PARAM_T userParam, + void (*rpfScCall)( ISO_SCLINK_T * psScLink ), + ISO_SC_CMD_e eCommand + ); + + /**************************************************************************/ + /*! + \brief Setting the version supported of this SC client + + \param[in] \wp{iScInst, iso_s16} + (Valid) Return value of IsoSC_InstCmd( ... IsoScOpenSCD ) + \param[in] \wp{bSCVersion, iso_u8} + New Standard Version supported of this SC client + \retval iso_s16 + - #E_NO_ERR - OK + - #E_NO_INSTANCE - SCC instance not found + */ + iso_s16 IsoSC_SetSCCVersion( iso_s16 iScInst, iso_u8 bSCVersion ); + + /**************************************************************************/ + /*! + \brief Initialisation of the SCOP basic object + + This function initialises the basic object of a SCOP. + + \param[in] \wp{iScInst, iso_s16} + (Valid) Return value of IsoSC_InstCmd( ... IsoScOpenSCD ) + \param[in] \wp{rwObjectId, iso_u16} + Object ID of basic object + \param[in] \wpp{rpabNameMask, const #iso_u8[]} + Mask for NAME used of SCM for filtering SCCs \n + NAME see ISO11783 - 5 + \param[in] \wp{rwSCDDesign, iso_u8*} + Object ID of textual representation in the referenced SCOP + \param[in] \wp{rwSCDGrafic, iso_u16} + Object ID of graphical respresentation in the referenced SCOP + \param[in] \wpp{racVersion, const #iso_char[]} + Pointer to SCD version label \n + Range: 1 - 64 charakters + \param[in] \wpp{racConfig, const #iso_char[]} + Pointer to configuration label \n + Range: 1 - 64 charakters + \param[in] \wp{rbNumbFuncObj, iso_u8} + Number of functions to follow + \param[in] \wpp{rpwListFuncObj, const #iso_u16[]} + Pointer to array of objects to follow ( list of function objects ) + \note \par + - There is only one basic object in a SCOP + - Calling this function is only allowed between IsoSC_InstCmd( IsoScOpenSCD ) + and IsoSC_InstCmd( IsoScCloseSCD ) + */ + void IsoSC_BasicObjSet( iso_s16 iScInst, iso_u16 rwObjectId, const iso_u8 rpabNameMask[], + iso_u16 rwSCDDesign, iso_u16 rwSCDGrafic, + const iso_char racVersion[], const iso_char racConfig[], + iso_u8 rbNumbFuncObj, const iso_u16 rpwListFuncObj[] ); + + /*************************************************************************/ + /*! + \brief Initialisation of the SCD (client) function object + + This function initialises a function object of a SCOP and must be called for every function. + + \param[in] \wp{iScInst, iso_s16} + (Valid) Return value of IsoSC_InstCmd( ... IsoScOpenSCD ) + \param[in] \wp{rwObjectId, iso_u16} + Object ID of function object + \param[in] \wp{rbFuncID, iso_u8} + Unique Function ID (used as reference in CAN messages) + Range: 0 - 255 + \param[in] \wp{rePrefTrigger, PrefTrig_te} + Preferred trigger of this SCD function \n + IsoTimeBased, IsoDistanceBased or IsoDontCare + \param[in] \wp{rbAttribute, iso_u8} + Additional attributes see SCD function object \n + see ISO 11783 - 14 - A.4 + \param[in] \wp{rwObjIdDesig, iso_u16} + Object ID of textual representation in the referenced SCOP + \param[in] \wp{rwObjIdGraph, iso_u16} + Object ID of graphical respresentation in the referenced SCOP + \param[in] \wp{rbNumbStateObj, iso_u8} + Number of state objects of this client function \n + Range: 0 - 64 + \param[in] \wpp{rpwListStateObj, const #iso_u16[] } + Pointer to array of objects to follow ( list of state objects ) + \retval iso_s16 + - #E_NO_ERR - OK + - #E_OVERFLOW - Array for functions is to small + - #E_NO_INSTANCE - SCC instance not found + \note \par + - This function must called for a function before IsoSC_FunctValueSet()! + - Calling this function is only allowed between IsoSC_InstCmd( IsoScOpenSCD ) + and IsoSC_InstCmd( IsoScCloseSCD ) + */ + iso_s16 IsoSC_FunctionObjSet( iso_s16 iScInst, iso_u16 rwObjectId, iso_u8 rbFuncID, PrefTrig_te rePrefTrigger, + iso_u8 rbAttribute, iso_u16 rwObjIdDesig, iso_u16 rwObjIdGraph, + iso_u8 rbNumbStateObj, const iso_u16 rpwListStateObj[] + ); + + /************************************************************************/ + /*! + \brief Initialisation of the function value of a function + + This function initialises the function value of a SCD function + + \param[in] \wp{iScInst, iso_s16} + (Valid) Return value of IsoSC_InstCmd( ... IsoScOpenSCD ) + \param[in] \wp{rbFuncId, iso_u8} + SCD Function ID + \param[in] \wp{rdwFuncValMin, iso_u32} + Minimum numeric function value \n + Range: 0 - 2^32 -1 + \param[in] \wp{rdwFuncValMax, iso_u32} + Maximum numeric function value \n + Range: 0 - 2^32 -1 + \param[in] \wp{rlFuncOffset, iso_s32} + Numeric function value offset \n + Range: -2^31 - 2^31-1 \n + Set to FFFFFFFF when the numeric function value representation in the attributes + is set to 00 + \param[in] \wp{rfFuncScale, iso_f32} + Numeric function value scale factor \n + Set to FFFFFFFF when the numeric function value representation in the attributes + is set to 00 + \param[in] \wp{rbNumbDec, iso_u8} + Number of decimals of numeric function value to display after the decimal point \n + Range: 0 - 7 + \param[in] \wp{rwObjIdUnitStr, iso_u16} + Object ID of referenced VT string object containing the unit string for display + with the numeric function value. \n + Set to FFFF when the numeric function value representation in the attributes is + set to 00. + \retval iso_s16 + - E_NO_ERR - OK + - E_RANGE - Function ID not found + - #E_NO_INSTANCE - SCC instance not found + \note \par + Corresponding SCD function have to be initialised before + */ + iso_s16 IsoSC_FunctValueSet( iso_s16 iScInst, iso_u8 rbFuncId, iso_u32 rdwFuncValMin, iso_u32 rdwFuncValMax, + iso_s32 rlFuncOffset, iso_f32 rfFuncScale, iso_u8 rbNumbDec, iso_u16 rwObjIdUnitStr + ); + + /*****************************************************************************/ + /*! + \brief Initialisation of a SCD state object + + This function initialises a SCD state object + + \param[in] \wp{iScInst, iso_s16} + (Valid) Return value of IsoSC_InstCmd( ... IsoScOpenSCD ) + \param[in] \wp{rwObjIDSta, iso_u16} + Object ID of state object + \param[in] \wp{rbStateID, iso_u8} + State ID, Range 0 - 63 + \param[in] \wp{rwObjIdDesig, iso_u16} + Object ID of textual representation in the referenced SCOP + \param[in] \wp{rwObjIdGraph, iso_u16} + Object ID of graphical respresentation in the referenced SCOP + \retval iso_s16 + - #E_NO_ERR - OK + - #E_OVERFLOW - Array for states is to small + - #E_NO_INSTANCE - SCC instance not found + \par + - Calling this function is only allowed between IsoSC_InstCmd( IsoScOpenSCD ) + and IsoSC_InstCmd( IsoScCloseSCD ) + */ + + iso_s16 IsoSC_StateObjSet( iso_s16 iScInst, iso_u16 rwObjIDSta, iso_u8 rbStateID, iso_u16 rwObjIdDesig, iso_u16 rwObjIdGraph ); + + /**************************************************************************/ + /*! + \brief This function sets the external object definition object of this client + + \param[in] \wp{iScInst, iso_s16} + (Valid) Return value of IsoSC_InstCmd( ... IsoScOpenSCD ) + \param[in] \wp{wExternalObjDefObj, iso_u16} + Object ID of external object definition object + + \retval iso_s16 + - #E_NO_ERR - OK + - #E_NO_INSTANCE - SCC instance not found + \par + There is only one external object definition object for SC allowed + */ + + iso_s16 IsoSC_ExternalObjDefSet( iso_s16 iScInst, iso_u16 wExternalObjDefObj ); + + /* Functions for sequenz control operations */ + /*********************************************************************************/ + /*! + \brief Command "SC Execution Indication" + + \param[in] \wp{s16CfHandle, iso_s16} + CF handle of SC Client + \param[in] \wp{rbFuncID, iso_u8} + (Client)Function ID \n + Range: 0 - 255 + \param[in] \wp{rbStateID, iso_u8} + State ID \n + Range: 0 - 63 + \param[in] \wp{reExeSta, ISO_SCEXST_e} + (Function)-Execution state \n + IsoFuncExeStartedCompleted, IsoFuncExeStarted, IsoFuncExeCompleted, IsoFuncExeError + \param[in] \wp{rdwFuncVal, iso_u32} + Function value \n + Range: 0 - 2^32 -1 + \retval iso_s16 + - #E_NO_ERR - OK + - #E_VALUE_WRONG - Function ID or State ID not valid + - #E_USER_ERROR - there is no SC instance for this SA + - #E_NOACT - SC Client is in the wrong (sequence)-state + */ + iso_s16 IsoSC_ExecutionIndication( iso_s16 s16CfHandle, iso_u8 rbFuncID, iso_u8 rbStateID, ISO_SCEXST_e reExeSta, iso_u32 rdwFuncVal ); + + /*************************************************************************/ + /*! + \brief Sending Client command response to SC Master Execution Command + + \param[in] \wp{s16CfHandle, iso_s16} + CF handle of SC Client + \param[in] \wp{rbFuncID, iso_u8} + (Client)Function ID \n + Range: 0 - 255 + \param[in] \wp{rbStateID, iso_u8} + State ID \n + Range: 0 - 63 + \param[in] \wp{reExeSta, ISO_SCEXST_e} + (Function)-Execution state \n + IsoFuncExeStartedCompleted, IsoFuncExeStarted, IsoFuncExeCompleted, IsoFuncExeError + \param[in] \wp{eErrorCode, ISO_SCEXEERR_e} + Error codes of SCClientExecutionStatus \n + IsoNoErr, IsoErrInTheFunction, IsoExeOperatorInteract, IsoConditionSCCnoExecut, + IsoExeAnyOtherError + \retval iso_s16 + - #E_NO_ERR - OK + - #E_VALUE_WRONG - Function ID or State ID not valid + - #E_NOACT - SC Client is in the wrong (sequence)-state + - #E_USER_ERROR - there is no SC instance for this SA + */ + iso_s16 IsoSC_ExecutionStatus( iso_s16 s16CfHandle, iso_u8 rbFuncID, iso_u8 rbStateID, ISO_SCEXST_e reExeSta, ISO_SCEXEERR_e eErrorCode ); + + /******************************************************************************************/ + /*! + \brief Sending SC Client Abort as broadcast message + + \param[in] \wp{s16CfHandle, iso_s16} + CF handle of sending SCC + \param[in] \wp{eErrorCode, ISO_SCABORTERR_e} + Specific error code of SC Client Abort \n + IsoTimeoutOnStatusMsg, IsoOperatorInteraction, IsoErrorDuringFuncExecut, + IsoAnyOtherError + \retval iso_s16 + - #E_NO_ERR - OK + - #E_NOACT - SC Client is in the wrong (sequence)-state + - #E_USER_ERROR - there is no SC instance for this CF handle + - #E_OVERFLOW - CAN buffer full + - #E_COM on bus-off + */ + iso_s16 IsoSC_ClientAbort( iso_s16 s16CfHandle, ISO_SCABORTERR_e eErrorCode ); + + + /*********************************************************************************************/ + /*! + \brief Setting a error state for a client function + + \param[in] \wp{s16CfHandle, iso_s16} + CF handle of SC Client + \param[in] \wp{rbFuncID, iso_u8} + SCD Function ID + \param[in] \wp{eFunErrCode, FuncErrSta_te} + Specific errorcode of client functions \n + FuNoErr, FuOneTimeErr, FuPermanentErr, FuCFLocked, FuCFDeactive, FuAnyOtherErr + + \retval iso_s16 + - E_NO_ERR - OK + - E_VALUE_WRONG - Function ID is not available + - E_USER_ERROR - there is no SC instance for this SA + */ + iso_s16 IsoSC_FunErrorStatusSet( iso_s16 s16CfHandle, iso_u8 rbFuncID, FuncErrSta_te eFunErrCode ); + + /***************************************************************************/ + /*! + \brief Reading the error state for a client function + + This function reads the actual error state of a SCD (client) function + + \param[in] \wp{s16CfHandle, iso_s16} + CF handle of SC Client + \param[in] \wp{rbFuncID, iso_u8} + SCD Function ID of client function \n + Range: 0 - 255 + \retval FuncErrSta_te + - Actual function error state + FuNoErr, FuOneTimeErr, FuPermanentErr, FuCFLocked, FuCFDeactive, FuAnyOtherErr + */ + FuncErrSta_te IsoSC_FunErrorStatusRead( iso_s16 s16CfHandle, iso_u8 rbFuncID ); + + /**********************************************************************/ + /*! + \brief Setting trigger mode for a function ID + + This function sets the trigger mode for a SCD function + + \param[in] \wp{s16CfHandle, iso_s16} + CF handle of SC Client + \param[in] \wp{rbFuncID, iso_u8} + Function ID of client function getting a new trigger mode + \param[in] \wp{eTrigger, PrefTrig_te} + New trigger for a function \n + IsoTimeBased, IsoDistanceBased or IsoDontCare + + \retval iso_s16 + - E_NO_ERR - OK + - E_RANGE - Function or SA not valid + */ + iso_s16 IsoSC_FunTriggerSet( iso_s16 s16CfHandle, iso_u8 rbFuncID, PrefTrig_te eTrigger ); + + /****************************************************************************/ + /*! + \brief Get some information of sequence control + + This function serves for the request of information of the SC + + \param[in] \wp{s16CfHandle, iso_s16} + - CF handle of sequence controller client + \param[in] \wp{eSCInfo, ISOVT_STATUS_e} + Enum of wished information of VT + - SCC_STATEOFANNOUNCING - See intern state machine (SubLogin_te) + - SCC_SEQUENCESTATE - Sequence state of SCC + - SCC_VERSION - Client Standard Version + - SCM_ACTIVE_ALIVE - SCM status message ok? + - SCM_ACTIVE_SOURCEADDRESS - Source address of active SCM + - SCM_SEQUENCESTATE - Sequence state of SCM + - SCM_CAP_PIXELXAXIS - Number of Pixels X-axis + - SCM_CAP_PIXELYAXIS - Number of Pixels X-axis + - SCM_CAP_MAXCHARSTR - Max. number of char of strings + - SCM_FONTCOLOUR - SCM font colour + - SCM_FONTSIZE -SCM font size + - SCM_FONTTYPE - SCM font type + - SCM_FONTSTYLE - SCM font style + - SCM_VERSION - Version of supported SC Standard + - SCD_NUMBERFUN - SCD function objects + - SCD_NUMBERSTATE - SCD state objectsn + - SCD_EXTOBJDEFID - External object definition object ID + \retval iso_s32 + Value of requested info: + - SCC_STATEOFANNOUNCING - Number of SubLogin_te + - SCC_SEQUENCESTATE - See StateSeq_te + - SCC_VERSION - Standard Version used of this client + - SCM_ACTIVE_ALIVE - ISO_TRUE means TC status msg is active, ISO_FALSE not + - SCM_ACTIVE_SOURCEADDRESS - Source address of SCM or ISO_NULL_ADDRESS + - SCM_SEQUENCESTATE - See StateSeq_te + - SCM_CAP_PIXELXAXIS - Number pixel X-axis or ISO_NOT_AVAILABLE_DM + - SCM_CAP_PIXELYAXIS - Number pixel Y-axis or ISO_NOT_AVAILABLE_DM + - SCM_CAP_MAXCHARSTR - Number char or ISO_NOT_AVAILABLE_DM + - SCM_FONTCOLOUR - SCM font colour (0xFF default likely not received) + - SCM_FONTSIZE -SCM font size (0xFF default likely not received) + - SCM_FONTTYPE - SCM font type (0xFF default likely not received) + - SCM_FONTSTYLE - SCM font style (0xFF default likely not received) + - SCM_VERSION - Number of Version see Part 14 - C3 + - SCD_NUMBERFUN - Number of SCD function objects + - SCD_NUMBERSTATE - Number of SCD state objects + - SCD_EXTOBJDEFID - Object ID of external object definition object + \note \par + All SCM_FONT_.. set to 0xFF means that its very unlikely that data receiced of SCM. + */ + iso_s32 IsoSC_StatusInfoGet( iso_s16 s16CfHandle, ISOSC_STATUS_e eSCInfo ); + + /* ************************************************************************ */ + /** @} */ /* END sequencectrl */ + /* ************************************************************************ */ + + + /* ************************************************************************ */ + #ifdef __cplusplus + } /* end of extern "C" */ + #endif + + #endif /* DEF_IsoSccApi_H */ + /* ************************************************************************ */ ++>>>>>>> rauch/jobrechner-import-20190607 diff --cc ptxdist/local_src/ecu-jobctl/extern/isobus/IsoTccApi.h index ba2d979,20b80aa..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-jobctl/extern/isobus/IsoTccApi.h +++ b/ptxdist/local_src/ecu-jobctl/extern/isobus/IsoTccApi.h @@@ -1,750 -1,1171 +1,1924 @@@ ++<<<<<<< HEAD +/* ************************************************************************ */ +/*! + \file + \brief ECU Driver TC Client Api Header File + \author Wegscheider Peter + \date Created XX.07.13 + + \copyright Copyright (c) WBZ-Engineering GmbH + + \par History: + \par + 04.07.2013 - author P. Wegscheider + - API declarations moved to this file + - Module version define added + \par + 12.12.2013 - author E. Hammerl + - Config- and TC versions defines moved from IsoTaskC.c to here + - Added IsoTC_SetVersionMsg() + \par + 11.06.2014 - author E. Hammerl + - Version updated to 2.2 + - Added IsoTC_SetPrefTC() + - Added IsoTC_Read_TCHandle() +*/ +/* ************************************************************************ */ +#ifndef DEF_IsoTccApi_H + #define DEF_IsoTccApi_H + +#ifdef __cplusplus +extern "C" { +#endif +/* ************************************************************************ */ + +/* ************************************************************************ */ +/*! \ingroup grp_versions + \brief Task Controller Client Client Module Version +*/ +#define VERSION_TCC 2.2 + + +/* ************************************************************************ */ +/* ********************************* IsoTaskC.c ************************** */ +/** \defgroup taskc TC-Client + \ingroup clients + \brief Part 10 - Task Controller Client +*/ +/* ************************************************************************ */ +/** \addtogroup taskc +@{ +*/ +/* ************************************************************************ */ + + #ifndef PROCESSDATA_MAX + #define PROCESSDATA_MAX (200) /**< Predefined number of process data ( -> more IsoConf.h) */ + #endif /* PROCESSDATA_MAX */ + #ifndef DEVICEDESCRIPTION_SIZE + #define DEVICEDESCRIPTION_SIZE (10000u) /**< Predefined size of buffer for device description pool ( -> more IsoConf.h) */ + #endif /* DEVICEDESCRIPTION_SIZE */ + #ifndef TC_NUMB_TCCLIENTS + #define TC_NUMB_TCCLIENTS (1) /**< Predefined size of buffer for device description pool ( -> more IsoConf.h) */ + #endif /* TC_NUMB_TCCLIENTS */ + #ifndef TC_NUMNESTED_DE + #define TC_NUMNESTED_DE (100) /**< Predefined size of number of nested Device elements ( -> more IsoConf.h) */ + #endif /* TC_NUMNESTED_DE */ + #ifndef TC_DEFTCM_BOOTTIME + #define TC_DEFTCM_BOOTTIME (10u) /**< Predefined boottime for the preferred TC ( -> more IsoConf.h) */ + #endif /* TC_DEFTCM_BOOTTIME */ + + /* TC versions */ + #define TC_DIS (0u) /**< TC DIS - first edition */ + #define TC_FDIS (1u) /**< TC FDIS - first edition */ + #define TC_ISO_1 (2u) /**< TC IS - first edition - Default */ + #define TC_R2DIS (3u) /**< TC DIS - second edition */ + #define TC_R2FDIS (4u) /**< TC FDIS - second edition */ + + /* Provided option bits */ + #define TC_SUPPORT_DOCU (0x01u) /**< Provided option: Supports documentation */ + #define TC_SUPPORT_TIME_POS (0x02u) /**< Provided option: Supports time and position for datalogging */ + #define TC_SUPPORT_TC_GEO (0x04u) /**< Provided option: Supports positon based control */ + #define TC_SUPPORT_PEER_CTRL (0x08u) /**< Provided option: Supports peer control assignment */ + #define TC_SUPPORT_TC_SC (0x10u) /**< Provided option: Supports implement section control */ + + /* Defines */ + #define TC_PROP_DEFAULT_SET (0x01u) /**< PD is member of default set */ + #define TC_PROP_SETABLE (0x02u) /**< PD is setable */ + #define TC_PROP_CONTROL_SOURCE (0x04u) /**< PD is control source (for peer control use) */ + + #define TC_TRIG_TIMEINTERVAL (0x01u) /**< PD Triggermethod time interval */ + #define TC_TRIG_DISTANCEINTERVAL (0x02u) /**< PD Triggermethod distance interval */ + #define TC_TRIG_THRESHOLD_LIMITS (0x04u) /**< PD Triggermethod threshold limits */ + #define TC_TRIG_ON_CHANGE (0x08u) /**< PD Triggermethod onchange */ + #define TC_TRIG_TOTAL (0x10u) /**< PD Triggermethod total */ + + /** \brief + Device element types + */ + typedef enum + { + de_undef, + de_device, + de_function, + de_bin, + de_section, + de_unit, + de_connector, + de_navigation, + de_lastentry + } DevElemType_e; + + /** \brief + Enum of annouce status of task controller client instance + */ + typedef enum + { + InstanceUnused, + ClientRestart, + Address_claim, + Waiting_6_seconds, + WaitingTaskControllerStatus, + WSMasterSend, + WSMemberSend, + WSTaskMessageSend, + RequestVersionMessageSend, + VersionMessageWaiting, + TCVersionRequestWaiting, + RequestLanguageCommandSend, + LanguageCommandWaiting, + RequestStructureLabelSend, + StructureLabelResponseWaiting, + RequestLocalizationLabelSend, + LocalizationLabelWaiting, + RequestObjectPoolTransferSend, + ObjPoolTransferWaiting, + ObjPoolDeleteSend, + ObjPoolDeleteRespWaiting, + ObjPoolTransferSend, + ObjPoolTransferRespWaiting, + ObjPoolActivateSend, + ObjPoolActivateRespWaiting, + ObjPoolActivateRespAnalyse, + TcRunning + } ISOTC_ANNOUNCE_e; + + /** \brief + Enum of status info + */ + typedef enum + { + TC_ALIVE, /**< TC alive check - TC status message ok? */ + TCC_STATEOFANNOUNCING, /**< see intern state machine of login (only for development) */ + TCC_STATE_ACT /**< Task active or not */ + } ISOTC_STATUS_e; + + /** \brief + Enum of command for setting the device description + */ + typedef enum + { + IsoTcOpenInst, /**< Open a TC client instance */ + IsoTcClosePool, /**< Closing the initialisation of a TC client pool (DD) */ + IsoTcGetPointOfInst, /**< Getting the number of a TC Client instance */ + IsoTcLogOut /**< Shut down and re-initialisation of a TC client */ + } ISO_TC_CMD_e; + + /** \brief + Enum which indicates the kind of TC callback calling + */ + typedef enum + { + IsoRequestValueCommand, /**< Actual value - lValueNew shall be set with actual value */ + IsoValueCommand, /**< Set point of TC - should be stored of application */ + IsoResponseToCommand, /**< Response of e. g. change designator message */ + IsoTaskStartStop, /**< Shows start, stop, resume of a task */ + IsoTCSizeOfDD, /**< Returns the real value of the DD in lValueNew */ + IsoTCVersionReceived, /**< TC has sended the Version message */ + IsoTCtoAppLast + } ISO_TCAPP_e; + + /** \brief + Struct which is used as interface to the application + */ + typedef struct + { + word wDDObjID; /**< Object ID of device description object */ + word wDevElementNumb; /**< Requested element number of TC (only process data) */ + word wDDI; /**< Data dictionary identifier (only process data)*/ + slong lValueNew; /**< New value */ + ISO_TCAPP_e ePDCmd; /**< Kind of TC callback calling */ + } ISO_TCLINK_T; + typedef ISO_TCLINK_T *ISO_TCLINK_t; + +/** \name TC Client Management Functions + +Use this functions to create and connect a TC client + +@{ +*/ +/*******************************************************************************/ +/*! + \brief Initialisation or shut down of a task controller client instance + + This function controls the initialisation of a device description and has got the ability + to find or to shut down a TC Client instance. + + \param[in] \wp{rpbWorkSetMasterName, byte[]} + Pointer to working set master NAME (ISO11783 - 5) \n + NAME of working which uses a TC Client + \param[in] \wpp{rpfPdCall, void(*)(#ISO_TCLINK_T*)} + Communication interface with task controller (Callbackfun.) + \param[in] \wp{eCommand, ISO_TC_CMD_e} + Command - what shall this function do? \n + - IsoTcOpenInst - Open an new TC Client instance and + starts the initialisation of a device description \n + - IsoTcClosePool - Finish the device description \n + - IsoTcGetPointOfInst - Returns the number of a TC Client instance + - IsoTcLogOut - Shut down a TC client + \retval sint + - 0 ... (TC_NUMB_TCCLIENTS - 1) - Number of TC client instance \n + - E_NO_INSTANCE - error - instance not found +*/ + +sint IsoTC_InstCmd ( const byte rpbWorkSetMasterName[], + void (*rpfPdCall)( ISO_TCLINK_T* psTcLi ), + ISO_TC_CMD_e eCommand + ); + +/*****************************************************************************/ +/*! + \brief Setting the preferred TC Server with its boottime + + This function sets the NAME of the preferred TC Server and its boottime. \n + It only works correct if called immediately after creating a TC client. + + \param[in] \wpp{rpbWorkSetMasterName, const uint8[]} + Pointer to working set master NAME (ISO11783 - 5) \n + NAME of working which uses a TC Client + \param[in] \wpp{rapu8NamePreferredTC, const uint8[]} + Pointer to NAME of the preferred TC \n + \param[in] \wpp{u16PrefTCBoottime, const uint16} + Boottime of the preferred TC in seconds \n + that means waittime for first TC status message + \retval sint16 + - E_NO_ERR - 0K + - E_NO_INSTANCE - wrong instance +*/ +sint16 IsoTC_SetPrefTC( const uint8 rpbWorkSetMasterName[], + const uint8 rapu8NamePreferredTC[], + const uint16 u16PrefTCBoottime ); + +/*****************************************************************************/ +/*! + \brief Setting the data for the TCC Version message + + Default of version message data are TC Version number 2. + The application must call this function for TC versions 3 or higher. + + \param[in] \wp{iTcInst, sint} + Number of TC Client instance + - Range: 0 - (TC_NUMB_TCCLIENTS - 1) + \param[in] \wpp{u8VersionNumber, const #byte} + Version number of this TC client see ISO-Standard + \param[in] \wpp{u8ProvidedOptions, const #byte} + First option byte of this TC client see defines #TC_SUPPORT_DOCU ff. + - 0xFF for TC-Version 2 + \param[in] \wpp{u8ProvidedOptions2, const #byte} + Second option byte + - 0xFF for TC-Version 2 + \param[in] \wpp{u8NumberBoomsForSC, const #byte} + Number of required booms for section control + - 0xFF for TC-Version 2 + \param[in] \wpp{u8NumberSectionsForSC, const #byte} + Number of required sections for section control + - 0xFF for TC-Version 2 + \param[in] \wpp{u8NumberControlChannels, const #byte} + Number of required control channels for position based control + - 0xFF for TC-Version 2 + \retval sint16 + - E_NO_ERR - 0K + - E_ERROR_INDI - Instance not open for setting + - E_NO_INSTANCE - wrong instance + \note \par + Calling of this function is only allowed during building of DD +*/ +sint16 IsoTC_SetVersionMsg( sint iTcInst, + const uint8 u8VersionNumber, + const uint8 u8ProvidedOptions, + const uint8 u8ProvidedOptions2, + const uint8 u8NumberBoomsForSC, + const uint8 u8NumberSectionsForSC, + const uint8 u8NumberControlChannels + ); + +/*****************************************************************************/ +/*! + \brief Reads the handle of the connected TC server + + This function reads the handle of the connected TC server + + \param[in] \wpp{rpbWorkSetMasterName, const uint8[]} + Pointer to working set master NAME (ISO11783 - 5) \n + NAME of working which uses a TC Client + \retval sint16 + - valid handle or HANDLE_UNVALID +*/ +sint16 IsoTC_Read_TCHandle( const uint8 rpbWorkSetMasterName[] ); + +/************************************************************************************/ +/*! + \brief Get informations of TCC status + + This function serves for the request of informations of the TC client + + \param[in] \wp{wSAofTCC, word } + Source address of task controller client + - Range: 0 .. 253 + \param[in] \wp{eTCInfo, ISOTC_STATUS_e } + Enum of wished information of TC + - TC_ALIVE - Controlling TC status message + - TCC_STATEOFANNOUNCING - see state ISOTC_ANNOUNCE_e + - TCC_STATE_ACT - Task active or inactive + \retval dword + Value of requested info: + - TC_ALIVE - TRUE means TC status msg is active + - TCC_STATEOFANNOUNCING - for debug purposes see + value of ISOTC_ANNOUNCE_e in IsoTaskC.c + - TCC_STATE_ACT - 1 means task active - 0 inactive +*/ + dword IsoTC_StatusInfoGet( word wSAofTCC, ISOTC_STATUS_e eTCInfo ); + +/** @} */ +/** \name TC Client Legacy Management Function + +Use this function to create a TC client and load a binary device description + @{ +*/ +/******************************************************************************/ +/*! + \brief Initialisation of a task controller instance + + Alternative Init function - device description is included as C-File or in Flash + + \param[in] \wpp{rpbFlPoolFirstAddress, const byte[]} + Pointer to first address of device description + \param[in] \wp{rwNumberOfTcObjects, word} + Number of objects in device description + \param[in] \wpp{rpfPdCall, void(*)(#ISO_TCLINK_T*)} + Communication interface for task controller + \retval sint + - E_NO_ERR + - E_USER_ERROR - User is not a working set master + - E_UNKNOWN_ERR - Init error +*/ + sint IsoTaskCAppInit ( const byte rpbFlPoolFirstAddress[], + word rwNumberOfTcObjects, + void (*rpfPdCall)( ISO_TCLINK_T* psTcLi ) + ); + +/** @} */ +/** \name TC Client - Functions for creating a device description + @{ +*/ +/*****************************************************************************/ +/*! + \brief Setting Device Description Object "DeviceObject" + + This function initialises a Device DVC. + Attention: Device object ID is predefined with 0 (see ISO 11783 - 10). + + \param[in] \wpp{iTcInst, sint} + Number of TC Client instance + - Range: 0 - (TC_NUMB_TCCLIENTS - 1) + \param[in] \wpp{rpcDeviceDesignator, const #schar[]} + Descriptive text of this device ( DeviceDesignator ) (B) + - Range: 0 .. 32 Charakters + \param[in] \wpp{rpcDeviceSoftwareVersion, const #schar[]} + Software version indicating text (C) + - Range: 0 .. 32 Charakters + \param[in] \wpp{rpbSerialNumber, const #schar[]} + Device and manufacturer-specific serial number (E) + - Range: 0 .. 32 characters + \param[in] \wpp{rpcDeviceStructureLabel, const #schar[]} + Label given by Device to identify the Device Description + Structure. This label allows the device to identify the + current version of the Device Description Object Pool + present in a Task Controller and to determine whether an + update is needed (7 characters) (F) + \param[in] \wpp{rpcDeviceLocalisationLabel, const #byte[]} + Label given by Device to identify the Device Description Localization. \n + Bytes 1 to 6 are defined by the Language Command PGN + (see ISO 11783-7). Byte 7 is reserved and set to 0xFF. (G) + \retval sint + - E_NO_ERR - 0K + - E_WARN - Maybe Device description buffer is to small + \note \par + Every DeviceDescription has only one Device object. +*/ +sint IsoTC_Device_Set ( sint iTcInst, + const schar rpcDeviceDesignator[], + const schar rpcDeviceSoftwareVersion[], + const schar rpbSerialNumber[], + const schar rpcDeviceStructureLabel[], + const byte rpcDeviceLocalisationLabel[] + ); + +/*********************************************************************************/ +/*! + \brief Setting Device Description Object "DeviceElement" + + This function initialises a Device Element DET. + + \param[in] \wp{iTcInst, sint} + Number of TC Client instance + - Range: 0 - (TC_NUMB_TCCLIENTS - 1) + \param[in] \wp{rwDeviceElementObjectID, word} + Unique object ID (B) + - Range: 0 - 65535 + \param[in] \wp{reDeviceElementType, DevElemType_e} + Element type - see detailed description in Part 10 (C) + \param[in] \wpp{rpcDeviceElementDesignator, const schar[]} + Descriptive text to identify this device element (D) + - Range: 0 .. 32 Charakters + \param[in] \wp{rwDeviceElementNumber, word} + Element number for process data variable addressing (E) + according to the definitions in Process Data Variable + definitions in ISO 11783-7. + \param[in] \wp{rwParentObjectID, word} + Object id of parent DeviceElementObject or DeviceObject (F) + in order to establish a hierarchical order of + DeviceElements ( 0 - 65535 ) + \retval sint + - E_NO_ERR + - E_WARN - Maybe Device description buffer is to small +*/ + sint IsoTC_DeviceElement_Set ( sint iTcInst, + word rwDeviceElementObjectID, + DevElemType_e reDeviceElementType, + const schar rpcDeviceElementDesignator[], + word rwDeviceElementNumber, + word rwParentObjectID + ); + +/***********************************************************************************************/ +/*! + \brief Closing Device Element + + This function closes the last opended Device Element + + \param[in] \wp{iTcInst, sint} + Number of TC Client instance + - Range: 0 - (TC_NUMB_TCCLIENTS-1) + \retval sint + - E_NO_ERR - 0K +*/ +sint IsoTC_DeviceElement_End( sint iTcInst ); + +/**********************************************************************/ +/*! + \brief Add a DPD object to the last Device Element + + \param[in] \wp{iTcInst, sint} + Number of TC Client instance + - Range: 0 - (TC_NUMB_TCCLIENTS-1) + \param[in] \wp{wObjectAdd, word} + Unique object ID (A) + - Range: 0 - 65535 + \retval sint + - E_NO_ERR - 0K +*/ +sint IsoTC_AddDPDObject( sint iTcInst, word wObjectAdd ); + +/****************************************************************************/ +/*! + \brief Add a DPT object to the last Device Element + + \param[in] \wp{iTcInst, sint} + Number of TC Client instance + - Range: 0 - (TC_NUMB_TCCLIENTS-1) + \param[in] \wp{wObjectAdd, word} + Unique object ID (A) + - Range: 0 - 65535 + \retval sint + - E_NO_ERR - 0K +*/ +sint IsoTC_AddDPTObject( sint iTcInst, word wObjectAdd ); + +/*******************************************************************************/ +/*! + \brief Setting Device Description Object "DeviceProcessData" + + This function initialises a Device Process Data DPD. + + \param[in] \wp{iTcInst, sint} + Number of TC Client instance + - Range: 0 - (TC_NUMB_TCCLIENTS - 1) + \param[in] \wp{rwProcessDataObjectID, word} + Unique object ID (A) + - Range: 0 - 65535 + \param[in] \wp{rwProcessDataDDI, word} + Identifier of Process Data Variable(DDI) (B) \n + See Definitions in ISO 11783-7 and ISO 11783-11. + \param[in] \wp{rbProcessDataProperty, byte} + Process data Property - a bitset combined of (C): + - Bit 0 = 1 = TC_PROP_DEFAULT_SET + - Bit 1 = 1 = TC_PROP_SETABLE + - Bit 2 = 1 = TC_PROP_CONTROL_SOURCE + \param[in] \wp{rbProcessDataTriggMethods, byte} + Process data trigger methods - a bitset combined of (D): + - Bit 0 = 1 = TC_TRIG_TIMEINTERVAL + - Bit 1 = 1 = TC_TRIG_DISTANCEINTERVAL + - Bit 2 = 1 = TC_TRIG_THRESHOLD_LIMITS + - Bit 3 = 1 = TC_TRIG_ON_CHANGE + - Bit 4 = 1 = TC_TRIG_TOTAL + \param[in] \wpp{rpcProcessDataDesignator, const schar[]} + Process data designator (E) \n + Descriptive text for this device process data ( 0 ..32 char.) + \param[in] \wp{rwDeviceValuePresentObjectID, word} + Object identifier of DeviceValuePresentationObject. Use + 65535 when no DeviceValuePresentationObject is referenced. + \retval sint + - E_NO_ERR + - E_WARN - Maybe Device description buffer is to small + \note \par + - IsoTC_AddDPDObject of this process data must be called before. +*/ +sint IsoTC_DeviceProcessData_Set ( sint iTcInst, + word rwProcessDataObjectID, + word rwProcessDataDDI, + byte rbProcessDataProperty, + byte rbProcessDataTriggMethods, + const schar rpcProcessDataDesignator[], + word rwDeviceValuePresentObjectID + ); + +/**************************************************************************************/ +/*! + \brief Setting the default trigger of a Device process data + + This function initialises the default trigger of a DDI. + + \param[in] \wp{iTcInst, sint} + Number of TC Client instance + - Range: 0 - (TC_NUMB_TCCLIENTS - 1) + \param[in] \wp{rwProcessDataObjectID, word} + Unique object ID (A) - IsoTC_DeviceProcessData_Set was called before + - Range: 0 - 65534 + \param[in] \wp{rbPdDeftTriggMethods, byte} + Default trigger methods in case of DDI RequestDefaultProcessData + - Bit 0 = 1 = TC_TRIG_TIMEINTERVAL + - Bit 1 = 1 = TC_TRIG_DISTANCEINTERVAL + - Bit 2 = 1 = TC_TRIG_THRESHOLD_LIMITS + - Bit 3 = 1 = TC_TRIG_ON_CHANGE + - Bit 4 = 1 = TC_TRIG_TOTAL + \param[in] \wp{rlPdDeftValTimeInt, slong} + Default trigger value for method time interval + - Unit: Milliseconds + - Range: 0 stops measurement, 10 minimum, 0 ... 60000 + \param[in] \wp{rlPdDeftValDistanceInt, slong} + Default trigger value for method distance interval + - Unit: Millimeter + - Range: 0 stops measurement, 0 ... 1000000 + \param[in] \wp{rlPdDeftValThreshMini, slong} + Default trigger value for method threshold minimum + - Unit: Depends on process data + - Range: -2^31+1 ... 2^31-2 + \param[in] \wp{rlPdDeftValThreshMaxi, slong} + Default trigger value for method threshold maximum + - Unit: Depends on process data + - Range: -2^31+2 ... 2^31-1 + \param[in] \wp{rlPdDeftValThreshChan, slong} + Default trigger value for method threshold change + - Unit: Depends on process data, signed long + - Range: 0 stops measurement, 1 logs each change, -2^31+1 ... 2^31-1 + \retval sint + - E_NO_ERR + - E_RANGE - Process data not found + + \note \par + - IsoTC_AddDPDObject of this process data must be called before. + - Attention: Function do not check if values are in range! +*/ + sint IsoTC_ProcessDataDefTrigger_Set ( sint iTcInst, + word rwProcessDataObjectID, + byte rbPdDeftTriggMethods, + slong rlPdDeftValTimeInt, + slong rlPdDeftValDistanceInt, + slong rlPdDeftValThreshMini, + slong rlPdDeftValThreshMaxi, + slong rlPdDeftValThreshChan + ); + +/********************************************************************************/ +/*! + \brief Setting Device Description Object "DeviceProperty" + + This function initialises a Device Property DPT + + \param[in] \wp{iTcInst, sint} + Number of TC Client instance + - Range: 0 - (TC_NUMB_TCCLIENTS - 1) + \param[in] \wp{rwDevicePropertyObjectID, word} + Unique object ID (A) + - Range: 0 - 65535 + \param[in] \wp{rwDevicePropertyDDI, word} + Property-DDI (B) + - Range: 0 -65535 + \param[in] \wp{rlDevicePropertyValue, slong} + Property Value (C) + - Full signed long range + \param[in] \wpp{rpcDevicePropertyDesignator, const schar[]} + Descriptive text for this device property + - Range: 0 - 32 charakter + \param[in] \wp{rwDeviceValuePresentObjectID, word} + Object ID of DeviceValuePresentationObject. Use + 65535 when no DeviceValuePresentationObject is referenced. + \retval sint + - E_NO_ERR + - E_WARN - Maybe Device description buffer is to small +*/ + sint IsoTC_DeviceProperty_Set ( sint iTcInst, + word rwDevicePropertyObjectID, + word rwDevicePropertyDDI, + slong rlDevicePropertyValue, + const schar rpcDevicePropertyDesignator[], + word rwDeviceValuePresentObjectID + ); +/*********************************************************************************/ +/*! + \brief Setting Device Description Object "DeviceValuePresentation" + + This function initialises a Device Value Presentation DVP. + + \param[in] \wp{iTcInst, sint} + Number of TC Client instance + - Range: 0 - (TC_NUMB_TCCLIENTS - 1) + \param[in] \wp{rwDeviceValuePresentObjectID, word} + Unique object ID (A) + - Range: 0 - 65535 + \param[in] \wp{rlOffset, slong} + Offset to be applied to the value for presentation (B) + - Full signed long range + \param[in] \wp{rfScale, schar*} + Scale to be applied to the value for presentation (C) + - Range: 0.000000001 .. 100000000.0 + \param[in] \wp{rbNumberOfDecimals, byte} + Specify number of decimals to display after the decimal point (D) + - Range: 0 .. 7 + \param[in] \wpp{rpcUnitDesignator, const schar[] } + Unit designator for this value presentation (E) + - Range: 0 - 32 charakter + \retval sint + - E_NO_ERR + - E_WARN - Maybe Device description buffer is to small +*/ + sint IsoTC_DeviceValuePresent_Set ( sint iTcInst, + word rwDeviceValuePresentObjectID, + slong rlOffset, + sfloat rfScale, + byte rbNumberOfDecimals, + const schar rpcUnitDesignator[] + ); + +/** @} */ +/** \name TC Client - Functions for working with a connected TC Client + @{ +*/ +/*********************************************************************************/ +/*! + \brief Sending of "change designator message" + + This message sends a change designator message. E. g. this can be necessary + to update the language of the description strings. + + \param[in] \wp{wSA_WSM, word} + Source address of task controller client (implement) + - Range: 0 - 253 + \param[in] \wp{wObjectID, word} + Object ID, which designator shall be changed + - Range: 0 - 65535 + \param[in] \wp{rpcDesignatorNew, schar[]} + Designator string + - Range: 0 - 32 charakter + \retval sint + - E_NO_ERR + - E_OVERFLOW - Transfer is busy - you must wait + - E_NO_INSTANCE - Instance not found + - E_USER_ERROR - User unknown +*/ + sint IsoTC_ChangeDesignator_Send( word wSA_WSM, word wObjectID, schar rpcDesignatorNew[] ); + +/******************************************************************************/ +/*! + \brief This function sets the distance for triggermethod "distance interval" + + If a process data of a TC client uses the triggermethod "distance interval" then the application + must set the distance ( ground or wheel ) with this function. + + \param[in] \wp{wSAofTCC, word} + Source address of task controller client (implement) + - Range: 0 - 253 + \param[in] \wp{dwDistance, dword} + Distance value of ground or wheel based speed + - Range: + - 0 - ISO_VALID_SIGNAL_DW + - ISO_NOT_AVAILABLE_DM ( default ) if distance is not available + - ISO_ERROR_INDI_DM if speed PGNs are missing or value is unvalid + \retval sint + - E_NO_ERR - OK + - E_NO_INSTANCE - there is no TC client for this SA + \note \par + This function should called every time a speed message ( 100ms ) is received +*/ + sint IsoTC_SetDistance( word wSAofTCC, dword dwDistance ); + +/*******************************************************************************/ +/*! + \brief This function sets and sends a DPD value manually to the TC + + A DPD value is sent manually to the TC only the thresholds are taken into consideration. + + \param[in] \wp{wSAofTCC, word} + Source address of task controller client (implement) + - Range: 0 - 253 + \param[in] \wp{wElementNumb, word} + Element number of DPD ( process data ) + - Range: 0 - 65534 + \param[in] \wp{wDDI, word} + DDI of DPD + \param[in] \wp{lPdValue, slong} + New Value of this DPD (full range) + \retval sint + - E_NO_ERR - OK + - E_NO_INSTANCE - there is no TC client for this SA + - E_NOT_AVAILABLE - DPD not found +*/ +sint IsoTC_SetDPDValue( word wSAofTCC, word wElementNumb, word wDDI, slong lPdValue ); + +/** @} */ +/* **************** End of functions and definitions which are only for LAYER 10 .. ******** */ + +/* ************************************************************************ */ +/** @} */ /* END taskc */ +/* ************************************************************************ */ + +/* ************************************************************************ */ +#ifdef __cplusplus +} /* end of extern "C" */ +#endif + +#endif /* DEF_IsoTccApi_H */ +/* ************************************************************************ */ ++======= + /* ************************************************************************ */ + /*! + \file + \brief ECU Driver TC Client API Header File + \author Wegscheider Peter + \date Created XX.07.13 + + \copyright Competence Center ISOBUS e.V. + + \par History: + \par + 04.07.2013 - author P. Wegscheider + - API declarations moved to this file + - Module version define added + \par + 12.12.2013 - author E. Hammerl + - Config- and TC versions defines moved from IsoTaskC.c to here + - Added IsoTC_SetVersionMsg() + \par + 11.06.2014 - author E. Hammerl + - Version updated to 2.2 + - Added IsoTC_SetPrefTC() + - Added IsoTC_Read_TCHandle() + \par + 25.03.2015 - author E. Hammerl + - Datalogger and Version 4 extensions + \par + 10.05.2016 - author E. Hammerl + - Added peer control functionality ( without API changes ) + - Added Event IsoEvLanguageCmdReceived ( called if LC of TC ( >=V4 ) is changed + - Structure label parameter changed from iso_char to iso_u8 + \par + 07.12.2016 - author E. Hammerl + - Added Process Data Error Codes and IsoValueCommandAcknow + \par + 16.12.2016 - author E. Hammerl + - Feature request ID 4629: client interfaces should only use handles + - SA deleted of fun. IsoTC_ReloadDDObjects(), IsoTC_ChangeDesignator_Send(), + IsoTC_SetDPDValue() and IsoTC_StatusInfoGet() + - IsoTcClosePool, IsoDlClosePool deleted + \par + 21.02.2017 - author P. Wegscheider + - Feature request ID 6003: client interfaces should only use handles (rather then ISOBUS NAME) + - Replaced working set master NAME parameter with CF handle for functions + IsoTC_InstCmd(), IsoTC_SetPrefTC(), IsoTC_SetPrefDL(), IsoTC_Read_TCHandle() and IsoTC_Read_DLHandle() + \par + 13.02.2018 - author P. Wegscheider + - Feature request ID 7676: missing const in callback parameter \n + Added const to TC callback function to parameter psTcCbConn, + installed with IsoTC_InstallCbConnection(). + \par + 20.02.2018 - author P.Wegscheider + - Feature ID 7528: add user parameter to callback functions + \par + 06.05.2018 - author P.Wegscheider + - Feature ID 3910: header files should include header files they depend on + \par + 14.06.2018 - author P.Wegscheider + - Feature request ID 8424: use ISO_CF_NAME_T in API functions + \par + 01.08.2018 - author P.Wegscheider + - BugID 9093: mark IsoTC_Device_Set() as deprecated + \par + 10.08.2018 - author P. Wegscheider + - BugID 8581: add "namespace ISOBUSDRIVER" to header files + \par + 16.10.2018 -author P.Wegscheider + - Feature request ID 9304: Wait in Event IsoEvLoadObjects \n + Added function IsoTC_TriggerEventAgain(). + */ + /* ************************************************************************ */ + #ifndef DEF_IsoTccApi_H + #define DEF_IsoTccApi_H + + /* include configuration, driver standard types and common definitions */ + #include "IsoCommonDef.h" + + #ifdef __cplusplus + extern "C" { + #endif + /* ************************************************************************ */ + + /* ************************************************************************ */ + /*! \ingroup grp_versions + \brief Task Controller Client Client Module Version + */ + #define VERSION_TCC 4.07 /* changed for v10.00 */ + + + /* ************************************************************************ */ + /* ********************************* IsoTaskC.c ************************** */ + /** \defgroup taskc TC-Client + \ingroup clients + \brief Part 10 - Task Controller Client + */ + /* ************************************************************************ */ + /** \addtogroup taskc + @{ + */ + /* ************************************************************************ */ + + #ifndef PROCESSDATA_MAX + #define PROCESSDATA_MAX (20u) /**< Predefined number of process data ( -> more IsoConf.h) */ + #endif /* PROCESSDATA_MAX */ + #ifndef DEVICEDESCRIPTION_SIZE + #define DEVICEDESCRIPTION_SIZE (1000uL) /**< Predefined size of buffer for device description pool ( -> more IsoConf.h) */ + #endif /* DEVICEDESCRIPTION_SIZE */ + #ifndef TC_NUMB_TCCLIENTS + #define TC_NUMB_TCCLIENTS (1) /**< Predefined number of possible TC/DL-Clients ( -> more IsoConf.h) */ + #endif /* TC_NUMB_TCCLIENTS */ + #ifndef TC_NUMNESTED_DE + #define TC_NUMNESTED_DE (10) /**< Predefined size of number of nested Device elements ( -> more IsoConf.h) */ + #endif /* TC_NUMNESTED_DE */ + #ifndef TC_DEFTCM_BOOTTIME + #define TC_DEFTCM_BOOTTIME (10u) /**< Predefined boottime for the preferred TC ( -> more IsoConf.h) */ + #endif /* TC_DEFTCM_BOOTTIME */ + #ifndef TC_TIMECYCLEMIN_PDS + #define TC_TIMECYCLEMIN_PDS (15L) /**< Predefined minimum timecycle for working with PDs */ + #endif /* TC_TIMECYCLEMIN_PDS */ + #ifndef TC_SENDCYCLEMAX_PDS + #define TC_SENDCYCLEMAX_PDS (100u) /**< Predefined maximum of PDs which should be send in one cyclic call */ + #endif /* TC_SENDCYCLEMAX_PDS */ + + #if defined(CCI_USE_NAMESPACE) && defined(__cplusplus) + #include "IsoTccApi.hpp" + #else /* not: defined(CCI_USE_NAMESPACE) && defined(__cplusplus) -> use C defines */ + + #define TCCLIENT_UNKNOWN (0xFFu) /**< Unvalid TC client (handle) */ + + /* TC versions */ + #define TC_DIS (0u) /**< TC DIS - first edition */ + #define TC_FDIS (1u) /**< TC FDIS - first edition */ + #define TC_ISO_1 (2u) /**< TC IS - first edition - Default */ + #define TC_R2DIS (3u) /**< TC DIS - second edition */ + #define TC_R2IS (4u) /**< TC FDIS/IS - second edition */ + + /* Provided option bits */ + #define TC_SUPPORT_DOCU (0x01u) /**< Provided option: Supports documentation */ + #define TC_SUPPORT_TIME_POS (0x02u) /**< Provided option: Deprecated Version 3 for time and pos logging */ + #define TC_SUPPORT_TC_GEO_NOPOS (0x02u) /**< Provided option: GEO without positon based control */ + #define TC_SUPPORT_TC_GEO (0x04u) /**< Provided option: GEO with positon based control */ + #define TC_SUPPORT_PEER_CTRL (0x08u) /**< Provided option: Supports peer control assignment */ + #define TC_SUPPORT_TC_SC (0x10u) /**< Provided option: Supports implement section control */ + #define TC_SUPPORT_OPT2 (0x00u) /**< Provided option iso_u8 2: Reserved as zero */ + + /* PD properties */ + #define TC_PROP_DEFAULT_SET (0x01u) /**< PD is member of default set */ + #define TC_PROP_SETABLE (0x02u) /**< PD is settable */ + #define TC_PROP_CONTROL_SOURCE (0x04u) /**< Control source */ + + /* PD trigger methods */ + #define TC_TRIG_TIMEINTERVAL (0x01u) /**< PD Triggermethod time interval */ + #define TC_TRIG_DISTANCEINTERVAL (0x02u) /**< PD Triggermethod distance interval */ + #define TC_TRIG_THRESHOLD_LIMITS (0x04u) /**< PD Triggermethod threshold limits */ + #define TC_TRIG_ON_CHANGE (0x08u) /**< PD Triggermethod onchange */ + #define TC_TRIG_TOTAL (0x10u) /**< PD Triggermethod total */ + + /* DDI definitions */ + #define TC_DDI_REQUEST_DEFAULT_PD (0xDFFFu) /**< DDI - RequestDefaultProcessData */ + + /* Process data error codes used in PDACK */ + #define no_Pd_error (0u) /**< PDACK no error */ + #define err_PdCommandNotSupported (1u) /**< PDACK Command not supported ( intern used ) */ + #define err_PdInvalidElementNumber (2u) /**< PDACK Invalid element number ( intern used ) */ + #define err_PdDDINotSupportedByElement (4u) /**< PDACK DDI not supported by element ( intern used ) */ + #define err_PdTriggerMethodNotSupported (8u) /**< PDACK Trigger method not supported ( intern used ) */ + #define err_PdProcessDataNotSettable (16u) /**< PDACK PD not settable( intern used ) */ + #define err_PdInvalidInterOrThreshold (32u) /**< PDACK Invalid/Unsupported interval/threshold( intern used ) */ + #define err_PdNotConformDDIDefinition (64u) /**< PDACK PD value not conform to DDI definition */ + #define err_PdOutsideOperationalRange (128u) /**< PDACK PD value is outside operational range of this device */ + + #endif /* not: defined(CCI_USE_NAMESPACE) && defined(__cplusplus) */ + + #ifdef DOXYGEN + /*! \def ISO_EXTERNAL_DDOPBUFFER + \brief Add the define #ISO_EXTERNAL_DDOPBUFFER to IsoConf.h to enable the external pool RAM buffer functionality. + \details The define is needed to replace the internal buffer with an external pool RAM buffer. \n + The external buffer must have the size defined by DEVICEDESCRIPTION_SIZE. \n + The pointer to this buffer must be set with IsoTcPoolSetBuffer(). + */ + #define ISO_EXTERNAL_DDOPBUFFER + #endif + + /** \brief + Device element types + */ + typedef enum + { + de_undef, + de_device, + de_function, + de_bin, + de_section, + de_unit, + de_connector, + de_navigation, + de_lastentry + } DevElemType_e; + + /** \brief + Enum of Login status of task controller client instance + */ + typedef enum + { + InstanceUnused, + ClientIsLoggedOut, + ClientRestart, + Address_claim, + Waiting_6_seconds, + WaitingTaskControllerStatus, + WSMasterSend, + WSMemberSend, + WSTaskMessageSend, + RequestVersionMessageSend, + VersionMessageWaiting, + TCVersionRequestWaiting, + RequestLanguageCommandSend, + LanguageCommandWaiting, + LoadObjectsOfApp, + RequestStructureLabelSend, + StructureLabelResponseWaiting, + RequestLocalizationLabelSend, + LocalizationLabelWaiting, + RequestObjectPoolTransferSend, + ObjPoolTransferWaiting, + ObjPoolDeleteSend, + ObjPoolDeleteRespWaiting, + ObjPoolActivateRespWaiting, + TcRunning + } ISOTC_ANNOUNCE_e; + + /** \brief + Enum of status info + */ + typedef enum + { + TC_ALIVE, /**< TC alive check - TC status message ok? */ + TCC_STATEOFANNOUNCING, /**< see intern state machine of login (only for development) */ + TCC_STATE_ACT /**< Task active or not */ + } ISOTC_STATUS_e; + + /** \brief + Enum which indicates the type of client ( TC or DL ) + */ + typedef enum + { + IsoClType_TC, /**< Client type: task controller */ + IsoClType_DL, /**< Client type: datalogger */ + IsoClType_DontCare /**< Type is dont care if func work with client number */ + } ISO_CLTYPE_e; + + /** \brief + Enum of command for setting the device description + */ + typedef enum + { + IsoTcOpenInst, /**< Open a TC client instance */ + IsoTcGetPointOfInst, /**< Getting the number of a TC Client instance */ + IsoTcLogOut, /**< Shut down and re-initialisation of a TC client */ + IsoDlOpenInst, /**< Open a DL client instance */ + IsoDlGetPointOfInst, /**< Getting the number of a DL Client instance */ + IsoDlLogOut /**< Shut down and re-initialisation of a DL client */ + } ISO_TC_CMD_e; + + /** \brief + Enum which indicates the type of TC process data callback + */ + typedef enum + { + IsoRequestValueCommand, /**< Actual value - lValueNew shall be set with actual value */ + IsoValueCommand, /**< Set point of TC - should be stored of application */ + IsoValueCommandAcknow, /**< Set point of TC - should be stored of application */ + IsoResponseToCommand, /**< Response of e. g. change designator message */ + IsoTaskStartStop, /**< Shows start, stop, resume of a task */ + IsoTCSizeOfDD, /**< Returns the real value of the DD in lValueNew */ + IsoTCVersionReceived, /**< Deprecated: TC has sended the Version message */ + IsoTCPDACKReceived, /**< TC od DL sends a PDACK */ + IsoTCtoAppLast + } ISO_TCAPP_e; + + /** \brief + Struct which is used as interface to the application + */ + typedef struct + { + iso_u16 wDDObjID; /**< Object ID of device description object */ + iso_u16 wDevElementNumb; /**< Requested element number of TC (only process data) */ + iso_u16 wDDI; /**< Data dictionary identifier (only process data)*/ + iso_s32 lValueNew; /**< New value */ + ISO_TCAPP_e ePDCmd; /**< Kind of TC callback calling */ + ISO_USER_PARAM_T userParam; /**< User parameter set with IsoTC_InstallCbConnection() */ + } ISO_TCLINK_T; + + /** \brief + Task Controller Version message data + */ + typedef struct + { + iso_u8 u8VersionNumber; /**< Version number of this TC client */ + iso_u8 u8Boottime; /**< Boottime - Number of seconds from power cycle to TC status */ + iso_u8 u8ProvidedOptions; /**< First options iso_u8 of version message */ + iso_u8 u8ProvidedOptions2; /**< Second options iso_u8 of version message */ + iso_u8 u8NumberBoomsForSC; /**< Number of booms for section control */ + iso_u8 u8NumberSectionsForSC; /**< Number of sections for section control */ + iso_u8 u8NumberControlChannels; /**< Number of control channels for position based control */ + } ISO_TCVERS_T; + + /** \brief + Enum which indicates the type of TC connection management callback + */ + typedef enum + { + IsoEvPrefServerNotAvailable, /**< Select/set (another) preferred TC/DL (-> if Preferred TC/DL is not on the network) */ + IsoEvServerVersionAvailable, /**< Version of server is available */ + IsoEvLanguageCmdReceived, /**< Language and metrics are received */ + IsoEvLoadObjects, /**< Create DDOP and PD list */ + IsoEvActivated, /**< Login finished - client is in state TcRunning */ + IsoEvDeactivated, /**< Client is deactivated ( logged out ) */ + IsoEvCmdSafeState, /**< Application shall go into safe state + - Move to another TC or TC status msg not received */ + IsoEvTick, /**< Called every cycle */ + IsoEvLoginAborted, /**< Uncoverable error during Login */ + IsoEvReloadDDOs, /**< Request for reload objects (DVC and/or DVP) */ + IsoEvReloadFinished /**< Pool activated after reload */ + } ISO_TCDLEVENT_e; + + /** \brief + Struct which is used as interface for the connection callback + */ + typedef struct + { + ISO_TCDLEVENT_e eClEvent; /**< Requested event of driver see enum */ + iso_u8 u8ClNum; /**< Number of client */ + ISO_USER_PARAM_T userParam; /**< User parameter set with IsoTC_InstallCbConnection() */ + } ISO_TCCBCONN_T; + + + /** \name TC Client Management Functions + + Use this functions to create and connect a TC client + + @{ + */ + /*******************************************************************************/ + /*! + \brief This function is for starting and stopping of TC/DL clients + + This function prepares with "IsoTcOpenInst/IsoDlOpenInst" a TC/DL client for login. + A running client has to be logout with this function before it can restarted with this + function again. + + \param[in] \wp{s16CfHandleMaster, iso_s16} + CF handle of working set master which uses a TC Client + \param[in] \wpp{userParam, const #ISO_USER_PARAM_T} + User parameter value for the callback function calls. \n + Use #ISO_USER_PARAM_DEFAULT if not used/needed. + \param[in] \wpp{rpfPdCall, void(*)(#ISO_TCLINK_T*)} + Communication interface with task controller (Callbackfun.) + \param[in] \wpp{rpfCbClConn, void(*)(const #ISO_TCCBCONN_T*)} + Callback function for connection control + \param[in] \wp{eCommand, ISO_TC_CMD_e} + Command - what shall this function do? \n + - IsoTcOpenInst - Open an new TC Client instance + - IsoTcGetPointOfInst - Returns the number of a TC Client instance + - IsoTcLogOut - Shut down a TC client + - Same for datalogger e. g. IsoDlOpenInst + \retval iso_u8 + - 0 ... (TC_NUMB_TCCLIENTS - 1) - Number of TC client instance \n + - TCCLIENT_UNKNOWN: No TCC instance, CF not a WS Master or TCC not logged out + + \par Hint: + The following parameter are only used if a connection gets created; eCommand = { IsoTcOpenInst, IsoDlOpenInst} + - const ISO_USER_PARAM_T userParam + - void (*rpfPdCall)( ISO_TCLINK_T* psTcLi ) + - void(*rpfCbClConn)(const ISO_TCCBCONN_T * psTcCbConn) + */ + iso_u8 IsoTC_InstCmd( iso_s16 s16CfHandleMaster, + const ISO_USER_PARAM_T userParam, + void (*rpfPdCall)( ISO_TCLINK_T* psTcLi ), + void (*rpfCbClConn)( const ISO_TCCBCONN_T * psTcCbConn ), + ISO_TC_CMD_e eCommand + ); + + /*******************************************************************************/ + /*! + \brief Installation of the connection control callback function + + This function installs the connection control callback function. The driver calls this function + in case of events during a client login. + + \param[in] \wpp{u8Inst, iso_u8} + Number of TC Client instance + - Range: 0 - (TC_NUMB_TCCLIENTS - 1) + \param[in] \wpp{rpfCbClConn, void(*)(const ISO_TCCBCONN_T*)} + Callback function for connection control + \retval iso_s16 + - #E_NO_ERR - 0K + - #E_RANGE - wrong client number + \note \par + - This function shall be called after "open instance" + - Deprecated - Use IsoTC_InstCmd() to set the callback + */ + ISO_DEPRECATED iso_s16 IsoTC_InstallCbConnection(iso_u8 u8Inst, void(*rpfCbClConn)(const ISO_TCCBCONN_T * psTcCbConn)); + + /*****************************************************************************/ + /*! + \brief Setting the preferred TC Server with its boottime + + This function sets the NAME of the preferred TC Server and its boottime. \n + It only works correct if called immediately after creating a TC client or + for event IsoEvPrefServerNotAvailable. + + \param[in] \wpp{s16CfHandleMaster, const #iso_s16} + CF handle of working set master which uses a TC Client + \param[in] \wpp{rapu8NamePreferredTC, const #ISO_CF_NAME_T*} + Pointer to NAME of the preferred TC \n + \param[in] \wpp{u16PrefTCBoottime, const iso_u16} + Boottime of the preferred TC in seconds \n + that means waittime for first TC status message + \retval iso_s16 + - #E_NO_ERR - 0K + - #E_NO_INSTANCE - wrong instance + - #E_NOACT - TC statemachine > WaitingTaskControllerStatus + - #E_RANGE - Null pointer given for rapu8NamePreferredTC + */ + iso_s16 IsoTC_SetPrefTC( const iso_s16 s16CfHandleMaster, + const ISO_CF_NAME_T* rapu8NamePreferredTC, + const iso_u16 u16PrefTCBoottime ); + + /*****************************************************************************/ + /*! + \brief Setting the preferred DL Server with its boottime + + This function sets the NAME of the preferred DL Server and its boottime. \n + It only works correct if called immediately after creating a DL client or + for event IsoEvPrefServerNotAvailable. + + \param[in] \wpp{s16CfHandleMaster, const #iso_s16} + CF handle of working set master which uses a DL Client + \param[in] \wpp{rapu8NamePreferredDL, const #ISO_CF_NAME_T*} + Pointer to NAME of the preferred TC \n + \param[in] \wpp{u16PrefDLBoottime, const iso_u16} + Boottime of the preferred DL in seconds \n + that means waittime for first TC status message + \retval iso_s16 + - #E_NO_ERR - 0K + - #E_NO_INSTANCE - wrong instance + - #E_NOACT - TC statemachine > WaitingTaskControllerStatus + - #E_RANGE - Null pointer given for rapu8NamePreferredDL + */ + iso_s16 IsoTC_SetPrefDL(const iso_s16 s16CfHandleMaster, + const ISO_CF_NAME_T* rapu8NamePreferredDL, + const iso_u16 u16PrefDLBoottime); + + /*****************************************************************************/ + /*! + \brief Move to another TC/DL + + \param[in] \wpp{u8ClInst, const iso_u8} + Number of TC Client instance + - Range: 0 - (TC_NUMB_TCCLIENTS - 1) + \param[in] \wpp{rapu8NameNewServer, const #ISO_CF_NAME_T*} + Pointer to NAME of the TC or DL \n + \param[in] \wpp{u16PrefServerBoottime, const iso_u16} + Boottime of the TC or DL in seconds \n + that means wait time for first TC status message + \retval iso_s16 + - #E_NO_ERR - 0K + - #E_NO_INSTANCE - Wrong instance + - #E_RANGE - rapu8NameNewServer is a NULL pointer + */ + iso_s16 IsoTC_MoveToAnotherTCoDL( const iso_u8 u8ClInst, + const ISO_CF_NAME_T* rapu8NameNewServer, + const iso_u16 u16PrefServerBoottime); + + /*****************************************************************************/ + /*! + \brief Setting the data for the TCC Version message + + Default of version message data are TC Version number 2. + The application must call this function for TC versions 3 or higher. + + \param[in] \wpp{u8ClInst, iso_u8} + Number of TC Client instance + - Range: 0 - (TC_NUMB_TCCLIENTS - 1) + \param[in] \wpp{u8VersionNumber, const #iso_u8} + Version number of this TC client see ISO-Standard + \param[in] \wpp{u8ProvidedOptions, const #iso_u8} + First option iso_u8 of this TC client see defines #TC_SUPPORT_DOCU ff. + - 0xFF for TC-Version 2 + \param[in] \wpp{u8ProvidedOptions2, const #iso_u8} + Second option iso_u8 + - 0xFF for TC-Version 2 + \param[in] \wpp{u8NumberBoomsForSC, const #iso_u8} + Number of required booms for section control + - 0xFF for TC-Version 2 + \param[in] \wpp{u8NumberSectionsForSC, const #iso_u8} + Number of required sections for section control + - 0xFF for TC-Version 2 + \param[in] \wpp{u8NumberControlChannels, const #iso_u8} + Number of required control channels for position based control + - 0xFF for TC-Version 2 + \retval iso_s16 + - #E_NO_ERR - 0K + - #E_ERROR_INDI - Instance not open for setting + - #E_NO_INSTANCE - wrong instance + \note \par + Calling of this function is only allowed during building of DD + */ + iso_s16 IsoTC_SetVersionMsg( const iso_u8 u8ClInst, + const iso_u8 u8VersionNumber, + const iso_u8 u8ProvidedOptions, + const iso_u8 u8ProvidedOptions2, + const iso_u8 u8NumberBoomsForSC, + const iso_u8 u8NumberSectionsForSC, + const iso_u8 u8NumberControlChannels + ); + + /*****************************************************************************/ + /*! + \brief Reading the data of the version message of the connected TC/DL + + \param[in] \wpp{u8ClInst, const iso_u8} + Number of TC Client instance + - Range: 0 - (TC_NUMB_TCCLIENTS - 1) + \param[out] \wpp{psVersDat, ISO_TCVERS_T*} + Pointer to version message struct + \retval iso_s16 + - #E_NO_ERR - 0K + - #E_NO_INSTANCE - wrong instance + - #E_RANGE - psVersDat is a NULL pointer + */ + iso_s16 IsoTC_ReadVersionOfServer(const iso_u8 u8ClInst, ISO_TCVERS_T* psVersDat); + + /*****************************************************************************/ + /*! + \brief Reading the Language command data for this connection + + \param[in] \wpp{u8ClInst, const iso_u8} + Number of TC Client instance + - Range: 0 - (TC_NUMB_TCCLIENTS - 1) + \param[out] \wpp{au8LCdata, iso_u8} + Pointer to LC data + \retval iso_s16 + - #E_NO_ERR - 0K + - #E_NO_INSTANCE - wrong instance + - #E_NOT_AVAILABLE - LC data are not available + - #E_RANGE - au8LCdata is a NULL pointer + */ + iso_s16 IsoTC_ReadLCDataofConnection(const iso_u8 u8ClInst, iso_u8 au8LCdata[]); + + /*****************************************************************************/ + /*! + \brief Reads the handle of the connected TC server + + This function reads the handle of the connected TC server + + \param[in] \wp{s16CfHandleMaster, iso_s16} + CF handle of working set master which uses a TC Client + \retval iso_s16 + - valid handle or #HANDLE_UNVALID + */ + iso_s16 IsoTC_Read_TCHandle( iso_s16 s16CfHandleMaster ); + + /*****************************************************************************/ + /*! + \brief Reads the handle of the connected DL server + + This function reads the handle of the connected DL server ( only for DL clients ) + + \param[in] \wp{s16CfHandleMaster, iso_s16} + CF handle of working set master which uses a DL Client + \retval iso_s16 + - valid handle or #HANDLE_UNVALID + */ + iso_s16 IsoTC_Read_DLHandle( iso_s16 s16CfHandleMaster ); + + /*****************************************************************************/ + /*! + \brief This function sends a Request Identify Task Controller message to the connected TC/DL + + \param[in] \wpp{u8ClInst, const iso_u8} + Number of TC Client instance + - Range: 0 - (TC_NUMB_TCCLIENTS - 1) + \retval iso_s16 + - #E_NO_ERR - 0K + - #E_NO_INSTANCE - wrong instance + - #E_USER_ERROR - CF ( sender or receiver ) is not logged + - #E_OVERFLOW - CAN buffer full + - #E_COM - CAN bus-off + */ + iso_s16 IsoTC_Request_Identify_TC(const iso_u8 u8ClInst); + + /************************************************************************************/ + /*! + \brief Get informations of TCC status + + This function serves for the request of informations of the TC client + + \param[in] \wp{s16CF, iso_s16} + - < TC_NUMB_TCCLIENTS: Client number + - > ISO_GLOBAL_ADDRESS: Handle of client CF + \param[in] \wp{eTCInfo, ISOTC_STATUS_e } + Enum of wished information of TC + - TC_ALIVE - Controlling TC status message + - TCC_STATEOFANNOUNCING - see state ISOTC_ANNOUNCE_e + - TCC_STATE_ACT - Task active or inactive (after login) + \retval iso_u32 + Value of requested info: + - #TC_ALIVE - ISO_TRUE means TC status msg is active + - #TCC_STATEOFANNOUNCING - for debug purposes see + value of ISOTC_ANNOUNCE_e in IsoTaskC.c + - #TCC_STATE_ACT - 1 means task active - 0 inactive + \note \par + - For applications with DL and TC client on same CF s16CfCl must be the Client number ! + */ + iso_u32 IsoTC_StatusInfoGet(iso_s16 s16CF, ISOTC_STATUS_e eTCInfo); + + /* ************************************************************************* */ + /*! + \brief Trigger connection event again + + Can only be called during the event callback call to stay in this state. + If the call is supported in this state the the event callback will be triggered again in the next cycle. + + Supported during the following events: + - #IsoEvLoadObjects + + \param[in] \wpp{u8ClInst, const iso_u8} + Number of TC Client instance + - Range: 0 - (TC_NUMB_TCCLIENTS - 1) + \retval iso_s16 + - #E_NO_ERR - 0K + - #E_NO_INSTANCE - wrong instance + - #E_NOACT - Call not supported in current state + */ + iso_s16 IsoTC_TriggerEventAgain(const iso_u8 u8ClInst); + + /** @} */ + /** \name TC Client Legacy Management Function + + Use this function for loading a binary device description + @{ + */ + /******************************************************************************/ + /*! + \brief DD loading out of a binary file + + Alternativ DD loading - device description is included as C-File or in Flash (binary) + + \param[in] \wpp{u8ClInst, const iso_u8} + Number of TC Client instance + - Range: 0 - (TC_NUMB_TCCLIENTS - 1) + \param[in] \wpp{rpbFlPoolFirstAddress, const iso_u8 HUGE_C[] } + Pointer to first address of device description + \param[in] \wp{rwNumberOfTcObjects, iso_u16} + Number of objects in device description + \retval iso_s16 + - #E_NO_ERR + - #E_UNKNOWN_ERR - Wrong working set + \note \par + - Function replaces IsoTaskCAppInit() + - Can only be used for simple DDs ( DPD after DET uses last device element entry ) + - Function works only without new connection callback and with one TC/DL client + */ + iso_s16 IsoTC_DDLoadOfBinary( const iso_u8 u8ClInst, + const iso_u8 rpbFlPoolFirstAddress[], + const iso_u16 rwNumberOfTcObjects + ); + + /** @} */ + /** \name TC Client - Functions for creating a device description + @{ + */ + /*****************************************************************************/ + /*! + \brief Setting Device Description Object "DeviceObject" + + This function initialises a Device DVC. + Attention: Device object ID is predefined with 0 (see ISO 11783 - 10). + + \param[in] \wp{u8ClNum, iso_u8} + Number of TC Client instance + - Range: 0 - (TC_NUMB_TCCLIENTS - 1) + \param[in] \wpp{rpcDeviceDesignator, const #iso_char[]} + Descriptive text of this device ( DeviceDesignator ) (B) + - Range: 0 .. 32(128 in version 4) characters + \param[in] \wpp{rpcDeviceSoftwareVersion, const #iso_char[]} + Software version indicating text (C) + - Range: 0 .. 32(128 in version 4) characters + \param[in] \wpp{rpbSerialNumber, const #iso_char[]} + Device and manufacturer-specific serial number (E) + - Range: 0 .. 32(128 in version 4) characters + \param[in] \wpp{rpcDeviceStructureLabel, const #iso_u8[]} + Label given by Device to identify the Device Description + Structure. This label allows the device to identify the + current version of the Device Description Object Pool + present in a Task Controller and to determine whether an + update is needed (7 characters) (F) + \param[in] \wpp{rpcDeviceLocalisationLabel, const #iso_u8[]} + Label given by Device to identify the Device Description Localization. \n + Bytes 1 to 6 are defined by the Language Command PGN + (see ISO 11783-7). Byte 7 is reserved and set to 0xFF. (G) + \retval iso_s16 + - #E_NO_ERR - 0K + - #E_OVERFLOW; - Buffer is to small + \note \par + Every DeviceDescription has only one Device object. + + With Version 10.00 the function is deprecated and should not be used for new applications. \n + Use IsoTC_DeviceExt_Set() for this purpose. + + */ + ISO_DEPRECATED iso_s16 IsoTC_Device_Set(iso_u8 u8ClNum, + const iso_char rpcDeviceDesignator[], + const iso_char rpcDeviceSoftwareVersion[], + const iso_char rpbSerialNumber[], + const iso_u8 rpcDeviceStructureLabel[], + const iso_u8 rpcDeviceLocalisationLabel[] + ); + + + /*****************************************************************************/ + /*! + \brief Setting Device Description Object "DeviceObject" + + This function initialises a Device DVC with an extended structure label \n + This is necessary for connections with server of version 4 or higher. + Attention: Device object ID is predefined with 0 (see ISO 11783 - 10). \n + + \param[in] \wp{u8ClNum, iso_u8} + Number of TC Client instance + - Range: 0 - (TC_NUMB_TCCLIENTS - 1) + \param[in] \wpp{rpcDeviceDesignator, const #iso_char[]} + Descriptive text of this device ( DeviceDesignator ) (B) + - Range: 0 .. 32(128 in version 4) characters + \param[in] \wpp{rpcDeviceSoftwareVersion, const #iso_char[]} + Software version indicating text (C) + - Range: 0 .. 32(128 in version 4) characters + \param[in] \wpp{rpbSerialNumber, const #iso_char[]} + Device and manufacturer-specific serial number (E) + - Range: 0 .. 32(128 in version 4) characters + \param[in] \wpp{rpcDeviceStructureLabel, const #iso_u8[]} + Label given by Device to identify the Device Description + Structure. This label allows the device to identify the + current version of the Device Description Object Pool + present in a Task Controller and to determine whether an + update is needed (7 characters) (F) + \param[in] \wpp{rpcDeviceLocalisationLabel, const #iso_u8[]} + Label given by Device to identify the Device Description Localization. \n + Bytes 1 to 6 are defined by the Language Command PGN + (see ISO 11783-7). Byte 7 is reserved and set to 0xFF. (G) + \param[in] \wpp{rpcExtendedStructureLabel, const #iso_u8[]} + Extended structure label, introduced in version 4, max. 32 bytes + \retval iso_s16 + - #E_NO_ERR - 0K + - #E_OVERFLOW; - Buffer is to small + - #E_NO_INSTANCE - Clientnumber has wrong value + - #E_USER_ERROR - Working set master not found + \note \par + Every DeviceDescription has only one Device object. + */ + iso_s16 IsoTC_DeviceExt_Set(iso_u8 u8ClNum, + const iso_char rpcDeviceDesignator[], + const iso_char rpcDeviceSoftwareVersion[], + const iso_char rpbSerialNumber[], + const iso_u8 rpcDeviceStructureLabel[], + const iso_u8 rpcDeviceLocalisationLabel[], + const iso_u8 rpcExtendedStructureLabel[] + ); + + /*********************************************************************************/ + /*! + \brief Setting Device Description Object "DeviceElement" + + This function initialises a Device Element DET. + + \param[in] \wp{u8ClNum, iso_u8} + Number of TC Client instance + - Range: 0 - (TC_NUMB_TCCLIENTS - 1) + \param[in] \wp{rwDeviceElementObjectID, iso_u16} + Unique object ID (B) + - Range: 0 - 65535 + \param[in] \wp{reDeviceElementType, DevElemType_e} + Element type - see detailed description in Part 10 (C) + \param[in] \wpp{rpcDeviceElementDesignator, const iso_char[]} + Descriptive text to identify this device element (D) + - Range: 0 .. 32(128 in version 4) characters + \param[in] \wp{rwDeviceElementNumber, iso_u16} + Element number for process data variable addressing (E) + according to the definitions in Process Data Variable + definitions in ISO 11783-7. + \param[in] \wp{rwParentObjectID, iso_u16} + Object id of parent DeviceElementObject or DeviceObject (F) + in order to establish a hierarchical order of + DeviceElements ( 0 - 65535 ) + \retval iso_s16 + - #E_NO_ERR + - #E_OVERFLOW; - Buffer is to small + - #E_NO_INSTANCE - Clientnumber has wrong value + */ + iso_s16 IsoTC_DeviceElement_Set(iso_u8 u8ClNum, + iso_u16 rwDeviceElementObjectID, + DevElemType_e reDeviceElementType, + const iso_char rpcDeviceElementDesignator[], + iso_u16 rwDeviceElementNumber, + iso_u16 rwParentObjectID + ); + + /***********************************************************************************************/ + /*! + \brief Closing Device Element + + This function closes the last opended Device Element + + \param[in] \wp{u8ClNum, iso_u8} + Number of TC Client instance + - Range: 0 - (#TC_NUMB_TCCLIENTS-1) + \retval iso_s16 + - #E_NO_ERR - 0K + - #E_NO_INSTANCE - Clientnumber has wrong value + */ + iso_s16 IsoTC_DeviceElement_End(iso_u8 u8ClNum); + + /**********************************************************************/ + /*! + \brief Add a DPD object to the last Device Element + + \param[in] \wp{u8ClNum, iso_u8} + Number of TC Client instance + - Range: 0 - (#TC_NUMB_TCCLIENTS-1) + \param[in] \wp{wObjectAdd, iso_u16} + Unique object ID (A) + - Range: 0 - 65535 + \retval iso_s16 + - #E_NO_ERR - 0K + - #E_OVERFLOW; - Process data buffer is to small + - #E_NOT_AVAILABLE - DDOP buffer is to small + - #E_NO_INSTANCE - Clientnumber has wrong value + */ + iso_s16 IsoTC_AddDPDObject(iso_u8 u8ClNum, iso_u16 wObjectAdd); + + /****************************************************************************/ + /*! + \brief Add a DPT object to the last Device Element + + \param[in] \wp{u8ClNum, iso_u8} + Number of TC Client instance + - Range: 0 - (#TC_NUMB_TCCLIENTS-1) + \param[in] \wp{wObjectAdd, iso_u16} + Unique object ID (A) + - Range: 0 - 65535 + \retval iso_s16 + - #E_NO_ERR - 0K + - #E_OVERFLOW; - Buffer is to small + - #E_NO_INSTANCE - Clientnumber has wrong value + */ + iso_s16 IsoTC_AddDPTObject(iso_u8 u8ClNum, iso_u16 wObjectAdd); + + /*******************************************************************************/ + /*! + \brief Setting Device Description Object "DeviceProcessData" + + This function initialises a Device Process Data DPD. + + \param[in] \wp{u8ClNum, iso_u8} + Number of TC Client instance + - Range: 0 - (#TC_NUMB_TCCLIENTS - 1) + \param[in] \wp{rwProcessDataObjectID, iso_u16} + Unique object ID (A) + - Range: 0 - 65535 + \param[in] \wp{rwProcessDataDDI, iso_u16} + Identifier of Process Data Variable(DDI) (B) \n + See Definitions in ISO 11783-7 and ISO 11783-11. + \param[in] \wp{rbProcessDataProperty, iso_u8} + Process data Property - a bitset combined of (C): + - Bit 0 = 1 = TC_PROP_DEFAULT_SET + - Bit 1 = 1 = TC_PROP_SETABLE + - Bit 2 = 1 = TC_PROP_CONTROL_SOURCE + \param[in] \wp{rbProcessDataTriggMethods, iso_u8} + Process data trigger methods - a bitset combined of (D): + - Bit 0 = 1 = TC_TRIG_TIMEINTERVAL + - Bit 1 = 1 = TC_TRIG_DISTANCEINTERVAL + - Bit 2 = 1 = TC_TRIG_THRESHOLD_LIMITS + - Bit 3 = 1 = TC_TRIG_ON_CHANGE + - Bit 4 = 1 = TC_TRIG_TOTAL + \param[in] \wpp{rpcProcessDataDesignator, const iso_char[]} + Process data designator (E) \n + - Range: 0 .. 32(128 in version 4) characters + \param[in] \wp{rwDeviceValuePresentObjectID, iso_u16} + Object identifier of DeviceValuePresentationObject. Use + 65535 when no DeviceValuePresentationObject is referenced. + \retval iso_s16 + - #E_NO_ERR + - #E_OVERFLOW; - Buffer is to small + - #E_NO_INSTANCE - Clientnumber has wrong value + \note \par + - IsoTC_AddDPDObject of this process data must be called before. + */ + iso_s16 IsoTC_DeviceProcessData_Set(iso_u8 u8ClNum, + iso_u16 rwProcessDataObjectID, + iso_u16 rwProcessDataDDI, + iso_u8 rbProcessDataProperty, + iso_u8 rbProcessDataTriggMethods, + const iso_char rpcProcessDataDesignator[], + iso_u16 rwDeviceValuePresentObjectID + ); + + /**************************************************************************************/ + /*! + \brief Setting the default trigger of a Device process data + + This function initialises the default trigger methods and values of a DDI. The default + trigger methods works independent of the trigger methods set for a DDI. + + \param[in] \wp{u8ClNum, iso_u8} + Number of TC Client instance + - Range: 0 - (TC_NUMB_TCCLIENTS - 1) + \param[in] \wp{rwProcessDataObjectID, iso_u16} + Unique object ID (A) - IsoTC_DeviceProcessData_Set was called before + - Range: 0 - 65534 + \param[in] \wp{rbPdDeftTriggMethods, iso_u8} + Default trigger methods in case of DDI RequestDefaultProcessData + - Bit 0 = 1 = TC_TRIG_TIMEINTERVAL + - Bit 1 = 1 = TC_TRIG_DISTANCEINTERVAL + - Bit 2 = 1 = TC_TRIG_THRESHOLD_LIMITS + - Bit 3 = 1 = TC_TRIG_ON_CHANGE + \param[in] \wp{rlPdDeftValTimeInt, iso_s32} + Default trigger value for method time interval + - Unit: Milliseconds + - Range: 0 stops measurement, 10 minimum, 0 ... 60000 + \param[in] \wp{rlPdDeftValDistanceInt, iso_s32} + Default trigger value for method distance interval + - Unit: Millimeter + - Range: 0 stops measurement, 0 ... 1000000 + \param[in] \wp{rlPdDeftValThreshMini, iso_s32} + Default trigger value for method threshold minimum + - Unit: Depends on process data + - Range: -2^31+1 ... 2^31-2 + \param[in] \wp{rlPdDeftValThreshMaxi, iso_s32} + Default trigger value for method threshold maximum + - Unit: Depends on process data + - Range: -2^31+2 ... 2^31-1 + \param[in] \wp{rlPdDeftValThreshChan, iso_s32} + Default trigger value for method threshold change + - Unit: Depends on process data, signed long + - Range: 0 stops measurement, 1 logs each change, -2^31+1 ... 2^31-1 + \retval iso_s16 + - #E_NO_ERR + - #E_RANGE - Process data not found + - #E_NO_INSTANCE - Clientnumber has wrong value + + \note \par + - IsoTC_AddDPDObject of this process data must be called before. + - Attention: Function do not check if values are in range! + */ + iso_s16 IsoTC_ProcessDataDefTrigger_Set(iso_u8 u8ClNum, + iso_u16 rwProcessDataObjectID, + iso_u8 rbPdDeftTriggMethods, + iso_s32 rlPdDeftValTimeInt, + iso_s32 rlPdDeftValDistanceInt, + iso_s32 rlPdDeftValThreshMini, + iso_s32 rlPdDeftValThreshMaxi, + iso_s32 rlPdDeftValThreshChan + ); + + /********************************************************************************/ + /*! + \brief Setting Device Description Object "DeviceProperty" + + This function initialises a Device Property DPT + + \param[in] \wp{u8ClNum, iso_u8} + Number of TC Client instance + - Range: 0 - (TC_NUMB_TCCLIENTS - 1) + \param[in] \wp{rwDevicePropertyObjectID, iso_u16} + Unique object ID (A) + - Range: 0 - 65535 + \param[in] \wp{rwDevicePropertyDDI, iso_u16} + Property-DDI (B) + - Range: 0 -65535 + \param[in] \wp{rlDevicePropertyValue, iso_s32} + Property Value (C) + - Full signed long range + \param[in] \wpp{rpcDevicePropertyDesignator, const iso_char[]} + Descriptive text for this device property + - Range: 0 .. 32(128 in version 4) characters + \param[in] \wp{rwDeviceValuePresentObjectID, iso_u16} + Object ID of DeviceValuePresentationObject. Use + 65535 when no DeviceValuePresentationObject is referenced. + \retval iso_s16 + - #E_NO_ERR + - #E_OVERFLOW; - Buffer is to small + - #E_NO_INSTANCE - Clientnumber has wrong value + */ + iso_s16 IsoTC_DeviceProperty_Set(iso_u8 u8ClNum, + iso_u16 rwDevicePropertyObjectID, + iso_u16 rwDevicePropertyDDI, + iso_s32 rlDevicePropertyValue, + const iso_char rpcDevicePropertyDesignator[], + iso_u16 rwDeviceValuePresentObjectID + ); + /*********************************************************************************/ + /*! + \brief Setting Device Description Object "DeviceValuePresentation" + + This function initialises a Device Value Presentation DVP. + + \param[in] \wp{u8ClNum, iso_u8} + Number of TC Client instance + - Range: 0 - (TC_NUMB_TCCLIENTS - 1) + \param[in] \wp{rwDeviceValuePresentObjectID, iso_u16} + Unique object ID (A) + - Range: 0 - 65535 + \param[in] \wp{rlOffset, iso_s32} + Offset to be applied to the value for presentation (B) + - Full signed long range + \param[in] \wp{rfScale, iso_char*} + Scale to be applied to the value for presentation (C) + - Range: 0.000000001 .. 100000000.0 + \param[in] \wp{rbNumberOfDecimals, iso_u8} + Specify number of decimals to display after the decimal point (D) + - Range: 0 .. 7 + \param[in] \wpp{rpcUnitDesignator, const iso_char[] } + Unit designator for this value presentation (E) + - Range: 0 .. 32(128 in version 4) characters + \retval iso_s16 + - #E_NO_ERR + - #E_OVERFLOW; - Buffer is to small + - #E_NO_INSTANCE - Clientnumber has wrong value + */ + iso_s16 IsoTC_DeviceValuePresent_Set(iso_u8 u8ClNum, + iso_u16 rwDeviceValuePresentObjectID, + iso_s32 rlOffset, + iso_f32 rfScale, + iso_u8 rbNumberOfDecimals, + const iso_char rpcUnitDesignator[] + ); + + #ifdef ISO_EXTERNAL_DDOPBUFFER + /*********************************************************************************/ + /*! + \brief Pool RAM buffer set function + \details Use the function to replace the internal with an extern buffer. \n + The external buffer must have the size defined by DEVICEDESCRIPTION_SIZE and set before + creating a device description object pool. \n + Add the define #ISO_EXTERNAL_DDOPBUFFER to IsoConf.h to enable this function. + \param[in] \wp{abTcDDOPRAMBuffer, iso_u8 HUGE_C[] } + Pointer to the external pool RAM buffer array. + \retval iso_s16 + - E_NO_ERR + */ + iso_s16 IsoTcPoolSetBuffer(iso_u8 HUGE_C abTcDDOPRAMBuffer[]); + + #endif + + /** @} */ + /** \name TC Client - Functions for working with a connected TC Client + @{ + */ + /*********************************************************************************/ + /*! + \brief Sending of "change designator message" + + This message sends a change designator message. E. g. this can be necessary + to update the language of the description strings. + + \param[in] \wp{s16CfCl, iso_s16 } + - < TC_NUMB_TCCLIENTS: Client number + - > ISO_GLOBAL_ADDRESS: Handle of client CF + \param[in] \wp{wObjectID, iso_u16 } + DD object ID + - Range: 0 - 65535 + \param[in] \wpp{rpcDesignatorNew, const #iso_char[] } + Designator string + - Range: 0 .. 32(128 in version 4) characters + \retval iso_s16 + - #E_NO_ERR + - #E_OVERFLOW - Transfer is busy - you must wait + - #E_NO_INSTANCE - Instance not found + - #E_USER_ERROR - Sender or receiver not available + \note \par + - For applications with DL and TC client on same CF s16CfCl must be the Client number ! + */ + iso_s16 IsoTC_ChangeDesignator_Send( iso_s16 s16CfCl, iso_u16 wObjectID, const iso_char rpcDesignatorNew[] ); + + /*********************************************************************************/ + /*! + \brief This function releases a DDOP upload ( only DVC and DVP objects ) + + This function is used in case of reloading DDOP objects ( new language! ). After calling this + function the driver requests with callbackfunction IsoEvReloadDDOs for the changed objects. + Calling only for TC/DL >= Version 4 allowed. + + \param[in] \wp{s16CfCl, iso_s16 } + - < TC_NUMB_TCCLIENTS: Client number + - > ISO_GLOBAL_ADDRESS: Handle of Client CF + \param[in] \wp{e_SVType, ISO_CLTYPE_e } + IsoClType_DontCare if s16CfCl is the Client number + \retval iso_s16 + - #E_NO_ERR + - #E_BUSY - Pool service is not free at the moment + - #E_NO_INSTANCE - Instance not found + - #E_USER_ERROR - User unknown + \note \par + - For applications with DL and TC client on same CF s16CfCl must be the Client number ! + */ + iso_s16 IsoTC_ReloadDDObjects(iso_s16 s16CfCl, ISO_CLTYPE_e e_SVType); + + /******************************************************************************/ + /*! + \brief This function sets the distance for triggermethod "distance interval" + + If a process data of a TC client uses the triggermethod "distance interval" then the application + must set the distance ( ground or wheel or NMEA ) with this function. + + \param[in] \wp{u32Distance, iso_u32 } + Distance value of ground, wheel based speed or GPS + - Range: + - 0 - #ISO_VALID_SIGNAL_DW + - #ISO_NOT_AVAILABLE_DM ( default ) if distance is not available + - #ISO_ERROR_INDI_DWM if speed PGNs are missing or value is invalid + \retval iso_s16 + - #E_NO_ERR - OK + \note \par + This function should called every time a speed message ( 100ms ) is received + */ + iso_s16 IsoTC_SetDistance(iso_u32 u32Distance); + + /*******************************************************************************/ + /*! + \brief This function sets and sends a DPD value manually to the TC + + A DPD value is sent manually to the TC only the thresholds are taken into consideration. + The function also works if task is not active. + + \param[in] \wp{s16CF, iso_s16} + - < TC_NUMB_TCCLIENTS: Client number + - > ISO_GLOBAL_ADDRESS: Handle of client CF + \param[in] \wp{wElementNumb, iso_u16} + Element number of DPD ( process data ) + - Range: 0 - 65534 + \param[in] \wp{wDDI, iso_u16} + DDI of DPD + \param[in] \wp{lPdValue, iso_s32} + New Value of this DPD (full range) + \retval iso_s16 + - #E_NO_ERR - OK + - #E_NO_INSTANCE - TC client not found + - #E_NOT_AVAILABLE - DPD not found + - #E_RANGE - New value outside of thresholds + - #E_OVERFLOW - CAN buffer full + - #E_COM - CAN bus-off + \note \par + - For applications with DL and TC client on same CF s16CfCl must be the Client number ! + */ + iso_s16 IsoTC_SetDPDValue(iso_s16 s16CF, iso_u16 wElementNumb, iso_u16 wDDI, iso_s32 lPdValue); + /** @} */ + /* **************** End of functions and definitions which are only for LAYER 10 .. ******** */ + + /* ************************************************************************ */ + /** @} */ /* END taskc */ + /* ************************************************************************ */ + + /* ************************************************************************ */ + #ifdef __cplusplus + } /* end of extern "C" */ + #endif + + #endif /* DEF_IsoTccApi_H */ + /* ************************************************************************ */ ++>>>>>>> rauch/jobrechner-import-20190607 diff --cc ptxdist/local_src/ecu-jobctl/extern/isobus/IsoVtcApi.h index 68a4150,d6e4707..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-jobctl/extern/isobus/IsoVtcApi.h +++ b/ptxdist/local_src/ecu-jobctl/extern/isobus/IsoVtcApi.h @@@ -1,2785 -1,4258 +1,7046 @@@ ++<<<<<<< HEAD +/* ************************************************************************ */ +/*! + \file + \brief ECU Driver VT Client Api Header File + \author Wegscheider Peter + \date Created XX.07.13 + + \copyright Copyright (c) WBZ-Engineering GmbH + + \par History: + \par + 04.07.2013 - author P. Wegscheider + - API declarations moved to this file + - Module version define added + \par + 25.11.2013 - author P. Wegscheider + - "Direct Pool Transfer" implementation + - Function IsoPoolInitDirectTransfer() added + \par + 09.12.2013 - author P. Wegscheider + - Functions IsoAuxPrefAssignmentCbSet() and IsoAuxPrefAssignmentTrigger() added + - Function IsoAuxAssignmentSet() disabled per default. + - VT_AUXAPP_T extended with baAuxName[8] (ISO name of the auxiliary input device) + - Define ISO_AUXFUNC_SINGLEASSIGN_CHECK added to enable the aux function single assignment check + \par + 15.05.2013 - author P. Wegscheider + - VERSION_VTC updated to 3.2 + - define ISO_EXTERNAL_POOLBUFFER and function IsoPoolSetBuffer() added + - Functions IsoPoolObjSize() and IsoPoolObjCopyToRAM() added + - Function IsoPoolObjectCbSet(), IsoPoObjAttributGet() and IsoPoolObjPtrGet() for AID reading added + - define ISOVT_AID_DEFINES check and AID_xxx defines added + \par + 22.07.2014 - author P. Wegscheider + - VERSION_VTC updated to 3.3 + - IsoPoolObjPtrGet() implementation changed to avoid compiler pointer cast error + +*/ +/* ************************************************************************ */ +#ifndef DEF_IsoVtcApi_H + #define DEF_IsoVtcApi_H + +#ifdef __cplusplus +extern "C" { +#endif +/* ************************************************************************ */ + +/* ************************************************************************ */ +/*! \ingroup grp_versions + \brief Virtual Terminal Client Module Version +*/ +#define VERSION_VTC 3.3 + + + +/* ************************************************************************ */ +/* ******* Following functions and definitions only for LAYER 6 .. ******** */ +/* ************************************************************************ */ + +/* ********************************* IsoVt.c ***************************** */ +/** \defgroup vtcl VT-Client + \ingroup clients + \brief Part 6 - Virtual Terminal Client +*/ +/* ************************************************************************ */ +/** \addtogroup vtcl +@{ +*/ +/* ************************************************************************ */ + + +/** \brief +Relationship between VT and WS +*/ +/* enum aux */ + typedef enum + { + Ws_Aux, /**< Working set uses VT for auxiliary assignment */ + Ws_MaskAux, /**< Working set has functions and partner is VT with function instance 0 */ + Ws_VtWaiter, /**< Working set is waiting for VT status msg */ + Ws_Mask, /**< Working set has functions but VT has not function instance 0 */ + Ws_Mask2Inst, /**< Working set which has created an AUX instance */ + Ws_MaskNoFunc, /**< Working set has no auxiliary functions */ + Ws_Last + } WSCOUP_STA_e; + +/** \brief Typedef of VT response message / command buffer entry + \details This sturcture is internaly used in the command buffer to store Iso commands \n + and as parameter in the callback function for VT responses to command messages and VT activation messages ( see IsoVTInit() ). + + Valid callback message fields depending on the iVtFunction value: + +\verbatim + iVtFunction: + get attribute wObjectID Object ID + bPara AID + wPara1 Current value of attribute + iErrorCode ErrorCode (see F.59) + softkey activation: wObjectID key object ID + wPara1 parent object ID + bPara key number (hard coded) + lValue activation code (0, 1, 2) + button activation: wObjectID button object ID + wPara1 parent object ID + bPara button key number + lValue activation code + pointing event: wPara1 X position in pixel + wPara2 Y position in pixel + VT select input object: wObjectID input object ID + wPara1 Selected/Deselected + iErrorCode error code see ISO Doku. + VT esc wObjectID ID of input field where aborted + iErrorCode error code see ISO Doku. + VT change numeric value wObjectID ID of input object + lValue new value + VT change active mask wObjectID momentan active mask + iErrorCode error code see ISO Doku. + VT change soft key mask wObjectID data or alarm mask object ID + wPara1 soft key mask object ID + iErrorCode error code see ISO Doku + VT change string value wObjectID ID of String object + bPara Length of string + pabVtData Pointer to characters + Auxiliary_assign type 1, 2 wObjectID Object ID auxiliary function + wPara1 Object ID auxiliary input (or input number type 1) + 0xFFFF for unassign + wPara2 Type of auxiliary incl. Attribut bits. + For getting the Aux function type "eAuxType" have to be masked with 0x1Fu. + bPara TRUE: Store as pref. assign, else not (only type 2) + lValue Bit 16 - 27: Manufacturer code, + Bit 0 - 15 Model Identification code of auxiliary input + (only type 2) + Auxiliary input type 1,2 wObjectID Object ID Auxiliary function type + wPara1 Input object ID (type 1 = input number + lValue Value 1 + wPara2 Value 2 + iErrorCode E_NO_ERR, E_CANMSG_MISSED (Alive of input) +\endverbatim + + */ + typedef struct + { + sint iVtFunction; /**< Last function of VT response (#ISOVT_FUNC_e) */ + word wObjectID; /**< Depends of function/command */ + slong lValue; /**< Value of VT change numeric value */ + word wPara1; /**< Word storage 1 */ + word wPara2; /**< Word storage 2 */ + byte bPara; /**< Byte storage i. e. soft key number */ + sint iErrorCode; /**< Error byte of response messages */ + slong lTimeSt; /**< Time stamp */ + byte* pabVtData; /**< Data of VT e. g. string characters */ + } ISOVT_MSG_STA_T, *ISOVT_MSG_STA_t ; + + /** \brief + State machine of Login of VT (dont change the numbers -> Documentation) + */ + typedef enum + { + safe_state = 0, /**< Application is not active */ + announce_stopped = 1, /**< No more trials for communication with VT */ + announce_aborted = 2, /**< Announcement will be repeated */ + moveToAnotherVT = 10, /**< Changing the VT is triggered of application */ + moveVT_deleteVersion = 11, /**< Pool in VT RAM has been deleted */ + moveVT_Delete_responded = 12, /**< Delete command is responded */ + vt_lost = 13, /**< VT is lost ( move to another VT or missing VT status */ + vt_status_received = 20, /**< VT Status message received */ + waiting_after_vt_status_rec = 21, /**< Waiting after receiption of vt status message */ + working_set_master_sended = 22, /**< Pool in VT RAM is deleted */ + request_get_memory_for_aux = 23, /**< Early get memory request */ + working_set_known = 24, /**< Working set master, -member */ + language_command = 26, /**< Check Language command, request if necessary */ + language_command_waiting = 27, /**< Language command waiting */ + request_get_softkeys = 30, /**< Request get softkeys */ + request_get_textfont = 31, /**< Request get textfont */ + request_get_hardware = 32, /**< Request get hardware */ + request_get_bgcolouruldm = 34, /**< Background colour of user-layout data mask */ + request_get_supported_object = 35, /**< Request get supported object */ + request_get_versions = 36, /**< Request get versions */ + check_sequenz_control = 40, /**< Reading SCM capabilities */ + waiting_after_GetVersions = 41, /**< Stop -> pool manipulation -> IsoVtContinue()! */ + waiting_for_SetPrefassign = 42, /**< Waiting for setting preferred assignment */ + appStartandVersionString = 43, /**< Check version strings and decide */ + pool_scan_running = 44, /**< Pool scan is running */ + pool_scan_finished = 45, /**< Pool scan is ready */ + request_load_version = 50, /**< Request load version */ + pool_service_running = 51, /**< Pool transfer is running */ + request_store_version = 52, /**< Request store version */ + check_store_version = 53, /**< Store version */ + reload_poolobjects = 54, /**< Reloading poolobjects */ + pref_assignment_send = 60, /**< Sending Preferred assignment */ + preferred_assignment_resp_wait = 61, /**< Waiting for response */ + announce_finished = 63, /**< Last step of login */ + application_running = 70 /**< Normal operation of application (commands ...) */ + } ISOVT_ANNOUNCE_e; + + /** \brief + Enum of all VT object types + */ + typedef enum + { + /* Top level objects */ + WorkingSet = 0, /**< Top level object describes an implement (working set). */ + /* Working set object */ + DataMask = 1, /**< Top level object that contains other objects. */ + AlarmMask = 2, /**< Top level object: Describes an alarm display. */ + Container = 3, /**< Used to group objects. */ + /* Key objects */ + SoftKeyMask = 4, /**< Top level object that contains key objects. */ + Key = 5, /**< Used to describe a soft key. */ + Button = 6, /**< Used to describe a button control. */ + /* Input field objects */ + InputBooleanField = 7, /**< Used to input a TRUE/FALSE type input. */ + InputStringField = 8, /**< Used to input a character string. */ + InputNumberField = 9, /**< Used to input an integer or float numeric. */ + InputListField = 10, /**< Used to select an item from a pre-defined list. */ + /* Output field objects */ + OutputStringField = 11, /**< Used to output a character string. */ + OutputNumberField = 12, /**< Used to output an integer or float numeric. */ + /* Output shape objects */ + TypLine = 13, /**< Used to output a line. */ + TypRectangle = 14, /**< Used to output a rectangle or square. */ + TypEllipse = 15, /**< Used to output an ellipse or circle. */ + TypPolygon = 16, /**< Used to output a polygon. */ + /* Output graphic objects */ + Meter = 17, /**< Used to output a meter. */ + LinearBarGraph = 18, /**< Used to output a linear bar graph. */ + ArchedBarGraph = 19, /**< Used to output an arched bar graph. */ + /* Picture graphic object */ + PictureGraphic = 20, /**< Used to output a picture graphic (bitmap). */ + /* Variable objects */ + NumberVariable = 21, /**< Used to store a 32-bit unsigned integer value. */ + StringVariable = 22, /**< Used to store a fixed length string value. */ + /* Attribute object */ + FontAttributesObject = 23, /**< Used to group font based attributes. */ + LineAttributesObject = 24, /**< Used to group line based attributes. */ + FillAttributesObject = 25, /**< Used to group fill based attributes. */ + InputAttributesObject = 26, /**< Used to specify a list of valid characters. */ + /* Pointer object */ + ObjectPointer = 27, /**< Used to reference another object. */ + /* Macro object */ + Macro = 28, /**< Special object that contains a list of commands. */ + /* Auxiliary control */ + AuxiliaryFunction = 29, /**< Defines the designator and function type. */ + AuxiliaryInput = 30, /**< Defines the designator, key number, and function type. */ + AuxiliaryFunction2 = 31, /**< Defines the designator and function type 2. */ + AuxiliaryInput2 = 32, /**< Defines the designator, key number, and function type 2. */ + AuxiliaryConDesigObjPoi = 33, /**< Defines the auxiliary control designator object pointer. */ + /* Version 4 objects - objects of user layout data masks */ + WindowMaskObject = 34, /**< Special (parent) object for user layout DM */ + KeyGroupObject = 35, /**< Parent object of user layout SKM */ + ColourMapObject = 39, /**< Changing the colour table */ + ObjectLabelReferList = 40, /**< For assigning (textual/graphical) label to objects */ + ObjectExternalObjDef = 41, /**< Lists objects which another WS can reference */ + ExternalRefName = 42, /**< Identifies a WSM of a WS which can be referenced */ + ExternalObjectPointer = 43, /**< Allows a WS to display objects from another WS */ + ObjectUndef = 255 + } OBJTYP_e; + + /** \brief + enum VT functions + */ + typedef enum + { + /* annex H: activation messages */ + softkey_activation = 0, + button_activation = 1, + pointing_event = 2, + VT_select_input_object = 3, + VT_esc = 4, + VT_change_numeric_value = 5, + VT_change_active_mask = 6, + VT_change_softkey_mask = 7, + VT_change_string_value = 8, + VT_onUserLayout_hideShow = 9, + + /* annex C: object transport protocol */ + objectpool_transfer_msg = 17, + end_of_pool_transfer = 18, + + /* annex K: auxiliary control */ + auxiliary_assign_type_1 = 32, + aux_input_status_type_1 = 33, + preferred_assignment = 34, + aux_input_maintenance = 35, + auxiliary_assign_type_2 = 36, + aux_input_status_enable = 37, + auxiliary_input_status_type_2 = 38, + + + /* annex F: command and macro messages */ + esc = 146, + hide_show_object = 160, + enable_disable_object = 161, + select_input_object = 162, + control_audio_device = 163, + set_audio_volume = 164, + change_child_location = 165, + change_size = 166, + change_background_colour = 167, + change_numeric_value = 168, + change_end_point = 169, + change_font_attributes = 170, + change_line_attributes = 171, + change_fill_attributes = 172, + change_activ_mask = 173, + change_softkey_mask = 174, + change_attribute = 175, + change_priority = 176, + change_list_item = 177, + delete_object_pool = 178, + change_string_value = 179, + change_child_position = 180, + get_attribute_value = 185, + select_colour_map = 186, + + /* annex D: technical data messages */ + get_memory = 192, + get_supported_widechar = 193, + get_number_softkey = 194, + get_textfonddata = 195, + get_WM_data = 196, + get_supported_objects = 197, + get_hardware = 199, + store_version = 208, + load_version = 209, + delete_version = 210, + get_version = 223, + get_version_response = 224, + + /* annex G: status messages */ + VT_status_message = 254, + working_set_maintenance_msg = 255 + } ISOVT_FUNC_e; + + /** \brief + enum of information request of VT client or command to VT client + */ + typedef enum + { + NAMEFCT_OF_VTUSER, /**< Function of ECU which uses VT*/ + VT_SOURCE_ADDRESS, /**< SA of VT */ + CF_SOURCE_ADDRESS, /**< SA of VT client */ + WS_COUPLE_STATE, /**< Relationship to VT */ + SA_OF_VTOWNER_MASTER, /**< SA of intern ECU which has VT communication */ + ID_VISIBLE_DATA_MASK, /**< Data mask open on VT*/ + ID_VISIBLE_SOFTKEY_MASK, /**< Soft key mask open on VT */ + VT_BUSY_CODE, /**< Busy code of VT Status message */ + AUXUNITS_TYPE1_ONBUS, /**< TRUE means that at least one auxiliary unit type 1 is on bus */ + AUXUNITS_TYPE2_ONBUS, /**< TRUE means that at least one auxiliary unit type 2 is on bus */ + VT_ALIVE, /**< VT lost for more than three seconds */ + VT_TEST_ALIVE_SIGNAL, /**< VT Status message every second */ + VT_DOWNLOAD_FINISHED, /**< That means complete announcing finished */ + VT_POOL_ACTIVE_onVT, /**< Pool active (selected) on VT */ + VT_STATEOFANNOUNCING, /**< State of announcing - see ISOVT_ANNOUNCE_e */ + WS_VERSION_NR, /**< Version number of this working set */ + VT_NUMBOFVERSIONSTRINGS, /**< Reads the number of version strings sent of VT */ + + /* Static properties of actual VT of this working set */ + VT_SOFTKEYXDOT, /**< Softkey designator - pixel X */ + VT_SOFTKEYYDOT, /**< Softkey designator - pixel Y */ + VT_VIRTUALSOFTKEYS, /**< Number of virtual soft keys of VT */ + VT_PHYSICALSOFTKEYS, /**< Number of physical soft keys of VT */ + VT_SMALLFONTSIZES, /**< VT TextFontData - small fonts */ + VT_LARGEFONTSIZES, /**< VT TextFontData - large fonts */ + VT_TYPEATTRIBUTES, /**< VT TextFontData - text attributes */ + VT_BOOTTIME, /**< Boot time of VT - time till first VT-Status-Msg */ + VT_GRAPHICTYPE, /**< VT hardware - grafik type */ + VT_VTHARDWARE, /**< VT hardware - audio */ + VT_DATAMASKRESOLUTION, /**< Data mask resolution */ + VT_VERSIONNR, /**< Version of working set VT */ + VT_BGCOLOURULDM, /**< Background colour of VTs User-Layout Data Mask */ + VT_BGCOLOURKEYCELL, /**< Background colour of VTs Key Cells */ + + /* Command */ + VT_LOGOUT /**< Command that resets a VT client - only for IsoVTDataSet() */ + } ISOVT_STATUS_e; + +/* Application functions */ +/** \name VT Client Management Functions + +Use this functions to create and connect a VT client + +@{ +*/ +/***************************************************************************/ +/*! + \brief Initialisation of a VT client instance + + \param[in] \wp{rpbWorkSetMasterName, byte*} + Pointer to working set master NAME (ISO11783 - 5) \n + NAME of network member, which uses the VT client + \param[in] \wpp{rpfVTStatus, void(*)(cbool\, word)} + Pointer to callback function which is called in case of opening a new data, alarm + or window mask, or of + - Parameter rqInfo is set to TRUE, if the working set is active. + - Parameter rwPage contains the object ID of the open mask, or NULL object ID if rqInfo is FALSE. + \param[in] \wpp{rpfVtMsgRec, void(*)(#ISOVT_MSG_STA_T * pIsoMsgSta)} + Pointer to callback function which is called in case of activation messages + and command responses to the user application. + See #ISOVT_MSG_STA_T for more informations. + \param[in] \wp{rabNameVTPreferred, byte*} + Pointer to NAME of preferred VT + \retval sint + - E_NO_ERR + - E_NO_INSTANCE - There is no instance free + \note \par + - Preferred VT: During Login the driver waits a waittime for this VT. + This can be useful in order to choice the last plugged VT. The actual + VT must be stored in NVM and during login initialised with this function. +*/ +sint IsoVTInit ( const byte * rpbWorkSetMasterName, + void (*rpfVTStatus)(cbool rqInfo, word rwPage), + void (*rpfVtMsgRec)(ISOVT_MSG_STA_T * pIsoMsgSta), + const byte * rabNameVTPreferred ); + +/****************************************************************************/ +/*! + \brief Reading informations of a VT client + + This function enables to read informations of a VT client and VT out of the driver. + This informations are useful for controlling the pool on VT e. g. with + VT_PHYSICALSOFTKEYS it is possible depending on number of phyical softkeys of + the VT to choice between different soft key masks. + + \param[in] \wp{eVTInfo, ISOVT_STATUS_e} + Enum of wished information of VT \n + Most of them are of the technical data messages + + \retval word Requested value depending of ISOVT_STATUS_e + - VT_SOURCE_ADDRESS: actual SA of VT or ISO_NULL_ADDRESS + - CF_SOURCE_ADDRESS: actaul SA of WS or ISO_NULL_ADDRESS + - WS_COUPLE_STATE: actual value of WSCOUP_STA_e + - ID_VISIBLE_.. : actual object in VT status message + - VT_BUSY_CODE: see VT status message + - AUXUNITS_TYPE1_ONBUS: TRUE -> Auxiliary unit type 1 is on bus + - VT_ALIVE: VT alive check (3s), 1 = alive + - VT_TEST_ALIVE_SIGNAL: VT alive check (1s - Vt status message) + - VT_DOWNLOAD_FINISHED: announce state > announce_finished? 1 + - VT_POOL_ACTIVE_onVT: 1: Own pool selected on VT + - VT_STATEOFANNOUNCING: see enum ISOVT_ANNOUNCE_e + - WS_VERSION_NR: Supported version of own pool see ISO_VTVERSION + - VT_NUMBOFVERSIONSTRINGS: Number of version strings stored in VT + - VT_VERSIONNR: Supported version of VT see Part 6 - D.3 + - VT_SOFTKEYXDOT ... VT_DATAMASKRESOLUTION: \n + Technical data messages of actual VT see Part 6 Annex D + - VT_BGCOLOURULDM, VT_BGCOLOURKEYCELL: colours see A.3 + \note \par + - VT_BOOTTIME: If the VT supports Boottime (>=IL4) this time (in sec) can be red, + then stored in NVM and set with IsoVTDataSet(). + - Attention: Correct WS instance must be set ( Calling IsoWsSetMaskInst() !) +*/ +word IsoGetVTStatusInfo ( ISOVT_STATUS_e eVTInfo ); + +#ifdef VERSION4 +/**********************************************************************************/ +/*! + \brief Check if object type is supported of VT + + Precondition for this function: VT must be version 4 or higher. + Then VT sends a sorted list during login with all supported objects. It can used + for controlling the command messages + \param[in] \wp{eTypeNumber, OBJTYP_e} + Object type (Byte 3 of every object) \n + Range: 0 - 36, 40 see ISO11783 - 6 - A.1.1 or OBJTYP_e + \retval cbool TRUE if VT supports this object + \note \par + - If there is no list received this function returns always FALSE. + - Attention: Correct WS instance must be set ( Calling IsoWsSetMaskInst() !) +*/ + cbool IsoCheckObjTypeSupported( OBJTYP_e eTypeNumber ); +#endif + +/****************************************************************************/ +/*! + \brief Setting informations of a VT client + + This function enables the change of some Working Set settings or the controll + of the state machine. For settings it should called after IsoVTInit(). + Furthermore it can be completely resetted a VT client with VT_LOGOUT. + \param[in] \wp{eVTInfo, ISOVT_STATUS_e} + VT_BOOTTIME - Boottime of preferredVT in seconds \n + VT_STATEOFANNOUNCING - Forced setting of Login state machine (test purposes) + see ISOVT_ANNOUNCE_e \n + WS_VERSION_NR - Version number of working set ( -> Used object in pool )\n + VT_LOGOUT - Shut down a VT client ( complete reset ) + \param[in] \wp{wDatNew, word} + New Value \n + VT_LOGOUT - the source address of the VT client which shall be logged out + \retval sint + - E_NO_ERR + \note \par + - Attention: Correct WS instance must be set ( Calling IsoWsSetMaskInst() or IsoVTInit()! ) +*/ + sint IsoVTDataSet( ISOVT_STATUS_e eVTInfo, word wDatNew ); + +/*****************************************************************************/ +/*! + \brief Continue VT Login state machine + + There are some cases where VT Login stops for application interaction. This function continues + the VT state machine. + + \retval sint + - E_NO_ERR + - E_ERROR_INDI - actual state dont supported of this function + \note \par + - Attention: Correct WS instance must be set ( Calling IsoWsSetMaskInst() !) + - Supported states: + - moveToAnotherVT (see fun. IsoVTMultipleNextVT() ) + - waiting_after_vt_status_rec (only for auxiliary input units) + - waiting_after_GetVersions + - waiting_for_SetPrefassign +*/ + sint IsoVtContinue( void ); + +/**************************************************************************/ +/*! + \brief Application can read the Version strings received from VT with GetVersion + + \param[in] \wp{acVersionStrings, schar[][8]} + Pointer to 2d-array - driver writes the version strings in this array \n + Version string length is 7 charakters + \retval sint Number of version strings received with GetVersion + \note \par + - Attention: Correct WS instance must be set ( Calling IsoWsSetMaskInst() !) +*/ + sint IsoVTVersionStringGet ( schar acVersionStrings [][8] ); + +/*****************************************************************************/ +/*! + \brief Calling this function releases the procedure to move to another VT + + The application have to select an available VT and releases with this function the VT change. + + \param[in] \wpp{rpabVtName, const #byte[]} + Pointer to NAME of "Next VT" see ISO11783 - 5 + + \retval sint + - E_NO_ERR - OK + - E_ERROR_INDI - Changing only possible in case of full log-on + - E_USER_ERROR - User "rpabVtName" not found or no VT + \note \par + - Attention: Correct WS instance must be set ( Calling IsoWsSetMaskInst() !) + - Using see exampel in VT application +*/ + sint IsoVTMultipleNextVT( const byte rpabVtName[] ); + +/**********************************************************************/ +/*! + \brief Calculate free elements of Command FIFO + + This function determines the number of free elements of the command FIFO. + It has been implemented for LIB Implementation (initiated of Grimme) + + \retval ushort Number of free elements of command FIFO \n + Range: 0 - VTMSG_BUFSIZE + \note \par + - Attention: Correct WS instance must be set ( Calling IsoWsSetMaskInst() !) +*/ + ushort IsoGetCMDFifoFree( void ); + +/**************************************************************************/ +/*! + \brief This function sets the working set instance for the masks. + + If the working set communicates with two terminals (mask and auxiliary) then for all + functions (commands, fun. of this modul) for VT have to ensure that they are used for + the correct instance. This function "switches" to the mask instance. + + \param[in] \wp{wSAVtUser, word} + Source address of a (intern) working set master \n + Range: 0 - 253 + \retval sint + - E_NO_ERR + - E_NO_INSTANCE - this user is no working set master + \note \par + - Calling this functions is not necessary in callbackfunctions + - All concerned function have the note: Attention: Correct .... +*/ + sint IsoWsSetMaskInst( word wSAVtUser ); + +/*****************************************************************************/ +/*! + \brief This function sets the working set instance for the masks with the WS NAME. + + If the working set communicates with two terminals (mask and auxiliary) then for all + functions (commands, fun. of this modul) for VT have to ensure that they are used for + the correct instance. This function "switches" to the mask instance. + + \param[in] \wpp{abWsName, const #byte*} + Name of (intern) working set master + \retval sint + - E_NO_ERR + - E_NO_INSTANCE - this user is no working set master + \note \par + - Calling this functions is not necessary in callbackfunctions + - All concerned function have the note: Attention: Correct .... + - Should be used when clients run in a own thread ( avoids using SA ) +*/ +sint IsoWsSetMaskInstWithName( const byte* abWsName ); + +/****************************************************************************/ +/*! + \brief This function sets the working set instance for auxiliary support + + If the working set communicates with two terminals (mask and auxiliary) then for all + functions (commands, fun. of this modul) for VT have to ensure that they are used for + the correct instance. This function "switches" to the auxiliary instance. + + \param[in] \wp{wSAVtUser, word} + Source address of a (intern) working set master \n + Range: 0 - 253 + \retval sint + - E_NO_ERR + - E_NO_INSTANCE - this user is no working set master + \note \par + - Calling this functions is not necessary in callbackfunctions + - All concerned function have the note: Attention: Correct .... +*/ +sint IsoWsSetAuxInst( word wSAVtUser ); + +/**************************************************************************/ +/*! + \brief This function sets the working set instance which supports SC. + + This function searches and activates the WS instance which supports the + sequence control ( -> VT with function instance 0 with or without auxiliary + functions ) + + \param[in] \wp{wSAVtUser, word} + Source address of a (intern) working set master \n + Range: 0 - 253 + \retval sint + - E_NO_ERR + - E_NO_INSTANCE - this user is no working set master + \note \par + - Calling this functions is not necessary in callbackfunctions +*/ +sint IsoWsSetSccInst( word wSAVtUser ); + +/** @} */ +/* ************************************************************************ */ +/** \name VT Client Annex E: Non volatile memory operations commands + @{ +*/ +/***************************************************************************************/ +/*! + \brief Command for deleting object pool of VT ROM + + This function releases a command to the VT. The pool selected with the version + string is deleted of Flash. + + \param[in] \wp{abVersionString, byte[] } + Pointer to version String which shall be deleted \n + Range: 7 Characters + \retval sint + - #E_NO_ERR - OK + - #E_OVERFLOW - buffer overflow + - #E_USER_ERROR - Network member not logged + \note \par + - Every function call causes the sending of this command on the bus. + Danger of buffer overflow and high bus load ! + - If its impossible to send this command then its stored in command buffer. + - Attention: Correct WS instance must be set ( Calling IsoWsSetMaskInst() !) + - This command should be sent after full login of VT client +*/ +sint IsoDeleteVersion( byte abVersionString[] ); + +/****************************************************************************/ +/*! + \brief Store object pool with version label from VT RAM to VT ROM + + This function stores the actual pool in VT RAM into the Flash (ROM) of the VT. + + \param[in] \wp{abVersionString, byte[] } + Pointer to version String which shall be deleted \n + Range: 7 Characters + \retval sint + - #E_NO_ERR - OK + - #E_OVERFLOW - buffer overflow + - #E_USER_ERROR - Network member not logged + \note \par + - Every function call causes the sending of this command on the bus. + Danger of buffer overflow and high bus load ! + - If its impossible to send this command then its stored in command buffer. + - Attention: Correct WS instance must be set ( Calling IsoWsSetMaskInst() !) + - This command should be sent after full login of VT client +*/ +sint IsoStoreVersion( byte abVersionString[] ); + +/** @} */ +/* ************************************************************************ */ +/** \name VT Client Annex F: Command and macro messages + @{ +*/ +/*****************************************************************************/ +/*! + \brief Command Hide/Show Object (Container) ( Part 6 - F.2 ) + + The Hide/Show Object command is used to hide or show a container object. + + \param[in] \wp{wId, word } + Object ID of Container + \param[in] \wp{bVisible, cbool} + 0 = Hide, 1 = Show + \retval sint + - #E_NO_ERR - OK + - #E_OVERFLOW - buffer overflow + - #E_USER_ERROR - Network member not logged + \note \par + - Every function call causes the sending of this command on the bus. + Danger of buffer overflow and high bus load ! + - If its impossible to send this command then its stored in command buffer. + - Attention: Correct WS instance must be set ( Calling IsoWsSetMaskInst() !) +*/ +sint IsoCmd_ShowHide( word wId, cbool bVisible ); + +/*********************************************************************************/ +/*! + \brief Command enable/disable (input) object - ( Part 6 - F.4 ) + + This command is used to enable or disable an input field object and pertains + to the accessibility of an input object. + + \param[in] \wp{wId, word} + Object ID of input object + \param[in] \wp{bAbility, cbool} + 0 == disable, 1 == enable + \retval sint + - #E_NO_ERR - OK + - #E_OVERFLOW - buffer overflow + - #E_USER_ERROR - Network member not logged + \note \par + - Every function call causes the sending of this command on the bus. + Danger of buffer overflow and high bus load ! + - If its impossible to send this command then its stored in command buffer. + - Attention: Correct WS instance must be set ( Calling IsoWsSetMaskInst() !) +*/ +sint IsoCmd_DisEnable( word wId, cbool bAbility ); + +/*********************************************************************************/ +/*! + \brief Command Select input object ( Part 6 - F.6 ) + + This command is used to force the selection of an input field object. + + \param[in] \wp{wId, word} + Object ID of input object + \retval sint + - #E_NO_ERR - OK + - #E_OVERFLOW - buffer overflow + - #E_USER_ERROR - Network member not logged + \note \par + - Every function call causes the sending of this command on the bus. + Danger of buffer overflow and high bus load ! + - If its impossible to send this command then its stored in command buffer. + - Attention: Correct WS instance must be set ( Calling IsoWsSetMaskInst() !) +*/ +sint IsoCmd_InputSelect ( word wId ); + +/***************************************************************************/ +/*! + \brief Esc Command + + This command is used to abort operator input ( Part 6 - F.8 ). + + \retval sint + - #E_NO_ERR - OK + - #E_OVERFLOW - buffer overflow + - #E_USER_ERROR - Network member not logged + \note \par + - Every function call causes the sending of this command on the bus. + Danger of buffer overflow and high bus load ! + - If its impossible to send this command then its stored in command buffer. + - Attention: Correct WS instance must be set ( Calling IsoWsSetMaskInst() !) +*/ +sint IsoCmd_Esc ( void ); + +/****************************************************************************/ +/*! + \brief Command Control audio device ( Part 6 - F.10 ). + + This command can be used to control the audio on the VT. + + \param[in] \wp{bNumOfRepit, byte} + Number of repetitions + Range: 1 - 255 + \param[in] \wp{wFrequency, word} + Frequency + \param[in] \wp{wOnTimeMs, word} + On time duration in ms + \param[in] \wp{wOffTimeMs, word} + Off time duration in ms + \retval sint + - #E_NO_ERR - OK + - #E_OVERFLOW - buffer overflow + - #E_USER_ERROR - Network member not logged + \note \par + - Every function call causes the sending of this command on the bus. + Danger of buffer overflow and high bus load ! + - If its impossible to send this command then its stored in command buffer. + - Attention: Correct WS instance must be set ( Calling IsoWsSetMaskInst() !) +*/ +sint IsoCmd_ControlAudio ( byte bNumOfRepit, + word wFrequency, word wOnTimeMs, word wOffTimeMs ); + +/***********************************************************************************/ +/*! + \brief Command SetAudioVolume + + This command can be used to control the audio on the VT (volume) ( Part 6 - F.12 ) + + \param[in] \wp{bVolume, byte} + Volume 0 - 100 (%) + \retval sint + - #E_NO_ERR - OK + - #E_OVERFLOW - Buffer overflow + - #E_NOT_AVAILABLE - VT has got no adjustable volume output + - #E_USER_ERROR - Network member not logged + \note \par + - Every function call causes the sending of this command on the bus. + Danger of buffer overflow and high bus load ! + - If its impossible to send this command then its stored in command buffer. + - Attention: Correct WS instance must be set ( Calling IsoWsSetMaskInst() !) +*/ +sint IsoCmd_SetAudioVolume ( byte bVolume ); + +/*********************************************************************************/ +/*! + \brief Command change child location ( Part 6 - F.14 ) + + The Change Child Location command is used to change the relative position of an object. + + \param[in] \wp{wId, word} + Object ID + \param[in] \wp{wIDParent, word} + Parent object ID + \param[in] \wp{bXchange, byte} + Relative change in x position (interpreted as signed!) + \param[in] \wp{bYchange, byte} + Relative change in y position (interpreted as signed!) + \retval sint + - #E_NO_ERR - OK + - #E_OVERFLOW - buffer overflow + - #E_USER_ERROR - Network member not logged + \note \par + - Every function call causes the sending of this command on the bus. + Danger of buffer overflow and high bus load ! + - If its impossible to send this command then its stored in command buffer. + - Attention: Correct WS instance must be set ( Calling IsoWsSetMaskInst() !) +*/ +sint IsoCmd_ChildLocation ( word wId, word wIDParent, + byte bXchange, byte bYchange + ); + +/****************************************************************************************/ +/*! + \brief Command change child position ( Part 6 - F.16 ) + + The Change Child Location command is used to change the absolute position of an object. + + \param[in] \wp{wId, word} + Object ID + \param[in] \wp{wIDParent, word} + Parent object ID + \param[in] \wp{Xchange_s16, sshort} + New X position relative to the top left corner of parent object + \param[in] \wp{Ychange_s16, sshort} + New Y position relative to the top left corner of parent object. + \retval sint + - E_NO_ERR - OK + - E_OVERFLOW - buffer overflow + - E_USER_ERROR - WSM or VT not announced + \note \par + - Every function call causes the sending of this command on the bus. + Danger of buffer overflow and high bus load ! + - If its impossible to send this command then its stored in command buffer. + - Attention: Correct WS instance must be set ( Calling IsoWsSetMaskInst() !) +*/ +sint IsoCmd_ChildPosition ( word wId, word wIDParent, + sshort Xchange_s16, sshort Ychange_s16 + ); + +/***********************************************************************************/ +/*! + \brief Command change size ( Part 6 - F.18 ) + + The Change Size command is used to change the size of an object. + + \param[in] \wp{wId, word} + Object ID + \param[in] \wp{wWidth, word} + New width + \param[in] \wp{wHeight, word} + New height + \retval sint + - #E_NO_ERR - OK + - #E_OVERFLOW - buffer overflow + - #E_USER_ERROR - Network member not logged + \note \par + - Every function call causes the sending of this command on the bus. + Danger of buffer overflow and high bus load ! + - If its impossible to send this command then its stored in command buffer. + - Attention: Correct WS instance must be set ( Calling IsoWsSetMaskInst() !) +*/ +sint IsoCmd_Size ( word wId, word wWidth, word wHeight ); + + /*****************************************************************************/ +/*! + \brief Command change background colour ( Part 6 - F.20 ) + + This command is used to change the background colour of an object. + + \param[in] \wp{wId, word} + Object ID + \param[in] \wp{bColour, word} + New Background colour see Part 6 - A.3 VT standard colour palette + \retval sint + - #E_NO_ERR - OK + - #E_OVERFLOW - buffer overflow + - #E_USER_ERROR - Network member not logged + \note \par + - Every function call causes the sending of this command on the bus. + Danger of buffer overflow and high bus load ! + - If its impossible to send this command then its stored in command buffer. + - Attention: Correct WS instance must be set ( Calling IsoWsSetMaskInst() !) +*/ +sint IsoCmd_BackgroundColour ( word wId, byte bColour ); + +/******************************************************************************/ +/*! + \brief Command change numeric value ( Part 6 - F.22 ) + + This command is used to change the value of an object. It applies only to objects + that have a numeric value attribute. + + \param[in] \wp{wId, word} + Object ID + \param[in] \wp{lNewValue, slong} + New value of ID + \retval sint + - #E_NO_ERR - OK + - #E_OVERFLOW - buffer overflow + - #E_USER_ERROR - Network member not logged + \note \par + - Every function call causes the sending of this command on the bus. + Danger of buffer overflow and high bus load ! + - If its impossible to send this command then its stored in command buffer. + - Attention: Correct WS instance must be set ( Calling IsoWsSetMaskInst() !) +*/ + sint IsoCmd_NumericValue( word wId, slong lNewValue ); + +/************************************************************************************/ +/*! + \brief Command change numeric value with command buffer reference ( Part 6 - F.22 ) + + This command is used to change the value of an object. It applies only to objects + that have a numeric value attribute. If the objectID is already in the command FIFO + then the value of this FIFO entry is updated. + + \param[in] \wp{wId, word} + Object ID + \param[in] \wp{lNewValue, slong} + New value of ID + \retval sint + - #E_NO_ERR - OK + - #E_OVERFLOW - buffer overflow + - #E_UNKNOWN_ERR - Buffernumber is to high + - #E_USER_ERROR - Network member not logged + \note \par + - Every function call causes the sending of this command on the bus. + Danger of buffer overflow and high bus load ! + - If its impossible to send this command then its stored in command buffer. + - Attention: Correct WS instance must be set ( Calling IsoWsSetMaskInst() !) +*/ + sint IsoCmd_NumericValueRef ( word wId, slong lNewValue ); + +/*******************************************************************************/ +/*! + \brief Command Change String Value ( Part 6 - F.24 ) + + This command sends a string to the VT. The length of the string including '\0' + may not be longer than the define STRLENGTHMAX. Take care that '\0' is trailed. + + \param[in] \wp{wId, word} + Object ID + \param[in] \wpp{pcString, const #byte[] } + Pointer to string + \retval sint + - E_NO_ERR - transport started + - 1 - command stored in FIFO (means OK) + - E_OVERFLOW - buffer overflow + - E_USER_ERROR - VT not known or own announcment not complete + \note \par + - Every function call causes the sending of this command on the bus. + Danger of buffer overflow and high bus load ! + - If its impossible to send this command then its stored in command buffer. + - Attention: Correct WS instance must be set ( Calling IsoWsSetMaskInst() !) +*/ + sint IsoCmd_String( word wId, const byte pcString[] ); + +/*******************************************************************************/ +/*! + \brief Command Change String Value with command buffer reference ( Part 6 - F.24 ) + + This command sends a string to the VT. If the ObjectID is already in the command FIFO + then the value of this FIFO entry is updated. The length of the string including '\0' + may not be longer than the define STRLENGTHMAX. Take care that '\0' is trailed. + + \param[in] \wp{wId, word} + Object ID + \param[in] \wpp{pcString, const #byte[] } + Pointer to string + \retval sint + - E_NO_ERR - transport started + - 1 - command stored in FIFO (means OK) + - E_OVERFLOW - buffer overflow + - E_USER_ERROR - VT not known or own announcment not complete + - E_UNKNOWN_ERR - Scanning of buffer failed + \note \par + - Every function call causes the sending of this command on the bus. + Danger of buffer overflow and high bus load ! + - If its impossible to send this command then its stored in command buffer. + - Attention: Correct WS instance must be set ( Calling IsoWsSetMaskInst() !) +*/ + sint IsoCmd_StringRef( word wId, const byte pcString[] ); + +/*******************************************************************************************/ +/*! + \brief Command change end point ( Part 6 - F.26 ) + + This command is used to change the end point of a line object by changing + the width, height and/or line direction attributes. + + \param[in] \wp{wId, word} + Object ID + \param[in] \wp{wXendp, word} + X value of end point + \param[in] \wp{wYendp, word} + Y value of end point + \param[in] \wp{bLineDirection, byte} + Line direction see Part 6 - B.27 + \retval sint + - #E_NO_ERR - OK + - #E_OVERFLOW - buffer overflow + - #E_USER_ERROR - Network member not logged + \note \par + - Every function call causes the sending of this command on the bus. + Danger of buffer overflow and high bus load ! + - If its impossible to send this command then its stored in command buffer. + - Attention: Correct WS instance must be set ( Calling IsoWsSetMaskInst() !) +*/ + sint IsoCmd_EndPoint ( word wId, word wXendp, word wYendp, byte bLineDirection ); + +/*******************************************************************************/ +/*! + \brief Command change font attributes ( Part 6 - F.28 ) + + This command is used to change the font attributes in a font attributes object. + + \param[in] \wp{wId, word} + Object ID + \param[in] \wp{bFontColour, byte} + New font colour (see Part 6 - A.3) + \param[in] \wp{bFontSize, byte} + New font size (see Part 6 - B.14) + \param[in] \wp{bFontType, byte} + New font type (see Part 6 - B.14) + \param[in] \wp{bFontStyle, byte} + New font style (see Part 6 - B.14) + \retval sint + - #E_NO_ERR - OK + - #E_OVERFLOW - buffer overflow + - #E_USER_ERROR - Network member not logged + \note \par + - Every function call causes the sending of this command on the bus. + Danger of buffer overflow and high bus load ! + - If its impossible to send this command then its stored in command buffer. + - Attention: Correct WS instance must be set ( Calling IsoWsSetMaskInst() !) +*/ + sint IsoCmd_FontAttributes ( word wId, + byte bFontColour, byte bFontSize, + byte bFontType, byte bFontStyle + ); + +/*******************************************************************************/ +/*! + \brief Command change line attributes ( Part 6 - F.30 ) + + This command is used to change the line attributes in a line attributes object. + + \param[in] \wp{wId, word} + Object ID + \param[in] \wp{bLineColour, byte} + New line colour (see Part 6 - A.3) + \param[in] \wp{bLineWidth, byte} + New line width (see Part 6 - B.14.3) + \param[in] \wp{wLineArt, word} + New line art (see Part 6 - B.14.3) + \retval sint + - #E_NO_ERR - OK + - #E_OVERFLOW - buffer overflow + - #E_USER_ERROR - Network member not logged + \note \par + - Every function call causes the sending of this command on the bus. + Danger of buffer overflow and high bus load ! + - If its impossible to send this command then its stored in command buffer. + - Attention: Correct WS instance must be set ( Calling IsoWsSetMaskInst() !) +*/ + sint IsoCmd_LineAttributes ( word wId, + byte bLineColour, byte bLineWidth, + word wLineArt + ); + +/**********************************************************************************/ +/*! + \brief Command change fill attributes ( Part 6 - F.32 ) + + This command is used to change the fill attributes in a fill attributes object. + + \param[in] \wp{wId, word} + Object ID + \param[in] \wp{bFillType, byte} + New fill type (see Part 6 - B.14.4) + \param[in] \wp{bFillColour, byte} + New fill colour (see Part 6 - B.14.4) + \param[in] \wp{wFillPattern, word} + New fill pattern (see Part 6 - B.14.4) + \retval sint + - #E_NO_ERR - OK + - #E_OVERFLOW - buffer overflow + - #E_USER_ERROR - Network member not logged + \note \par + - Every function call causes the sending of this command on the bus. + Danger of buffer overflow and high bus load ! + - If its impossible to send this command then its stored in command buffer. + - Attention: Correct WS instance must be set ( Calling IsoWsSetMaskInst() !) +*/ + sint IsoCmd_FillAttributes ( word wId, + byte bFillType, byte bFillColour, + word wFillPattern + ); +/******************************************************************************/ +/*! + \brief Command change active mask( Part 6 - F.34 ) + + This command is used to change the active mask of a working set to either + a data or an alarm mask object. + + \param[in] \wp{wIdWorkSet, word} + WorkingSet Object ID + \param[in] \wp{wIdNewMask, word} + Object ID of new active (data/alarm)-mask + \retval sint + - #E_NO_ERR - OK + - #E_OVERFLOW - buffer overflow + - #E_USER_ERROR - Network member not logged + \note \par + - Every function call causes the sending of this command on the bus. + Danger of buffer overflow and high bus load ! + - If its impossible to send this command then its stored in command buffer. + - Attention: Correct WS instance must be set ( Calling IsoWsSetMaskInst() !) +*/ + sint IsoCmd_ActiveMask ( word wIdWorkSet, word wIdNewMask ); + +/******************************************************************************/ +/*! + \brief Command change soft key mask( Part 6 - F.36 ) + + This command is used to change the soft key mask associated with a data or alarm mask object. + + \param[in] \wp{bMaskType, byte} + 1 == Data, 2 == Alarm + \param[in] \wp{wIdActMask, word} + Object ID of active Mask + \param[in] \wp{wIdSoftKeyMask, word} + Object ID of (new) soft key mask + \retval sint + - #E_NO_ERR - OK + - #E_OVERFLOW - buffer overflow + - #E_USER_ERROR - Network member not logged + \note \par + - Every function call causes the sending of this command on the bus. + Danger of buffer overflow and high bus load ! + - If its impossible to send this command then its stored in command buffer. + - Attention: Correct WS instance must be set ( Calling IsoWsSetMaskInst() !) +*/ + sint IsoCmd_SoftKeyMask ( byte bMaskType, word wIdActMask, word wIdSoftKeyMask ); + + /****************************************************************************/ +/*! + \brief Command change attribute( Part 6 - F.38 ) + + This command is used to change any attribute with an assigned AID. + This message cannot be used to change strings. + + \param[in] \wp{wId, word} + Object ID + \param[in] \wp{bIdAttribute, byte} + Attribute ID (AID) - see description of wished object + \param[in] \wp{lValueAttribute, slong} + New value for attribute + \retval sint + - #E_NO_ERR - OK + - #E_OVERFLOW - buffer overflow + - #E_USER_ERROR - Network member not logged + \note \par + - Every function call causes the sending of this command on the bus. + Danger of buffer overflow and high bus load ! + - If its impossible to send this command then its stored in command buffer. + - Attention: Correct WS instance must be set ( Calling IsoWsSetMaskInst() !) +*/ + sint IsoCmd_Attribute ( word wId, byte bIdAttribute, slong lValueAttribute ); + +/**********************************************************************************/ +/*! + \brief Command change priority( Part 6 - F.40 ) + + This command is used to change the priority of an alarm mask. + + \param[in] \wp{wId, word} + Object ID of alarm mask + \param[in] \wp{bPriority, byte} + New priority + \retval sint + - #E_NO_ERR - OK + - #E_OVERFLOW - buffer overflow + - #E_USER_ERROR - Network member not logged + \note \par + - Every function call causes the sending of this command on the bus. + Danger of buffer overflow and high bus load ! + - If its impossible to send this command then its stored in command buffer. + - Attention: Correct WS instance must be set ( Calling IsoWsSetMaskInst() !) +*/ + sint IsoCmd_Priority ( word wId, byte bPriority ); + +/*******************************************************************************/ +/*! + \brief Command change list item ( Part 6 - F.42 ) + + This command is used to change a list item in a list input object. + + \param[in] \wp{wIdInput, word} + Object ID of a list input object + \param[in] \wp{bListIndex, byte} + List index (-> see list) + \param[in] \wp{wIdNew, word} + New object ID or 0xFFFF to set empty + \retval sint + - #E_NO_ERR - OK + - #E_OVERFLOW - buffer overflow + - #E_USER_ERROR - Network member not logged + \note \par + - Every function call causes the sending of this command on the bus. + Danger of buffer overflow and high bus load ! + - If its impossible to send this command then its stored in command buffer. + - Attention: Correct WS instance must be set ( Calling IsoWsSetMaskInst() !) +*/ + sint IsoCmd_ListItem ( word wIdInput, byte bListIndex, word wIdNew ); + +/***********************************************************************************/ +/*! + \brief Command Delete Object Pool ( Part 6 - F.44 ) + + This command is used to delete the entire object pool of this working set from volatile storage. + It might be used by an implement that is shutting down or during the development of object pools./n + This function is driver intern used in case of moving to another VT. Calling restarts the announcement + with another VT if available. + + \retval sint + - #E_NO_ERR - OK + - #E_OVERFLOW - buffer overflow + - #E_USER_ERROR - Network member not logged + \note \par + - Every function call causes the sending of this command on the bus. + Danger of buffer overflow and high bus load ! + - If its impossible to send this command then its stored in command buffer. + - Attention: Correct WS instance must be set ( Calling IsoWsSetMaskInst() !) +*/ + sint IsoCmd_DeleteObjectPool( void ); + +/*****************************************************************************/ +/*! + \brief Command GetAttribute( Part 6 - F.58 ) + + This message is available in VT Version 4 and later. This command is used by a + Working Set to query the VT for the current state of objects within the VT. + + \param[in] \wp{wId, word} + Object ID + \param[in] \wp{bAID, byte} + Attribute ID of the object + \retval sint + - #E_NO_ERR - OK + - #E_OVERFLOW - buffer overflow + - #E_USER_ERROR - Network member not logged + \note \par + - Every function call causes the sending of this command on the bus. + Danger of buffer overflow and high bus load ! + - If its impossible to send this command then its stored in command buffer. + - Attention: Correct WS instance must be set ( Calling IsoWsSetMaskInst() !) +*/ + sint IsoCmd_GetAttribute( word wId, byte bAID ); + +#ifdef VERSION4 + /****************************************************************************/ + /*! + \brief Command Select Colour Map ( VT version 3 and later ) ( Part 6 - F.60 ) + + The Select Colour Map command is used to select the active Colour Map. This command can take a + long time to execute. The command applies to any presentation from the originating Working Set, + which includes objects that may be shown on other Working Set screens (e.g. Auxiliary Control + objects as may be presented on VT proprietary and other Working Set masks using the Auxiliary + Control Designator Type 2 Object Pointer). + + \param[in] \wp{wObjIdColourMap, word} + Object ID of Colour map object or FFFF to restore the default + colour table (see A.3) + \retval sint + - #E_NO_ERR - OK + - #E_OVERFLOW - buffer overflow + - #E_USER_ERROR - Network member not logged + \note \par + - Every function call causes the sending of this command on the bus. + Danger of buffer overflow and high bus load ! + - If its impossible to send this command then its stored in command buffer. + - Attention: Correct WS instance must be set ( Calling IsoWsSetMaskInst() !) + */ + sint IsoCmd_SelectColourMap( word wObjIdColourMap ); +#endif + +/** @} */ +/* ************************************************************************ */ +/** \name VT Client Special command functions ( Legacy - only with one VT client ) + @{ +*/ +/*****************************************************************************/ +/* + \brief Function for single controlled commands(SCC) of command + + This function sends a command (value) one time. + + \param[in] \wp{eVtFunc, ISOVT_FUNC_e} + Change_numeric_value or hide_show_object + \param[in] \wp{wObjId, word} + Object ID + \param[in] \wp{lVal, slong} + Value for called object ID \n + \retval sint + - #E_NO_ERR + - #E_OVERFLOW - buffer is full + - #E_RANGE - unvalid call see ISOVT_FUNC_e + \note \par + If the data mask changes the intern list of object IDs is deleted. + With the first call of this function the object ID is added to the list. +*/ + sint IsoCommandSC ( ISOVT_FUNC_e eVtFunc, word wObjId, slong lVal ); + +/******************************************************************************/ +/*! + \brief Function for event controlled responses (ECC) of command + + This function sends automatic a new command if the new value is different of the last value. + + \param[in] \wp{eVtFunc, ISOVT_FUNC_e} + Change_numeric_value or hide_show_object + \param[in] \wp{wObjId, word} + Object ID + \param[in] \wp{lVal, slong} + New value for called object ID + \retval sint + - #E_NO_ERR + - #E_OVERFLOW - buffer is full + - #E_RANGE - unvalid call see ISOVT_FUNC_e + \note + \par + If the data mask changes the intern list of object IDs is deleted. + With the first call of this function the object ID is added to the list. +*/ + sint IsoCommandEC ( ISOVT_FUNC_e eVtFunc, word wObjId, slong lVal ); + +/*************************************************************************************/ +/*! + \brief Function for time controlled responses (TCR) of command + + This function sends automatic a new command after the Time "wDeltaTime". + + \param[in] \wp{eVtFunc, ISOVT_FUNC_e} + Change_numeric_value or hide_show_object + \param[in] \wp{wObjId, word} + Object ID + \param[in] \wp{lVal, slong} + New value for called object ID + \param[in] \wp{wDeltaTime, word} + + \retval sint + - #E_NO_ERR + - #E_OVERFLOW - buffer is full + - #E_RANGE - unvalid call see ISOVT_FUNC_e + \note \par + If the data mask changes the intern list of object IDs is deleted. + With the first call of this function the object ID is added to the list. +*/ + sint IsoCommandTC ( ISOVT_FUNC_e eVtFunc, word wObjId, slong lVal, word wDeltaTime ); +/*****************************************************************************/ +/*! + \brief Manual delete of automatic object ID list + + \retval sint + - #E_NO_ERR + \note \par + Normally in case of data mask change the Object ID list is deleted. + If the application shall control it this function enables the deleting + of the list manual. See IsoSetObjIdListNoAutoDelete() and + IsoSetObjIdListAutoDeleteActive() +*/ + sint IsoVTaListDel ( void ); /* Manual delete of list */ + +/*****************************************************************************/ +/*! + \brief Manual delete of automatic object ID list + + \retval sint + - #E_NO_ERR + \note \par + Normally in case of data mask change the Object ID list is deleted. + If the application shall control it this function enables the deleting + of the list manual. See IsoSetObjIdListNoAutoDelete() and + IsoSetObjIdListAutoDeleteActive() +*/ + sint IsoSetObjIdListNoAutoDelete ( void ); /* Switch off automatic deleting of object ID list */ + + +/* ********************************* IsoAux.c *************************************** */ +/** @} */ +/** \addtogroup aux Auxiliary +@{ +*/ + +#ifdef DOXYGEN + /*! \def ISO_AUXFUNC_SINGLEASSIGN_CHECK + \brief Add the define #ISO_AUXFUNC_SINGLEASSIGN_CHECK to IsoConf.h to enable the + aux function single assignment check. + \details + If enabled, the ECU driver validates assignments to aux functions to reject + invalid assignments with it's own single assignment functions. + */ + #define ISO_AUXFUNC_SINGLEASSIGN_CHECK /* enable single assignment check */ +#endif + + + +/* **************************************************************************************** */ +/** \brief + Values of auxiliary (input) function types + */ + typedef enum + { + Bool_Latched = 0, /**< Two-position switch */ + Analog_0_100 = 1, /**< Analog maintains position setting */ + Bool_NonLatched = 2, /**< Two-position switch - returns to off */ + Analog_Ret50perc = 3, /**< Two way analog - return to centre position */ + Analog_Ret0perc = 4, /**< One way analog - return to 0% */ + DualBool_BothLatched = 5, /**< Three-position switch - latching in all positions */ + DualBool_BothNonLatched = 6, /**< Three-position switch - return to centre */ + DualBool_LatchedUp = 7, /**< Three-position switch - latching in up position */ + DualBool_LatchedDown = 8, /**< Three-position switch - latching in down position */ + CombinedAnalog_Ret50 = 9, /**< Two way analog - return to centre position - with latching */ + CombinedAnalog_LatchBool = 10, /**< Analog maintains position setting with latching Boolean at 0% and 100% positions */ + QuadratBool_NonLatched = 11, /**< Two quadrature mounted Three-position switches - return to centre position */ + QuadratAnalog = 12, /**< Two quadrature mounted analog maintain position setting - centre is 50% */ + QuadratAnalog_Ret50prec = 13, /**< Two quadrature mounted analog returns to centre position at 50% */ + BidirectionalCounter = 14, /**< Count increases when turning in the encoders "increase" direction (analog opposite direction */ + /**< ... Reserved */ + RemoveAssignment = 31, /**< Used for remove assignment command */ + AuxFunUndefined = 32 + } VTAUXTYP_e; + +/* **************************************************************************************** */ + /** \brief + Value of auxiliary inputs + */ + typedef enum + { + AuxDisabled = 0, /**< Off - backward, down, left, or not pressed */ + AuxEnabled = 1, /**< On - forward, up, right, or pressed */ + AuxHeld = 2, /**< Held (forward, up, or right) */ + AuxEnabledBackwards = 4, /**< On momentary - backward, down or left */ + AuxHeldBackwards = 8, /**< Held (backwards, down, or left) */ + AuxDefault = 9 + } VTAUXSTATES_e; + +/* **************************************************************************************** */ +/** \brief +Struct for auxiliary control assignment of application +*/ /* [DOXYGEN_VT_AUXAPP_T] */ +typedef struct +{ + word wObjID_Fun; /**< Object ID of auxiliary function */ + word wObjID_Input; /**< Object ID of auxiliary input */ + VTAUXTYP_e eAuxType; /**< Function or input typ */ + + word wManuCode; /**< Manufacturer Code of auxiliary input device */ + word wModelIdentCode; /**< Model identification code of aux input device */ + cbool qPrefAssign; /**< This assignment shall used for preferred assignment */ + byte baAuxName[8]; /**< ISO name of the auxiliary input device. The bytes must be set to 0xFF if not used. */ +} VT_AUXAPP_T, *VT_AUXAPP_t ; +/* [DOXYGEN_VT_AUXAPP_T] */ + +/* **************************************************************************************** */ +/*! + \brief Preferred assignment callback function pointer. + + \param[in,out] \wp{asAuxAss, VT_AUXAPP_T []} + Pointer to the array, which must be filled from the application. + \param[in,out] \wp{ps16MaxNumberOfAssigns, sint16*} + Pointer to the number of array entries + - in: The value contains the maximum number of assignment array entries, which can be filled. + - out: The application must set the value to the number of filled assignment array entries. +*/ +typedef void (*iso_fnCbAuxPrefAssignment_t)(VT_AUXAPP_T asAuxAss[], sint16* ps16MaxNumberOfAssigns); + +/* **************************************************************************************** */ +/*! + \brief Set preferred assignment callback function. + + \param[in] \wp{pfnCallbackFunction, iso_fnCbAuxPrefAssignment_t} + Pointer to the callback function. + \retval sint + - E_NO_ERR + The function should be called after IsoVTInit() to set the preferred assignment callback function. + The VT client will call this function every time before sending the prefered assignment to the VT. +*/ +sint IsoAuxPrefAssignmentCbSet( iso_fnCbAuxPrefAssignment_t pfnCallbackFunction ); + +/* **************************************************************************************** */ +/*! + \brief The function triggers the sending of the preferred assignment to the VT. + + Before sending the preferred assignment the callback function, + that was set with IsoAuxPrefAssignmentCbSet(), is called to get the + preferred assignments from the application. + + \retval sint + - E_NO_ERR - preferred assignment message is triggered to be send + - E_NOACT - triggering not possible +*/ +sint IsoAuxPrefAssignmentTrigger( void ); + +/*****************************************************************************/ +/*! + \brief Function for application in order to read assignment and store it + + \param[in] \wp{asAuxAss, VT_AUXAPP_T[]} + Pointer to array of auxiliary assignments + \param[in] \wp{riNumberOfFunctions, sint*} + Pointer to number of assignments (return value of driver) + \retval sint + - E_NO_ERR + - E_RANGE +*/ +sint IsoAuxAssignmentRead( VT_AUXAPP_T asAuxAss[], sint* riNumberOfFunctions ); + +/******************************************************************************/ +/*! + \brief Application sets "preferred assignment" during login phase + + This function gives an array of the preferred assignment struct to the driver. This is + necessary during login-phase. The assignments can be in every order. + + \param[in] \wp{asAuxAss, VT_AUXAPP_T[]} + Pointer to (preferred) assignment + \param[in] \wp{rs16NumberOfAssigns, sint16} + Number of preferred assignments + \retval sint + - E_NO_ERR - preferred assignment has been set + - E_RANGE - function parameter not valid + \note \par + The preferred assignment must be "static" (VT_AUXAPP_T[]) because the driver + copy the assignments not until it sends the prefered assignment to the VT. + + With Version 6.04 the function is deprecated and should not be used for new applications. \n + Use IsoAuxPrefAssignmentCbSet() to set a callback function, + which will be called to get the prefrred assignment from the application. +*/ +sint IsoAuxAssignmentSet( VT_AUXAPP_T asAuxAss[], sint16 rs16NumberOfAssigns ); + +/****************************************************************************/ +/*! + \brief Initialisation of an auxiliary input unit + + Setting the model indentification code, calling after IsoUserAnnounce allowed + + \param[in] \wpp{rpabName, const byte*} + Pointer to name of auxiliary input device + \param[in] \wp{rwModelIdentCode, word} + Model identification code + \retval sint + - E_NO_ERR +*/ +sint IsoAuxUnitInit ( const byte* rpabName, word rwModelIdentCode ); + +/***********************************************************************/ +/*! + \brief Sending an auxiliary input status message on the bus ( VT version < 3 ) + + \param[in] \wp{iInpNr, sint} + Number of auxiliary array - corresponds with the order in the pool \n + that means first aux input in pool is iInpNr = 0 etc. + \param[in] \wp{Val1_u16, ushort} + New value for this input + \retval sint + - E_NO_ERR + \note \par + This function is only necessary for the implemenation of Auxiliay Input Units. +*/ +sint IsoAuxInputStatus ( sint iInpNr, ushort Val1_u16 ); + +/***************************************************************************************/ +/*! + \brief Sending an auxiliary input status message on the bus ( VT version > 2 ) + + \param[in] \wp{iInpNr, sint} + Number of auxiliary array - corresponds with the order in the pool \n + that means first aux input in pool is iInpNr = 0 etc. + \param[in] \wp{Val1_u16, ushort} + New value for this input + \param[in] \wp{Val2_u16, ushort} + Second new value for this input + \retval sint + - E_NO_ERR + \note \par + This function is only necessary for the implemenation of Auxiliay Input Units. +*/ +sint IsoAuxInputStatus2 ( sint iInpNr, ushort Val1_u16, ushort Val2_u16 ); + +/** @} */ /* END aux */ + + +/* ********************************* IsoAlarm.c *************************************** */ +/** \addtogroup ala Alarms +@{ +*/ + + #define ISOALARMPRIO_LIFE_EM (0x00u) /**< Alarm priortity - high */ + #define ISOALARMPRIO_PROCESS_EM (0x01u) /**< Alarm priortity - low */ + + /* Alarm-Features */ + #define AL_VISIBLE (0x01u) /**< \brief Alarms are shown on terminal */ + #define AL_STORAGE (0x02u) /**< \brief Alarms are entried in non-erasable memory */ + #define AL_TIMECONTROLLED (0x04u) /**< \brief Time controlled alarms */ + #define AL_INTERLOCK (0x08u) /**< \brief Interlocking - alarm can be called only one time */ + #define AL_QUITofAPPLIC (0x10u) /**< \brief Quit of application necessary for deleting alarm */ + #define AL_BROADCAST (0x20u) /**< \brief Sended as broadcast to GLOBAL ADDRESS (Unimog) */ + + /** \brief + Enum for alarm commands + */ + typedef enum + { + AlEngage, /**< Alarm engaging */ + AlDisengage, /**< Alarm disengaging */ + AlQuitTest, /**< Testing if command -AlQuitofApplication- have already set */ + AlQuitofApplication, /**< see feature AL_QUITofAPPLIC, after quit of VT an application quit */ + /**< is necessary */ + AlInterlockDisengage, /**< Possibility for re-activation interlocked alarms */ + AlDelete /**< Alarm is deleted */ + } ISOAL_CMD_e; + + /** \brief + Administration struct for ISO alarms + */ + typedef struct + { + dword dwIdentity; /**< 16bit: ProjectID | 16bit: AlarmID */ + byte bFeature; /**< Properties of an alarm - e.g. AL_QUITofAPPLIC */ + byte bAlStatus; /**< Status corresponding features */ + byte bPriority; /**< See *.h */ + byte bData; + word wFctofSender; /**< Function field of sending ECU */ + slong lTimeStamp; /**< Time stamp for e.g. broadcast */ + sint eState; /**< State machine */ + } ISOALARM_T, *ISOALARM_t; + + /* Function prototyps */ +/******************************************************************************/ +/*! + \brief Initialisation of an alarm object + + This function initializes an alarm object. Every alarm object is associated + with an alarm mask. The alarm modul supports the ISO11783 alarm behaviour. + + \param[in] \wp{rpsIsoAlarm, ISOALARM_t} + Pointer to alarm struct provided by application + \param[in] \wp{rbPriority, byte} + Alarm priority \n + Range: ISOALARMPRIO_LIFE_EM (high), ISOALARMPRIO_PROCESS_EM (low) + \param[in] \wpp{rpbWSMasterName, const byte[]} + NAME of Working Set Master of this alarm + \param[in] \wp{rwAlarmID, word} + Object ID of corresponding alarm mask + \param[in] \wp{rbFeatures, byte} + Features of this alarm + - AL_VISIBLE - Not supported of ISO11783 + - AL_STORAGE - Not supported of ISO11783 + - AL_TIMECONTROLLED - Not supported of ISO11783 + - AL_INTERLOCK - Alarm is interlocked that means second call dont release it + - AL_QUITofAPPLIC - also app. must confirm the acklowedge of VT for deleting + - AL_BROADCAST - Not supported of ISO11783 + \param[in] \wp{rwFctSender, word} + Not supported of ISO11783 - set with ISO_DUMMY + */ +void IsoAlarmObjInit ( ISOALARM_t rpsIsoAlarm, byte rbPriority, + const byte rpbWSMasterName[], word rwAlarmID, + byte rbFeatures, word rwFctSender + ); + +/*****************************************************************************/ +/*! + \brief User interface function to engage, disengage, ... alarms + + This function is used to control an alarm. It can engaged, disengaged, checked + if VT has acknowledged it, setting the Quit of application or disengage the + interlock. + + \param[in] \wp{rpsIsoAlarm, ISOALARM_t} + Pointer to controlled alarm + \param[in] \wp{reCommand, ISOAL_CMD_e} + Control command + - AlEngage - an alarm is engaged -> Alarm mask on VT + - AlDisengage - an alarm is disengaged (->manual Time control ) + - AlQuitTest - if an alarm has the feature AL_QUITofAPPLIC the appl. + must confirm the acknowledge. AlQuitTest checks if the alarm is + acknowledged of VT operator. \n + - AlQuitofApplication - if an engaged alarm with feature AL_QUITofAPPLIC + ia acknowledged of VT then the appl. must call this control. for + deleting the alarm + - AlInterlockDisengage - for reactivation of interlocked alarms + \retval sint + - E_NO_ERR - OK + - E_OVERFLOW - Alarm buffer is full + - E_BUSY - Repeated calling of an interlocked alarm + - E_WARN - Alarm not found in the alarm list + - 1 - Quit of application has been OK (see features) + - 2 - Alarm is acknowledged of VT and can be quitted + \note \par + - An alarm can only released if it is not interlocked. + - Time control can realised manual with disengaging the alarm. + - With this concept (every alarm has an alarm mask) + its necessary to create an alarm mask for every alarm. + Alternativly its possible to change the textual/grafical objects of one + alarm mask. In this case there is only one alarm mask necessary. +*/ + sint IsoAlarmCmd ( ISOALARM_t rpsIsoAlarm, ISOAL_CMD_e reCommand ); + +/****************************************************************************************/ +/*! + \brief User interface function to read number of stored alarm + + This function reads the actual active number of alarms. + + \retval word + Number of alarms which are active + \note \par + e. g. it is possible to avoid unnecessary cyclic calls for controlling the alarms. +*/ + word IsoAlarmGetNum( void ); + +/********************************************************************************************/ +/*! + \brief Setting an "return data mask" before application quit of an alarm + + This function sets the data mask which will appear after application quit or disengaging + of an alarm. + + \param[in] \wp{DmObjId_cu16, word} + Object ID of a data mask object + \note \par + In normal behaviour the driver sends "change active mask" of the data mask which + is referenced in the working set object (default data mask). The reason is when sending + an alarm without open the pool on VT there is no return mask defined. This function +*/ + void IsoAlarmSetReturnObjId( word DmObjId_cu16 ); + +/** @} */ /* END ala */ + +/* ********************************* IsoPool.c *************************************** */ +/** \addtogroup poolmani Poolmanipulation +@{ +*/ + + #define ISO_FACTOR_ONE (10000u) /**< Scaling factor - 1 - */ + #define ISO_POOLDATA_READY (1u) /**< Direct transfer: Requested pool objects are ready to upload */ +#ifndef ISO_POOLDATA_WAIT_TIME + #define ISO_POOLDATA_WAIT_TIME (0u) /**< Direct transfer: Maximum wait time in milliseconds to use single (E)TP for pool upload */ +#endif + +#ifdef DOXYGEN + /*! \def ISO_POOL_DIRECT_LOAD + \brief Add the define #ISO_POOL_DIRECT_LOAD to IsoConf.h to enable the "Direct Pool Transfer". + \details The define is needed to use IsoPoolInitDirectTransfer(). + */ + #define ISO_POOL_DIRECT_LOAD + + /*! \def ISO_EXTERNAL_POOLBUFFER + \brief Add the define #ISO_EXTERNAL_POOLBUFFER to IsoConf.h to enable the external pool RAM buffer functionality. + \details The define is needed to replace the internal buffer with an external pool RAM buffer. \n + The external buffer must have the size defined by RAMSIZEPOOL. \n + The pointer to this buffer must be set with IsoPoolSetBuffer(). + */ + #define ISO_EXTERNAL_POOLBUFFER +#endif + + /** \brief + Enum for Readfunction of special pool infos + */ + typedef enum + { + PoolROMStartAddress, /**< Start address of pool in FLASH */ + PoolROMSize, /**< Size of original pool */ + PoolRAMStartAddress, /**< Start address of pool in RAM */ + PoolRAMSize, /**< Pool size, only valid after download !!! */ + ObjIDWorkingSet, /**< Object identifier of working set */ + ObjIDFirstDataMask, /**< First data mask */ + PointerVersionString, /**< Pointer to the version string */ + PoolGraphicType, /**< Graphic type of pool - see IsoPoolInit () */ + PoolDataMaskScalFaktor, /**< Scaling factor of data mask */ + PoolSoftKeyMaskScalFaktor, /**< Scaling factor of soft key mask */ + BufferUsed /**< Actual Bytes in pool buffer */ + } ISOPOOLINFO_e; + + /** \brief + Enum of pool manipulation modes + */ + typedef enum + { + NoScaling, /**< Object or object range is not scaled */ + Scaling, /**< Object or object range is scaled */ + Centering, /**< Object or object range is centered */ + NotLoad, /**< Object or object range is not loaded during pool transport */ + Proprietary, /**< Object or object range is manipulated of a proriertary manipulation module */ + LoadMoveID, /**< Object or object range is loaded to new destination address */ + LoadCopyID, /**< Object or object range is copied to destination address */ + ColourReduction, /**< Colour depth of object or object range is reduced */ + AuxToV2, /**< Auxiliary object or object range is transformed into version 2 */ + LastMode + } ISOPOOLMANIMODE_e; + + /** \brief + Enum of colour depth of pool + */ + typedef enum + { + monochrome = 0, /**< Monochrome */ + colour_16 = 1, /**< 16 colour */ + colour_256 = 2, /**< 256 colour */ + colour_undef = 3 + } ISOGRAPH_TYPE_e; + + /** \brief + Enum of pool state machine + */ + typedef enum + { + PoolLazy, /**< - Poolservice inactive */ + PoolLoadInit, /**< - Initialisation of pool service in order to scan or transport */ + PoolLoadSeg, /**< + - Segmented poolservice: Loading objects in buffer + - Direct transfer: Requesting next pool objects */ + PoolScanSeg, /**< + - Segmented poolservice: Scanning objects in buffer + - Direct transfer: Scanning requested objects */ + PoolScanning, /**< + - Scanning for "normal" flashtransfer + - Direct Transfer: Start pool scanning */ + PoolWaitTransfer, /**< - Wait till VT client decide if primary pool transfer is necessary */ + PoolGetMemory, /**< - Sending and receiving GetMemory */ + ETPBuffLoad, /**< + - "normal" flashtransfer: Manipulating objects and storing in ETP buffer + - Direct Transfer: start direct transfer */ + ETPBuffLoadSeg, /**< + - Segmented poolservice: Loading pooldata in buffer + - Direct transfer: Requesting next pool objects */ + ETPBuffScanSeg, /**< + - Segmented poolservice: Scanning pooldata in buffer + - Direct transfer: Scanning and sending requested objects */ + ETPBuffManiSeg, /**< - Segmented poolservice: Manipulating pooldata in buffer */ + ETPBlockManipulated, /**< + - Decide before ETPstart if last of any block + - Direct transfer: not used */ + ETPBuffLoadSegAfterETP, /**< + - Segmented poolservice: Copiing rest pool data at begin of buffer + - Direct transfer: not used */ + ETP_start, /**< + - Starting ETP transfer + - Direct transfer: not used */ + ETP_Trans_running, /**< - Wainting till ETP transfer is finished */ + ETP_finished /**< - Decide if further transfer necessary or finish pool service */ + } ISOPOOLSM_e; + + /** \brief + Enum for pool service callback + */ + typedef enum + { + PoolBlockRequest, /**< Driver request pool data ( segmented pool transfer) */ + PoolGetMemoryFailed, /**< Informs that VT has not enough memory for the pool */ + PoolStatemachine, /**< Gives actual state of pool state machine to application */ + PoolFileCloseRequest, /**< Gives the application the possibility to close the pool ( segmented pool transfer) */ + PoolObjectRequest /**< Driver request some complete objects ( direct pool transfer ) */ + } ISOPOOLCBREQ_e; + + /** \brief + Struct for pool callback + */ + typedef struct + { + ISOPOOLCBREQ_e ePoolCtrl; /**< Command/Kind of (CB)call */ + /* for command PoolBlockRequest */ + byte HUGE_C* pbAddress; /**< + - Segmented pool transfer - PoolBlockRequest: + - Address for pool buffer + - Direct pool transfer - PoolObjectRequest: + - Start address of the current pool objects buffer. \n + Must be set from the application in the PoolObjectRequest callback. + - Else: not valid */ + word wBlockSizeReq; /**< + - Segmented pool transfer - PoolBlockRequest: + - Requested blocksize + - Direct pool transfer - PoolObjectRequest: + - Must be set to #ISO_POOLDATA_READY, if buffer is ready to upload. + - Else: not valid */ + word wBlockSizeLoad; /**< + - Segmented pool transfer - PoolBlockRequest: + - App -> Driver: really load bytes + - Direct pool transfer - PoolObjectRequest: + - Driver: Request counter starting with 1. + - App: Size of the buffer that ready to upload + - App: Set the size to 0 and wBlockSizeReq to #ISO_POOLDATA_READY, + to indicate that no more objects are to send. + - Else: not valid */ + /* for command PoolStatemachine */ + ISOPOOLSM_e ePoolServState; /**< Delivers state of pool service state machine */ + } ISOPOOLCTRL_T; + typedef ISOPOOLCTRL_T *ISOPOOLCTRL_t; + + /** \brief Callback function pointer for driver requesting the pool data / objects from the application. + \details The callback function is used from the segmented and the direct pool transfer + to get the source location for the next pool data segment or the next complete objects + from the application. + \param[in,out] \wp{psPoolCtrl, ISOPOOLCTRL_T* } + Pointer to the ISOPOOLCTRL_T object. + */ + typedef void (*ISO_POOL_CALLBACK_t)( ISOPOOLCTRL_T * psPoolCtrl ); + + /** \brief Callback function pointer to return an pool object to the application. + \details The callback function is used from the pool transfer + to give back the current pool object to the application. \n + The callback function can be set with IsoPoolObjectCbSet(). + \param[in] \wpp{pau8Object, const uint8 HUGE_C[] } + Pointer to the object data byte array. + \param[in] \wp{u16ObjID, uint16 } + The extracted object ID. + \param[in] \wp{u8ObjType, uint8 } + The extracted object type. + \param[in] \wp{eState, ISOPOOLSM_e } + The current state of the pool service. + */ + typedef void (*iso_fnCbPoolObject_t)(const uint8 HUGE_C pau8Object[], uint16 u16ObjID, uint8 u8ObjType, ISOPOOLSM_e eState); + +/* Function prototyps */ + +#ifdef ISO_POOL_DIRECT_LOAD +/* **************************************************************************************** */ +/*! + \brief Initialisation of the direct pool transfer + + This function is used instead of IsoPoolInit() to transfer a pool without using the driver internal pool buffer. + This function must called after knowing VT characteristics! + + \param[in] \wp{rasVersionString, byte[7] } + Pointer to "Pool Version String" \n + Range: exact 7 Signs + \param[in] \wp{rbDesignatorWidth, byte} + Soft key designator width - minimum == 60 \n + In order to guarantee proper functionality of pool manipulation + this value should be 60 + \param[in] \wp{rbDesignatorHeight, byte} + Soft key designator height - minimum == 32 + In order to guarantee proper functionality of pool manipulation + this value should be 32 + \param[in] \wp{rwMaskSize, word} + Data and Alarm Mask size of this pool \n + Range: Minimum 200 - Maximum (undefined depends on physical VTs) + \param[in] \wp{rwMaxTime, word} + Maximum time in milliseconds the application needed to load the next pool objects for the driver. \n + - 0: The driver has direct access to the pool data memory + - else: The application copies the data in a memory zone where the driver has direct access. \n + Range: Minimum 0 - Maximum (undefined depends on the ECU hardware) + \param[in] \wp{rpfPoolLoad, ISO_POOL_CALLBACK_t } + Callback function pointer for the driver pool object requests. + + \retval sint + - E_NO_ERR + + \par + Add the define #ISO_POOL_DIRECT_LOAD to IsoConf.h to enable the "Direct Pool Transfer". + +*/ +sint IsoPoolInitDirectTransfer( const byte rasVersionString[7], + byte rbDesignatorWidth, byte rbDesignatorHeight, word rwMaskSize, + word rwMaxTime, ISO_POOL_CALLBACK_t rpfPoolLoad ); +#endif /* ISO_POOL_DIRECT_LOAD */ + + +/******************************************************************************************/ +/*! + \brief Initialisation of the object pool for segmented handling + + This function is used instead of IsoPoolInit() in the case that the pool shall + load out partial of a mass storage e. g. SD-Card. + This function must called after knowing VT characteristics! + + \param[in] \wp{rasVersionString, byte[] } + Pointer to "Pool Version String" \n + Range: exact 7 Signs + \param[in] \wp{rdwBuffOffset, dword} + BufferOffset to Poolbuffer -> Startaddress for loaded objects \n + Details see help - VT client/VT Pool Manipulation/.. + \param[in] \wp{rwNumberObjects, word} + Number of objects in object pool + \param[in] \wp{reGraphicType, ISOGRAPH_TYPE_e} + Graphic type of this pool ( monochrome, colour_16, colour_256 ) + \param[in] \wp{rbDesignatorWidth, byte} + Soft key designator width - minimum == 60 \n + In order to guarantee proper functionality of pool manipulation + this value should be 60 + \param[in] \wp{rbDesignatorHeight, byte} + Soft key designator height - minimum == 32 + In order to guarantee proper functionality of pool manipulation + this value should be 32 + \param[in] \wp{rwMaskSize, word} + Data and Alarm Mask size of this pool \n + Range: Minimum 200 - Maximum (undefined depends on physical VTs) + \param[in] \wpp{rpfPoolLoad, void(*)(#ISOPOOLCTRL_T *)} + Callbackfunction for driver requests of pool + + \retval sint + - E_NO_ERR + - E_OVERFLOW: Pool RAM Buffer is NULL pointer +*/ +sint IsoPoolInitSegmented( const byte rasVersionString[],dword rdwBuffOffset, + word rwNumberObjects, ISOGRAPH_TYPE_e reGraphicType, + byte rbDesignatorWidth, byte rbDesignatorHeight, + word rwMaskSize, void (*rpfPoolLoad)( ISOPOOLCTRL_T * psPoolCtrl ) ); + +/****************************************************************************************/ +/*! + \brief Initialisation of the object pool + + All parameters which are necessary for successful pool initialisation. + This function must called after knowing VT characteristics! + + \param[in] \wp{rasVersionString, byte[] } + Pointer to "Pool Version String" \n + Range: exact 7 Signs + \param[in] \wp{rpbPoolFirstAddress, byte* HUGE_C} + Absolute address of first byte of this pool + \param[in] \wp{rdwPoolSize, dword } + Not necessary except in combination with IsoPoolTransferFlashPool() \n + Range: 1 - 117440512 + \param[in] \wp{rwNumberObjects, word } + Number of objects which are transfered ! \n + You can use the function IsoGetNumofPoolObjs() for determination of this value \n + Range: 0 - 65535 + \param[in] \wp{reGraphicType, ISOGRAPH_TYPE_e } + Grafic type of this pool ( monochrome, colour_16, colour_256 ) + \param[in] \wp{rbDesignatorWidth, byte } + Soft key designator width - minimum == 60 \n + In order to guarantee proper functionality of pool manipulation + this value should be 60 + \param[in] \wp{rbDesignatorHeight, byte } + Soft key designator height - minimum == 32 + In order to guarantee proper functionality of pool manipulation + this value should be 32 + \param[in] \wp{rwMaskSize, word } + Data and Alarm Mask size of this pool \n + Range: Minimum 200 - Maximum (undefined depends on physical VTs) + + \retval sint + - E_NO_ERR + - E_OVERFLOW: Pool RAM Buffer is NULL pointer + \note \par + - see also IsoPoolInitSegmented() +*/ +sint IsoPoolInit ( const byte rasVersionString[], byte HUGE_C* rpbPoolFirstAddress, dword rdwPoolSize, + word rwNumberObjects, ISOGRAPH_TYPE_e reGraphicType, + byte rbDesignatorWidth, byte rbDesignatorHeight, word rwMaskSize ); + +/************************************************************************/ +/*! + \brief Installing the pool callbackfunction + + This function installs the pool callbackfunction. It is used instead in the case + when no segmented pool transfer is used and the application wants to receive the + GetMemory failure info and/or to monitor the pool state machine + + \param[in] \wp{rpfPoolLoad, void*(ISOPOOLCTRL_T *) } + Callbackfunction +*/ +void IsoPoolCbInstall( void (*rpfPoolLoad)( ISOPOOLCTRL_T * psPoolCtrl ) ); + +/*************************************************************************************/ +/*! + \brief Function for reloading object(s) after standard pool transport + + This function initializes a pool reload and starts execution if return value is true. + + \param[in] \wp{rpPoolFirstAddress, byte* HUGE_C} + Pointer to pool in flash \n + Exception: "0" NULL pointer for segmented or direct pool transfer + \param[in] \wp{rwNumberObjects, word} + Number of objects to transfer ( including "notload" ) \n + Exception: 0 for direct pool transfer + + \retval cbool + - FALSE - Another pool transport is running + - TRUE - Pool reload is started + \par + Example of usage: + \code + if ( IsoPoolReload( 0, 62 ) ) + { + word wSKM_Scal = 0u; + // Reload ranges + IsoPoolSetIDRangeMode( 0, 1099, 0, NotLoad ); + IsoPoolSetIDRangeMode( 1100, 1100, 1002, LoadMoveID ); 1002 = target(start)ID + IsoPoolSetIDRangeMode( 1101, 39999, 0, NotLoad ); + IsoPoolSetIDRangeMode( 42001, 65334, 0, NotLoad ); + // Manipulating ranges + wSKM_Scal = (word)IsoPoolReadInfo( PoolSoftKeyMaskScalFaktor ); + IsoPoolSetIDRangeMode( 40012, 40012, wSKM_Scal, Centering ); + } + \endcode + - Every call of IsoPoolReload( ) with return "TRUE" releases a object pool transport! + - Return "FALSE" means there is another pool transport running - application must repeat + calling IsoPoolReload() + - Reloading object ranges shall handled with "NotLoad" in normal pool manipulation + - LoadMoveID: Offset for all objects in example is 1100 - 1000 = -100 + + \par + You must add the define #ISO_POOL_DIRECT_LOAD to IsoConf.h + to enable the "Direct Pool Transfer" mode for this function. +*/ +cbool IsoPoolReload( byte HUGE_C* rpPoolFirstAddress, word rwNumberObjects ); + +/************************************************************************************/ +/*! + \brief Requesting some important and needed values from the pool - see ISOPOOLINFO_e + + \param[in] \wp{ePoolReading, ISOPOOLINFO_e} + Enumeration which includes all value which can be requested + \code + - PoolROMSize - Size of original pool + - PoolRAMSize - Pool size, only valid after download !!! + - ObjIDWorkingSet - Object identifier of working set + - ObjIDFirstDataMask - First data mask + - PoolGraphicType - Graphic type of pool - see IsoPoolInit () + - PoolDataMaskScalFaktor - Scaling factor of data mask (after IsoPoolInit() ) + - PoolSoftKeyMaskScalFaktor - Scaling factor of soft key mask (after IsoPoolInit() ) + - BufferUsed - Number of bytes in pool buffer + \endcode + \retval dword + - Wished value +*/ + dword IsoPoolReadInfo( ISOPOOLINFO_e ePoolReading ); + +/************************************************************************************/ +/* + \brief Requesting a pointer value - see ISOPOOLINFO_e + + \param[in] \wp{ePoolReading, ISOPOOLINFO_e } + Enumeration which includes all value which can be requested + + \code + - PointerVersionString - Pointer to the version string + \endcode + \retval schar * + - Pointer to version string +*/ + schar * IsoPoolReadPtrLoc( ISOPOOLINFO_e ePoolReading ); + +/**************************************************************************************/ +/*! + \brief Function in order to transfer pool of FLASH for test purposes + + This function transfer the original pool in non-volatile-memory (normally Flash) + This can be useful for comparing the work of the poolmanipulation with the original data + + \param[in] \wp{qFlashTransfer, cbool} + + - TRUE - Transfer Flash Pool + - FALSE - Use pool manipulation + + \retval sint + - E_NO_ERR +*/ + sint IsoPoolTransferFlashPool( cbool qFlashTransfer ); + +/******************************************************************************/ +/*! + \brief Setting scaling factor and the characteristics of a object ID range + + This function is used for control the manipulation of the driver with pool objects. + First two parameter determines the range of IDs. Start ID and end ID same value means + only one Object ID. + + \param[in] \wp{wStartId, word} + Object ID - Start ID of range \n + Range: 0 - 65535 + \param[in] \wp{wEndId, word} + Object ID - End ID of range \n + Range: 0 - 65535 \n + Object ID shall be identical or greater than Start ID + \param[in] \wp{rwManipulValue, word} + Manipulation value for this range depending of manipulation range: \n + \code + - Scaling factor for modes "Scaling" and "Centering" 10000 means factor 1, 20000 means factor 2 ... + - Target objectID of moved range for "LoadMoveID" + - Target objectID of copied range for "LoadCopyID" + - Colour depth see ISOGRAPH_TYPE_e for mode "ColourReduction" ( only pictures ) + - Dont care for other modes + \endcode + \param[in] \wp{eModeMani, ISOPOOLMANIMODE_e} + Manipulation mode ( NoScaling, Scaling, Centering, NotLoad, Proprietary, + LoadMoveID, LoadCopyID, ColourReduction, AuxToV2 ) + + \retval sint + - E_NO_ERR - OK + - E_OVERFLOW - Setting not possible because list is full + \note \par + - Every call of this function is entried in a struct. Take care that the define + ISO_NO_SCALING_ELEMENTS_MAX is sufficient. This value defines the maximum number + of Ranges. + - LoadCopyID can be used multiple for the same object(s) ( -> define ISO_POOLNUMANICOPY!! ) +*/ + sint IsoPoolSetIDRangeMode( word wStartId, word wEndId, word rwManipulValue, ISOPOOLMANIMODE_e eModeMani ); + +/*******************************************************************************/ +/*! + \brief Changing Active Mask and Working Set Identifier Object before pool transport + + This function must called after IsoPoolInit(). + Using is necessary if the selection of the active data mask is done during pool manipulation. + + \param[in] \wp{wDMActive, word} + Active Mask Object ID + \param[in] \wp{wWSIdentObjectID, word} + First Working Set Identifier Object ID + + \retval sint + - E_NO_ERR + \note \par + Special function to manipulate the predefined WSO entries before pool manipulation +*/ + + sint IsoPoolDMActiveWSIdentSet ( word wDMActive, word wWSIdentObjectID ); + +/***************************************************************************/ +/*! + \brief Determination of number of objects in the pool + + This function counts the number of objects in a pool. + + \param[in] \wp{pbFlashAct, byte HUGE_C[] } + Pointer on first byte of pool + \param[in] \wp{lSize, slong} + Size of pool in bytes + + \retval word Number of objects in pool + \note \par + This function is used before IsoPoolInit() for determining the number of + objects in a pool. +*/ + word IsoGetNumofPoolObjs( const byte HUGE_C pbFlashAct[], slong lSize ); + +/***************************************************************************/ +/*! + \brief Determination of the size of specific object in the pool + + This function returns the size of the given object in bytes. + + \param[in] \wp{pbFlashObj, byte HUGE_C[] } + Pointer to the object byte array + \retval dword size of the object in bytes or zero in case of an error +*/ + dword IsoPoolObjSize( const byte HUGE_C pbFlashObj[] ); + +#ifdef ISO_EXTERNAL_POOLBUFFER +/***************************************************************************/ +/*! + \brief Pool RAM buffer set function + \details Use the function to replace the internal with an extern buffer. \n + The external buffer must have the size defined by RAMSIZEPOOL and set before + calling a IsoPoolInit() function. \n + Add the define #ISO_EXTERNAL_POOLBUFFER to IsoConf.h to enable this function. + \param[in] \wp{abPoolRAMBuffer, byte HUGE_C[] } + Pointer to the external pool RAM buffer array. + \retval sint + - E_NO_ERR +*/ + sint IsoPoolSetBuffer ( byte HUGE_C abPoolRAMBuffer[] ); + +#endif + +#ifdef POOLPROP_ +/****************************************************************************/ +/*! + \brief Initialisation of own pool manipulation + + This function enables proprietary pool manipulation. Preprozessor POOLPROP_ must be set. + The function behind "rpf_ProprietaryAdaptation" replaces the driver intern pool manipulation + + + \param[in] \wp{rpf_ProprietaryAdaptation, sint*(OBJTYP_e\, word\, dword\, byte HUGE_C*\, byte HUGE_C*\, word*) } + Pointer to own proprietary pool manipulation function + \retval sint + - E_NO_ERR + \note \par + Special feature initiated of Company Kuhn +*/ + sint IsoPoolPropAdaptInit( sint (*rpf_ProprietaryAdaptation)(OBJTYP_e, word, dword, const byte HUGE_C*, byte HUGE_C*, word*) ); + + +/****************************************************************************/ +/*! + \brief Copy a object from Flash to RAM + + \param[in] \wp{pbFlashObjOffset, byte HUGE_C*} + Absolut start address of an object + \param[in] \wp{dwUsedBuff, dword} + Actually occupied object buffer + \param[in] \wp{pbRAMPos, byte HUGE_C*} + Absolut target address of an object in the RAM + \param[in] \wp{wObjFlashSize, word} + Object size + + \retval sint + - E_NO_ERR - OK + - E_OVERFLOW - if RAM buffer is full +*/ + sint IsoPoolObjCopyToRAM( const byte HUGE_C pbFlashObjOffset[], dword dwUsedBuff, + byte HUGE_C pbRAMPos[], word wObjFlashSize ); + + +#endif /* POOLPROP_ */ + + + /** \brief Use IsoPoolObjectCbSet() to set an "object processing" callback function. + \details The given callback function is called from the pool transfer + for every pool object while scanning or uploading a pool to the VT. \n + The callback function can be used to read the attributes of the object. + \param[in] \wp{pfnCallbackFunction, iso_fnCbPoolObject_t } + Pointer to the applcation function which should be called + when processing a new pool object. \n + Can be set to the NULL pointer to disable the functionality. + \retval sint + - E_NO_ERR - OK + */ + sint IsoPoolObjectCbSet( iso_fnCbPoolObject_t pfnCallbackFunction ); + + + /** \brief + Enum of result size for attribute-ID + */ + typedef enum + { + UnsignedLong, /**< value is uint32 */ + SignedLong, /**< value is int32 */ + Float /**< value is float32 */ + } ISOPO_AID_VALUETYPE_e; + + /*! \ brief AID value */ + typedef struct + { + ISOPO_AID_VALUETYPE_e eAID_valuetype; /*! \brief witch AID type is required */ + uint32 u32AID_value; /*! \brief AID value unsiged type */ + sint32 s32AID_value; /*! \brief AID value siged type */ + float32 f32AID_value; /*! \brief AID value float type */ + } ISOPoAID_Value_T; + + + /** + \brief Use IsoPoObjAttributGet() to get the value of the appropriate attribute ID. + + \param[in] \wpp{pau8Objekt[], const uint8 HUGE_C } + byte array pointer to the pool object + \param[in] \wp{u16AID, uint16 } + desired attribut ID (AID) + \param[out] \wp{psIsoPoAID_Val, ISOPoAID_Value_T* } + Pointer to the result value \n + depending on result size type, the value will be stored as \n + u32AID_value, s32AID_value or f32AID_value. \ + The required data type is defined in eAID_valuetype. + \retval sint16 + - E_NO_ERR - OK + - E_RANGE - wrong parameter + */ + sint16 IsoPoObjAttributGet( const uint8 HUGE_C pau8Objekt[], uint16 u16AID, ISOPoAID_Value_T* const psIsoPoAID_Val ); + + /* ************************************************************************ */ + /** + \brief Use IsoPoolObjPtrGet() to get the pointer to the object data. + + \param[in] \wpp{pau8Pool, const uint8 HUGE_C [] } + byte array pointer to the pool + \param[in] \wp{u32ObjOffset, uint32 } + desired object offset in bytes + \retval const uint8 HUGE_C * + Pointer to the object data or NULL pointer in case of an error \n + + */ + const uint8 HUGE_C * IsoPoolObjPtrGet( const uint8 HUGE_C pau8Pool[], uint32 u32ObjOffset ); + +/* ************************************************************************ */ +#ifdef DOXYGEN + /*! \def ISOVT_AID_DEFINES + \brief Add the define ISOVT_AID_DEFINES to your IsoConf.h + to make the object pool attribute defines visible. + */ + #define ISOVT_AID_DEFINES +#endif + +#ifdef ISOVT_AID_DEFINES /* use the AID defines of the ECU Driver */ +/* ************************************************************************ */ +/** \addtogroup gr_isovt_aids Object pool attribute id defines + \brief Add the define ISOVT_AID_DEFINES to your IsoConf.h + to make the object pool attribute defines visible. + @{ */ +/*! \name Object type object attribute id + @{ */ +#define AID_TYPE 0U /*!< \brief 0: AID object type */ +/*!@}*/ + +/*! \name Working set object attribute id's + @{ */ +#define AID_WS_BG_COLOUR 1U /*!< \brief 1: AID_WS_BG_COLOUR */ +#define AID_WS_SELECTABLE 2U /*!< \brief 2: AID_WS_SELECTABLE */ +#define AID_WS_ACTIVE_MASK 3U /*!< \brief 3: AID_WS_ACTIVE_MASK */ +/*!@}*/ + +/*! \name Data mask object attribute id's + @{ */ +#define AID_DM_BG_COLOUR 1U /*!< \brief 1: AID_DM_BG_COLOUR */ +#define AID_DM_SOFT_KEY_MASK 2U /*!< \brief 2: AID_DM_SOFT_KEY_MASK */ +/*!@}*/ + +/*! \name Alarm mask object attribute id's + @{ */ +#define AID_AM_BG_COLOUR 1U /*!< \brief 1: AID_AM_BG_COLOUR */ +#define AID_AM_SOFT_KEY_MASK 2U /*!< \brief 2: AID_AM_SOFT_KEY_MASK */ +#define AID_AM_PRIORITY 3U /*!< \brief 3: AID_AM_PRIORITY */ +#define AID_AM_ACOUSTIC 4U /*!< \brief 4: AID_AM_ACOUSTIC */ +/*!@}*/ + + +/*! \name Container object attribute id' + @{ */ +#define AID_CO_WIDTH 1U /*!< \brief 1: AID_CO_WIDTH */ +#define AID_CO_HEIGHT 2U /*!< \brief 2: AID_CO_HEIGHT */ +#define AID_CO_HIDDEN 3U /*!< \brief 3: AID_CO_HIDDEN */ +/*!@}*/ + +/*! \name Soft key mask object attribute id's + @{ */ +#define AID_SKM_BG_COLOUR 1U /*!< \brief 1: AID_SKM_BG_COLOUR */ +/*!@}*/ + +/*! \name Soft key object attribute id's + @{ */ +#define AID_SK_BG_COLOUR 1U /*!< \brief 1: AID_SK_BG_COLOUR */ +#define AID_SK_KEY_CODE 2U /*!< \brief 2: AID_SK_KEY_CODE */ +/*!@}*/ + +/*! \name Button object attribute id's + @{ */ +#define AID_BO_WIDTH 1U /*!< \brief 1: AID_BO_WIDTH */ +#define AID_BO_HEIGHT 2U /*!< \brief 2: AID_BO_HEIGHT */ +#define AID_BO_BG_COLOUR 3U /*!< \brief 3: AID_BO_BG_COLOUR */ +#define AID_BO_BORDERCOLOUR 4U /*!< \brief 4: AID_BO_BORDERCOLOUR */ +#define AID_BO_KEY_CODE 5U /*!< \brief 5: AID_BO_KEY_CODE */ +#define AID_BO_OPTIONS 6U /*!< \brief 6: AID_BO_OPTIONS */ +/*!@}*/ + +/*! \name Input boolean object attribute id's + @{ */ +#define AID_IB_BG_COLOUR 1U /*!< \brief 1: AID_IB_BG_COLOUR */ +#define AID_IB_WIDTH 2U /*!< \brief 2: AID_IB_WIDTH */ +#define AID_IB_FG_COLOUR 3U /*!< \brief 3: AID_IB_FG_COLOUR */ +#define AID_IB_VARIABLE_REF 4U /*!< \brief 4: AID_IB_VARIABLE_REF */ +#define AID_IB_VALUE 5U /*!< \brief 5: AID_IB_VALUE */ +#define AID_IB_ENABLED 6U /*!< \brief 6: AID_IB_ENABLED */ +/*!@}*/ + +/*! \name Input string object attribute id's + @{ */ +#define AID_IS_WIDTH 1U /*!< \brief 1: AID_IS_WIDTH */ +#define AID_IS_HEIGHT 2U /*!< \brief 2: AID_IS_HEIGHT */ +#define AID_IS_BG_COLOUR 3U /*!< \brief 3: AID_IS_BG_COLOUR */ +#define AID_IS_FONT_ATT 4U /*!< \brief 4: AID_IS_FONT_ATT */ +#define AID_IS_INP_ATT 5U /*!< \brief 5: AID_IS_INP_ATT */ +#define AID_IS_OPTIONS 6U /*!< \brief 6: AID_IS_OPTIONS */ +#define AID_IS_VARIABLE_REF 7U /*!< \brief 7: AID_IS_VARIABLE_REF */ +#define AID_IS_JUSTIFICATION 8U /*!< \brief 8: AID_IS_JUSTIFICATION */ +#define AID_IS_ENABLED 9U /*!< \brief 9: AID_IS_ENABLED */ +/*!@}*/ + +/*! \name Input number object attribute is's + @{ */ +#define AID_IN_WIDTH 1U /*!< \brief 1: AID_IN_WIDTH */ +#define AID_IN_HEIGHT 2U /*!< \brief 2: AID_IN_HEIGHT */ +#define AID_IN_BG_COLOUR 3U /*!< \brief 3: AID_IN_BG_COLOUR */ +#define AID_IN_FONT_ATT 4U /*!< \brief 4: AID_IN_FONT_ATT */ +#define AID_IN_OPTIONS 5U /*!< \brief 5: AID_IN_OPTIONS */ +#define AID_IN_VARIABLE_REF 6U /*!< \brief 6: AID_IN_VARIABLE_REF */ +#define AID_IN_MIN_VALUE 7U /*!< \brief 7: AID_IN_MIN_VALUE */ +#define AID_IN_MAX_VALUE 8U /*!< \brief 8: AID_IN_MAX_VALUE */ +#define AID_IN_OFFSET 9U /*!< \brief 9: AID_IN_OFFSET */ +#define AID_IN_SCALE 10U /*!< \brief 10: AID_IN_SCALE */ +#define AID_IN_NUMB_DECIMALS 11U /*!< \brief 11: AID_IN_NUMB_DECIMALS */ +#define AID_IN_FORMAT 12U /*!< \brief 12: AID_IN_FORMAT */ +#define AID_IN_JUSTIFICATION 13U /*!< \brief 13: AID_IN_JUSTIFICATION */ +#define AID_IN_VALUE 14U /*!< \brief 14: AID_IN_VALUE */ +#define AID_IN_OPTIONS_2 15U /*!< \brief 15: AID_IN_OPTIONS_2 */ +/*!@}*/ + +/*! \name input list object attribute id's + @{ */ +#define AID_IL_WIDTH 1U /*!< \brief 1: AID_IL_WIDTH */ +#define AID_IL_HEIGHT 2U /*!< \brief 2: AID_IL_HEIGHT */ +#define AID_IL_VARIABLE_REF 3U /*!< \brief 3: AID_IL_VARIABLE_REF */ +#define AID_IL_VALUE 4U /*!< \brief 4: AID_IL_VALUE */ +#define AID_IL_OPTIONS 5U /*!< \brief 5: AID_IL_OPTIONS */ +/*!@}*/ + +/*! \name Output string object attribute id's + @{ */ +#define AID_OS_WIDTH 1U /*!< \brief 1: AID_OS_WIDTH */ +#define AID_OS_HEIGHT 2U /*!< \brief 2: AID_OS_HEIGHT */ +#define AID_OS_BG_COLOUR 3U /*!< \brief 3: AID_OS_BG_COLOUR */ +#define AID_OS_FONT_ATT 4U /*!< \brief 4: AID_OS_FONT_ATT */ +#define AID_OS_OPTIONS 5U /*!< \brief 5: AID_OS_OPTIONS */ +#define AID_OS_VARIABLE_REF 6U /*!< \brief 6: AID_OS_VARIABLE_REF */ +#define AID_OS_JUSTIFICATION 7U /*!< \brief 7: AID_OS_JUSTIFICATION */ +/*!@}*/ + +/*! \name Output number object attribute id's + @{ */ +#define AID_ON_WIDTH 1U /*!< \brief 1: AID_ON_WIDTH */ +#define AID_ON_HEIGHT 2U /*!< \brief 2: AID_ON_HEIGHT */ +#define AID_ON_BG_COLOUR 3U /*!< \brief 3: AID_ON_BG_COLOUR */ +#define AID_ON_FONT_ATT 4U /*!< \brief 4: AID_ON_FONT_ATT */ +#define AID_ON_OPTIONS 5U /*!< \brief 5: AID_ON_OPTIONS */ +#define AID_ON_VARIABLE_REF 6U /*!< \brief 6: AID_ON_VARIABLE_REF */ +#define AID_ON_OFFSET 7U /*!< \brief 7: AID_ON_OFFSET */ +#define AID_ON_SCALE 8U /*!< \brief 8: AID_ON_SCALE */ +#define AID_ON_NUMB_DECIMALS 9U /*!< \brief 9: AID_ON_NUMB_DECIMALS */ +#define AID_ON_FORMAT 10U /*!< \brief 10: AID_ON_FORMAT */ +#define AID_ON_JUSTIFICATION 11U /*!< \brief 11: AID_ON_JUSTIFICATION */ +#define AID_ON_VALUE 12U /*!< \brief 12: AID_ON_VALUE */ +/*!@}*/ + +/*! \name Output line object attribute id's + @{ */ +#define AID_OL_LINE_ATT 1U /*!< \brief 1: AID_OL_LINE_ATT */ +#define AID_OL_WIDTH 2U /*!< \brief 2: AID_OL_WIDTH */ +#define AID_OL_HEIGHT 3U /*!< \brief 3: AID_OL_HEIGHT */ +#define AID_OL_LINE_DIR 4U /*!< \brief 4: AID_OL_LINE_DIR */ +/*!@}*/ + +/*! \name Output rectangle object attribute id's + @{ */ +#define AID_OR_LINE_ATT 1U /*!< \brief 1: AID_OR_LINE_ATT */ +#define AID_OR_WIDTH 2U /*!< \brief 2: AID_OR_WIDTH */ +#define AID_OR_HEIGHT 3U /*!< \brief 3: AID_OR_HEIGHT */ +#define AID_OR_LINE_SUPPR 4U /*!< \brief 4: AID_OR_LINE_SUPPR */ +#define AID_OR_FILL_ATT 5U /*!< \brief 5: AID_OR_FILL_ATT */ +/*!@}*/ + +/*! \name Output ellipse object attribute id's + @{ */ +#define AID_OE_LINE_ATT 1U /*!< \brief 1: AID_OE_LINE_ATT */ +#define AID_OE_WIDTH 2U /*!< \brief 2: AID_OE_WIDTH */ +#define AID_OE_HEIGHT 3U /*!< \brief 3: AID_OE_HEIGHT */ +#define AID_OE_ELLIPSE_TYPE 4U /*!< \brief 4: AID_OE_ELLIPSE_TYPE */ +#define AID_OE_START_ANGLE 5U /*!< \brief 5: AID_OE_START_ANGLE */ +#define AID_OE_END_ANGLE 6U /*!< \brief 6: AID_OE_END_ANGLE */ +#define AID_OE_FILL_ATT 7U /*!< \brief 7: AID_OE_FILL_ATT */ +/*!@}*/ + +/*! \name Output polypon object attribute id's + @{ */ +#define AID_OP_WIDTH 1U /*!< \brief 1: AID_OP_WIDTH */ +#define AID_OP_HEIGHT 2U /*!< \brief 2: AID_OP_HEIGHT */ +#define AID_OP_LINE_ATT 3U /*!< \brief 3: AID_OP_LINE_ATT */ +#define AID_OP_FILL_ATT 4U /*!< \brief 4: AID_OP_FILL_ATT */ +#define AID_OP_POLYGON_TYPE 5U /*!< \brief 5: AID_OP_POLYGON_TYPE */ +/*!@}*/ + +/*! \name Output meter object attribute id's + @{ */ +#define AID_OM_WIDTH 1U /*!< \brief 1: AID_OM_WIDTH */ +#define AID_OM_NEEDLE_COLOUR 2U /*!< \brief 2: AID_OM_NEEDLE_COLOUR */ +#define AID_OM_BORDER_COLOUR 3U /*!< \brief 3: AID_OM_BORDER_COLOUR */ +#define AID_OM_ARC_THICK_COLOUR 4U /*!< \brief 4: AID_OM_ARC_THICK_COLOUR */ +#define AID_OM_OPTIONS 5U /*!< \brief 5: AID_OM_OPTIONS */ +#define AID_OM_NUMB_TICKS 6U /*!< \brief 6: AID_OM_NUMB_TICKS */ +#define AID_OM_START_ANGLE 7U /*!< \brief 7: AID_OM_START_ANGLE */ +#define AID_OM_END_ANGLE 8U /*!< \brief 8: AID_OM_END_ANGLE */ +#define AID_OM_MIN_VALUE 9U /*!< \brief 9: AID_OM_MIN_VALUE */ +#define AID_OM_MAX_VALUE 10U /*!< \brief 10: AID_OM_MAX_VALUE */ +#define AID_OM_VARIABLE_REF 11U /*!< \brief 11: AID_OM_VARIABLE_REF */ +#define AID_OM_VALUE 12U /*!< \brief 12: AID_OM_VALUE */ +/*!@}*/ + +/*! \name Output linear bar graph object attribute id's + @{ */ +#define AID_OLBG_WIDTH 1U /*!< \brief 1: AID_OLBG_WIDTH */ +#define AID_OLBG_HEIGHT 2U /*!< \brief 2: AID_OLBG_HEIGHT */ +#define AID_OLBG_COLOUR 3U /*!< \brief 3: AID_OLBG_COLOUR */ +#define AID_OLBG_TARGET_LINE_COLOUR 4U /*!< \brief 4: AID_OLBG_TARGET_LINE_COLOUR */ +#define AID_OLBG_OPTIONS 5U /*!< \brief 5: AID_OLBG_OPTIONS */ +#define AID_OLBG_NUMB_TICKS 6U /*!< \brief 6: AID_OLBG_NUMB_TICKS */ +#define AID_OLBG_MIN_VALUE 7U /*!< \brief 7: AID_OLBG_MIN_VALUE */ +#define AID_OLBG_MAX_VALUE 8U /*!< \brief 8: AID_OLBG_MAX_VALUE */ +#define AID_OLBG_VARIABLE_REF 9U /*!< \brief 9: AID_OLBG_VARIABLE_REF */ +#define AID_OLBG_TARGET_VAL_VAR_REF 10U /*!< \brief 10: AID_OLBG_TARGET_VAL_VAR_REF */ +#define AID_OLBG_TARGET_VALUE 11U /*!< \brief 11: AID_OLBG_TARGET_VALUE */ +#define AID_OLBG_VALUE 12U /*!< \brief 12: AID_OLBG_VALUE */ +/*!@}*/ + +/*! \name Output arched bar graph object attribute id's + @{ */ +#define AID_OABG_WIDTH 1U /*!< \brief 1: AID_OABG_WIDTH */ +#define AID_OABG_HEIGHT 2U /*!< \brief 2: AID_OABG_HEIGHT */ +#define AID_OABG_COLOUR 3U /*!< \brief 3: AID_OABG_COLOUR */ +#define AID_OABG_TARGET_LINE_COLOUR 4U /*!< \brief 4: AID_OABG_TARGET_LINE_COLOUR */ +#define AID_OABG_OPTIONS 5U /*!< \brief 5: AID_OABG_OPTIONS */ +#define AID_OABG_START_ANGLE 6U /*!< \brief 6: AID_OABG_START_ANGLE */ +#define AID_OABG_END_ANGLE 7U /*!< \brief 7: AID_OABG_END_ANGLE */ +#define AID_OABG_BAR_GRAPH_WIDTH 8U /*!< \brief 8: AID_OABG_BAR_GRAPH_WIDTH */ +#define AID_OABG_MIN_VALUE 9U /*!< \brief 9: AID_OABG_MIN_VALUE */ +#define AID_OABG_MAX_VALUE 10U /*!< \brief 10: AID_OABG_MAX_VALUE */ +#define AID_OABG_VARIABLE_REF 11U /*!< \brief 11: AID_OABG_VARIABLE_REF */ +#define AID_OABG_TARGET_VAL_VAR_REF 12U /*!< \brief 12: AID_OABG_TARGET_VAL_VAR_REF */ +#define AID_OABG_TARGET_VALUE 13U /*!< \brief 13: AID_OABG_TARGET_VALUE */ +#define AID_OABG_VALUE 14U /*!< \brief 14: AID_OABG_VALUE */ +/*!@}*/ + +/*! \name Picture graphic object attribute id's + @{ */ +#define AID_PG_WIDTH 1U /*!< \brief 1: AID_PG_WIDTH */ +#define AID_PG_OPTIONS 2U /*!< \brief 2: AID_PG_OPTIONS */ +#define AID_PG_TRANSPARENCY_COLOUER 3U /*!< \brief 3: AID_PG_TRANSPARENCY_COLOUER */ +#define AID_PG_ACTUAL_WIDTH 4U /*!< \brief 4: AID_PG_ACTUAL_WIDTH */ +#define AID_PG_ACTUAL_HEIGHT 5U /*!< \brief 5: AID_PG_ACTUAL_HEIGHT */ +#define AID_PG_FORMAT 6U /*!< \brief 6: AID_PG_FORMAT */ +/*!@}*/ + +/*! \name Number variable object attribute id's + @{ */ +#define AID_NV_VALUE 1U /*!< \brief 1: AID_NV_VALUE */ +/*!@}*/ + +/*! \name Font attributes object attribute id's + @{ */ +#define AID_FA_FONT_COLOUR 1U /*!< \brief 1: AID_FA_FONT_COLOUR */ +#define AID_FA_FONT_SIZE 2U /*!< \brief 2: AID_FA_FONT_SIZE */ +#define AID_FA_FONT_TYPE 3U /*!< \brief 3: AID_FA_FONT_TYPE */ +#define AID_FA_FONT_STYLE 4U /*!< \brief 4: AID_FA_FONT_STYLE */ +/*!@}*/ + +/*! \name Line attributes object attribute id's + @{ */ +#define AID_LA_LINE_COLOUR 1U /*!< \brief 1: AID_LA_LINE_COLOUR */ +#define AID_LA_LINE_WIDTH 2U /*!< \brief 2: AID_LA_LINE_WIDTH */ +#define AID_LA_LINE_ART 3U /*!< \brief 3: AID_LA_LINE_ART */ +/*!@}*/ + +/*! \name Fill attributes object attribute id's + @{ */ +#define AID_FA_FILL_TYPE 1U /*!< \brief 1: AID_FA_FILL_TYPE */ +#define AID_FA_FILL_COLOUR 2U /*!< \brief 2: AID_FA_FILL_COLOUR */ +#define AID_FA_FILL_PATTERN 3U /*!< \brief 3: AID_FA_FILL_PATTERN */ +/*!@}*/ + +/*! \name Input object attribute id's + @{ */ +#define AID_IP_VALIDATION_TYPE 1U /*!< \brief 1: AID_IP_VALIDATION_TYPE */ +/*!@}*/ + +/*! \name Object pointer attribute id's + @{ */ +#define AID_OP_VALUE 1U /*!< \brief 1: AID_OP_VALUE */ +/*!@}*/ + +/*! \name Auxiliary function type 2 object attribute id's + @{ */ +#define AID_AUXF2_BG_COLOUR 1U /*!< \brief 1: AID_AUXF2_BG_COLOUR */ +#define AID_AUXF2_FUNCTION 2U /*!< \brief 2: AID_AUXF2_FUNCTION */ +/*!@}*/ + +/*! \name Auxiliary input type 2 object attribute id's + @{ */ +#define AID_AUXI2_BG_COLOUR 1U /*!< \brief 1: AID_AUXI2_BG_COLOUR */ +#define AID_AUXI2_FUNCTION 2U /*!< \brief 2: AID_AUXI2_FUNCTION */ +/*!@}*/ + +/*! \name Auxiliary control designator type 2 object pointer attribute id's + @{ */ +#define AID_AUXC2_PTR_TYPE 1U /*!< \brief 1: AID_AUXC2_PTR_TYPE */ +#define AID_AUXC2_OBJ_ID 2U /*!< \brief 2: AID_AUXC2_OBJ_ID */ +/*!@}*/ + +/*! \name Window mask object attribute id's + @{ */ +#define AID_WM_BG_COLOUR 1U /*!< \brief 1: AID_WM_BG_COLOUR */ +#define AID_WM_OPTIONS 2U /*!< \brief 2: AID_WM_OPTIONS */ +#define AID_WM_NAME 3U /*!< \brief 3: AID_WM_NAME */ +/*!@}*/ + +/*! \name Key group object attribute id's + @{ */ +#define AID_KG_OPTIONS 1U /*!< \brief 1: AID_KG_OPTIONS */ +#define AID_KG_NAME 2U /*!< \brief 2: AID_KG_NAME */ +/*!@}*/ + + +/*! \name Object label reference list object attribute id's + @{ */ +#define AID_OLRL_NUMB_LABLED_OBJ 1U /*!< \brief 1: AID_OLRL_NUMB_LABLED_OBJ */ +/*!@}*/ + +/*! \name External object attribute id's + @{ */ +#define AID_EX_OPTIONS 1U /*!< \brief 1: AID_EX_OPTIONS */ +#define AID_EX_NAME_0 2U /*!< \brief 2: AID_EX_NAME_0 */ +#define AID_EX_NAME_1 3U /*!< \brief 3: AID_EX_NAME_1 */ +/*!@}*/ + +/*! \name External reference name object attribute id's + @{ */ +#define AID_EXRN_OPTIONS 1U /*!< \brief 1: AID_EXRN_OPTIONS */ +#define AID_EXRN_NAME_0 2U /*!< \brief 2: AID_EXRN_NAME_0 */ +#define AID_EXRN_NAME_1 3U /*!< \brief 3: AID_EXRN_NAME_1 */ +/*!@}*/ + +/*! \name External object pointer object attribute id's + @{ */ +#define AID_EXOP_DEF_OBJ_ID 1U /*!< \brief 1: AID_EXOP_DEF_OBJ_ID */ +#define AID_EXOP_EXT_REF_NAME_ID 2U /*!< \brief 2: AID_EXOP_EXT_REF_NAME_ID */ +#define AID_EXOP_EXT_OBJ 3U /*!< \brief 3: AID_EXOP_EXT_OBJ */ +/*!@}*/ + + + + +/** @} */ /* END gr_isovt_aids */ +#endif +/* ************************************************************************ */ + +/** @} */ /* END poolmani */ + + +/* ************************************************************************ */ +/** @} */ /* END vtcl */ +/* ************************************************************************ */ + + +/* ************************************************************************ */ +#ifdef __cplusplus +} /* end of extern "C" */ +#endif + +#endif /* DEF_IsoVtcApi_H */ +/* ************************************************************************ */ ++======= + /* ************************************************************************ */ + /*! + \file + \brief ECU Driver VT Client API Header File + \author Wegscheider Peter + \date Created XX.07.13 + + \copyright Competence Center ISOBUS e.V. + + \par History: + \par + 04.07.2013 - author P. Wegscheider + - API declarations moved to this file + - Module version define added + \par + 25.11.2013 - author P. Wegscheider + - "Direct Pool Transfer" implementation + - Function IsoPoolInitDirectTransfer() added + \par + 09.12.2013 - author P. Wegscheider + - Functions IsoAuxPrefAssignmentCbSet() and IsoAuxPrefAssignmentTrigger() added + - Function IsoAuxAssignmentSet() disabled per default. + - VT_AUXAPP_T extended with baAuxName[8] (ISO name of the auxiliary input device) + - Define ISO_AUXFUNC_SINGLEASSIGN_CHECK added to enable the aux function single assignment check + \par + 15.05.2013 - author P. Wegscheider + - VERSION_VTC updated to 3.2 + - define ISO_EXTERNAL_POOLBUFFER and function IsoPoolSetBuffer() added + - Functions IsoPoolObjSize() and IsoPoolObjCopyToRAM() added + - Function IsoPoolObjectCbSet(), IsoPoObjAttributGet() and IsoPoolObjPtrGet() for AID reading added + - define ISOVT_AID_DEFINES check and AID_xxx defines added + \par + 22.07.2014 - author P. Wegscheider + - VERSION_VTC updated to 3.3 + - IsoPoolObjPtrGet() implementation changed to avoid compiler pointer cast error + \par + 23.03.2015 - author P. Wegscheider + - VERSION_VTC updated to 3.4 + - Feature request ID 2122: Optimization of direct load pool transfer + \par + 14.04.2016 - author E. Hammerl + - Added IsoVTObjTypeParsableSet() + - Renamed IsoCheckObjTypeSupported() into IsoVTObjTypeIsSupported() + - Added defines for VT versions + - Added enum for VT events, callback installer function for this events + - Added defines, AIDs and command functions for new objects of V 4,5,6 + - Changed iso_char into iso_8 ( IsoVTVersionStringGet(), IsoPoolReadPtrLoc() ) + - Changes in Returnvalues of all command functions( #E_USER_ERROR into ##E_NO_INSTANCE ) + - Added bFuncAttribute in struct VT_AUXAPP_T ! + - ObjectExternalObjDef renamed to ExternalObjectDef + - Added IsoAuxCapabilitiesRequest() for auxiliary capabilities request + - Changed two parameters of ISOPOOLCTRL_T from iso_u16 to iso_u32 + - VERSION_VTC updated to 5.1 + \par + 01.08.2016 - author P. Wegscheider + - VERSION_VTC updated to 5.2 + - Feature request ID 4565 Master registration ( VTC solution ) + - Added IsoVTSetNewPreferredVT() + - Added #IsoEvConnSelectPreferredVT to ISOVT_VTEVENT_e + \par + 15.12.2016 - author P. Wegscheider + - Feature request ID 4629: client interfaces should only use handles + - Replaced source address (SA) parameter with CF handle for functions + IsoWsSetMaskInst(), IsoWsSetAuxInst() and IsoWsSetSccInst() + - Removed unneeded parameter rwFctSender from IsoAlarmObjInit() + - Removed fields bData and wFctofSender from structure #ISOALARM_T + \par + 10.01.2017 - author P. Wegscheider + - Feature request ID 4655: IsoCmd_Attribute(): change parameter lvalue from iso_s32 to iso_u32 + - Feature request ID 4656: IsoCmd_LockUnlockMask(): change parameter lvalue from iso_s32 to iso_u16 + - Feature request ID 4657: IsoCmd_NumericValueRef(), IsoCmd_NumericValue(): change parameter lvalue from iso_s32 to iso_u32 + \par + 12.01.2017 - author P. Wegscheider + - Feature request ID 4638: Added IsoPoolWSSelectableSet() to change WS selectable attribute + \par + 16.01.2017 - author P. Wegscheider + - Feature request ID 4654: callback prior to saving the object pool + - Added ISOVT_VTEVENT_e events IsoEvMaskReadyToStore and IsoEvAuxReadyToStore + - Added new ISOVT_ANNOUNCE_e state waiting_before_store before request_store_version to signal the new events + \par + 26.01.2017 - author P. Wegscheider + - Feature ID 4209: declare pointer parameter in functions as const* where applicable + - IsoVTInit() - set callback functions parameter ISOVT_MSG_STA_T as const + - IsoAuxAssignmentSet() - set parameter VT_AUXAPP_T as const + - IsoPoolReadPtrLoc() - set return value to const iso_u8* + \par + 20.02.2017 - author P. Wegscheider + - Feature request ID 6015: event if pool reload is finished \n + (Added events #IsoEvMaskPoolReloadFinished and #IsoEvAuxPoolReloadFinished) + \par + 21.02.2017 - author P. Wegscheider + - Feature request ID 6003: client interfaces should only use handles (rather then ISOBUS NAME) + - Replaced working set master NAME parameter with CF handle for functions + IsoVTInit(), IsoVT_InstallCbConnection(), IsoAuxUnitInit() and IsoAlarmObjInit() + - Removed IsoWsSetMaskInstWithName() + \par + 21.02.2018 - author P.Wegscheider + - Feature ID 7528: add user parameter to callback functions + - Feature ID 8157: AUX: add a getter to obtain the drivers aux function index of an given object \n + Added function IsoAuxInputIndexToObjId() to get the index to an input object ID + \par + 06.05.2018 - author P.Wegscheider + - Feature ID 3910: header files should include header files they depend on + \par + 14.06.2018 - author P.Wegscheider + - Feature request ID 8424: use ISO_CF_NAME_T in API functions + \par + 15.06.2018 - author P.Wegscheider + - Feature ID 8822: allow for a secondary pool manipulation + \par + 18.07.2018 - author P.Wegscheider + - Feature BugID 8425: integrate APA AUX - pool upload client + - Moved API and renamed functions + \par + 10.08.2018 - author P. Wegscheider + - BugID 8581: add "namespace ISOBUSDRIVER" to header files + \par + 25.10.2018 - author P.Wegscheider + - Feature ID 9539: While scanning an Auxiliary Input object additional data ( array index ) shall be made available to the application + \par + 20.11.2018 - author P.Wegscheider + - Feature ID 9545: ISO 11783-6_Virtual Terminal (4th edition 2018) -- new graphic objects + - Added and updated VT 6 objects; Replaced PNGObject enumeration entry with GraphicDataObject + */ + /* ************************************************************************ */ + #ifndef DEF_IsoVtcApi_H + #define DEF_IsoVtcApi_H + + /* include configuration, driver standard types and common definitions */ + #include "IsoCommonDef.h" + + #ifdef __cplusplus + extern "C" { + #endif + /* ************************************************************************ */ + + /* ************************************************************************ */ + /*! \ingroup grp_versions + \brief Virtual Terminal Client Module Version + */ + #define VERSION_VTC 5.6 /* changed for v10.00 */ + + + + /* ************************************************************************ */ + /* ******* Following functions and definitions only for LAYER 6 .. ******** */ + /* ************************************************************************ */ + + /* ********************************* IsoVt.c ***************************** */ + /** \defgroup vtcl VT-Client + \ingroup clients + \brief Part 6 - Virtual Terminal Client + */ + + #if defined(DOXYGEN) + /*! \defgroup vtclmem Reduce memory footprint options + \ingroup vtcl + \brief Optional defines to reduce the VT-Client RAM and FLASH memory footprint. \n + The following defines can be added to the application specific IsoConf.h. + @{ */ + + /*! \brief Disable UT3 functionality ( VT Version 4 and Version 5 ). + ( IsoAux.c ) + */ + #define ISO_VTC_DISABLE_UT3 + #undef ISO_VTC_DISABLE_UT3 + + /*! \brief Disable auxiliary function type 2 functionality. + ( IsoAux.c ) + */ + #define ISO_VTC_DISABLE_AUX_N + #undef ISO_VTC_DISABLE_AUX_N + + /*! \brief Disable auxiliary function type 1 functionality. + (Location: IsoAuxOld.c ) + */ + #define ISO_VTC_DISABLE_AUX_O + #undef ISO_VTC_DISABLE_AUX_O + + /*! \brief Disable functionality for event and time controlled responses (ECC/TCR) of commands. + (Location: IsoVtXcr.c ) + */ + #define ISO_VTC_DISABLE_XCR + #undef ISO_VTC_DISABLE_XCR + + /*! \brief Disable buffered standard and segmented pool upload functionality. + (Location: IsoPool.c ) + \details The define is normally only used in combination with #ISO_POOL_DIRECT_LOAD + to reduce the memory footprint of the pool management module. + */ + #define ISO_VTC_DISABLE_POOL_BUFFERED_LOAD + #undef ISO_VTC_DISABLE_POOL_BUFFERED_LOAD + + /*! \brief Enable VT client alarm management functionality. + ( IsoAlarm.c ) + */ + #define ISO_VTC_ENABLE_ALARM + + /*! \brief Enable auxiliary input type 1 and 2 functionality. + (Location: IsoAux.c, IsoAuxOld.c ) + \details This enables a subset of the of the ISO 11783 functionality needed to implement an auxiliary input unit device. + */ + #define ISO_VTC_ENABLE_AUX_INPUT + + + /* make sure that the API documentation can be generated */ + #if !defined(ISO_VTC_ALARM) + #define ISO_VTC_ALARM + #endif + #if !defined(ISO_VTC_AUX_N) + #define ISO_VTC_AUX_N + #endif + #if !defined(ISO_VTC_AUX_O) + #define ISO_VTC_AUX_O + #endif + #if !defined(ISO_VTC_AUX_INP_N) + #define ISO_VTC_AUX_INP_N + #endif + #if !defined(ISO_VTC_AUX_INP_O) + #define ISO_VTC_AUX_INP_O + #endif + #if !defined(ISO_VTC_XCR) + #define ISO_VTC_XCR + #endif + + /*! @} */ + #endif /* DOXYGEN memory */ + + + + /* ************************************************************************ */ + /** \addtogroup vtcl + @{ + */ + /* ************************************************************************ */ + + #if defined(CCI_USE_NAMESPACE) && defined(__cplusplus) + #include "IsoVtcApi.hpp" + #else /* not: defined(CCI_USE_NAMESPACE) && defined(__cplusplus) -> use C defines */ + + /* VT versions */ + #define VT_V0_FE (0U) /**< VT DIS - draft first edition 2001*/ + #define VT_V1_FE (1U) /**< VT FDIS - final draft first edition */ + #define VT_V2_FE (2U) /**< VT IS - ISO first edition 2004*/ + #define VT_V3_SE_UT2 (3U) /**< VT IS - ISO second edition with Version 3 reference 2010*/ + #define VT_V4_SE_UT3 (4U) /**< VT IS - ISO second edition - Version 4 enhancements 2010*/ + #define VT_V5_SE_UT3 (5U) /**< VT IS - ISO second edition - Version 5 enhancements 2011 */ + #define VT_V6_TE (6U) /**< VT IS - ISO fourth edition - Version 6 enhancements 2018 */ + + #define LENVERSIONSTRV4 (7U) /**< Length of version strings 4 and earlier */ + #define LENVERSIONSTRV5 (32U) /**< Length of version strings 5 and later */ + + #endif /* not: defined(CCI_USE_NAMESPACE) && defined(__cplusplus) */ + + #ifdef ISO_VTC_UT3 + #define LENVERSIONSTR (32U) /* LENVERSIONSTRV5 */ + #else + #define LENVERSIONSTR (7U) /* LENVERSIONSTRV4 */ + #endif + + /** \brief + Relationship of VT Client and VT Server connection + */ + typedef enum + { + Ws_Aux, /**< Working set uses VT for auxiliary assignment */ + Ws_MaskAux, /**< Working set has functions and partner is VT with function instance 0 */ + Ws_VtWaiter, /**< Working set is waiting for VT status msg */ + Ws_Mask, /**< Working set has functions but VT has not function instance 0 */ + Ws_Mask2Inst, /**< Working set which has created an AUX instance */ + Ws_MaskNoFunc, /**< Working set has no auxiliary functions */ + Ws_Last + } WSCOUP_STA_e; + + + /** \brief Typedef of Struct for received VT messages and responses used in VT Messages Callback . + \details + - Struct is used for giving various VT message data to the application + - Corresponding Callbackfunction see IsoVTInit() + - Responses of commands are not documented (see Sourcecode IsoVTCmd.c) + - Valid callback message fields depending on the iVtFunction (ISOVT_FUNC_e): + + \verbatim + iVtFunction: + softkey_activation wObjectID key object ID + wPara1 parent object ID + bPara key number (hard coded) + lValue activation code (0, 1, 2, 3(Version 4)) see [1] + button_activation wObjectID button object ID + wPara1 parent object ID + bPara button key number + lValue activation code (0, 1, 2, 3(Version 4)) see [1] + pointing_event wPara1 X position in pixel + wPara2 Y position in pixel + VT_select_input_object wObjectID input object ID + wPara1 Selected/Deselected + wPara2 Bitmask (Version 5 and later) + VT_esc wObjectID ID of input field where aborted + iErrorCode error code see ISO Doku. + VT_change_numeric_value wObjectID ID of input object + lValue new value + VT_change_active_mask wObjectID momentan active mask + iErrorCode error code see ISO Doku. + VT_change_softkey_mask wObjectID data or alarm mask object ID + wPara1 soft key mask object ID + iErrorCode error code see ISO Doku + VT_change_string_value wObjectID ID of String object + bPara Length of string + pabVtData Pointer to characters + ( Version 4 ) + VT_onUserLayout_hideShow wObjectID Object ID of WM, DM, SKM, KG + wPara2 Hide/show + wPara1 Object ID of second WM, DM, SKM, KG + bPara Hide/show of second + get_attribute_value wObjectID Object ID + bPara AID + wPara1 Current value of attribute + iErrorCode ErrorCode (see F.59) + ( Version 3 ) + preferred_assignment wObjectID Auxiliary function object if faulty + iErrorCode Error code see ISO Doku. + auxiliary_assign_type_1, .._2 wObjectID Object ID auxiliary function + wPara1 Object ID auxiliary input (or input number type 1) + 0xFFFF for unassign + wPara2 Type of auxiliary incl. Attribute bits see [2] + bPara ISO_TRUE: Store as pref. assign, else not (only type 2) + lValue Bit 16 - 27: Manufacturer code, + Bit 0 - 15 Model Identification code of auxiliary input + (only type 2) + pabVtData only for auxiliary_assign_type_2: + Pointer to the last/current aux unit ISONAME or 8*0xFF + auxiliary_input_status_type_2 + aux_input_status_type_1 wObjectID Object ID Auxiliary function type + wPara1 Input object ID (type 1 = input number + lValue Value 1 + wPara2 Value 2 + iErrorCode E_NO_ERR, E_CANMSG_MISSED (Alive of input) + ( Version 5 ) + auxiliary_capabilities bPara Number of auxiliary Units + pabVtData Pointer to data ( Byte 3 ... ) + proprietary VT client notifications: + vtc_pool_aux_input_type_2 wObjectID Object ID Auxiliary input type 2 + wPara1 Array index number (parameter for IsoAuxInputStatus2()) + wPara2 Type of auxiliary input + + + [1] Timeout control of softkeys and buttons have to be done of application ! + [2] Attribute bits are given to application as additional information + For getting the Auxiliary type application have to mask out it. + \endverbatim + + */ + typedef struct + { + iso_s16 iVtFunction; /**< Last function of VT response (#ISOVT_FUNC_e) */ + iso_u16 wObjectID; /**< Depends of function/command */ + iso_u32 lValue; /**< Value of VT change numeric value */ + iso_u16 wPara1; /**< Word storage 1 */ + iso_u16 wPara2; /**< Word storage 2 */ + iso_u8 bPara; /**< Byte storage i. e. soft key number */ + iso_s16 iErrorCode; /**< Error iso_u8 of response messages */ + iso_s32 lTimeSt; /**< Time stamp */ + iso_u8* pabVtData; /**< Data of VT e. g. string characters */ + ISO_USER_PARAM_T userParam; /**< User parameter set with IsoVTInit() */ + } ISOVT_MSG_STA_T, *ISOVT_MSG_STA_t ; + + + /** \brief + Events for VT Client connection callback function + */ + typedef enum + { + IsoEvConnSelectPreferredVT, /**< Initial preferred VT is not available. + \details This event is only triggered if one or more VTs are available. + In this case the application can set a new preferred VT with IsoVTSetNewPreferredVT(). + */ + IsoEvMaskServerVersAvailable, /**< Version of mask (VT)server is available */ + IsoEvMaskLanguageCmd, /**< Language and/or metrics of VT server has been changed */ + IsoEvMaskTechDataV4Request, /**< Enables requesting of technical data messages Annex D.10 till D.14 */ + IsoEvMaskLoadObjects, /**< Set and manipulate pool */ + IsoEvMaskReadyToStore, /**< VTC is ready to store the uploaded object pool. + \details If defined ISO_VTC_WAITBEFORESTORE the state machine will stay in this state + until the application calls IsoVtContinue(). + If ISO_VTC_WAITBEFORESTORE is not defined or the callback function is not set, + we continue immediately with state #request_store_version. */ + IsoEvMaskActivated, /**< Login finished - client is in state application_running */ + IsoEvMaskTick, /**< Mask connection cyclic call */ + IsoEvMaskLoginAborted, /**< Mask connection uncoverable error during Login */ + IsoEvMaskStateChanged, /**< Reports changes of VTC maskinstance to statemachine */ + IsoEvMaskPoolReloadFinished, /**< Mask connection: object pool reload finished */ + /* Mask/Aux connection independent */ + IsoEvConnSafeState, /**< Application shall go into safe state ( connection closed ) */ + /* Only called if Aux functions in pool and second connection is running */ + IsoEvAuxServerVersAvailable, /**< Version of server is available */ + IsoEvAuxLanguageCmd, /**< Language and/or metrics of VT server with function instance 0 has been changed */ + IsoEvAuxTechDataV4Request, /**< Enables requesting of of Annex D.10 till D.14 */ + IsoEvAuxLoadObjects, /**< Set and manipulate pool */ + IsoEvAuxReadyToStore, /**< VTC is ready to store the uploaded object pool on the AUX VT instance + \details See #IsoEvMaskReadyToStore for more information. */ + IsoEvAuxActivated, /**< Login finished - client is in state VtRunning */ + IsoEvAuxTick, /**< Auxiliary connection cyclic call */ + IsoEvAuxLoginAborted, /**< Auxiliary connection uncoverable error during Login */ + IsoEvAuxStateChanged, /**< Reports changes of VTC auxinstance to statemachine */ + IsoEvAuxPoolReloadFinished /**< Auxiliary connection: object pool reload finished */ + } ISOVT_VTEVENT_e; + + + /** \brief + States of VT state machine + */ + typedef enum + { + safe_state = 0, /**< Application is not active */ + announce_stopped = 1, /**< No more trials for communication with VT */ + announce_aborted = 2, /**< Announcement will be repeated */ + moveToAnotherVT = 10, /**< Changing the VT is triggered of application */ + moveVT_deleteVersion = 11, /**< Pool in VT RAM has been deleted */ + delete_respond_waiting = 12, /**< Waiting for response to delete object pool */ + delete_responded = 13, /**< Response for delete version is received */ + vt_lost = 14, /**< VT is lost ( move to another VT or missing VT status */ + vt_status_received = 20, /**< VT Status message received */ + waiting_after_vt_status_rec = 21, /**< Waiting after receiption of vt status message */ + working_set_master_sended = 22, /**< Pool in VT RAM is deleted */ + request_get_memory_for_aux = 23, /**< Early get memory request */ + language_command = 26, /**< Check Language command, request if necessary */ + language_command_waiting = 27, /**< Language command waiting */ + request_get_softkeys = 30, /**< Request get softkeys */ + request_get_textfont = 31, /**< Request get textfont */ + request_get_hardware = 32, /**< Request get hardware */ + request_get_versions = 36, /**< Request get versions */ + check_sequenz_control = 40, /**< Reading SCM capabilities */ + waiting_after_GetVersions = 41, /**< Stop -> pool manipulation -> IsoVtContinue()! */ + waiting_for_SetPrefassign = 42, /**< Waiting for setting preferred assignment */ + appStartandVersionString = 43, /**< Check version strings and decide */ + pool_scan_running = 44, /**< Pool scan is running */ + pool_scan_finished = 45, /**< Pool scan is ready */ + request_load_version = 50, /**< Request load version */ + pool_service_running = 51, /**< Pool transfer is running */ + waiting_before_store = 52, /**< Waiting before continue with "Request store version" */ + request_store_version = 53, /**< Request store version */ + reload_poolobjects = 54, /**< Reloading poolobjects */ + pref_assignment_send = 60, /**< Sending Preferred assignment */ + preferred_assignment_resp_wait = 61, /**< Waiting for preferred assignment response */ + announce_finished = 63, /**< Last step of login */ + application_running = 70 /**< Normal operation of application (commands ...) */ + } ISOVT_ANNOUNCE_e; + + /** \brief + Enum of all VT object types + */ + typedef enum + { + /* Top level objects */ + WorkingSet = 0, /**< Top level object describes an implement (working set). */ + /* Working set object */ + DataMask = 1, /**< Top level object that contains other objects. */ + AlarmMask = 2, /**< Top level object: Describes an alarm display. */ + Container = 3, /**< Used to group objects. */ + /* Key objects */ + SoftKeyMask = 4, /**< Top level object that contains key objects. */ + Key = 5, /**< Used to describe a soft key. */ + Button = 6, /**< Used to describe a button control. */ + /* Input field objects */ + InputBooleanField = 7, /**< Used to input a ISO_TRUE/ISO_FALSE type input. */ + InputStringField = 8, /**< Used to input a character string. */ + InputNumberField = 9, /**< Used to input an integer or float numeric. */ + InputListField = 10, /**< Used to select an item from a pre-defined list. */ + /* Output field objects */ + OutputStringField = 11, /**< Used to output a character string. */ + OutputNumberField = 12, /**< Used to output an integer or float numeric. */ + /* Output shape objects */ + TypLine = 13, /**< Used to output a line. */ + TypRectangle = 14, /**< Used to output a rectangle or square. */ + TypEllipse = 15, /**< Used to output an ellipse or circle. */ + TypPolygon = 16, /**< Used to output a polygon. */ + /* Output graphic objects */ + Meter = 17, /**< Used to output a meter. */ + LinearBarGraph = 18, /**< Used to output a linear bar graph. */ + ArchedBarGraph = 19, /**< Used to output an arched bar graph. */ + /* Picture graphic object */ + PictureGraphic = 20, /**< Used to output a picture graphic (bitmap). */ + /* Variable objects */ + NumberVariable = 21, /**< Used to store a 32-bit unsigned integer value. */ + StringVariable = 22, /**< Used to store a fixed length string value. */ + /* Attribute object */ + FontAttributesObject = 23, /**< Used to group font based attributes. */ + LineAttributesObject = 24, /**< Used to group line based attributes. */ + FillAttributesObject = 25, /**< Used to group fill based attributes. */ + InputAttributesObject = 26, /**< Used to specify a list of valid characters. */ + /* Pointer object */ + ObjectPointer = 27, /**< Used to reference another object. */ + /* Macro object */ + Macro = 28, /**< Special object that contains a list of commands. */ + /* Auxiliary control */ + AuxiliaryFunction = 29, /**< Defines the designator and function type. */ + AuxiliaryInput = 30, /**< Defines the designator, key number, and function type. */ + AuxiliaryFunction2 = 31, /**< Defines the designator and function type 2. */ + AuxiliaryInput2 = 32, /**< Defines the designator, key number, and function type 2 */ + AuxiliaryConDesigObjPoi = 33, /**< Defines the auxiliary control designator object pointer */ + /* Version 4 objects */ + WindowMaskObject = 34, /**< Special (parent) object for user layout DM */ + KeyGroupObject = 35, /**< Parent object of user layout SKM */ + GraphicsContextObject = 36, /**< Graphics Context object */ + OutputListObject = 37, /**< Used to output a output list */ + ExtInputAttributeObject = 38, /**< Extended input attribute object */ + ColourMapObject = 39, /**< Changing the colour table */ + ObjectLabelReferList = 40, /**< For assigning (textual/graphical) label to objects */ + /* Version 5 objects */ + ExternalObjectDef = 41, /**< Lists objects which another WS can reference */ + ExternalRefName = 42, /**< Identifies a WSM of a WS which can be referenced */ + ExternalObjectPointer = 43, /**< Allows a WS to display objects from another WS */ + AnimationObject = 44, /**< Used to display animations */ + /* Version 6 objects */ + ColourPaletteObject = 45, /**< Used for replacing VT standard colour palette */ + GraphicDataObject = 46, /**< Graphic Data object; Used for displaying Portable Network Graphic object */ + WSSpecialControlsObject = 47, /**< Working Set Special Controls object */ + ScaledGraphicObject = 48, /**< Scaled Graphic object */ + ObjectUndef = 255 + } OBJTYP_e; + + /** \brief + Enum VT functions + */ + typedef enum + { + /* Annex H: activation messages */ + softkey_activation = 0, + button_activation = 1, + pointing_event = 2, + VT_select_input_object = 3, + VT_esc = 4, + VT_change_numeric_value = 5, + VT_change_active_mask = 6, + VT_change_softkey_mask = 7, + VT_change_string_value = 8, + VT_onUserLayout_hideShow = 9, /* V4 */ + VT_controlAudioTermination = 10, /* V4 - without response */ + + /* Annex C: object transport protocol */ + objectpool_transfer_msg = 17, + end_of_pool_transfer = 18, + + /* Annex K: auxiliary control */ + auxiliary_assign_type_1 = 32, + aux_input_status_type_1 = 33, + preferred_assignment = 34, + aux_input_maintenance = 35, + auxiliary_assign_type_2 = 36, + aux_input_status_enable = 37, + auxiliary_input_status_type_2 = 38, + auxiliary_capabilities = 39, + + /* Annex D, E, F works with the command buffer */ + /* Annex F: command and macro messages */ + esc = 146, + hide_show_object = 160, + enable_disable_object = 161, + select_input_object = 162, + control_audio_device = 163, + set_audio_volume = 164, + change_child_location = 165, + change_size = 166, + change_background_colour = 167, + change_numeric_value = 168, + change_end_point = 169, + change_font_attributes = 170, + change_line_attributes = 171, + change_fill_attributes = 172, + change_activ_mask = 173, + change_softkey_mask = 174, + change_attribute = 175, + change_priority = 176, + change_list_item = 177, + delete_object_pool = 178, + change_string_value = 179, + change_child_position = 180, + change_object_label = 181, /**< V4 */ + change_polygon_point = 182, /**< V4 */ + change_polygon_scale = 183, /**< V4 */ + graphics_context = 184, /**< V4 */ + get_attribute_value = 185, /**< V4 */ + select_colour_map = 186, /**< V4 */ + identify_VT = 187, /**< V4 */ + execute_ExtMacro = 188, /**< V5 */ + lockunlock_mask = 189, /**< V4 */ + execute_Macro = 190, /**< V4 */ + + /* Annex D: technical data messages */ + get_memory = 192, + get_supported_widechar = 193, /**< V4 */ + get_number_softkey = 194, + get_textfonddata = 195, + get_WM_data = 196, /**< V4 */ + get_supported_objects = 197, /**< V4 */ + get_hardware = 199, + + /* Annex E: technical data messages */ + store_version = 208, + load_version = 209, + delete_version = 210, + extended_get_version = 211, /**< V5 */ + extended_store_version = 212, /**< V5 */ + extended_load_version = 213, /**< V5 */ + extended_delete_version = 214, /**< V5 */ + get_version = 223, + get_version_response = 224, + + /* F.66/67 */ + unsupported_VTfunction = 253, /**< V5 */ + + /* Annex G: status messages */ + VT_status_message = 254, + working_set_maintenance_msg = 255, + + /*proprietary VT client notifications */ + vtc_pool_aux_input_type_2 = 256, /**< Found auxiliary input type 2 object in pool */ + + vtfunction_undef = -1 /**< Avoids compiler warning */ + } ISOVT_FUNC_e; + + /** \brief + Enum of information request of VT client or command to VT client + */ + typedef enum + { + NAMEFCT_OF_VTUSER, /**< Function of ECU which uses VT*/ + VT_SOURCE_ADDRESS, /**< SA of VT */ + VT_HND, /**< CF handle of VT */ + CF_SOURCE_ADDRESS, /**< SA of VT client */ + CF_HND, /**< CF handle of VT client */ + WS_COUPLE_STATE, /**< Relationship to VT */ + SA_OF_VTOWNER_MASTER, /**< SA of ECU which has VT communication */ + HND_OF_VTOWNER_MASTER, /**< CF handle of ECU which has VT communication */ + ID_VISIBLE_DATA_MASK, /**< Data mask open on VT*/ + ID_VISIBLE_SOFTKEY_MASK, /**< Soft key mask open on VT */ + VT_BUSY_CODE, /**< Busy code of VT Status message */ + AUXUNITS_TYPE1_ONBUS, /**< ISO_TRUE means that at least one auxiliary unit type 1 is on bus */ + AUXUNITS_TYPE2_ONBUS, /**< ISO_TRUE means that at least one auxiliary unit type 2 is on bus */ + VT_ALIVE, /**< VT lost for more than three seconds */ + VT_TEST_ALIVE_SIGNAL, /**< VT Status message every second */ + VT_DOWNLOAD_FINISHED, /**< That means complete announcing finished */ + VT_POOL_ACTIVE_onVT, /**< Pool active (selected) on VT */ + VT_STATEOFANNOUNCING, /**< State of announcing - see ISOVT_ANNOUNCE_e */ + WS_VERSION_NR, /**< Version number of this working set */ + VT_NUMBOFVERSIONSTRINGS, /**< Reads the number of version strings sent of VT */ + + /* Static properties of actual VT of this working set */ + VT_NAVSOFTKEYS, /**< Navigation soft keys - Version 4 */ + VT_SOFTKEYXDOT, /**< Softkey designator - pixel X */ + VT_SOFTKEYYDOT, /**< Softkey designator - pixel Y */ + VT_VIRTUALSOFTKEYS, /**< Number of virtual soft keys of VT */ + VT_PHYSICALSOFTKEYS, /**< Number of physical soft keys of VT */ + VT_SMALLFONTSIZES, /**< VT TextFontData - small fonts */ + VT_LARGEFONTSIZES, /**< VT TextFontData - large fonts */ + VT_TYPEATTRIBUTES, /**< VT TextFontData - text attributes */ + VT_BOOTTIME, /**< Boot time of VT - time till first VT-Status-Msg */ + VT_GRAPHICTYPE, /**< VT hardware - grafik type */ + VT_VTHARDWARE, /**< VT hardware - audio, touch ... */ + VT_DATAMASKRESOLUTION, /**< Data mask resolution */ + VT_VERSIONNR, /**< Version of working set VT */ + VT_BGCOLOURULDM, /**< Background colour of VTs User-Layout Data Mask */ + VT_BGCOLOURKEYCELL, /**< Background colour of VTs Key Cells */ + + /* Command */ + VT_LOGOUT /**< Command that resets a VT client - only for IsoVTDataSet() */ + } ISOVT_STATUS_e; + + /* Callback function type definitions */ + + /*! \brief VT status message callback data structure */ + typedef struct + { + iso_bool qWsActive; /**< ISO_TRUE, if the working set is active (displayed on screen) */ + iso_u16 wPage; /**< Contains the object ID of the open mask, or NULL object ID if rqInfo is ISO_FALSE */ + ISO_USER_PARAM_T userParam; /**< User parameter set with IsoVTInit() */ + } ISOVT_STATUS_DATA_T; + + /*! \brief VTC event callback data structure */ + typedef struct + { + ISOVT_VTEVENT_e eEvent; /**< VTC connection event */ + ISO_USER_PARAM_T userParam; /**< User parameter set with IsoVTInit() */ + } ISOVT_EVENT_DATA_T; + + /*! \brief Type definition of the status callback function */ + typedef void(*ISOVT_CbStatus_t)( const ISOVT_STATUS_DATA_T* psStatusData ); + + /*! \brief Type definition of the message callback function */ + typedef void (*ISOVT_CbMsg_t)( const ISOVT_MSG_STA_T * psMsgData ); + + /*! \brief Type definition of the connection event callback function */ + typedef void (*ISOVT_CbConnectionEv_t)( const ISOVT_EVENT_DATA_T* psEvData ); + + /* Application functions */ + /** \name VT Client Management Functions + + Use this functions to create and connect a VT client + + @{ + */ + /***************************************************************************/ + /*! + \brief Initialisation of a VT client instance + + \param[in] \wp{s16CfHandleMaster, iso_s16} + CF handle of working set master which uses the VT client + \param[in] \wpp{userParam, const #ISO_USER_PARAM_T} + User parameter value for the callback function calls. \n + Use #ISO_USER_PARAM_DEFAULT if not used/needed. + \param[in] \wp{rpfVTStatus, ISOVT_CbStatus_t} + Pointer to callback function which is called in case of opening a new data, alarm + or window mask, or of + - Parameter rqInfo is set to ISO_TRUE, if the working set is active. + - Parameter rwPage contains the object ID of the open mask, or NULL object ID if rqInfo is ISO_FALSE. + \param[in] \wp{rpfVtMsgRec, ISOVT_CbMsg_t} + Pointer to callback function which is called in case of activation messages + and command responses to the user application. + See #ISOVT_MSG_STA_T for more information. + \param[in] \wp{pfnCbVtClConn, ISOVT_CbConnectionEv_t} + Pointer to the connection event callback function + or NULL pointer if not used. + \param[in] \wpp{rabNameVTPreferred, const #ISO_CF_NAME_T*} + Pointer to NAME of preferred VT + \retval iso_s16 + - E_NO_ERR + - E_NO_INSTANCE - There is no instance free + \note \par + - Preferred VT: During Login the driver waits a waittime for this VT. + This can be useful in order to choice the last plugged VT. The actual + VT must be stored in NVM and during login initialised with this function. + */ + iso_s16 IsoVTInit ( iso_s16 s16CfHandleMaster, + const ISO_USER_PARAM_T userParam, + ISOVT_CbStatus_t rpfVTStatus, + ISOVT_CbMsg_t rpfVtMsgRec, + ISOVT_CbConnectionEv_t pfnCbVtClConn, + const ISO_CF_NAME_T* rabNameVTPreferred ); + + /****************************************************************************/ + /*! + \brief Function installs the connection event callback ( optional ) + + \param[in] \wp{s16CfHandleMaster, iso_s16} + CF handle of working set master which uses the VT client + \param[in] \wp{pfnCbVtClConn, ISOVT_CbConnectionEv_t} + Pointer to the connection event callback function. + \retval iso_s16 + - E_NO_ERR + - E_NO_INSTANCE - Connection with this NAME not found + */ + ISO_DEPRECATED iso_s16 IsoVT_InstallCbConnection(iso_s16 s16CfHandleMaster, + ISOVT_CbConnectionEv_t pfnCbVtClConn); + + /****************************************************************************/ + /*! + \brief Reading informations of a VT client + + This function enables to read informations of a VT client and VT out of the driver. + This informations are useful for controlling the pool on VT e. g. with + VT_PHYSICALSOFTKEYS it is possible depending on number of phyical softkeys of + the VT to choice between different soft key masks. + + \param[in] \wp{eVTInfo, ISOVT_STATUS_e} + Enum of wished information of VT \n + Most of them are of the technical data messages + + \retval iso_u16 Requested value depending of ISOVT_STATUS_e + - VT_SOURCE_ADDRESS: actual SA of VT or ISO_NULL_ADDRESS + - CF_SOURCE_ADDRESS: actaul SA of WS or ISO_NULL_ADDRESS + - WS_COUPLE_STATE: actual value of WSCOUP_STA_e + - ID_VISIBLE_.. : actual object in VT status message + - VT_BUSY_CODE: see VT status message + - AUXUNITS_TYPE1_ONBUS: ISO_TRUE -> Auxiliary unit type 1 is on bus + - VT_ALIVE: VT alive check (3s), 1 = alive + - VT_TEST_ALIVE_SIGNAL: VT alive check (1s - Vt status message) + - VT_DOWNLOAD_FINISHED: announce state > announce_finished? 1 + - VT_POOL_ACTIVE_onVT: 1: Own pool selected on VT + - VT_STATEOFANNOUNCING: see enum ISOVT_ANNOUNCE_e + - WS_VERSION_NR: Supported version of own pool see ISO_VTVERSION + - VT_NUMBOFVERSIONSTRINGS: Number of version strings stored in VT + - VT_VERSIONNR: Supported version of VT see Part 6 - D.3 + - VT_NAVSOFTKEYS: Navigation softkeys ( of Version 4 else 0xFF ) + - VT_SOFTKEYXDOT ... VT_DATAMASKRESOLUTION: \n + Technical data messages of actual VT see Part 6 Annex D + - VT_BGCOLOURULDM, VT_BGCOLOURKEYCELL: colours see A.3 + \note \par + - VT_BOOTTIME: If the VT supports Boottime (>=IL4 and Value != 0xFF) the value (in sec) can be red, + and then stored in NVM and set with IsoVTDataSet() next startup. + - Attention: Correct WS instance must be set ( Calling IsoWsSetMaskInst() !) + */ + iso_u16 IsoGetVTStatusInfo ( ISOVT_STATUS_e eVTInfo ); + + #ifdef ISO_VTC_UT3 + /**********************************************************************************/ + /*! + \brief Manual setting of a supported ( parsable ) object type + + This function is used to add object types of higher versions to a list + which is used for parsing decisions + + \param[in] \wp{eObjType, OBJTYP_e} + Object type (Byte 3 of every object) + \note \par + - Attention: Correct WS instance must be set ( Calling IsoWsSetMaskInst() ! ) + */ + void IsoVTObjTypeParsableSet(OBJTYP_e eObjType); + + /**********************************************************************************/ + /*! + \brief Check if object type is supported of VT + + Precondition for this function: VT must be version 4 or higher. + Then VT sends a sorted list during login with all supported objects. It can used + for controlling the command messages + \param[in] \wp{eObjType, OBJTYP_e} + Object type (Byte 3 of every object) \n + Range: 0 - 36, 40 see ISO11783 - 6 - A.1.1 or OBJTYP_e + \retval iso_bool ISO_TRUE if VT supports this object + \note \par + - If there is no list received of VT this function returns always ISO_FALSE. + - Attention: Correct WS instance must be set ( Calling IsoWsSetMaskInst() !) + */ + iso_bool IsoVTObjTypeIsSupported( OBJTYP_e eObjType); + + #endif /* ISO_VTC_UT3 */ + + + /****************************************************************************/ + /*! + \brief Setting information of a VT client + + This function enables the change of some Working Set settings or the control + of the state machine. For settings it should called after IsoVTInit(). + Furthermore it can be completely resetted a VT client with VT_LOGOUT. + \param[in] \wp{eVTInfo, ISOVT_STATUS_e} + VT_BOOTTIME - Boot time of preferredVT in seconds \n + VT_STATEOFANNOUNCING - Forced setting of Login state machine (test purposes) + see ISOVT_ANNOUNCE_e \n + WS_VERSION_NR - Version number of working set ( -> Used object in pool )\n + VT_LOGOUT - Shut down a VT client ( complete reset ) + \param[in] \wp{wDatNew, iso_u16} + New Value \n + VT_LOGOUT - the source address of the VT client which shall be logged out + \retval iso_s16 + - E_NO_ERR + - E_NO_INSTANCE + \note \par + - Attention: Correct WS instance must be set ( Calling IsoWsSetMaskInst() or IsoVTInit()! ) + */ + iso_s16 IsoVTDataSet( ISOVT_STATUS_e eVTInfo, iso_u16 wDatNew ); + + /*****************************************************************************/ + /*! + \brief Continue VT Login state machine + + There are some cases where VT Login stops for application interaction. + This function continues the VT state machine. + + \retval iso_s16 + - E_NO_ERR + - E_ERROR_INDI - actual state don't supported of this function + - E_NO_INSTANCE + \note \par + - Attention: Correct WS instance must be set ( Calling IsoWsSetMaskInst() !) + - Supported states: + - moveToAnotherVT (see fun. IsoVTMultipleNextVT() ) + - waiting_after_vt_status_rec (only for auxiliary input units) + - waiting_after_GetVersions + - waiting_before_store + - waiting_for_SetPrefassign + */ + iso_s16 IsoVtContinue( void ); + + /**************************************************************************/ + /*! + \brief Function reads the Version strings received from VT with (Extended) Get Versions + + The version strings received of VT can be read. If both Working Set and VT are Version 5 + or higher the version strings are ( exactly )32 bytes else 7 bytes. + + \param[in] \wp{au8VersionStrings, iso_u8[][LENVERSIONSTR]} + Pointer to 2d-array - driver writes the version strings in this array + - first element is number of version strings see POOLVERSIONS + - second element is string length LENVERSIONSTR + \retval iso_s16 + Number of version strings received with (Extended) Get Version + \note \par + - Attention: Correct WS instance must be set + */ + iso_u8 IsoVTVersionStringGet(iso_u8 au8VersionStrings[][LENVERSIONSTR]); + + /*****************************************************************************/ + /*! + \brief Function to set the preferred VT to a new CF name. + + The function can only called before the client has selected a VT (safe state). \n + In this case the given name is set as new preferred VT and the VT boot timeout is reseted. + + \param[in] \wpp{rpabVtName, const #ISO_CF_NAME_T*} + Pointer to the NAME of the VT or dummy name (8 * 0xFFu) + + \retval iso_s16 + - E_NO_ERR - On success + - E_RANGE - rpabVtName is the NULL pointer or WS instance is not set + - E_ERROR_INDI - Changing only possible while waiting for the currently set preferred VT + - E_USER_ERROR - CF name "rpabVtName" is not a valid VT name (wrong name function) + \par + - Attention: Correct WS instance must be set ( Calling IsoWsSetMaskInst() !) + if this function is called outside of a VT-client callback function. + - This function should be used to select the wished VT during the #IsoEvConnSelectPreferredVT event callback. + */ + iso_s16 IsoVTSetNewPreferredVT(const ISO_CF_NAME_T* rpabVtName); + + /*****************************************************************************/ + /*! + \brief Calling this function releases the procedure to move to another VT + + The application have to select an available VT and releases with this function the VT change. + + \param[in] \wpp{rpabVtName, const #ISO_CF_NAME_T*} + Pointer to NAME of "Next VT" see ISO11783 - 5 + + \retval iso_s16 + - E_NO_ERR - OK + - E_ERROR_INDI - Changing only possible in case of full log-on + - E_USER_ERROR - User "rpabVtName" not found or no VT + \note \par + - Attention: Correct WS instance must be set ( Calling IsoWsSetMaskInst() !) + - Using see exampel in VT application + */ + iso_s16 IsoVTMultipleNextVT( const ISO_CF_NAME_T* rpabVtName ); + + /******************************************************************************/ + /*! + \brief This function reads the language of the working set + + The language command of the VT which displays the data masks is retured. If there + is no VT the language command of the TECU is returned. + + \param[in] \wp{s16CfHandleMaster, iso_s16} + CF handle of working set master (VT client handle) + \param[out] \wp{abLanguageCmd, iso_u8[]} + Pointer to language command of this working set + \retval iso_s16 + - E_NO_ERR - OK + - E_ERROR_INDI - WS not found + \note \par + - Attention: Function works only correct after login has passed the LC reception + (e. g. waiting_after_GetVersions) else it provides the TECU LC + */ + iso_s16 IsoReadWorkingSetLanguageData( iso_s16 s16CfHandleMaster, iso_u8 abLanguageCmd[] ); + + /**********************************************************************/ + /*! + \brief Calculate free elements of Command FIFO + + This function determines the number of free elements of the command FIFO. + It has been implemented for LIB Implementation (initiated of Grimme) + + \retval iso_u16 Number of free elements of command FIFO \n + Range: 0 - VTMSG_BUFSIZE + \note \par + - Attention: Correct WS instance must be set ( Calling IsoWsSetMaskInst() !) + */ + iso_u16 IsoGetCMDFifoFree( void ); + + /**************************************************************************/ + /*! + \brief This function sets the working set instance for the masks. + + If the working set communicates with two terminals (mask and auxiliary) then for all + functions (commands, fun. of this module) for VT have to ensure that they are used for + the correct instance. This function "switches" to the mask instance. + + \param[in] \wp{s16CfHndVtUser, iso_s16} + CF handle of a (intern) working set master + \retval iso_s16 + - E_NO_ERR + - E_NO_INSTANCE - this user is no working set master + \note \par + - Calling this functions is not necessary in callback functions + - All concerned function have the note: Attention: Correct .... + */ + iso_s16 IsoWsSetMaskInst( iso_s16 s16CfHndVtUser); + + /****************************************************************************/ + /*! + \brief This function sets the working set instance for auxiliary support + + If the working set communicates with two terminals (mask and auxiliary) then for all + functions (commands, fun. of this module) for VT have to ensure that they are used for + the correct instance. This function "switches" to the auxiliary instance. + + \param[in] \wp{s16CfHndVtUser, iso_s16} + CF handle of a (intern) working set master + \retval iso_s16 + - E_NO_ERR + - E_NO_INSTANCE - this user is no working set master + \note \par + - Calling this functions is not necessary in callback functions + - All concerned function have the note: Attention: Correct .... + */ + iso_s16 IsoWsSetAuxInst( iso_s16 s16CfHndVtUser ); + + /**************************************************************************/ + /*! + \brief This function sets the working set instance which supports SC. + + This function searches and activates the WS instance which supports the + sequence control ( -> VT with function instance 0 with or without auxiliary + functions ) + + \param[in] \wp{s16CfHndVtUser, iso_s16} + CF handle of a (intern) working set master + \retval iso_s16 + - E_NO_ERR + - E_NO_INSTANCE - this user is no working set master + \note \par + - Calling this functions is not necessary in callback functions + */ + iso_s16 IsoWsSetSccInst( iso_s16 s16CfHndVtUser ); + + /** @} */ + /* ************************************************************************ */ + /** \name VT Client Annex D,E: Technical data messages and Non volatile memory operations commands + @{ + */ + #ifdef ISO_VTC_UT3 + /***************************************************************************/ + /*! + \brief This technical message requests the supported widechars for a certain code plane ( D.10 ) + + The Get Supported Widechars message is used by the Working Set to determine the WideChars supported + by the VT. This message only applies to version 4 and later VTs. + + \param[in] \wp{u8CodePlane, iso_u8} + Codeplane - Range: 0 ... 16 + \param[in] \wp{u16RangeFirstWidechar, iso_u16} + First widechar of inquiried code plane + \param[in] \wp{u16RangeLastWidechar, iso_u16} + Last widechar of inquiried code plane + \retval iso_s16 + - #E_NO_ERR - OK + - #E_OVERFLOW - buffer overflow + - #E_NOACT - Command not possible in current state + - #E_NO_INSTANCE - No VT client available + \note \par + - Every function call causes the sending of this command on the bus. + Danger of buffer overflow and high bus load ! + - Attention: Correct WS instance must be set ( Calling IsoWsSetMaskInst() !) + */ + iso_s16 IsoGetSupportedWidechar(iso_u8 u8CodePlane, + iso_u16 u16RangeFirstWidechar, iso_u16 u16RangeLastWidechar); + + /***************************************************************************/ + /*! + \brief This technical message requests background colours ( D.12 ) + + The Working Set sends the Get Window Mask Data message to request the background colour + of UserLayout Data Mask and the background colour of the Key Cells on a User-Layout Soft Key Mask. + This message applies to version 4 and later VTs. + + \retval iso_s16 + - #E_NO_ERR - OK + - #E_OVERFLOW - buffer overflow + - #E_NOACT - Command not possible in current state + - #E_NO_INSTANCE - No VT client available + \note \par + - Every function call causes the sending of this command on the bus. + Danger of buffer overflow and high bus load ! + - Attention: Correct WS instance must be set ( Calling IsoWsSetMaskInst() !) + */ + iso_s16 IsoGetWindowMaskData(void); + + /***************************************************************************/ + /*! + \brief This technical message requests for supported objects ( D.14 ) + + This command is used by the WS to get the list of all object types supported by the VT. + This message applies to version 4 and later VTs. + + \retval iso_s16 + - #E_NO_ERR - OK + - #E_OVERFLOW - buffer overflow + - #E_NOACT - Command not possible in current state + - #E_NO_INSTANCE - No VT client available + \note \par + - Every function call causes the sending of this command on the bus. + Danger of buffer overflow and high bus load ! + - Attention: Correct WS instance must be set ( Calling IsoWsSetMaskInst() !) + */ + iso_s16 IsoGetSupportedObjects(void); + + /************************************************************************************/ + /*! + \brief Store object pool with extended version label from VT RAM to VT ROM + + This function stores the actual pool in VT RAM into the Flash (ROM) of the VT. + This message applies to version 5 and later VTs. + + \param[in] \wp{abVersionString, iso_u8[]} + Pointer to version String which shall be stored \n + Length of Bytearray: 32 Characters + \retval iso_s16 + - #E_NO_ERR - OK + - #E_OVERFLOW - buffer overflow + - #E_NOACT - Command not possible in current state + - #E_NO_INSTANCE - No VT client available + \note \par + - Every function call causes the sending of this command on the bus. + Danger of buffer overflow and high bus load ! + - Attention: Correct WS instance must be set ( Calling IsoWsSetMaskInst() !) + - This command should be sent after full login of VT client + */ + iso_s16 IsoExtendedStoreVersion(const iso_u8 abVersionString[]); + + /***************************************************************************************/ + /*! + \brief Command for deleting object pool with extended version label of VT ROM + + This function releases a command to the VT. The pool selected with the version + string is deleted of Flash. + + \param[in] \wp{abVersionString, iso_u8[]} + Pointer to version String which shall be deleted \n + Length of Bytearray: 32 Characters + \retval iso_s16 + - #E_NO_ERR - OK + - #E_OVERFLOW - buffer overflow + - #E_NOACT - Command not possible in current state + - #E_NO_INSTANCE - No VT client available + \note \par + - Every function call causes the sending of this command on the bus. + Danger of buffer overflow and high bus load ! + - Attention: Correct WS instance must be set ( Calling IsoWsSetMaskInst() !) + - This command should be sent after full login of VT client + */ + iso_s16 IsoExtendedDeleteVersion(const iso_u8 abVersionString[]); + #endif /* ISO_VTC_UT3 */ + + /***************************************************************************************/ + /*! + \brief Command for deleting object pool of VT ROM + + This function releases a command to the VT. The pool selected with the version + string is deleted of Flash. + + \param[in] \wpp{abVersionString, const #iso_u8[] } + Pointer to version String which shall be deleted \n + Length of Bytearray: 7 Characters + \retval iso_s16 + - #E_NO_ERR - OK + - #E_OVERFLOW - buffer overflow + - #E_NOACT - Command not possible in current state + - #E_NO_INSTANCE - No VT client available + \note \par + - Every function call causes the sending of this command on the bus. + Danger of buffer overflow and high bus load ! + - Attention: Correct WS instance must be set ( Calling IsoWsSetMaskInst() !) + */ + iso_s16 IsoDeleteVersion( const iso_u8 abVersionString[] ); + + /****************************************************************************/ + /*! + \brief Store object pool with version label from VT RAM to VT ROM + + This function stores the actual pool in VT RAM into the Flash (ROM) of the VT. + + \param[in] \wpp{abVersionString, const #iso_u8[] } + Pointer to version String which shall be deleted \n + Length of Bytearray: 7 Characters + \retval iso_s16 + - #E_NO_ERR - OK + - #E_OVERFLOW - buffer overflow + - #E_NOACT - Command not possible in current state + - #E_NO_INSTANCE - No VT client available + \note \par + - Every function call causes the sending of this command on the bus. + Danger of buffer overflow and high bus load ! + - Attention: Correct WS instance must be set ( Calling IsoWsSetMaskInst() !) + */ + iso_s16 IsoStoreVersion( const iso_u8 abVersionString[] ); + + /** @} */ + /* ************************************************************************ */ + /** \name VT Client Annex F: Command and macro messages + @{ + */ + /*****************************************************************************/ + /*! + \brief Command Hide/Show Object (Container) ( Part 6 - F.2 ) + + The Hide/Show Object command is used to hide or show a container object. + + \param[in] \wp{wId, iso_u16 } + Object ID of Container + \param[in] \wp{bVisible, iso_bool} + 0 = Hide, 1 = Show + \retval iso_s16 + - #E_NO_ERR - OK + - #E_OVERFLOW - buffer overflow + - #E_NOACT - Command not possible in current state + - #E_NO_INSTANCE - No VT client available + \note \par + - Every function call causes the sending of this command on the bus. + Danger of buffer overflow and high bus load ! + - Attention: Correct WS instance must be set ( Calling IsoWsSetMaskInst() !) + */ + iso_s16 IsoCmd_ShowHide( iso_u16 wId, iso_bool bVisible ); + + /*********************************************************************************/ + /*! + \brief Command enable/disable (input) object - ( Part 6 - F.4 ) + + This command is used to enable or disable an input field object and pertains + to the accessibility of an input object. + + \param[in] \wp{wId, iso_u16} + Object ID of input object + \param[in] \wp{bAbility, iso_bool} + 0 == disable, 1 == enable + \retval iso_s16 + - #E_NO_ERR - OK + - #E_OVERFLOW - buffer overflow + - #E_NOACT - Command not possible in current state + - #E_NO_INSTANCE - No VT client available + \note \par + - Every function call causes the sending of this command on the bus. + Danger of buffer overflow and high bus load ! + - Attention: Correct WS instance must be set ( Calling IsoWsSetMaskInst() !) + */ + iso_s16 IsoCmd_DisEnable( iso_u16 wId, iso_bool bAbility ); + + /*********************************************************************************/ + /*! + \brief Command Select input object ( Part 6 - F.6 ) + + This command is used to force the selection of an input field object. + + \param[in] \wp{wId, iso_u16} + Object ID of input object + \param[in] \wp{u8Option, iso_u8} + normal: 0xFF, for Version 4 also 0 possible + \retval iso_s16 + - #E_NO_ERR - OK + - #E_OVERFLOW - buffer overflow + - #E_NOACT - Command not possible in current state + - #E_NO_INSTANCE - No VT client available + \note \par + - Every function call causes the sending of this command on the bus. + Danger of buffer overflow and high bus load ! + - Attention: Correct WS instance must be set ( Calling IsoWsSetMaskInst() !) + */ + iso_s16 IsoCmd_InputSelect ( iso_u16 wId, iso_u8 u8Option); + + /***************************************************************************/ + /*! + \brief Esc Command + + This command is used to abort operator input ( Part 6 - F.8 ). + + \retval iso_s16 + - #E_NO_ERR - OK + - #E_OVERFLOW - buffer overflow + - #E_NOACT - Command not possible in current state + - #E_NO_INSTANCE - No VT client available + \note \par + - Every function call causes the sending of this command on the bus. + Danger of buffer overflow and high bus load ! + - Attention: Correct WS instance must be set ( Calling IsoWsSetMaskInst() !) + */ + iso_s16 IsoCmd_Esc( void ); + + /****************************************************************************/ + /*! + \brief Command Control audio device ( Part 6 - F.10 ). + + This command can be used to control the audio on the VT. + + \param[in] \wp{bNumOfRepit, iso_u8} + Number of repetitions + Range: 1 - 255 + \param[in] \wp{wFrequency, iso_u16} + Frequency + \param[in] \wp{wOnTimeMs, iso_u16} + On time duration in ms + \param[in] \wp{wOffTimeMs, iso_u16} + Off time duration in ms + \retval iso_s16 + - #E_NO_ERR - OK + - #E_OVERFLOW - buffer overflow + - #E_NOACT - Command not possible in current state + - #E_NO_INSTANCE - No VT client available + \note \par + - Every function call causes the sending of this command on the bus. + Danger of buffer overflow and high bus load ! + - Attention: Correct WS instance must be set ( Calling IsoWsSetMaskInst() !) + */ + iso_s16 IsoCmd_ControlAudio ( iso_u8 bNumOfRepit, + iso_u16 wFrequency, iso_u16 wOnTimeMs, iso_u16 wOffTimeMs ); + + /***********************************************************************************/ + /*! + \brief Command SetAudioVolume + + This command can be used to control the audio on the VT (volume) ( Part 6 - F.12 ) + + \param[in] \wp{bVolume, iso_u8} + Volume 0 - 100 (%) + \retval iso_s16 + - #E_NO_ERR - OK + - #E_OVERFLOW - Buffer overflow + - #E_NOACT - Command not possible in current state + - #E_NOT_AVAILABLE - VT has got no adjustable volume output + - #E_NO_INSTANCE - No VT client available + \note \par + - Every function call causes the sending of this command on the bus. + Danger of buffer overflow and high bus load ! + - Attention: Correct WS instance must be set ( Calling IsoWsSetMaskInst() !) + */ + iso_s16 IsoCmd_SetAudioVolume ( iso_u8 bVolume ); + + /*********************************************************************************/ + /*! + \brief Command change child location ( Part 6 - F.14 ) + + The Change Child Location command is used to change the relative position of an object. + + \param[in] \wp{wId, iso_u16} + Object ID + \param[in] \wp{wIDParent, iso_u16} + Parent object ID + \param[in] \wp{bXchange, iso_u8} + Relative change in x position (interpreted as signed!) + \param[in] \wp{bYchange, iso_u8} + Relative change in y position (interpreted as signed!) + \retval iso_s16 + - #E_NO_ERR - OK + - #E_OVERFLOW - buffer overflow + - #E_NOACT - Command not possible in current state + - #E_NO_INSTANCE - No VT client available + \note \par + - Every function call causes the sending of this command on the bus. + Danger of buffer overflow and high bus load ! + - Attention: Correct WS instance must be set ( Calling IsoWsSetMaskInst() !) + */ + iso_s16 IsoCmd_ChildLocation ( iso_u16 wId, iso_u16 wIDParent, + iso_u8 bXchange, iso_u8 bYchange + ); + + /****************************************************************************************/ + /*! + \brief Command change child position ( Part 6 - F.16 ) + + The Change Child Location command is used to change the absolute position of an object. + + \param[in] \wp{wId, iso_u16} + Object ID + \param[in] \wp{wIDParent, iso_u16} + Parent object ID + \param[in] \wp{Xchange_s16, iso_s16} + New X position relative to the top left corner of parent object + \param[in] \wp{Ychange_s16, iso_s16} + New Y position relative to the top left corner of parent object. + \retval iso_s16 + - #E_NO_ERR - OK + - #E_OVERFLOW - buffer overflow + - #E_NOACT - Command not possible in current state + - #E_NO_INSTANCE - No VT client available + \note \par + - Every function call causes the sending of this command on the bus. + Danger of buffer overflow and high bus load ! + - Attention: Correct WS instance must be set ( Calling IsoWsSetMaskInst() !) + */ + iso_s16 IsoCmd_ChildPosition ( iso_u16 wId, iso_u16 wIDParent, + iso_s16 Xchange_s16, iso_s16 Ychange_s16 + ); + + /***********************************************************************************/ + /*! + \brief Command change size ( Part 6 - F.18 ) + + The Change Size command is used to change the size of an object. + + \param[in] \wp{wId, iso_u16} + Object ID + \param[in] \wp{wWidth, iso_u16} + New width + \param[in] \wp{wHeight, iso_u16} + New height + \retval iso_s16 + - #E_NO_ERR - OK + - #E_OVERFLOW - buffer overflow + - #E_NOACT - Command not possible in current state + - #E_NO_INSTANCE - No VT client available + \note \par + - Every function call causes the sending of this command on the bus. + Danger of buffer overflow and high bus load ! + - Attention: Correct WS instance must be set ( Calling IsoWsSetMaskInst() !) + */ + iso_s16 IsoCmd_Size ( iso_u16 wId, iso_u16 wWidth, iso_u16 wHeight ); + + /*****************************************************************************/ + /*! + \brief Command change background colour ( Part 6 - F.20 ) + + This command is used to change the background colour of an object. + + \param[in] \wp{wId, iso_u16} + Object ID + \param[in] \wp{bColour, iso_u16} + New Background colour see Part 6 - A.3 VT standard colour palette + \retval iso_s16 + - #E_NO_ERR - OK + - #E_OVERFLOW - buffer overflow + - #E_NOACT - Command not possible in current state + - #E_NO_INSTANCE - No VT client available + \note \par + - Every function call causes the sending of this command on the bus. + Danger of buffer overflow and high bus load ! + - Attention: Correct WS instance must be set ( Calling IsoWsSetMaskInst() !) + */ + iso_s16 IsoCmd_BackgroundColour ( iso_u16 wId, iso_u8 bColour ); + + /******************************************************************************/ + /*! + \brief Command change numeric value ( Part 6 - F.22 ) + + This command is used to change the value of an object. It applies only to objects + that have a numeric value attribute. + + \param[in] \wp{u16Id, iso_u16} + Object ID + \param[in] \wp{u32NewValue, iso_u32} + New value of ID + \retval iso_s16 + - #E_NO_ERR - OK + - #E_OVERFLOW - buffer overflow + - #E_NOACT - Command not possible in current state + - #E_NO_INSTANCE - No VT client available + \note \par + - Every function call causes the sending of this command on the bus. + Danger of buffer overflow and high bus load ! + - Attention: Correct WS instance must be set ( Calling IsoWsSetMaskInst() !) + */ + iso_s16 IsoCmd_NumericValue( iso_u16 u16Id, iso_u32 u32NewValue); + + /************************************************************************************/ + /*! + \brief Command change numeric value with command buffer reference ( Part 6 - F.22 ) + + This command is used to change the value of an object. It applies only to objects + that have a numeric value attribute. If the objectID is already in the command FIFO + then the value of this FIFO entry is updated. + + \param[in] \wp{u16Id, iso_u16} + Object ID + \param[in] \wp{u32NewValue, iso_u32} + New value of ID + \retval iso_s16 + - #E_NO_ERR - OK + - #E_OVERFLOW - buffer overflow + - #E_NOACT - Command not possible in current state + - #E_UNKNOWN_ERR - Buffernumber is to high + - #E_NO_INSTANCE - No VT client available + \note \par + - Every function call causes the sending of this command on the bus. + Danger of buffer overflow and high bus load ! + - Attention: Correct WS instance must be set ( Calling IsoWsSetMaskInst() !) + */ + iso_s16 IsoCmd_NumericValueRef ( iso_u16 u16Id, iso_u32 u32NewValue ); + + /*******************************************************************************/ + /*! + \brief Command Change String Value ( Part 6 - F.24 ) + + This command sends a string to the VT. The length of the string including '\0' + may not be longer than the define STRLENGTHMAX. Take care that '\0' is trailed. + + \param[in] \wp{wId, iso_u16} + Object ID + \param[in] \wpp{pcString, const #iso_u8[] } + Pointer to string + \retval iso_s16 + - #E_NO_ERR - transport started + - #E_OVERFLOW - buffer overflow + - #E_NOACT - Command not possible in current state + - #E_NO_INSTANCE - No VT client available + \note \par + - Every function call causes the sending of this command on the bus. + Danger of buffer overflow and high bus load ! + - Attention: Correct WS instance must be set ( Calling IsoWsSetMaskInst() !) + */ + iso_s16 IsoCmd_String( iso_u16 wId, const iso_u8 pcString[] ); + + /*******************************************************************************/ + /*! + \brief Command Change String Value with command buffer reference ( Part 6 - F.24 ) + + This command sends a string to the VT. If the ObjectID is already in the command FIFO + then the value of this FIFO entry is updated. The length of the string including '\0' + may not be longer than the define STRLENGTHMAX. Take care that '\0' is trailed. + + \param[in] \wp{wId, iso_u16} + Object ID + \param[in] \wpp{pcString, const #iso_u8[] } + Pointer to string + \retval iso_s16 + - #E_NO_ERR - transport started + - #E_OVERFLOW - buffer overflow + - #E_NOACT - Command not possible in current state + - #E_UNKNOWN_ERR - Scanning of buffer failed + - #E_NO_INSTANCE - No VT client available + \note \par + - Every function call causes the sending of this command on the bus. + Danger of buffer overflow and high bus load ! + - Attention: Correct WS instance must be set ( Calling IsoWsSetMaskInst() !) + */ + iso_s16 IsoCmd_StringRef( iso_u16 wId, const iso_u8 pcString[] ); + + /*******************************************************************************************/ + /*! + \brief Command change end point ( Part 6 - F.26 ) + + This command is used to change the end point of a line object by changing + the width, height and/or line direction attributes. + + \param[in] \wp{wId, iso_u16} + Object ID + \param[in] \wp{wXendp, iso_u16} + X value of end point + \param[in] \wp{wYendp, iso_u16} + Y value of end point + \param[in] \wp{bLineDirection, iso_u8} + Line direction see Part 6 - B.27 + \retval iso_s16 + - #E_NO_ERR - OK + - #E_OVERFLOW - buffer overflow + - #E_NOACT - Command not possible in current state + - #E_NO_INSTANCE - No VT client available + \note \par + - Every function call causes the sending of this command on the bus. + Danger of buffer overflow and high bus load ! + - If its impossible to send this command then its stored in command buffer. + - Attention: Correct WS instance must be set ( Calling IsoWsSetMaskInst() !) + */ + iso_s16 IsoCmd_EndPoint ( iso_u16 wId, iso_u16 wXendp, iso_u16 wYendp, iso_u8 bLineDirection ); + + /*******************************************************************************/ + /*! + \brief Command change font attributes ( Part 6 - F.28 ) + + This command is used to change the font attributes in a font attributes object. + + \param[in] \wp{wId, iso_u16} + Object ID + \param[in] \wp{bFontColour, iso_u8} + New font colour (see Part 6 - A.3) + \param[in] \wp{bFontSize, iso_u8} + New font size (see Part 6 - B.14) + \param[in] \wp{bFontType, iso_u8} + New font type (see Part 6 - B.14) + \param[in] \wp{bFontStyle, iso_u8} + New font style (see Part 6 - B.14) + \retval iso_s16 + - #E_NO_ERR - OK + - #E_OVERFLOW - buffer overflow + - #E_NOACT - Command not possible in current state + - #E_NO_INSTANCE - No VT client available + \note \par + - Every function call causes the sending of this command on the bus. + Danger of buffer overflow and high bus load ! + - Attention: Correct WS instance must be set ( Calling IsoWsSetMaskInst() !) + */ + iso_s16 IsoCmd_FontAttributes( iso_u16 wId, + iso_u8 bFontColour, iso_u8 bFontSize, + iso_u8 bFontType, iso_u8 bFontStyle + ); + + /*******************************************************************************/ + /*! + \brief Command change line attributes ( Part 6 - F.30 ) + + This command is used to change the line attributes in a line attributes object. + + \param[in] \wp{wId, iso_u16} + Object ID + \param[in] \wp{bLineColour, iso_u8} + New line colour (see Part 6 - A.3) + \param[in] \wp{bLineWidth, iso_u8} + New line width (see Part 6 - B.14.3) + \param[in] \wp{wLineArt, iso_u16} + New line art (see Part 6 - B.14.3) + \retval iso_s16 + - #E_NO_ERR - OK + - #E_OVERFLOW - buffer overflow + - #E_NOACT - Command not possible in current state + - #E_NO_INSTANCE - No VT client available + \note \par + - Every function call causes the sending of this command on the bus. + Danger of buffer overflow and high bus load ! + - Attention: Correct WS instance must be set ( Calling IsoWsSetMaskInst() !) + */ + iso_s16 IsoCmd_LineAttributes ( iso_u16 wId, + iso_u8 bLineColour, iso_u8 bLineWidth, + iso_u16 wLineArt + ); + + /**********************************************************************************/ + /*! + \brief Command change fill attributes ( Part 6 - F.32 ) + + This command is used to change the fill attributes in a fill attributes object. + + \param[in] \wp{wId, iso_u16} + Object ID + \param[in] \wp{bFillType, iso_u8} + New fill type (see Part 6 - B.14.4) + \param[in] \wp{bFillColour, iso_u8} + New fill colour (see Part 6 - B.14.4) + \param[in] \wp{wFillPattern, iso_u16} + New fill pattern (see Part 6 - B.14.4) + \retval iso_s16 + - #E_NO_ERR - OK + - #E_OVERFLOW - buffer overflow + - #E_NOACT - Command not possible in current state + - #E_NO_INSTANCE - No VT client available + \note \par + - Every function call causes the sending of this command on the bus. + Danger of buffer overflow and high bus load ! + - Attention: Correct WS instance must be set ( Calling IsoWsSetMaskInst() !) + */ + iso_s16 IsoCmd_FillAttributes ( iso_u16 wId, + iso_u8 bFillType, iso_u8 bFillColour, + iso_u16 wFillPattern + ); + /******************************************************************************/ + /*! + \brief Command change active mask( Part 6 - F.34 ) + + This command is used to change the active mask of a working set to either + a data or an alarm mask object. + + \param[in] \wp{wIdWorkSet, iso_u16} + WorkingSet Object ID + \param[in] \wp{wIdNewMask, iso_u16} + Object ID of new active (data/alarm)-mask + \retval iso_s16 + - #E_NO_ERR - OK + - #E_OVERFLOW - buffer overflow + - #E_NOACT - Command not possible in current state + - #E_NO_INSTANCE - No VT client available + \note \par + - Every function call causes the sending of this command on the bus. + Danger of buffer overflow and high bus load ! + - Attention: Correct WS instance must be set ( Calling IsoWsSetMaskInst() !) + */ + iso_s16 IsoCmd_ActiveMask ( iso_u16 wIdWorkSet, iso_u16 wIdNewMask ); + + /******************************************************************************/ + /*! + \brief Command change soft key mask( Part 6 - F.36 ) + + This command is used to change the soft key mask associated with a data or alarm mask object. + + \param[in] \wp{bMaskType, iso_u8} + 1 == Data, 2 == Alarm + \param[in] \wp{wIdActMask, iso_u16} + Object ID of active Mask + \param[in] \wp{wIdSoftKeyMask, iso_u16} + Object ID of (new) soft key mask + \retval iso_s16 + - #E_NO_ERR - OK + - #E_OVERFLOW - buffer overflow + - #E_NOACT - Command not possible in current state + - #E_NO_INSTANCE - No VT client available + \note \par + - Every function call causes the sending of this command on the bus. + Danger of buffer overflow and high bus load ! + - Attention: Correct WS instance must be set ( Calling IsoWsSetMaskInst() !) + */ + iso_s16 IsoCmd_SoftKeyMask ( iso_u8 bMaskType, iso_u16 wIdActMask, iso_u16 wIdSoftKeyMask ); + + /****************************************************************************/ + /*! + \brief Command change attribute( Part 6 - F.38 ) + + This command is used to change any attribute with an assigned AID. + This message cannot be used to change strings. + + \param[in] \wp{u16Id, iso_u16} + Object ID + \param[in] \wp{u8IdAttribute, iso_u8} + Attribute ID (AID) - see description of wished object + \param[in] \wp{u32ValueAttribute, iso_u32} + New value for attribute + \retval iso_s16 + - #E_NO_ERR - OK + - #E_OVERFLOW - buffer overflow + - #E_NOACT - Command not possible in current state + - #E_NO_INSTANCE - No VT client available + \note \par + - Every function call causes the sending of this command on the bus. + Danger of buffer overflow and high bus load ! + - Attention: Correct WS instance must be set ( Calling IsoWsSetMaskInst() !) + */ + iso_s16 IsoCmd_Attribute ( iso_u16 u16Id, iso_u8 u8IdAttribute, iso_u32 u32ValueAttribute ); + + /**********************************************************************************/ + /*! + \brief Command change priority( Part 6 - F.40 ) + + This command is used to change the priority of an alarm mask. + + \param[in] \wp{wId, iso_u16} + Object ID of alarm mask + \param[in] \wp{bPriority, iso_u8} + New priority + \retval iso_s16 + - #E_NO_ERR - OK + - #E_OVERFLOW - buffer overflow + - #E_NOACT - Command not possible in current state + - #E_NO_INSTANCE - No VT client available + \note \par + - Every function call causes the sending of this command on the bus. + Danger of buffer overflow and high bus load ! + - Attention: Correct WS instance must be set ( Calling IsoWsSetMaskInst() !) + */ + iso_s16 IsoCmd_Priority ( iso_u16 wId, iso_u8 bPriority ); + + /*******************************************************************************/ + /*! + \brief Command change list item ( Part 6 - F.42 ) + + This command is used to change a list item in a list input object. + + \param[in] \wp{wIdInput, iso_u16} + Object ID of a list input object + \param[in] \wp{bListIndex, iso_u8} + List index (-> see list) + \param[in] \wp{wIdNew, iso_u16} + New object ID or 0xFFFF to set empty + \retval iso_s16 + - #E_NO_ERR - OK + - #E_OVERFLOW - buffer overflow + - #E_NOACT - Command not possible in current state + - #E_NO_INSTANCE - No VT client available + \note \par + - Every function call causes the sending of this command on the bus. + Danger of buffer overflow and high bus load ! + - Attention: Correct WS instance must be set ( Calling IsoWsSetMaskInst() !) + */ + iso_s16 IsoCmd_ListItem ( iso_u16 wIdInput, iso_u8 bListIndex, iso_u16 wIdNew ); + + /***********************************************************************************/ + /*! + \brief Command Delete Object Pool ( Part 6 - F.44 ) + + This command is used to delete the entire object pool of this working set from volatile storage. + It might be used by an implement that is shutting down or during the development of object pools./n + This function is driver intern used in case of moving to another VT. Calling restarts the announcement + with another VT if available. + + \retval iso_s16 + - #E_NO_ERR - OK + - #E_OVERFLOW - buffer overflow + - #E_NOACT - Command not possible in current state + - #E_NO_INSTANCE - No VT client available + \note \par + - Every function call causes the sending of this command on the bus. + Danger of buffer overflow and high bus load ! + - Attention: Correct WS instance must be set ( Calling IsoWsSetMaskInst() !) + */ + iso_s16 IsoCmd_DeleteObjectPool( void ); + + #ifdef ISO_VTC_UT3 + /*****************************************************************************/ + /*! + \brief Command Lock/UnlockMask( Part 6 - F.46 ) + + This message is available in VT Version 4 and later. This command is used by a + Working Set to disallow or allow screen refreshes at the VT for the visible Data + Mask or User-Layout Data Mask owned by the requesting Working Set. + + \param[in] \wp{u8LockCmd, iso_u8} + 0 = Unlock, 1 = Lock data mask or user-layout data mask + \param[in] \wp{u16Id, iso_u16} + Object ID of data mask or user layout data mask to lock or unlock + \param[in] \wp{u16LockTimeoutMs, iso_u16} + Lock timeout in ms or zero for no timeout + \retval iso_s16 + - #E_NO_ERR - OK + - #E_OVERFLOW - buffer overflow + - #E_NOACT - Command not possible in current state + - #E_NO_INSTANCE - No VT client available + \note \par + - Every function call causes the sending of this command on the bus. + Danger of buffer overflow and high bus load ! + - Attention: Correct WS instance must be set ( Calling IsoWsSetMaskInst() !) + */ + iso_s16 IsoCmd_LockUnlockMask(iso_u8 u8LockCmd, iso_u16 u16Id, iso_u16 u16LockTimeoutMs); + + /*****************************************************************************/ + /*! + \brief Command Execute Macro( Part 6 - F.48 ) + + This message is available in VT Version 4 and later. + This command is used to execute a Macro. + + \param[in] \wp{u16Id, iso_u16} + Object ID of Macro object ( max. value 255 ) + \retval iso_s16 + - #E_NO_ERR - OK + - #E_OVERFLOW - buffer overflow + - #E_NOACT - Command not possible in current state + - #E_NO_INSTANCE - No VT client available + \note \par + - Every function call causes the sending of this command on the bus. + Danger of buffer overflow and high bus load ! + - Attention: Correct WS instance must be set ( Calling IsoWsSetMaskInst() !) + */ + iso_s16 IsoCmd_ExecuteMacro(iso_u16 u16Id); + + /*****************************************************************************/ + /*! + \brief Command Change Object Label( Part 6 - F.50 ) + + This command is used by an ECU to change a label of an object. See also B.21 + Object Label Reference List object. + + \param[in] \wp{u16Id, iso_u16} + Object ID of object to associate label with + \param[in] \wp{u16ObIdStringVar, iso_u16} + Object ID of a String Variable object that contains the label string + (32 characters maximum) or FFFF if no text is supplied + \param[in] \wp{u8FontType, iso_u8} + Font type (ignored if String Variable object reference is NULL or the + string contains a WideString ) + \param[in] \wp{u16ObIdGrafic, iso_u16} + Object ID of an object to be used as a graphic representation of + the object label or FFFF16 if no designator supplied. + \retval iso_s16 + - #E_NO_ERR - OK + - #E_OVERFLOW - buffer overflow + - #E_NOACT - Command not possible in current state + - #E_NO_INSTANCE - No VT client available + \note \par + - Every function call causes the sending of this command on the bus. + Danger of buffer overflow and high bus load ! + - Attention: Correct WS instance must be set ( Calling IsoWsSetMaskInst() !) + */ + iso_s16 IsoCmd_ChangeObjectLabel(iso_u16 u16Id, iso_u16 u16ObIdStringVar, + iso_u8 u8FontType, iso_u16 u16ObIdGrafic); + + /*****************************************************************************/ + /*! + \brief Command Change Polygon Point( Part 6 - F.52 ) + + This command is used by a Working Set to modify a point in an Output Polygon object. + + \param[in] \wp{u16Id, iso_u16} + Object ID of the Output Polygon object to change + \param[in] \wp{u8PointIndex, iso_u8} + Point index of the point to replace. + \param[in] \wp{u16NewXValue, iso_u16} + New X value of a point relative to the top left corner of the polygon + \param[in] \wp{u16NewYValue, iso_u16} + New Y value of a point relative to the top left corner of the polygon + \retval iso_s16 + - #E_NO_ERR - OK + - #E_OVERFLOW - buffer overflow + - #E_NOACT - Command not possible in current state + - #E_NO_INSTANCE - No VT client available + \note \par + - Every function call causes the sending of this command on the bus. + Danger of buffer overflow and high bus load ! + - Attention: Correct WS instance must be set ( Calling IsoWsSetMaskInst() !) + */ + iso_s16 IsoCmd_ChangePolygonPoint(iso_u16 u16Id, iso_u8 u8PointIndex, + iso_u16 u16NewXValue, iso_u16 u16NewYValue); + + /*****************************************************************************/ + /*! + \brief Command Change Polygon Scale( Part 6 - F.54 ) + + This command is used by a Working Set to change the scale of a complete Output Polygon object. + + \param[in] \wp{u16Id, iso_u16} + Object ID of the Output Polygon object to scale + \param[in] \wp{u16NewWidth, iso_u16} + New width attribute + \param[in] \wp{u16NewHeight, iso_u16} + New height attribute + \retval iso_s16 + - #E_NO_ERR - OK + - #E_OVERFLOW - buffer overflow + - #E_NOACT - Command not possible in current state + - #E_NO_INSTANCE - No VT client available + \note \par + - Every function call causes the sending of this command on the bus. + Danger of buffer overflow and high bus load ! + - Attention: Correct WS instance must be set ( Calling IsoWsSetMaskInst() !) + */ + iso_s16 IsoCmd_ChangePolygonScale(iso_u16 u16Id, iso_u16 u16NewWidth, iso_u16 u16NewHeight); + + /*****************************************************************************/ + /*! + \brief Command Graphics Context ( Part 6 - F.56 ) + + This command is used to manipulate a graphics Context object (only on version 4 or later VTs). + + \param[in] \wp{u16Id, iso_u16} + Object ID of a Graphics Context object + \param[in] \wp{u8SubCommandID, iso_u8} + Sub-Command ID + \param[in] \wpp{u8ParaList[], const #iso_u8[]} + Parameters based on sub-command ID byte + \param[in] \wp{u16LenBytes, iso_u16} + Length in bytes of parameter list + \retval iso_s16 + - #E_NO_ERR - OK + - #E_OVERFLOW - buffer overflow + - #E_NOACT - Command not possible in current state + - #E_NO_INSTANCE - No VT client available + \note \par + - Every function call causes the sending of this command on the bus. + Danger of buffer overflow and high bus load ! + - Attention: Correct WS instance must be set ( Calling IsoWsSetMaskInst() !) + - Function uses string buffer ( Parameterlist has to be smaller than STRLENGTHMAX ) + */ + iso_s16 IsoCmd_GraphicsContext(iso_u16 u16Id, iso_u8 u8SubCommandID, + const iso_u8 u8ParaList[], iso_u16 u16LenBytes); + + /*****************************************************************************/ + /*! + \brief Command GetAttribute( Part 6 - F.58 ) + + This message is available in VT Version 4 and later. This command is used by a + Working Set to query the VT for the current state of objects within the VT. + + \param[in] \wp{wId, iso_u16} + Object ID + \param[in] \wp{bAID, iso_u8} + Attribute ID of the object + \retval iso_s16 + - #E_NO_ERR - OK + - #E_OVERFLOW - buffer overflow + - #E_NOACT - Command not possible in current state + - #E_NO_INSTANCE - No VT client available + \note \par + - Every function call causes the sending of this command on the bus. + Danger of buffer overflow and high bus load ! + - Attention: Correct WS instance must be set ( Calling IsoWsSetMaskInst() !) + */ + iso_s16 IsoCmd_GetAttribute( iso_u16 wId, iso_u8 bAID ); + + /****************************************************************************/ + /*! + \brief Command Select Colour Map ( VT version 4 and later ) ( Part 6 - F.60 ) + + The Select Colour Map command is used to select the active Colour Map. This command can take a + long time to execute. The command applies to any presentation from the originating Working Set, + which includes objects that may be shown on other Working Set screens (e.g. Auxiliary Control + objects as may be presented on VT proprietary and other Working Set masks using the Auxiliary + Control Designator Type 2 Object Pointer). + + \param[in] \wp{wObjIdColourMap, iso_u16} + Object ID of Colour map object or FFFF to restore the default + colour table (see A.3) + \retval iso_s16 + - #E_NO_ERR - OK + - #E_OVERFLOW - buffer overflow + - #E_NOACT - Command not possible in current state + - #E_NO_INSTANCE - No VT client available + \note \par + - Every function call causes the sending of this command on the bus. + Danger of buffer overflow and high bus load ! + - Attention: Correct WS instance must be set ( Calling IsoWsSetMaskInst() !) + */ + iso_s16 IsoCmd_SelectColourMap( iso_u16 wObjIdColourMap ); + + /*****************************************************************************/ + /*! + \brief Command Identify VT ( Part 6 - F.62 ) + + The Identify VT message may be sent by either Working Sets or VTs. + This message is available in VT Version 4 and later. + + \retval iso_s16 + - #E_NO_ERR - OK + - #E_OVERFLOW - buffer overflow + - #E_NOACT - Command not possible in current state + - #E_NO_INSTANCE - No VT client available + \note \par + - Every function call causes the sending of this command on the bus. + Danger of buffer overflow and high bus load ! + - Attention: Correct WS instance must be set ( Calling IsoWsSetMaskInst() !) + */ + iso_s16 IsoCmd_IdentifyVT(void); + + /*****************************************************************************/ + /*! + \brief Command Execute Extended Macro( Part 6 - F.64 ) + + This command is used to execute a Macro with 16-bit Object ID. + This message is available in VT version 5 and later. + + \param[in] \wp{u16IdMac, iso_u16} + Object ID of Macro object + \retval iso_s16 + - #E_NO_ERR - OK + - #E_OVERFLOW - buffer overflow + - #E_NOACT - Command not possible in current state + - #E_NO_INSTANCE - No VT client available + \note \par + - Every function call causes the sending of this command on the bus. + Danger of buffer overflow and high bus load ! + - Attention: Correct WS instance must be set ( Calling IsoWsSetMaskInst() !) + */ + iso_s16 IsoCmd_ExecuteExtendedMacro(iso_u16 u16IdMac); + + #endif + + /** @} */ + + #if defined(ISO_VTC_XCR) + /* ************************************************************************ */ + /** \name VT Client Special command functions ( Legacy - only with one VT client ) + \brief to disable this functions add the define ISO_VTC_DISABLE_XCR to your IsoConf.h + @{ + */ + /*****************************************************************************/ + /* + \brief Function for single controlled commands(SCC) of command + + This function sends a command (value) one time. + + \param[in] \wp{eVtFunc, ISOVT_FUNC_e} + Change_numeric_value or hide_show_object + \param[in] \wp{wObjId, iso_u16} + Object ID + \param[in] \wp{dwVal, iso_u32} + Value for called object ID \n + \retval iso_s16 + - #E_NO_ERR + - #E_OVERFLOW - buffer is full + - #E_RANGE - unvalid call see ISOVT_FUNC_e + \note \par + If the data mask changes the intern list of object IDs is deleted. + With the first call of this function the object ID is added to the list. + */ + iso_s16 IsoCommandSC ( ISOVT_FUNC_e eVtFunc, iso_u16 wObjId, iso_u32 dwVal); + + /******************************************************************************/ + /*! + \brief Function for event controlled responses (ECC) of command + + This function sends automatic a new command if the new value is different of the last value. + + \param[in] \wp{eVtFunc, ISOVT_FUNC_e} + Change_numeric_value or hide_show_object + \param[in] \wp{wObjId, iso_u16} + Object ID + \param[in] \wp{dwVal, iso_u32} + New value for called object ID + \retval iso_s16 + - #E_NO_ERR + - #E_OVERFLOW - buffer is full + - #E_RANGE - invalid call see ISOVT_FUNC_e + \note + \par + If the data mask changes the intern list of object IDs is deleted. + With the first call of this function the object ID is added to the list. + */ + iso_s16 IsoCommandEC ( ISOVT_FUNC_e eVtFunc, iso_u16 wObjId, iso_u32 dwVal); + + /*************************************************************************************/ + /*! + \brief Function for time controlled responses (TCR) of command + + This function sends automatic a new command after the Time "wDeltaTime". + + \param[in] \wp{eVtFunc, ISOVT_FUNC_e} + Change_numeric_value or hide_show_object + \param[in] \wp{wObjId, iso_u16} + Object ID + \param[in] \wp{dwVal, iso_u32} + New value for called object ID + \param[in] \wp{wDeltaTime, iso_u16} + + \retval iso_s16 + - #E_NO_ERR + - #E_OVERFLOW - buffer is full + - #E_RANGE - invalid call see ISOVT_FUNC_e + \note \par + If the data mask changes the intern list of object IDs is deleted. + With the first call of this function the object ID is added to the list. + */ + iso_s16 IsoCommandTC ( ISOVT_FUNC_e eVtFunc, iso_u16 wObjId, iso_u32 dwVal, iso_u16 wDeltaTime ); + /*****************************************************************************/ + /*! + \brief Manual delete of automatic object ID list + + \retval iso_s16 + - #E_NO_ERR + \note \par + Normally in case of data mask change the Object ID list is deleted. + If the application shall control it this function enables the deleting + of the list manual. See IsoSetObjIdListNoAutoDelete() and + IsoSetObjIdListAutoDeleteActive() + */ + iso_s16 IsoVTaListDel ( void ); /* Manual delete of list */ + + /*****************************************************************************/ + /*! + \brief Manual delete of automatic object ID list + + \retval iso_s16 + - #E_NO_ERR + \note \par + Normally in case of data mask change the Object ID list is deleted. + If the application shall control it this function enables the deleting + of the list manual. See IsoSetObjIdListNoAutoDelete() and + IsoSetObjIdListAutoDeleteActive() + */ + iso_s16 IsoSetObjIdListNoAutoDelete ( void ); /* Switch off automatic deleting of object ID list */ + + /** @} */ + #endif /* defined(ISO_VTC_XCR) */ + + /* ********************************* IsoAux.c *************************************** */ + /** \addtogroup aux Auxiliary + @{ + */ + + #ifdef DOXYGEN + /*! \def ISO_AUXFUNC_SINGLEASSIGN_CHECK + \brief Add the define #ISO_AUXFUNC_SINGLEASSIGN_CHECK to IsoConf.h to enable the + aux function single assignment check. + \details + If enabled, the ECU driver validates assignments to aux functions to reject + invalid assignments with it's own single assignment functions. + */ + #define ISO_AUXFUNC_SINGLEASSIGN_CHECK /* enable single assignment check */ + #endif + + + + /* **************************************************************************************** */ + /** \brief + Values of auxiliary (input) function types + */ + typedef enum + { + Bool_Latched = 0, /**< Two-position switch */ + Analog_0_100 = 1, /**< Analog maintains position setting */ + Bool_NonLatched = 2, /**< Two-position switch - returns to off */ + Analog_Ret50perc = 3, /**< Two way analog - return to centre position */ + Analog_Ret0perc = 4, /**< One way analog - return to 0% */ + DualBool_BothLatched = 5, /**< Three-position switch - latching in all positions */ + DualBool_BothNonLatched = 6, /**< Three-position switch - return to centre */ + DualBool_LatchedUp = 7, /**< Three-position switch - latching in up position */ + DualBool_LatchedDown = 8, /**< Three-position switch - latching in down position */ + CombinedAnalog_Ret50 = 9, /**< Two way analog - return to centre position - with latching */ + CombinedAnalog_LatchBool = 10, /**< Analog maintains position setting with latching Boolean at 0% and 100% positions */ + QuadratBool_NonLatched = 11, /**< Two quadrature mounted Three-position switches - return to centre position */ + QuadratAnalog = 12, /**< Two quadrature mounted analog maintain position setting - centre is 50% */ + QuadratAnalog_Ret50prec = 13, /**< Two quadrature mounted analog returns to centre position at 50% */ + BidirectionalCounter = 14, /**< Count increases when turning in the encoders "increase" direction (analog opposite direction */ + /**< ... Reserved */ + RemoveAssignment = 31, /**< Used for remove assignment command */ + AuxFunUndefined = 32 + } VTAUXTYP_e; + + /* **************************************************************************************** */ + /** \brief + Value of auxiliary inputs + */ + typedef enum + { + AuxDisabled = 0, /**< Off - backward, down, left, or not pressed */ + AuxEnabled = 1, /**< On - forward, up, right, or pressed */ + AuxHeld = 2, /**< Held (forward, up, or right) */ + AuxEnabledBackwards = 4, /**< On momentary - backward, down or left */ + AuxHeldBackwards = 8, /**< Held (backwards, down, or left) */ + AuxDefault = 9 + } VTAUXSTATES_e; + + /* **************************************************************************************** */ + /** \brief + Struct for auxiliary control assignment of application + */ /* [DOXYGEN_VT_AUXAPP_T] */ + typedef struct + { + iso_u16 wObjID_Fun; /**< Object ID of auxiliary function */ + iso_u16 wObjID_Input; /**< Object ID of auxiliary input */ + VTAUXTYP_e eAuxType; /**< Function/input type (without attribute bits) + - only because of downwards compatibility */ + iso_u16 wManuCode; /**< Manufacturer Code of auxiliary input device */ + iso_u16 wModelIdentCode; /**< Model identification code of aux input device */ + iso_bool qPrefAssign; /**< This assignment shall used for preferred assignment */ + iso_u8 bFuncAttribute; /**< Complete function attribute byte of auxiliary function */ + ISO_CF_NAME_T baAuxName; /**< ISO name of the auxiliary input device. The bytes must be set to 0xFF if not used. */ + } VT_AUXAPP_T, *VT_AUXAPP_t ; + /* [DOXYGEN_VT_AUXAPP_T] */ + + + /* **************************************************************************************** */ + /*! + \brief Preferred assignment callback function pointer. + + \param[in,out] \wp{asAuxAss, VT_AUXAPP_T []} + Pointer to the array, which must be filled from the application. + \param[in,out] \wp{ps16MaxNumberOfAssigns, iso_s16*} + Pointer to the number of array entries + - in: The value contains the maximum number of assignment array entries, which can be filled. + - out: The application must set the value to the number of filled assignment array entries. + \param[in] \wp{userParam, ISO_USER_PARAM_T} + User parameter set with IsoVTInit() + */ + typedef void (*iso_fnCbAuxPrefAssignment_t)( VT_AUXAPP_T asAuxAss[], iso_s16* ps16MaxNumberOfAssigns, ISO_USER_PARAM_T userParam ); + + #if defined(ISO_VTC_AUX_N) + + /* ************************************************************************ */ + /** \name Functions for VT Client Auxiliay function support + @{ + */ + /* **************************************************************************************** */ + /*! + \brief Set preferred assignment callback function. + + \param[in] \wp{pfnCallbackFunction, iso_fnCbAuxPrefAssignment_t} + Pointer to the callback function. + \retval iso_s16 + - E_NO_ERR + - E_NO_INSTANCE + The function should be called after IsoVTInit() to set the preferred assignment callback function. + The VT client will call this function every time before sending the prefered assignment to the VT. + */ + iso_s16 IsoAuxPrefAssignmentCbSet( iso_fnCbAuxPrefAssignment_t pfnCallbackFunction ); + + /* **************************************************************************************** */ + /*! + \brief The function triggers the sending of the preferred assignment to the VT. + + Before sending the preferred assignment the callback function, + that was set with IsoAuxPrefAssignmentCbSet(), is called to get the + preferred assignments from the application. + + \retval iso_s16 + - E_NO_ERR - preferred assignment message is triggered to be send + - E_NOACT - triggering not possible + - E_NO_INSTANCE + */ + iso_s16 IsoAuxPrefAssignmentTrigger( void ); + + /*****************************************************************************/ + /*! + \brief Function for application in order to read assignment and store it + + \param[in] \wp{asAuxAss, VT_AUXAPP_T[]} + Pointer to array of auxiliary assignments + \param[in] \wp{riNumberOfFunctions, iso_s16*} + Pointer to number of assignments (return value of driver) + \retval iso_s16 + - E_NO_ERR + - E_RANGE + - E_NO_INSTANCE + \note \par + - V8.01: Use bFuncAttribute instead of eAuxType as Function attribute type + */ + iso_s16 IsoAuxAssignmentRead( VT_AUXAPP_T asAuxAss[], iso_s16* riNumberOfFunctions ); + + /******************************************************************************/ + /*! + \brief Application sets "preferred assignment" during login phase + + This function gives an array of the preferred assignment struct to the driver. This is + necessary during login-phase. The assignments can be in every order. + + \param[in] \wpp{asAuxAss, const #VT_AUXAPP_T[]} + Pointer to (preferred) assignment + \param[in] \wp{rs16NumberOfAssigns, iso_s16} + Number of preferred assignments + \retval iso_s16 + - E_NO_ERR - preferred assignment has been set + - E_RANGE - function parameter not valid + - E_NO_INSTANCE + \note \par + The preferred assignment must be "static" (VT_AUXAPP_T[]) because the driver + copy the assignments not until it sends the preferred assignment to the VT. + + With Version 6.04 the function is deprecated and should not be used for new applications. \n + Use IsoAuxPrefAssignmentCbSet() to set a callback function, + which will be called to get the preferred assignment from the application. + */ + ISO_DEPRECATED iso_s16 IsoAuxAssignmentSet( const VT_AUXAPP_T asAuxAss[], iso_s16 rs16NumberOfAssigns ); + /** @} */ + #endif /* defined(ISO_VTC_AUX_N) */ + + #if defined(ISO_VTC_AUX_INP_N) + /* ************************************************************************ */ + /** \name Functions for implementation of Auxiliary Input Unit devices + @{ + */ + /****************************************************************************/ + /*! + \brief Initialisation of an auxiliary input unit + + Setting the model identification code, calling after IsoUserAnnounce allowed + + \param[in] \wp{s16CfHandleMaster, iso_s16} + CF handle of auxiliary input device + \param[in] \wp{rwModelIdentCode, iso_u16} + Model identification code + \retval iso_s16 + - E_NO_ERR + - E_NO_INSTANCE + */ + iso_s16 IsoAuxUnitInit ( iso_s16 s16CfHandleMaster, iso_u16 rwModelIdentCode ); + + + /***************************************************************************************/ + /*! + \brief Sending an auxiliary input status message on the bus ( VT version > 2 ) + + \param[in] \wp{iInpNr, iso_s16} + Number of auxiliary array - corresponds with the order in the pool \n + that means first aux input in pool is iInpNr = 0 etc. + \param[in] \wp{Val1_u16, iso_u16} + New value for this input + \param[in] \wp{Val2_u16, iso_u16} + Second new value for this input + \retval iso_s16 + - E_NO_ERR + - E_NO_INSTANCE + - E_OVERFLOW on send FIFO full + - E_COM on bus-off + \note \par + This function is only necessary for the implementation of Auxiliary Input Units. + */ + iso_s16 IsoAuxInputStatus2 ( iso_s16 iInpNr, iso_u16 Val1_u16, iso_u16 Val2_u16 ); + + /* ************************************************************************ */ + /*! + \brief Helper function to get the array index for a given input object ID + + \param[in] \wp{u16ObjIDInput, iso_u16} + Pool object ID of the input + \retval iso_s16 + - >= 0: array index + - < 0: Error code + \par + This function is only for the implementation of Auxiliary Input Units. + */ + iso_s16 IsoAuxInputIndexToObjId ( iso_u16 u16ObjIDInput); + + #endif /* defined(ISO_VTC_AUX_INP_N) */ + + #if defined(ISO_VTC_AUX_INP_O) + + /* ************************************************************************ */ + /*! + \brief Sending an auxiliary input status message on the bus ( VT version < 3 ) + + \param[in] \wp{iInpNr, iso_s16} + Number of auxiliary array - corresponds with the order in the pool \n + that means first aux input in pool is iInpNr = 0 etc. + \param[in] \wp{Val1_u16, iso_u16} + New value for this input + \retval iso_s16 + - #E_NO_ERR + - #E_NO_INSTANCE + - #E_OVERFLOW on send FIFO full + - #E_COM on bus-off + \note \par + This function is only necessary for the implementation of Auxiliary Input Units. + */ + iso_s16 IsoAuxInputStatus ( iso_s16 iInpNr, iso_u16 Val1_u16 ); + + /** @} */ + #endif /* defined(ISO_VTC_AUX_INP_O) */ + + #if defined(ISO_VTC_AUX_N) || defined(ISO_VTC_AUX_INP_N) + #ifdef ISO_VTC_UT3 + /* ************************************************************************ */ + /** \name Auxiliary Capabilities request + @{ + */ + /****************************************************************************/ + /*! + \brief Auxiliary Capabilities request ( VT version 5 and later ) + + \param[in] \wp{u8RequestType, iso_u8} + Capabilities for: 0 = Aux Input Unit, 1 = Aux Function Unit + \retval iso_s16 + - #E_NO_ERR - OK + - #E_OVERFLOW - buffer overflow + - #E_NO_INSTANCE - No VT client available + \note \par + - Every function call causes the sending of this command on the bus. + Danger of buffer overflow and high bus load ! + - Attention: Correct WS instance must be set ( Calling IsoWsSetMaskInst() !) + */ + iso_s16 IsoAuxCapabilitiesRequest(iso_u8 u8RequestType); + + /** @} */ + #endif /* ISO_VTC_UT3 */ + #endif /* defined(ISO_VTC_AUX_N) || defined(ISO_VTC_AUX_INP_N) */ + + /** @} */ /* END aux */ + + + /* ********************************* IsoAlarm.c *************************************** */ + /** \addtogroup ala Alarms + @{ + */ + + #define ISOALARMPRIO_LIFE_EM (0x00U) /**< Alarm priority - high, operator in danger... */ + #define ISOALARMPRIO_PROCESS_EM (0x01U) /**< Alarm priority - medium, normal alarm */ + #define ISOALARMPRIO_LOW (0x02U) /**< Alarm priority - low, information only */ + + /* Alarm-Features */ + #define AL_VISIBLE (0x01U) /**< \brief Alarms are shown on terminal */ + #define AL_STORAGE (0x02U) /**< \brief Alarms are entried in non-erasable memory */ + #define AL_TIMECONTROLLED (0x04U) /**< \brief Time controlled alarms */ + #define AL_INTERLOCK (0x08U) /**< \brief Interlocking - alarm can be called only one time */ + #define AL_QUITofAPPLIC (0x10U) /**< \brief Quit of application necessary for deleting alarm */ + #define AL_BROADCAST (0x20U) /**< \brief Send as broadcast to GLOBAL ADDRESS (Unimog) */ + + + /** \brief + Enum for alarm commands + */ + typedef enum + { + AlEngage, /**< Alarm engaging */ + AlDisengage, /**< Alarm disengaging */ + AlQuitTest, /**< Testing if command -AlQuitofApplication- have already set */ + AlQuitofApplication, /**< see feature AL_QUITofAPPLIC, after quit of VT an application quit */ + /**< is necessary */ + AlInterlockDisengage, /**< Possibility for re-activation interlocked alarms */ + AlDelete /**< Alarm is deleted */ + } ISOAL_CMD_e; + + /** \brief + Administration struct for ISO alarms + */ + typedef struct + { + iso_u32 dwIdentity; /**< 16bit: ProjectID | 16bit: AlarmID */ + iso_u8 bFeature; /**< Properties of an alarm - e.g. AL_QUITofAPPLIC */ + iso_u8 bAlStatus; /**< Status corresponding features */ + iso_u8 bPriority; /**< See *.h */ + iso_s32 lTimeStamp; /**< Time stamp for e.g. broadcast */ + iso_s16 eState; /**< State machine */ + } ISOALARM_T, *ISOALARM_t; + + #ifdef ISO_VTC_ALARM + /******************************************************************************/ + /*! + \brief Initialisation of an alarm object + + This function initializes an alarm object. Every alarm object is associated + with an alarm mask. The alarm module supports the ISO11783 alarm behavior. + + \param[in] \wp{rpsIsoAlarm, ISOALARM_t} + Pointer to alarm structure provided by application + \param[in] \wp{rbPriority, iso_u8} + Alarm priority \n + Range: ISOALARMPRIO_LIFE_EM (high), ISOALARMPRIO_PROCESS_EM (low) + \param[in] \wp{s16CfHandleMaster, iso_s16} + CF handle of Working Set Master of this alarm + \param[in] \wp{rwAlarmID, iso_u16} + Object ID of corresponding alarm mask + \param[in] \wp{rbFeatures, iso_u8} + Features of this alarm + - AL_VISIBLE - Not supported of ISO11783 + - AL_STORAGE - Not supported of ISO11783 + - AL_TIMECONTROLLED - Not supported of ISO11783 + - AL_INTERLOCK - Alarm is interlocked that means second call don't release it + - AL_QUITofAPPLIC - also app. must confirm the acknowledge of VT for deleting + - AL_BROADCAST - Not supported of ISO11783 + */ + void IsoAlarmObjInit ( ISOALARM_t rpsIsoAlarm, iso_u8 rbPriority, + iso_s16 s16CfHandleMaster, iso_u16 rwAlarmID, + iso_u8 rbFeatures + ); + + /*****************************************************************************/ + /*! + \brief User interface function to engage, disengage, ... alarms + + This function is used to control an alarm. It can engaged, disengaged, checked + if VT has acknowledged it, setting the Quit of application or disengage the + interlock. + + \param[in] \wp{rpsIsoAlarm, ISOALARM_t} + Pointer to controlled alarm + \param[in] \wp{reCommand, ISOAL_CMD_e} + Control command + - AlEngage - an alarm is engaged -> Alarm mask on VT + - AlDisengage - an alarm is disengaged (->manual Time control ) + - AlQuitTest - if an alarm has the feature AL_QUITofAPPLIC the appl. + must confirm the acknowledge. AlQuitTest checks if the alarm is + acknowledged of VT operator. \n + - AlQuitofApplication - if an engaged alarm with feature AL_QUITofAPPLIC + ia acknowledged of VT then the appl. must call this control. for + deleting the alarm + - AlInterlockDisengage - for reactivation of interlocked alarms + \retval iso_s16 + - E_NO_ERR - OK + - E_OVERFLOW - Alarm buffer is full + - E_BUSY - Repeated calling of an interlocked alarm + - E_WARN - Alarm not found in the alarm list + - 1 - Quit of application has been OK (see features) + - 2 - Alarm is acknowledged of VT and can be quitted + \note \par + - An alarm can only released if it is not interlocked. + - Time control can realised manual with disengaging the alarm. + - With this concept (every alarm has an alarm mask) + its necessary to create an alarm mask for every alarm. + Alternatively its possible to change the textual/graphical objects of one + alarm mask. In this case there is only one alarm mask necessary. + */ + iso_s16 IsoAlarmCmd ( ISOALARM_t rpsIsoAlarm, ISOAL_CMD_e reCommand ); + + /****************************************************************************************/ + /*! + \brief User interface function to read number of stored alarm + + This function reads the actual active number of alarms. + + \retval iso_u16 + Number of alarms which are active + \note \par + e. g. it is possible to avoid unnecessary cyclic calls for controlling the alarms. + */ + iso_u16 IsoAlarmGetNum( void ); + + /********************************************************************************************/ + /*! + \brief Setting an "return data mask" before application quit of an alarm + + This function sets the data mask which will appear after application quit or disengaging + of an alarm. + + \param[in] \wp{DmObjId_cu16, iso_u16} + Object ID of a data mask object + \note \par + In normal behaviour the driver sends "change active mask" of the data mask which + is referenced in the working set object (default data mask). The reason is when sending + an alarm without open the pool on VT there is no return mask defined. This function + */ + void IsoAlarmSetReturnObjId( iso_u16 DmObjId_cu16 ); + + #endif /* ISO_VTC_ALARM */ + /** @} */ /* END ala */ + + /* ********************************* IsoPool.c *************************************** */ + /** \addtogroup poolmani Poolmanipulation + @{ + */ + + #define ISO_FACTOR_ONE (10000U) /**< Scaling factor - 1 - */ + #define ISO_POOLDATA_READY (1UL) /**< Direct transfer: Requested pool objects are ready to upload */ + #ifndef ISO_POOLDATA_WAIT_TIME + #define ISO_POOLDATA_WAIT_TIME (0U) /**< Direct transfer: Maximum wait time in milliseconds to use single (E)TP for pool upload */ + #endif + + #ifdef DOXYGEN + /*! \def ISO_POOL_DIRECT_LOAD + \brief Add the define #ISO_POOL_DIRECT_LOAD to IsoConf.h to enable the "Direct Pool Transfer". + \details The define is needed to use IsoPoolInitDirectTransfer(). + */ + #define ISO_POOL_DIRECT_LOAD + + /*! \def ISO_VTPO_TP_BUFFER_SIZE + \brief Size of the direct pool transfer (E)TP data iso_u8 buffer. + \details + You can use iso_CoreTPRepeatSet(x) to set the number of TP data packets which should be send in one loop. \n + The TP pool buffer size ISO_VTPO_TP_BUFFER_SIZE should be greater or equal (x*7u)+3u to use the full TP transfer speed. \n + You can use IsoPoolSetDTRepeatRate(y) to increase the call frequency PoolDoDirectLoadPool() in state TPBuffScanSeg, \n + to make sure that the TP pool buffer can be filled in one loop. \n + + */ + #define ISO_VTPO_TP_BUFFER_SIZE (16u) + + /*! \def ISO_VTPO_OBJ_FIELD_SIZE + \brief Size of the direct pool transfer object field array for storing the needed field manipulations + */ + #define ISO_VTPO_OBJ_FIELD_SIZE (6u) + + /*! \def ISO_EXTERNAL_POOLBUFFER + \brief Add the define #ISO_EXTERNAL_POOLBUFFER to IsoConf.h to enable the external pool RAM buffer functionality. + \details The define is needed to replace the internal buffer with an external pool RAM buffer. \n + The external buffer must have the size defined by RAMSIZEPOOL. \n + The pointer to this buffer must be set with IsoPoolSetBuffer(). + */ + #define ISO_EXTERNAL_POOLBUFFER + + #endif + + /** \brief + Enum for read function of special pool information + */ + typedef enum + { + PoolROMStartAddress, /**< Start address of pool in FLASH */ + PoolROMSize, /**< Size of original pool */ + PoolRAMStartAddress, /**< Start address of pool in RAM */ + PoolRAMSize, /**< Pool size, only valid after download !!! */ + ObjIDWorkingSet, /**< Object identifier of working set */ + ObjIDFirstDataMask, /**< First data mask */ + PointerVersionString, /**< Pointer to the version string */ + PoolGraphicType, /**< Graphic type of pool - see IsoPoolInit () */ + PoolDataMaskScalFaktor, /**< Scaling factor of data mask */ + PoolSoftKeyMaskScalFaktor, /**< Scaling factor of soft key mask */ + BufferUsed /**< Actual Bytes in pool buffer */ + } ISOPOOLINFO_e; + + /** \brief + Enum of pool manipulation modes + */ + typedef enum + { + NoScaling, /**< Object or object range is not scaled */ + Scaling, /**< Object or object range is scaled */ + Centering, /**< Object or object range is centered */ + NotLoad, /**< Object or object range is not loaded during pool transport */ + Proprietary, /**< Object or object range is manipulated of a proriertary manipulation module */ + LoadMoveID, /**< Object or object range is loaded to new destination address */ + LoadCopyID, /**< Object or object range is copied to destination address */ + ColourReduction, /**< Colour depth of object or object range is reduced */ + AuxToV2, /**< Auxiliary object or object range is transformed into version 2 */ + LastMode + } ISOPOOLMANIMODE_e; + + /** \brief + Enum of colour depth of pool + */ + typedef enum + { + monochrome = 0, /**< Monochrome */ + colour_16 = 1, /**< 16 colour */ + colour_256 = 2, /**< 256 colour */ + colour_undef = 3 + } ISOGRAPH_TYPE_e; + + /** \brief + Enum of pool state machine + */ + typedef enum + { + PoolLazy, /**< - Poolservice inactive */ + PoolLoadInit, /**< - Initialisation of pool service in order to scan or transport */ + PoolLoadSeg, /**< + - Segmented poolservice: Loading objects in buffer + - Direct transfer: Requesting next pool objects */ + PoolScanSeg, /**< + - Segmented poolservice: Scanning objects in buffer + - Direct transfer: Scanning requested objects */ + PoolScanning, /**< + - Scanning for "normal" flashtransfer + - Direct Transfer: Start pool scanning */ + PoolWaitTransfer, /**< - Wait till VT client decide if primary pool transfer is necessary */ + PoolGetMemory, /**< - Sending and receiving GetMemory */ + ETPBuffLoad, /**< + - "normal" flashtransfer: Manipulating objects and storing in ETP buffer + - Direct Transfer: start direct transfer */ + ETPBuffLoadSeg, /**< + - Segmented poolservice: Loading pooldata in buffer + - Direct transfer: Requesting next pool objects */ + ETPBuffScanSeg, /**< + - Segmented poolservice: Scanning pooldata in buffer + - Direct transfer: Scanning and sending requested objects */ + ETPBuffManiSeg, /**< - Segmented poolservice: Manipulating pooldata in buffer */ + ETPBlockManipulated, /**< + - Decide before ETPstart if last of any block + - Direct transfer: not used */ + ETPBuffLoadSegAfterETP, /**< + - Segmented poolservice: Copiing rest pool data at begin of buffer + - Direct transfer: not used */ + ETP_start, /**< + - Starting ETP transfer + - Direct transfer: not used */ + ETP_Trans_running, /**< - Wainting till ETP transfer is finished */ + ETP_finished /**< - Decide if further transfer necessary or finish pool service */ + } ISOPOOLSM_e; + + /** \brief + Enum for pool service callback + */ + typedef enum + { + PoolBlockRequest, /**< Driver request pool data ( segmented pool transfer) */ + PoolGetMemoryFailed, /**< Informs that VT has not enough memory for the pool */ + PoolStatemachine, /**< Gives actual state of pool state machine to application */ + PoolFileCloseRequest, /**< Gives the application the possibility to close the pool ( segmented pool transfer) */ + PoolObjectRequest /**< Driver request some complete objects ( direct pool transfer ) */ + } ISOPOOLCBREQ_e; + + /** \brief + Struct for pool callback + */ + typedef struct + { + ISOPOOLCBREQ_e ePoolCtrl; /**< Command/Kind of (CB)call */ + /* for command PoolBlockRequest */ + iso_u8 HUGE_C* pbAddress; /**< + - Segmented pool transfer - PoolBlockRequest: + - Address for pool buffer + - Direct pool transfer - PoolObjectRequest: + - Start address of the current pool objects buffer. \n + Must be set from the application in the PoolObjectRequest callback. + - Else: not valid */ + iso_u32 u32BlockSizeReq; /**< + - Segmented pool transfer - PoolBlockRequest: + - Requested blocksize + - Direct pool transfer - PoolObjectRequest: + - Must be set to #ISO_POOLDATA_READY, if buffer is ready to upload. + - Else: not valid */ + iso_u32 u32BlockSizeLoad; /**< + - Segmented pool transfer - PoolBlockRequest: + - App -> Driver: really load bytes + - Direct pool transfer - PoolObjectRequest: + - Driver: Request counter starting with 1. + - App: Size of the buffer that ready to upload + - App: Set the size to 0 and wBlockSizeReq to #ISO_POOLDATA_READY, + to indicate that no more objects are to send. + - Else: not valid */ + /* for command PoolStatemachine */ + ISOPOOLSM_e ePoolServState; /**< Delivers state of pool service state machine */ + ISO_USER_PARAM_T userParam; /*!< \brief User parameter of this VT client */ + } ISOPOOLCTRL_T; + typedef ISOPOOLCTRL_T *ISOPOOLCTRL_t; + + /** \brief Callback function pointer for driver requesting the pool data / objects from the application. + \details The callback function is used from the segmented and the direct pool transfer + to get the source location for the next pool data segment or the next complete objects + from the application. + \param[in,out] \wp{psPoolCtrl, ISOPOOLCTRL_T* } + Pointer to the ISOPOOLCTRL_T object. + */ + typedef void (*ISO_POOL_CALLBACK_t)( ISOPOOLCTRL_T * psPoolCtrl ); + + /** \brief Callback function pointer to return an pool object to the application. + \details The callback function is used from the pool transfer + to give back the current pool object to the application. \n + The callback function can be set with IsoPoolObjectCbSet(). + \param[in] \wpp{pau8Object, const iso_u8 HUGE_C[] } + Pointer to the object data iso_u8 array. + \param[in] \wp{u16ObjID, iso_u16 } + The extracted object ID. + \param[in] \wp{u8ObjType, iso_u8 } + The extracted object type. + \param[in] \wp{eState, ISOPOOLSM_e } + The current state of the pool service. + \param[in] \wp{userParam, ISO_USER_PARAM_T } + User parameter of this VT client. + */ + typedef void (*iso_fnCbPoolObject_t)(const iso_u8 HUGE_C pau8Object[], iso_u16 u16ObjID, iso_u8 u8ObjType, ISOPOOLSM_e eState, ISO_USER_PARAM_T userParam); + + /* Function prototyps */ + + #ifdef ISO_POOL_DIRECT_LOAD + /* **************************************************************************************** */ + /*! + \brief Initialisation of the direct pool transfer + + This function is used instead of IsoPoolInit() to transfer a pool without using the driver internal pool buffer. + This function must called after knowing VT characteristics! + + \param[in] \wp{rasVersionString, iso_u8[] } + Pointer to "Pool Version String" \n + Range: exact 7 characters for WS versions less than 5 otherwise exact 32 characters + \param[in] \wp{rbDesignatorWidth, iso_u8} + Soft key designator width - minimum == 60 \n + In order to guarantee proper functionality of pool manipulation + this value should be 60 + \param[in] \wp{rbDesignatorHeight, iso_u8} + Soft key designator height - minimum == 32 + In order to guarantee proper functionality of pool manipulation + this value should be 32 + \param[in] \wp{rwMaskSize, iso_u16} + Data and Alarm Mask size of this pool \n + Range: Minimum 200 - Maximum (undefined depends on physical VTs) + \param[in] \wp{rwMaxTime, iso_u16} + Maximum time in milliseconds the application needed to load the next pool objects for the driver. \n + - 0: The driver has direct access to the pool data memory + - else: The application copies the data in a memory zone where the driver has direct access. \n + Range: Minimum 0 - Maximum (undefined depends on the ECU hardware) + \param[in] \wp{rpfPoolLoad, ISO_POOL_CALLBACK_t } + Callback function pointer for the driver pool object requests. + + \retval iso_s16 + - E_NO_ERR + - E_NO_INSTANCE + - E_RANGE + + \par + Add the define #ISO_POOL_DIRECT_LOAD to IsoConf.h to enable the "Direct Pool Transfer". + + */ + iso_s16 IsoPoolInitDirectTransfer( const iso_u8 rasVersionString[], + iso_u8 rbDesignatorWidth, iso_u8 rbDesignatorHeight, iso_u16 rwMaskSize, + iso_u16 rwMaxTime, ISO_POOL_CALLBACK_t rpfPoolLoad ); + + /* ********************************************************************* */ + /*! + \brief Set the direct load pool transfer repetition value for one loop + + \param[in] \wp{s16DTSpeed, iso_s16} + Number of cyclic calls in one loop to speed up the transport\n + Range: 1 - about 10 (depends on #ISO_VTPO_TP_BUFFER_SIZE, and the size of the pool objects ..) \n + Default: 1 + \retval iso_s16 + - #E_NO_ERR on success + - #E_RANGE on s16DTSpeed is not valid + \details The value is used as in the state TPBuffScanSeg to loop over up to s16DTSpeed pool objects + to fill the internal TP pool buffer. The loop is also terminated if the TP pool buffer is full + or the last object of the current pool data block is processed. \n + See also #ISO_VTPO_TP_BUFFER_SIZE and IsoPoolInitDirectTransfer(). + */ + iso_s16 IsoPoolSetDTRepeatRate( iso_s16 s16DTSpeed ); + + #endif /* ISO_POOL_DIRECT_LOAD */ + + + #if defined(ISO_POOL_BUFFERED_LOAD) + + /******************************************************************************************/ + /*! + \brief Initialisation of the object pool for segmented handling + + This function is used instead of IsoPoolInit() in the case that the pool shall + load out partial of a mass storage e. g. SD-Card. + This function must called after knowing VT characteristics! + + \param[in] \wp{rasVersionString, iso_u8[] } + Pointer to "Pool Version String" \n + Range: exact 7 characters for WS versions less than 5 otherwise exact 32 characters + \param[in] \wp{rdwBuffOffset, iso_u32} + BufferOffset to Poolbuffer -> Startaddress for loaded objects \n + Details see help - VT client/VT Pool Manipulation/.. + \param[in] \wp{rwNumberObjects, iso_u16} + Number of objects in object pool + \param[in] \wp{reGraphicType, ISOGRAPH_TYPE_e} + Graphic type of this pool ( monochrome, colour_16, colour_256 ) + \param[in] \wp{rbDesignatorWidth, iso_u8} + Soft key designator width - minimum == 60 \n + In order to guarantee proper functionality of pool manipulation + this value should be 60 + \param[in] \wp{rbDesignatorHeight, iso_u8} + Soft key designator height - minimum == 32 + In order to guarantee proper functionality of pool manipulation + this value should be 32 + \param[in] \wp{rwMaskSize, iso_u16} + Data and Alarm Mask size of this pool \n + Range: Minimum 200 - Maximum (undefined depends on physical VTs) + \param[in] \wp{rpfPoolLoad, ISO_POOL_CALLBACK_t} + Callback function for driver requests of pool + + \retval iso_s16 + - E_NO_ERR + - E_OVERFLOW: Pool RAM Buffer is NULL pointer + - E_NO_INSTANCE + - E_RANGE: Parameter not valid ( rasVersionString is a NULL pointer) + */ + iso_s16 IsoPoolInitSegmented( const iso_u8 rasVersionString[],iso_u32 rdwBuffOffset, + iso_u16 rwNumberObjects, ISOGRAPH_TYPE_e reGraphicType, + iso_u8 rbDesignatorWidth, iso_u8 rbDesignatorHeight, + iso_u16 rwMaskSize, ISO_POOL_CALLBACK_t rpfPoolLoad ); + + #endif /* defined(ISO_POOL_BUFFERED_LOAD) */ + + + /****************************************************************************************/ + /*! + \brief Initialisation of the object pool + + All parameters which are necessary for successful pool initialisation. + This function must called after knowing VT characteristics! + + \param[in] \wp{rasVersionString, iso_u8[] } + Pointer to "Pool Version String" \n + Range: exact 7 characters for WS versions less than 5 otherwise exact 32 characters + \param[in] \wp{rpbPoolFirstAddress, iso_u8* HUGE_C} + Absolute address of first iso_u8 of this pool + \param[in] \wp{rdwPoolSize, iso_u32 } + Not necessary except in combination with IsoPoolTransferFlashPool() \n + Range: 1 - 117440512 + \param[in] \wp{rwNumberObjects, iso_u16 } + Number of objects which are transferred ! \n + You can use the function IsoGetNumofPoolObjs() for determination of this value \n + Range: 0 - 65535 + \param[in] \wp{reGraphicType, ISOGRAPH_TYPE_e } + Graphic type of this pool ( monochrome, colour_16, colour_256 ) + \param[in] \wp{rbDesignatorWidth, iso_u8 } + Soft key designator width - minimum == 60 \n + In order to guarantee proper functionality of pool manipulation + this value should be 60 + \param[in] \wp{rbDesignatorHeight, iso_u8 } + Soft key designator height - minimum == 32 + In order to guarantee proper functionality of pool manipulation + this value should be 32 + \param[in] \wp{rwMaskSize, iso_u16 } + Data and Alarm Mask size of this pool \n + Range: Minimum 200 - Maximum (undefined depends on physical VTs) + + \retval iso_s16 + - E_NO_ERR + - E_OVERFLOW: Pool RAM Buffer is NULL pointer + - E_NO_INSTANCE + - E_RANGE: Parameter not valid + \note \par + - see also IsoPoolInitSegmented() + */ + iso_s16 IsoPoolInit ( const iso_u8 rasVersionString[], iso_u8 HUGE_C* rpbPoolFirstAddress, iso_u32 rdwPoolSize, + iso_u16 rwNumberObjects, ISOGRAPH_TYPE_e reGraphicType, + iso_u8 rbDesignatorWidth, iso_u8 rbDesignatorHeight, iso_u16 rwMaskSize ); + + /************************************************************************/ + /*! + \brief Installing the pool callbackfunction + + This function installs the pool callbackfunction. It is used instead in the case + when no segmented pool transfer is used and the application wants to receive the + GetMemory failure info and/or to monitor the pool state machine + + \param[in] \wp{rpfPoolLoad, ISO_POOL_CALLBACK_t } + Callbackfunction + */ + void IsoPoolCbInstall( ISO_POOL_CALLBACK_t rpfPoolLoad ); + + /*************************************************************************************/ + /*! + \brief Function for reloading object(s) after standard pool transport + + This function initializes a pool reload and starts execution if return value is true. + + \param[in] \wp{rpPoolFirstAddress, iso_u8* HUGE_C} + Pointer to pool in flash \n + Exception: "0" NULL pointer for segmented or direct pool transfer + \param[in] \wp{rwNumberObjects, iso_u16} + Number of objects to transfer ( including "notload" ) \n + Exception: 0 for direct pool transfer + + \retval iso_bool + - ISO_FALSE - Another pool transport is running + - ISO_TRUE - Pool reload is started + \par + Example of usage: + \code + if ( IsoPoolReload( 0, 62 ) ) + { + iso_u16 wSKM_Scal = 0u; + // Reload ranges + IsoPoolSetIDRangeMode( 0, 1099, 0, NotLoad ); + IsoPoolSetIDRangeMode( 1100, 1100, 1002, LoadMoveID ); 1002 = target(start)ID + IsoPoolSetIDRangeMode( 1101, 39999, 0, NotLoad ); + IsoPoolSetIDRangeMode( 42001, 65334, 0, NotLoad ); + // Manipulating ranges + wSKM_Scal = (iso_u16)IsoPoolReadInfo( PoolSoftKeyMaskScalFaktor ); + IsoPoolSetIDRangeMode( 40012, 40012, wSKM_Scal, Centering ); + } + \endcode + - Every call of IsoPoolReload( ) with return "ISO_TRUE" releases a object pool transport! + - Return "ISO_FALSE" means there is another pool transport running - application must repeat + calling IsoPoolReload() + - Reloading object ranges shall handled with "NotLoad" in normal pool manipulation + - LoadMoveID: Offset for all objects in example is 1100 - 1000 = -100 + + \par + You must add the define #ISO_POOL_DIRECT_LOAD to IsoConf.h + to enable the "Direct Pool Transfer" mode for this function. + */ + iso_bool IsoPoolReload( iso_u8 HUGE_C* rpPoolFirstAddress, iso_u16 rwNumberObjects ); + + /************************************************************************************/ + /*! + \brief Requesting some important and needed values from the pool - see ISOPOOLINFO_e + + \param[in] \wp{ePoolReading, ISOPOOLINFO_e} + Enumeration which includes all value which can be requested + \code + - PoolROMSize - Size of original pool + - PoolRAMSize - Pool size, only valid after download !!! + - ObjIDWorkingSet - Object identifier of working set + - ObjIDFirstDataMask - First data mask + - PoolGraphicType - Graphic type of pool - see IsoPoolInit () + - PoolDataMaskScalFaktor - Scaling factor of data mask (after IsoPoolInit() ) + - PoolSoftKeyMaskScalFaktor - Scaling factor of soft key mask (after IsoPoolInit() ) + - BufferUsed - Number of bytes in pool buffer + \endcode + \retval iso_u32 + - Wished value + */ + iso_u32 IsoPoolReadInfo( ISOPOOLINFO_e ePoolReading ); + + /************************************************************************************/ + /*! + \brief Requesting a pointer value - see ISOPOOLINFO_e + + \param[in] \wp{ePoolReading, ISOPOOLINFO_e } + Enumeration which includes all value which can be requested + + \code + - PointerVersionString - Pointer to the version string + \endcode + \retval const #iso_u8* + - Pointer to Working set version string + */ + const iso_u8 * IsoPoolReadPtrLoc( ISOPOOLINFO_e ePoolReading ); + + /**************************************************************************************/ + /*! + \brief Function in order to transfer pool of FLASH for test purposes + + This function transfer the original pool in non-volatile-memory (normally Flash) + This can be useful for comparing the work of the pool manipulation with the original data + + \param[in] \wp{qFlashTransfer, iso_bool} + + - ISO_TRUE - Transfer Flash Pool + - ISO_FALSE - Use pool manipulation + + \retval iso_s16 + - E_NO_ERR + - E_NO_INSTANCE + */ + iso_s16 IsoPoolTransferFlashPool( iso_bool qFlashTransfer ); + + /******************************************************************************/ + /*! + \brief Setting scaling factor and the characteristics of a object ID range + + This function is used for control the manipulation of the driver with pool objects. + First two parameter determines the range of IDs. Start ID and end ID same value means + only one Object ID. + + \param[in] \wp{wStartId, iso_u16} + Object ID - Start ID of range \n + Range: 0 - 65535 + \param[in] \wp{wEndId, iso_u16} + Object ID - End ID of range \n + Range: 0 - 65535 \n + Object ID shall be identical or greater than Start ID + \param[in] \wp{rwManipulValue, iso_u16} + Manipulation value for this range depending of manipulation range: \n + \code + - Scaling factor for modes "Scaling" and "Centering" 10000 means factor 1, 20000 means factor 2 ... + - Target objectID of moved range for "LoadMoveID" + - Target objectID of copied range for "LoadCopyID" + - Colour depth see ISOGRAPH_TYPE_e for mode "ColourReduction" ( only pictures ) + - Dont care for other modes + \endcode + \param[in] \wp{eModeMani, ISOPOOLMANIMODE_e} + Manipulation mode ( NoScaling, Scaling, Centering, NotLoad, Proprietary, + LoadMoveID, LoadCopyID, ColourReduction, AuxToV2 ) + + \retval iso_s16 + - E_NO_ERR - OK + - E_OVERFLOW - Setting not possible because list is full + - E_NO_INSTANCE + \note \par + - Every call of this function is entried in a struct. Take care that the define + ISO_NO_SCALING_ELEMENTS_MAX is sufficient. This value defines the maximum number + of Ranges. + - LoadCopyID can be used multiple for the same object(s) ( -> define ISO_POOLNUMANICOPY!! ) + */ + iso_s16 IsoPoolSetIDRangeMode( iso_u16 wStartId, iso_u16 wEndId, iso_u16 rwManipulValue, ISOPOOLMANIMODE_e eModeMani ); + + /*******************************************************************************/ + /*! + \brief Changing Active Mask and Working Set Identifier Object before pool transport + + This function must called after IsoPoolInit(). + Using is necessary if the selection of the active data mask is done during pool manipulation. + + \param[in] \wp{wDMActive, iso_u16} + Active Mask Object ID + \param[in] \wp{wWSIdentObjectID, iso_u16} + First Working Set Identifier Object ID + + \retval iso_s16 + - E_NO_ERR + - E_NO_INSTANCE + \note \par + Special function to manipulate the predefined WSO entries before pool manipulation + */ + iso_s16 IsoPoolDMActiveWSIdentSet ( iso_u16 wDMActive, iso_u16 wWSIdentObjectID ); + + /*******************************************************************************/ + /*! + \brief Changing Working Set Object selectable attribute before pool transport + + This function must called after IsoPoolInit(). + + \param[in] \wp{qSelectable, iso_bool} + - #ISO_TRUE if the Working Set can be selected by the operator + - #ISO_FALSE if the Working Set should not be selectable + \retval iso_s16 + - E_NO_ERR + - E_NO_INSTANCE + \par + Special function to manipulate the predefined WSO entry before pool manipulation + */ + iso_s16 IsoPoolWSSelectableSet ( iso_bool qSelectable ); + + /***************************************************************************/ + /*! + \brief Determination of number of objects in the pool + + This function counts the number of objects in a pool. + + \param[in] \wp{pbFlashAct, iso_u8 HUGE_C[] } + Pointer on first iso_u8 of pool + \param[in] \wp{lSize, iso_s32} + Size of pool in bytes + + \retval iso_u16 Number of objects in pool + \note \par + This function is used before IsoPoolInit() for determining the number of + objects in a pool. + */ + iso_u16 IsoGetNumofPoolObjs( const iso_u8 HUGE_C pbFlashAct[], iso_s32 lSize ); + + /***************************************************************************/ + /*! + \brief Determination of the size of specific object in the pool + + This function returns the size of the given object in bytes. + + \param[in] \wp{pbFlashObj, iso_u8 HUGE_C[] } + Pointer to the object iso_u8 array + \retval iso_u32 size of the object in bytes or zero in case of an error + */ + iso_u32 IsoPoolObjSize( const iso_u8 HUGE_C pbFlashObj[] ); + + #ifdef ISO_EXTERNAL_POOLBUFFER + /***************************************************************************/ + /*! + \brief Pool RAM buffer set function + \details Use the function to replace the internal with an extern buffer. \n + The external buffer must have the size defined by RAMSIZEPOOL and set before + calling a IsoPoolInit() function. \n + Add the define #ISO_EXTERNAL_POOLBUFFER to IsoConf.h to enable this function. + \param[in] \wp{abPoolRAMBuffer, iso_u8 HUGE_C[] } + Pointer to the external pool RAM buffer array. + \retval iso_s16 + - E_NO_ERR + */ + iso_s16 IsoPoolSetBuffer ( iso_u8 HUGE_C abPoolRAMBuffer[] ); + + #endif + + #ifdef POOLPROP_ + + /****************************************************************************/ + /*! + \brief Type definition of the proprietary pool object manipulation callback function + + \retval iso_s16 + - E_NO_ERR - done/copied + - E_OVERFLOW - to large for free RAM buffer -> do in next (E)TP + - E_NOACT - not handled/copied -> use pool service functions + \note \par + Special feature initiated of Company Kuhn + */ + typedef iso_s16 (*ISOVT_CbPoolProprietaryAdaptation_t)(OBJTYP_e eObjType, iso_u16 u16ObjID, iso_u32 u32BufferUsed, + const iso_u8 HUGE_C* pu8ObjAdr, iso_u8 HUGE_C* pu8DestAdr, + iso_u32* pu32ObjSize, ISO_USER_PARAM_T userParam); + + /****************************************************************************/ + /*! + \brief Initialisation of own pool manipulation + + This function enables proprietary pool manipulation. Preprozessor POOLPROP_ must be set. + The function behind "rpf_ProprietaryAdaptation" replaces the driver intern pool manipulation + + + \param[in] \wp{rpf_ProprietaryAdaptation, ISOVT_CbPoolProprietaryAdaptation_t} + Pointer to own proprietary pool manipulation function + \retval iso_s16 + - E_NO_ERR + \note \par + Special feature initiated of Company Kuhn + */ + iso_s16 IsoPoolPropAdaptInit( ISOVT_CbPoolProprietaryAdaptation_t rpf_ProprietaryAdaptation ); + + /****************************************************************************/ + /*! + \brief Copy a object from Flash to RAM + + \param[in] \wp{pbFlashObjOffset, iso_u8 HUGE_C*} + Absolut start address of an object + \param[in] \wp{dwUsedBuff, iso_u32} + Actually occupied object buffer + \param[in] \wp{pbRAMPos, iso_u8 HUGE_C*} + Absolut target address of an object in the RAM + \param[in] \wp{wObjFlashSize, iso_u16} + Object size + + \retval iso_s16 + - E_NO_ERR - OK + - E_OVERFLOW - if RAM buffer is full + */ + iso_s16 IsoPoolObjCopyToRAM( const iso_u8 HUGE_C pbFlashObjOffset[], iso_u32 dwUsedBuff, + iso_u8 HUGE_C pbRAMPos[], iso_u16 wObjFlashSize ); + + + #endif /* POOLPROP_ */ + + #ifdef CCI_SECONDARY_POOL_MANIPULATION + + /* ************************************************************************ */ + /*! + \brief Callback function pointer to return an pool object to the application. + \details The callback function is called from the pool transfer + to give back the current pool object to the application + and can be used to manipulate the object attributes in the RAM buffer + before the object is transferred to the VT. \n + The callback function can be set with IsoPoolSecondaryAdaptInit(). + + \param[in] \wp{eObjectType, OBJTYP_e } + The extracted object type. + \param[in] \wp{u16ObjectId, iso_u16 } + The extracted object ID. + \param[in,out] \wp{pau8Object, iso_u8 HUGE_C[] } + Pointer to the object data byte array in the RAM buffer. + \param[in] \wp{u32ObjectSize, iso_u32 } + Size of the pool object in bytes. + \param[in] \wp{userParam, ISO_USER_PARAM_T } + User parameter of this VT client. + */ + typedef void(*ISOVT_CbPoolSecondaryAdaptation_t)(OBJTYP_e eObjectType, iso_u16 u16ObjectId, + iso_u8 HUGE_C pau8Object[], iso_u32 u32ObjectSize, ISO_USER_PARAM_T userParam); + + /* ************************************************************************ */ + /*! + \brief Sets the callback function for a secondary pool object manipulation + + This function enables the proprietary pool manipulation. + The given callback function is called for every object after the internal manipulation of the object. + Preprocessor define #CCI_SECONDARY_POOL_MANIPULATION must be set. + + \param[in] \wp{rpf_SecondaryAdaptation, ISOVT_CbPoolSecondaryAdaptation_t} + Pointer to own secondary pool manipulation function, + or NULL pointer to disable. + */ + void IsoPoolSecondaryAdaptInit(ISOVT_CbPoolSecondaryAdaptation_t rpf_SecondaryAdaptation); + + #endif /* CCI_SECONDARY_POOL_MANIPULATION */ + + /** \brief Use IsoPoolObjectCbSet() to set an "object processing" callback function. + \details The given callback function is called from the pool transfer + for every pool object while scanning or uploading a pool to the VT. \n + The callback function can be used to read the attributes of the object. + \param[in] \wp{pfnCallbackFunction, iso_fnCbPoolObject_t } + Pointer to the applcation function which should be called + when processing a new pool object. \n + Can be set to the NULL pointer to disable the functionality. + \retval iso_s16 + - E_NO_ERR - OK + - E_NO_INSTANCE + */ + iso_s16 IsoPoolObjectCbSet( iso_fnCbPoolObject_t pfnCallbackFunction ); + + + /** \brief + Enum of result size for attribute-ID + */ + typedef enum + { + UnsignedLong, /**< value is iso_u32 */ + SignedLong, /**< value is int32 */ + Float /**< value is iso_f32 */ + } ISOPO_AID_VALUETYPE_e; + + /*! \ brief AID value */ + typedef struct + { + ISOPO_AID_VALUETYPE_e eAID_valuetype; /*! \brief witch AID type is required */ + iso_u32 u32AID_value; /*! \brief AID value unsiged type */ + iso_s32 s32AID_value; /*! \brief AID value siged type */ + iso_f32 f32AID_value; /*! \brief AID value float type */ + } ISOPoAID_Value_T; + + + /***************************************************************************/ + /*! + \brief Use IsoPoObjAttributGet() to get the value of the appropriate attribute ID. + + \param[in] \wpp{pau8Objekt[], const iso_u8 HUGE_C } + iso_u8 array pointer to the pool object + \param[in] \wp{u16AID, iso_u16 } + desired attribut ID (AID) + \param[out] \wp{psIsoPoAID_Val, ISOPoAID_Value_T* } + Pointer to the result value \n + depending on result size type, the value will be stored as \n + u32AID_value, s32AID_value or f32AID_value. \ + The required data type is defined in eAID_valuetype. + \retval iso_s16 + - E_NO_ERR - OK + - E_RANGE - wrong parameter + */ + iso_s16 IsoPoObjAttributGet( const iso_u8 HUGE_C pau8Objekt[], iso_u16 u16AID, ISOPoAID_Value_T* const psIsoPoAID_Val ); + + /* ************************************************************************ */ + /*! + \brief Use IsoPoolObjPtrGet() to get the pointer to the object data. + + \param[in] \wpp{pau8Pool, const iso_u8 HUGE_C [] } + iso_u8 array pointer to the pool + \param[in] \wp{u32ObjOffset, iso_u32 } + desired object offset in bytes + \retval const iso_u8 HUGE_C * + Pointer to the object data or NULL pointer in case of an error \n + + */ + const iso_u8 HUGE_C * IsoPoolObjPtrGet( const iso_u8 HUGE_C pau8Pool[], iso_u32 u32ObjOffset ); + + /* ************************************************************************ */ + #ifdef DOXYGEN + /*! \def ISOVT_AID_DEFINES + \brief Add the define ISOVT_AID_DEFINES to your IsoConf.h + to make the object pool attribute defines visible. + */ + #define ISOVT_AID_DEFINES + #endif + + #if defined(CCI_USE_NAMESPACE) && defined(__cplusplus) + /* IsoVtcApi.hpp is already included above */ + #else /* not: defined(CCI_USE_NAMESPACE) && defined(__cplusplus) -> use C defines */ + + #ifdef ISOVT_AID_DEFINES /* use the AID defines of the ECU Driver */ + /* ************************************************************************ */ + /** \addtogroup gr_isovt_aids Object pool attribute id defines + \brief Add the define ISOVT_AID_DEFINES to your IsoConf.h + to make the object pool attribute defines visible. + @{ */ + /*! \name Object type object attribute id + @{ */ + #define AID_TYPE 0U /*!< \brief 0: AID object type */ + /*!@}*/ + + /*! \name Working set object attribute id's + @{ */ + #define AID_WS_BG_COLOUR 1U /*!< \brief 1: AID_WS_BG_COLOUR */ + #define AID_WS_SELECTABLE 2U /*!< \brief 2: AID_WS_SELECTABLE */ + #define AID_WS_ACTIVE_MASK 3U /*!< \brief 3: AID_WS_ACTIVE_MASK */ + /*!@}*/ + + /*! \name Data mask object attribute id's + @{ */ + #define AID_DM_BG_COLOUR 1U /*!< \brief 1: AID_DM_BG_COLOUR */ + #define AID_DM_SOFT_KEY_MASK 2U /*!< \brief 2: AID_DM_SOFT_KEY_MASK */ + /*!@}*/ + + /*! \name Alarm mask object attribute id's + @{ */ + #define AID_AM_BG_COLOUR 1U /*!< \brief 1: AID_AM_BG_COLOUR */ + #define AID_AM_SOFT_KEY_MASK 2U /*!< \brief 2: AID_AM_SOFT_KEY_MASK */ + #define AID_AM_PRIORITY 3U /*!< \brief 3: AID_AM_PRIORITY */ + #define AID_AM_ACOUSTIC 4U /*!< \brief 4: AID_AM_ACOUSTIC */ + /*!@}*/ + + + /*! \name Container object attribute id' + @{ */ + #define AID_CO_WIDTH 1U /*!< \brief 1: AID_CO_WIDTH */ + #define AID_CO_HEIGHT 2U /*!< \brief 2: AID_CO_HEIGHT */ + #define AID_CO_HIDDEN 3U /*!< \brief 3: AID_CO_HIDDEN */ + /*!@}*/ + + /*! \name Soft key mask object attribute id's + @{ */ + #define AID_SKM_BG_COLOUR 1U /*!< \brief 1: AID_SKM_BG_COLOUR */ + /*!@}*/ + + /*! \name Soft key object attribute id's + @{ */ + #define AID_SK_BG_COLOUR 1U /*!< \brief 1: AID_SK_BG_COLOUR */ + #define AID_SK_KEY_CODE 2U /*!< \brief 2: AID_SK_KEY_CODE */ + /*!@}*/ + + /*! \name Button object attribute id's + @{ */ + #define AID_BO_WIDTH 1U /*!< \brief 1: AID_BO_WIDTH */ + #define AID_BO_HEIGHT 2U /*!< \brief 2: AID_BO_HEIGHT */ + #define AID_BO_BG_COLOUR 3U /*!< \brief 3: AID_BO_BG_COLOUR */ + #define AID_BO_BORDERCOLOUR 4U /*!< \brief 4: AID_BO_BORDERCOLOUR */ + #define AID_BO_KEY_CODE 5U /*!< \brief 5: AID_BO_KEY_CODE */ + #define AID_BO_OPTIONS 6U /*!< \brief 6: AID_BO_OPTIONS */ + /*!@}*/ + + /*! \name Input boolean object attribute id's + @{ */ + #define AID_IB_BG_COLOUR 1U /*!< \brief 1: AID_IB_BG_COLOUR */ + #define AID_IB_WIDTH 2U /*!< \brief 2: AID_IB_WIDTH */ + #define AID_IB_FG_COLOUR 3U /*!< \brief 3: AID_IB_FG_COLOUR */ + #define AID_IB_VARIABLE_REF 4U /*!< \brief 4: AID_IB_VARIABLE_REF */ + #define AID_IB_VALUE 5U /*!< \brief 5: AID_IB_VALUE */ + #define AID_IB_ENABLED 6U /*!< \brief 6: AID_IB_ENABLED */ + /*!@}*/ + + /*! \name Input string object attribute id's + @{ */ + #define AID_IS_WIDTH 1U /*!< \brief 1: AID_IS_WIDTH */ + #define AID_IS_HEIGHT 2U /*!< \brief 2: AID_IS_HEIGHT */ + #define AID_IS_BG_COLOUR 3U /*!< \brief 3: AID_IS_BG_COLOUR */ + #define AID_IS_FONT_ATT 4U /*!< \brief 4: AID_IS_FONT_ATT */ + #define AID_IS_INP_ATT 5U /*!< \brief 5: AID_IS_INP_ATT */ + #define AID_IS_OPTIONS 6U /*!< \brief 6: AID_IS_OPTIONS */ + #define AID_IS_VARIABLE_REF 7U /*!< \brief 7: AID_IS_VARIABLE_REF */ + #define AID_IS_JUSTIFICATION 8U /*!< \brief 8: AID_IS_JUSTIFICATION */ + #define AID_IS_ENABLED 9U /*!< \brief 9: AID_IS_ENABLED */ + /*!@}*/ + + /*! \name Input number object attribute is's + @{ */ + #define AID_IN_WIDTH 1U /*!< \brief 1: AID_IN_WIDTH */ + #define AID_IN_HEIGHT 2U /*!< \brief 2: AID_IN_HEIGHT */ + #define AID_IN_BG_COLOUR 3U /*!< \brief 3: AID_IN_BG_COLOUR */ + #define AID_IN_FONT_ATT 4U /*!< \brief 4: AID_IN_FONT_ATT */ + #define AID_IN_OPTIONS 5U /*!< \brief 5: AID_IN_OPTIONS */ + #define AID_IN_VARIABLE_REF 6U /*!< \brief 6: AID_IN_VARIABLE_REF */ + #define AID_IN_MIN_VALUE 7U /*!< \brief 7: AID_IN_MIN_VALUE */ + #define AID_IN_MAX_VALUE 8U /*!< \brief 8: AID_IN_MAX_VALUE */ + #define AID_IN_OFFSET 9U /*!< \brief 9: AID_IN_OFFSET */ + #define AID_IN_SCALE 10U /*!< \brief 10: AID_IN_SCALE */ + #define AID_IN_NUMB_DECIMALS 11U /*!< \brief 11: AID_IN_NUMB_DECIMALS */ + #define AID_IN_FORMAT 12U /*!< \brief 12: AID_IN_FORMAT */ + #define AID_IN_JUSTIFICATION 13U /*!< \brief 13: AID_IN_JUSTIFICATION */ + #define AID_IN_VALUE 14U /*!< \brief 14: AID_IN_VALUE */ + #define AID_IN_OPTIONS_2 15U /*!< \brief 15: AID_IN_OPTIONS_2 */ + /*!@}*/ + + /*! \name input list object attribute id's + @{ */ + #define AID_IL_WIDTH 1U /*!< \brief 1: AID_IL_WIDTH */ + #define AID_IL_HEIGHT 2U /*!< \brief 2: AID_IL_HEIGHT */ + #define AID_IL_VARIABLE_REF 3U /*!< \brief 3: AID_IL_VARIABLE_REF */ + #define AID_IL_VALUE 4U /*!< \brief 4: AID_IL_VALUE */ + #define AID_IL_OPTIONS 5U /*!< \brief 5: AID_IL_OPTIONS */ + /*!@}*/ + + /*! \name Output string object attribute id's + @{ */ + #define AID_OS_WIDTH 1U /*!< \brief 1: AID_OS_WIDTH */ + #define AID_OS_HEIGHT 2U /*!< \brief 2: AID_OS_HEIGHT */ + #define AID_OS_BG_COLOUR 3U /*!< \brief 3: AID_OS_BG_COLOUR */ + #define AID_OS_FONT_ATT 4U /*!< \brief 4: AID_OS_FONT_ATT */ + #define AID_OS_OPTIONS 5U /*!< \brief 5: AID_OS_OPTIONS */ + #define AID_OS_VARIABLE_REF 6U /*!< \brief 6: AID_OS_VARIABLE_REF */ + #define AID_OS_JUSTIFICATION 7U /*!< \brief 7: AID_OS_JUSTIFICATION */ + /*!@}*/ + + /*! \name Output number object attribute id's + @{ */ + #define AID_ON_WIDTH 1U /*!< \brief 1: AID_ON_WIDTH */ + #define AID_ON_HEIGHT 2U /*!< \brief 2: AID_ON_HEIGHT */ + #define AID_ON_BG_COLOUR 3U /*!< \brief 3: AID_ON_BG_COLOUR */ + #define AID_ON_FONT_ATT 4U /*!< \brief 4: AID_ON_FONT_ATT */ + #define AID_ON_OPTIONS 5U /*!< \brief 5: AID_ON_OPTIONS */ + #define AID_ON_VARIABLE_REF 6U /*!< \brief 6: AID_ON_VARIABLE_REF */ + #define AID_ON_OFFSET 7U /*!< \brief 7: AID_ON_OFFSET */ + #define AID_ON_SCALE 8U /*!< \brief 8: AID_ON_SCALE */ + #define AID_ON_NUMB_DECIMALS 9U /*!< \brief 9: AID_ON_NUMB_DECIMALS */ + #define AID_ON_FORMAT 10U /*!< \brief 10: AID_ON_FORMAT */ + #define AID_ON_JUSTIFICATION 11U /*!< \brief 11: AID_ON_JUSTIFICATION */ + #define AID_ON_VALUE 12U /*!< \brief 12: AID_ON_VALUE */ + /*!@}*/ + + /*! \name Output line object attribute id's + @{ */ + #define AID_OL_LINE_ATT 1U /*!< \brief 1: AID_OL_LINE_ATT */ + #define AID_OL_WIDTH 2U /*!< \brief 2: AID_OL_WIDTH */ + #define AID_OL_HEIGHT 3U /*!< \brief 3: AID_OL_HEIGHT */ + #define AID_OL_LINE_DIR 4U /*!< \brief 4: AID_OL_LINE_DIR */ + /*!@}*/ + + /*! \name Output rectangle object attribute id's + @{ */ + #define AID_OR_LINE_ATT 1U /*!< \brief 1: AID_OR_LINE_ATT */ + #define AID_OR_WIDTH 2U /*!< \brief 2: AID_OR_WIDTH */ + #define AID_OR_HEIGHT 3U /*!< \brief 3: AID_OR_HEIGHT */ + #define AID_OR_LINE_SUPPR 4U /*!< \brief 4: AID_OR_LINE_SUPPR */ + #define AID_OR_FILL_ATT 5U /*!< \brief 5: AID_OR_FILL_ATT */ + /*!@}*/ + + /*! \name Output ellipse object attribute id's + @{ */ + #define AID_OE_LINE_ATT 1U /*!< \brief 1: AID_OE_LINE_ATT */ + #define AID_OE_WIDTH 2U /*!< \brief 2: AID_OE_WIDTH */ + #define AID_OE_HEIGHT 3U /*!< \brief 3: AID_OE_HEIGHT */ + #define AID_OE_ELLIPSE_TYPE 4U /*!< \brief 4: AID_OE_ELLIPSE_TYPE */ + #define AID_OE_START_ANGLE 5U /*!< \brief 5: AID_OE_START_ANGLE */ + #define AID_OE_END_ANGLE 6U /*!< \brief 6: AID_OE_END_ANGLE */ + #define AID_OE_FILL_ATT 7U /*!< \brief 7: AID_OE_FILL_ATT */ + /*!@}*/ + + /*! \name Output polypon object attribute id's + @{ */ + #define AID_OP_WIDTH 1U /*!< \brief 1: AID_OP_WIDTH */ + #define AID_OP_HEIGHT 2U /*!< \brief 2: AID_OP_HEIGHT */ + #define AID_OP_LINE_ATT 3U /*!< \brief 3: AID_OP_LINE_ATT */ + #define AID_OP_FILL_ATT 4U /*!< \brief 4: AID_OP_FILL_ATT */ + #define AID_OP_POLYGON_TYPE 5U /*!< \brief 5: AID_OP_POLYGON_TYPE */ + /*!@}*/ + + /*! \name Output meter object attribute id's + @{ */ + #define AID_OM_WIDTH 1U /*!< \brief 1: AID_OM_WIDTH */ + #define AID_OM_NEEDLE_COLOUR 2U /*!< \brief 2: AID_OM_NEEDLE_COLOUR */ + #define AID_OM_BORDER_COLOUR 3U /*!< \brief 3: AID_OM_BORDER_COLOUR */ + #define AID_OM_ARC_THICK_COLOUR 4U /*!< \brief 4: AID_OM_ARC_THICK_COLOUR */ + #define AID_OM_OPTIONS 5U /*!< \brief 5: AID_OM_OPTIONS */ + #define AID_OM_NUMB_TICKS 6U /*!< \brief 6: AID_OM_NUMB_TICKS */ + #define AID_OM_START_ANGLE 7U /*!< \brief 7: AID_OM_START_ANGLE */ + #define AID_OM_END_ANGLE 8U /*!< \brief 8: AID_OM_END_ANGLE */ + #define AID_OM_MIN_VALUE 9U /*!< \brief 9: AID_OM_MIN_VALUE */ + #define AID_OM_MAX_VALUE 10U /*!< \brief 10: AID_OM_MAX_VALUE */ + #define AID_OM_VARIABLE_REF 11U /*!< \brief 11: AID_OM_VARIABLE_REF */ + #define AID_OM_VALUE 12U /*!< \brief 12: AID_OM_VALUE */ + /*!@}*/ + + /*! \name Output linear bar graph object attribute id's + @{ */ + #define AID_OLBG_WIDTH 1U /*!< \brief 1: AID_OLBG_WIDTH */ + #define AID_OLBG_HEIGHT 2U /*!< \brief 2: AID_OLBG_HEIGHT */ + #define AID_OLBG_COLOUR 3U /*!< \brief 3: AID_OLBG_COLOUR */ + #define AID_OLBG_TARGET_LINE_COLOUR 4U /*!< \brief 4: AID_OLBG_TARGET_LINE_COLOUR */ + #define AID_OLBG_OPTIONS 5U /*!< \brief 5: AID_OLBG_OPTIONS */ + #define AID_OLBG_NUMB_TICKS 6U /*!< \brief 6: AID_OLBG_NUMB_TICKS */ + #define AID_OLBG_MIN_VALUE 7U /*!< \brief 7: AID_OLBG_MIN_VALUE */ + #define AID_OLBG_MAX_VALUE 8U /*!< \brief 8: AID_OLBG_MAX_VALUE */ + #define AID_OLBG_VARIABLE_REF 9U /*!< \brief 9: AID_OLBG_VARIABLE_REF */ + #define AID_OLBG_TARGET_VAL_VAR_REF 10U /*!< \brief 10: AID_OLBG_TARGET_VAL_VAR_REF */ + #define AID_OLBG_TARGET_VALUE 11U /*!< \brief 11: AID_OLBG_TARGET_VALUE */ + #define AID_OLBG_VALUE 12U /*!< \brief 12: AID_OLBG_VALUE */ + /*!@}*/ + + /*! \name Output arched bar graph object attribute id's + @{ */ + #define AID_OABG_WIDTH 1U /*!< \brief 1: AID_OABG_WIDTH */ + #define AID_OABG_HEIGHT 2U /*!< \brief 2: AID_OABG_HEIGHT */ + #define AID_OABG_COLOUR 3U /*!< \brief 3: AID_OABG_COLOUR */ + #define AID_OABG_TARGET_LINE_COLOUR 4U /*!< \brief 4: AID_OABG_TARGET_LINE_COLOUR */ + #define AID_OABG_OPTIONS 5U /*!< \brief 5: AID_OABG_OPTIONS */ + #define AID_OABG_START_ANGLE 6U /*!< \brief 6: AID_OABG_START_ANGLE */ + #define AID_OABG_END_ANGLE 7U /*!< \brief 7: AID_OABG_END_ANGLE */ + #define AID_OABG_BAR_GRAPH_WIDTH 8U /*!< \brief 8: AID_OABG_BAR_GRAPH_WIDTH */ + #define AID_OABG_MIN_VALUE 9U /*!< \brief 9: AID_OABG_MIN_VALUE */ + #define AID_OABG_MAX_VALUE 10U /*!< \brief 10: AID_OABG_MAX_VALUE */ + #define AID_OABG_VARIABLE_REF 11U /*!< \brief 11: AID_OABG_VARIABLE_REF */ + #define AID_OABG_TARGET_VAL_VAR_REF 12U /*!< \brief 12: AID_OABG_TARGET_VAL_VAR_REF */ + #define AID_OABG_TARGET_VALUE 13U /*!< \brief 13: AID_OABG_TARGET_VALUE */ + #define AID_OABG_VALUE 14U /*!< \brief 14: AID_OABG_VALUE */ + /*!@}*/ + + /*! \name Picture graphic object attribute id's + @{ */ + #define AID_PG_WIDTH 1U /*!< \brief 1: AID_PG_WIDTH */ + #define AID_PG_OPTIONS 2U /*!< \brief 2: AID_PG_OPTIONS */ + #define AID_PG_TRANSPARENCY_COLOUER 3U /*!< \brief 3: AID_PG_TRANSPARENCY_COLOUER */ + #define AID_PG_ACTUAL_WIDTH 4U /*!< \brief 4: AID_PG_ACTUAL_WIDTH */ + #define AID_PG_ACTUAL_HEIGHT 5U /*!< \brief 5: AID_PG_ACTUAL_HEIGHT */ + #define AID_PG_FORMAT 6U /*!< \brief 6: AID_PG_FORMAT */ + /*!@}*/ + + /*! \name Number variable object attribute id's + @{ */ + #define AID_NV_VALUE 1U /*!< \brief 1: AID_NV_VALUE */ + /*!@}*/ + + /*! \name Font attributes object attribute id's + @{ */ + #define AID_FA_FONT_COLOUR 1U /*!< \brief 1: AID_FA_FONT_COLOUR */ + #define AID_FA_FONT_SIZE 2U /*!< \brief 2: AID_FA_FONT_SIZE */ + #define AID_FA_FONT_TYPE 3U /*!< \brief 3: AID_FA_FONT_TYPE */ + #define AID_FA_FONT_STYLE 4U /*!< \brief 4: AID_FA_FONT_STYLE */ + /*!@}*/ + + /*! \name Line attributes object attribute id's + @{ */ + #define AID_LA_LINE_COLOUR 1U /*!< \brief 1: AID_LA_LINE_COLOUR */ + #define AID_LA_LINE_WIDTH 2U /*!< \brief 2: AID_LA_LINE_WIDTH */ + #define AID_LA_LINE_ART 3U /*!< \brief 3: AID_LA_LINE_ART */ + /*!@}*/ + + /*! \name Fill attributes object attribute id's + @{ */ + #define AID_FA_FILL_TYPE 1U /*!< \brief 1: AID_FA_FILL_TYPE */ + #define AID_FA_FILL_COLOUR 2U /*!< \brief 2: AID_FA_FILL_COLOUR */ + #define AID_FA_FILL_PATTERN 3U /*!< \brief 3: AID_FA_FILL_PATTERN */ + /*!@}*/ + + /*! \name Input object attribute id's + @{ */ + #define AID_IP_VALIDATION_TYPE 1U /*!< \brief 1: AID_IP_VALIDATION_TYPE */ + /*!@}*/ + + /*! \name Object pointer attribute id's + @{ */ + #define AID_OP_VALUE 1U /*!< \brief 1: AID_OP_VALUE */ + /*!@}*/ + + /*! \name Auxiliary function type 2 object attribute id's + @{ */ + #define AID_AUXF2_BG_COLOUR 1U /*!< \brief 1: AID_AUXF2_BG_COLOUR */ + #define AID_AUXF2_FUNCTION 2U /*!< \brief 2: AID_AUXF2_FUNCTION */ + /*!@}*/ + + /*! \name Auxiliary input type 2 object attribute id's + @{ */ + #define AID_AUXI2_BG_COLOUR 1U /*!< \brief 1: AID_AUXI2_BG_COLOUR */ + #define AID_AUXI2_FUNCTION 2U /*!< \brief 2: AID_AUXI2_FUNCTION */ + /*!@}*/ + + /*! \name Auxiliary control designator type 2 object pointer attribute id's + @{ */ + #define AID_AUXC2_PTR_TYPE 1U /*!< \brief 1: AID_AUXC2_PTR_TYPE */ + #define AID_AUXC2_OBJ_ID 2U /*!< \brief 2: AID_AUXC2_OBJ_ID */ + /*!@}*/ + + /*! \name Window mask object attribute id's + @{ */ + #define AID_WM_BG_COLOUR 1U /*!< \brief 1: AID_WM_BG_COLOUR */ + #define AID_WM_OPTIONS 2U /*!< \brief 2: AID_WM_OPTIONS */ + #define AID_WM_NAME 3U /*!< \brief 3: AID_WM_NAME */ + /*!@}*/ + + /*! \name Key group object attribute id's + @{ */ + #define AID_KG_OPTIONS 1U /*!< \brief 1: AID_KG_OPTIONS */ + #define AID_KG_NAME 2U /*!< \brief 2: AID_KG_NAME */ + /*!@}*/ + + /*! \name Graphic context attribute id's + @{ */ + #define AID_GC_VP_WIDTH 1U /*!< \brief 1: AID_GC_VP_WIDTH */ + #define AID_GC_VP_HEIGHT 2U /*!< \brief 2: AID_GC_VP_HEIGHT */ + #define AID_GC_VP_X 3U /*!< \brief 3: AID_GC_VP_X */ + #define AID_GC_VP_Y 4U /*!< \brief 4: AID_GC_VP_Y */ + #define AID_GC_CANVAS_WIDTH 5U /*!< \brief 5: AID_GC_CANVAS_WIDTH */ + #define AID_GC_CANVAS_HEIGHT 6U /*!< \brief 6: AID_GC_CANVAS_HEIGHT*/ + #define AID_GC_VP_ZOOM 7U /*!< \brief 7: AID_GC_VP_ZOOM */ + #define AID_GC_GR_CURSOR_X 8U /*!< \brief 8: AID_GC_GR_CURSOR_X */ + #define AID_GC_GR_CURSOR_Y 9U /*!< \brief 9: AID_GC_GR_CURSOR_Y */ + #define AID_GC_FG_COLOUR 10U /*!< \brief 10: AID_GC_FG_COLOUR */ + #define AID_GC_BG_COLOUR 11U /*!< \brief 11: AID_GC_BG_COLOUR */ + #define AID_GC_FONTATT 12U /*!< \brief 12: AID_GC_FONTATT */ + #define AID_GC_LINEATT 13U /*!< \brief 13: AID_GC_LINEATT */ + #define AID_GC_FILLATT 14U /*!< \brief 14: AID_GC_FILLATT */ + #define AID_GC_FORMAT 15U /*!< \brief 15: AID_GC_FORMAT */ + #define AID_GC_OPTIONS 16U /*!< \brief 16: AID_GC_OPTIONS */ + #define AID_GC_TRANS_COLOUR 17U /*!< \brief 17: AID_GC_TRANS_COLOUR */ + /*!@}*/ + + /*! \name Output list object id's + @{ */ + #define AID_OLA_WIDTH 1U /*!< \brief 1: AID_OLA_WIDTH */ + #define AID_OLA_HEIGHT 2U /*!< \brief 2: AID_OLA_HEIGHT */ + #define AID_OLA_VARREF 3U /*!< \brief 3: AID_OLA_VARREF */ + #define AID_OLA_VALUE 4U /*!< \brief 4: AID_OLA_VALUE */ + /*!@}*/ + + /*! \name Extended input attributes id's + @{ */ + #define AID_EIA_VALTYPE 1U /*!< \brief 1: AID_EIA_VALTYPE */ + /*!@}*/ + + /*! \name Object label reference list object attribute id's + @{ */ + #define AID_OLRL_NUMB_LABLED_OBJ 1U /*!< \brief 1: AID_OLRL_NUMB_LABLED_OBJ */ + /*!@}*/ + + /*! \name External object attribute id's + @{ */ + #define AID_EX_OPTIONS 1U /*!< \brief 1: AID_EX_OPTIONS */ + #define AID_EX_NAME_0 2U /*!< \brief 2: AID_EX_NAME_0 */ + #define AID_EX_NAME_1 3U /*!< \brief 3: AID_EX_NAME_1 */ + /*!@}*/ + + /*! \name External reference name object attribute id's + @{ */ + #define AID_EXRN_OPTIONS 1U /*!< \brief 1: AID_EXRN_OPTIONS */ + #define AID_EXRN_NAME_0 2U /*!< \brief 2: AID_EXRN_NAME_0 */ + #define AID_EXRN_NAME_1 3U /*!< \brief 3: AID_EXRN_NAME_1 */ + /*!@}*/ + + /*! \name External object pointer object attribute id's + @{ */ + #define AID_EXOP_DEF_OBJ_ID 1U /*!< \brief 1: AID_EXOP_DEF_OBJ_ID */ + #define AID_EXOP_EXT_REF_NAME_ID 2U /*!< \brief 2: AID_EXOP_EXT_REF_NAME_ID */ + #define AID_EXOP_EXT_OBJ 3U /*!< \brief 3: AID_EXOP_EXT_OBJ */ + /*!@}*/ + + /*! \name Animation object id's + @{ */ + #define AID_AO_WIDTH 1U /*!< \brief 1: AID_AO_WIDTH */ + #define AID_AO_HEIGHT 2U /*!< \brief 2: AID_AO_HEIGHT */ + #define AID_AO_REFRESHINT 3U /*!< \brief 3: AID_AO_REFRESHINT */ + #define AID_AO_VALUE 4U /*!< \brief 4: AID_AO_VALUE */ + #define AID_AO_ENABLED 5U /*!< \brief 5: AID_AO_ENABLED */ + #define AID_AO_FICHILDINDEX 6U /*!< \brief 6: AID_AO_FICHILDINDEX */ + #define AID_AO_LACHILDINDEX 7U /*!< \brief 7: AID_AO_LACHILDINDEX */ + #define AID_AO_DEFCHILDINDEX 8U /*!< \brief 8: AID_AO_DEFCHILDINDEX*/ + #define AID_AO_OBJECTS 9U /*!< \brief 9: AID_AO_OBJECTS */ + /*!@}*/ + + /*! \name Colour palette object id's + @{ */ + #define AID_CP_OPTIONS 1U /*!< \brief 1: AID_CP_OPTIONS */ + /*!@}*/ + + + /*! \name Graphic data object (PNG) id's + @{ */ + #define AID_GD_FORMAT 1U /*!< \brief 1: AID_GD_FORMAT */ + /*!@}*/ + + /*! \name Scaled Graphic object id's + @{ */ + #define AID_SG_WIDTH 1U /*!< \brief 1: AID_SG_WIDTH */ + #define AID_SG_HEIGHT 2U /*!< \brief 2: AID_SG_HEIGHT */ + #define AID_SG_SCALE_TYPE 3U /*!< \brief 3: AID_SG_SCALE_TYPE */ + #define AID_SG_OPTIONS 4U /*!< \brief 4: AID_SG_OPTIONS */ + #define AID_SG_VALUE 5U /*!< \brief 5: AID_SG_VALUE */ + /*!@}*/ + + /*! \name Working Set Special Controls object id's + @{ */ + #define AID_WSSC_NUMOFBYTES 1U /*!< \brief 1: AID_WSSC_NUMOFBYTES */ + #define AID_WSSC_COLOUR_MAP 2U /*!< \brief 2: AID_WSSC_COLOUR_MAP */ + #define AID_WSSC_COLOUR_PALETTE 3U /*!< \brief 3: AID_WSSC_COLOUR_PALETTE */ + /*!@}*/ + + /** @} */ /* END gr_isovt_aids */ + #endif /* ISOVT_AID_DEFINES */ + /* ************************************************************************ */ + + #endif /* not: defined(CCI_USE_NAMESPACE) && defined(__cplusplus) */ + + /** @} */ /* END poolmani */ + + + /* ************************************************************************ */ + /** @} */ /* END vtcl */ + /* ************************************************************************ */ + + + + /* ************************************************************************ */ + /*! \defgroup grp_vtcl_gaux Graphical Auxiliary Input Device Client + \ingroup vtcl + \brief Client to connect and upload an object pool to an graphical auxiliary input devices + + Can be enabled with the IsoConf.h define #ISO_VTC_GRAPHIC_AUX. + + @{ + */ + /* **************************** defines *********************************** */ + #if defined(DOXYGEN) + /*! \brief Enable graphical auxiliary VT client functionality. */ + #define ISO_VTC_GRAPHIC_AUX + #endif + + /*! + \name Configuration: + \brief The following define can be set by the application + @{ + \def ISO_VTC_GAUX_CLIENTS_MAX + \brief Number of internal graphical auxiliary VT clients + \def ISO_VTC_GAUX_SERVERS_MAX + \brief Number of external graphical auxiliary VT servers + \def ISO_VTC_GAUX_CONNECTIONS_MAX + \brief Maximum number of possible connections between all clients and servers + \details Should be (ISO_VTC_GAUX_CLIENTS_MAX * ISO_VTC_GAUX_SERVERS_MAX) + \def ISO_VTC_GAUX_WSVERSION + \brief Working set (VT) version for graphical auxiliary clients + @} + */ + #if !defined(ISO_VTC_GAUX_WSVERSION) + #if !defined(ISO_VTVERSION) + #ifdef ISO_VTC_UT3 + #define ISO_VTC_GAUX_WSVERSION (5u) + #else + #define ISO_VTC_GAUX_WSVERSION (3u) + #endif + #else /* defined(ISO_VTVERSION) */ + #define ISO_VTC_GAUX_WSVERSION (ISO_VTVERSION) + #endif /* defined(ISO_VTVERSION) */ + #endif /* !defined(ISO_VTC_GAUX_WSVERSION) */ + + #if !defined(ISO_VTC_GAUX_CLIENTS_MAX) + #define ISO_VTC_GAUX_CLIENTS_MAX 4u + #endif /* !defined(ISO_VTC_GAUX_CLIENTS_MAX) */ + + #if !defined(ISO_VTC_GAUX_SERVERS_MAX) + #define ISO_VTC_GAUX_SERVERS_MAX 4u + #endif /* !defined(ISO_VTC_GAUX_SERVERS_MAX) */ + + #if !defined(ISO_VTC_GAUX_CONNECTIONS_MAX) + #define ISO_VTC_GAUX_CONNECTIONS_MAX 16u + #endif /* !defined(ISO_VTC_GAUX_CONNECTIONS_MAX) */ + + + /* **************************** constants ********************************* */ + + /* **************************** type definitions ************************** */ + /*! \brief Graphical auxiliary client connection event enumeration */ + typedef enum + { + IsoVtcAux_EvGetVersions, /*!< \brief Stored version strings received */ + IsoVtcAux_EvWaitForPool, /*!< \brief Waiting for a pool to upload */ + IsoVtcAux_EvActivated, /*!< \brief Running state (pool (up)load finished) */ + IsoVtcAux_EvAborted, /*!< \brief Connection aborted */ + IsoVtcAux_EvSafeState /*!< \brief Connection removed */ + } IsoVtcGAux_EventId_eT; + + + /*! \brief currently unused. + needed if we want to send commands in the next release */ + typedef struct + { + iso_s16 s16ConnHnd; /*!< \brief Handle of the connection */ + iso_s16 s16WsCfHnd; /*!< \brief CF handle of the internal working set master */ + iso_s16 s16VtCfHnd; /*!< \brief CF handle of the external graphical auxiliary VT server */ + ISO_USER_PARAM_T userParam; /*!< \brief User parameter */ + } IsoVtcGAux_Msg_Ts; + + /*!< \brief Graphical auxiliary client connection event message */ + typedef struct + { + IsoVtcGAux_EventId_eT eEventId; /*!< \brief Event type identifier */ + iso_s16 s16ConnHnd; /*!< \brief Connection handle */ + iso_s16 s16WsCfHnd; /*!< \brief CF handle of the client */ + iso_s16 s16VtCfHnd; /*!< \brief CF handle of the server */ + iso_u16 u16DataSize; /*!< \brief > 0 for Event specific data else 0 */ + const iso_u8 HUGE_C *pau8Data; /*!< \brief if u16DataSize > 0 pointer to Event specific data else NULL pointer */ + ISO_USER_PARAM_T userParam; /*!< \brief User parameter */ + } IsoVtcGAux_ConnEv_Ts; + + /*! \brief currently unused. + needed if we want to send commands in the next release */ + typedef iso_s16 (*IsoVtcGAuxMsgCb_fpt)(const IsoVtcGAux_Msg_Ts * pMsg); + + /*!< \brief Type definition of the graphical auxiliary client connection event message callback function */ + typedef iso_s16 (*IsoVtcGAuxEventCb_fpt)(const IsoVtcGAux_ConnEv_Ts * pEvent); + + /* **************************** functions ********************************* */ + + /* ************************************************************************ */ + /*! + \brief Graphical auxiliary pool service RAM buffer set function + \details Use the function to replace the internal with an extern buffer. \n + The external buffer must have the size defined by ISO_VTAUX_POOLBUFFERSIZE (default RAMSIZEPOOL) + and set before calling a IsoVtcGAux_PoolInit() function. \n + Add the define #ISO_EXTERNAL_POOLBUFFER to IsoConf.h to enable this function. + + \param[in] \wp{au8PoolBuffer, iso_u8 HUGE_C[] } + Pointer to the external pool RAM buffer array. + \retval iso_s16 + - E_NO_ERR + - E_CONFIG + */ + iso_s16 IsoVtcGAux_SetPoolServiceBuffer(iso_u8 HUGE_C au8PoolBuffer[]); + + /* ************************************************************************ */ + /*! + \brief Set the direct load pool transfer repetition value for one loop + + \param[in] \wp{s16DTSpeed, iso_s16} + Number of cyclic calls in one loop to speed up the transport\n + Range: 1 - about 10 (depends on #ISO_VTPO_TP_BUFFER_SIZE, and the size of the pool objects ..) \n + Default: 1 + \retval iso_s16 + - #E_NO_ERR on success + - #E_RANGE on s16DTSpeed is not valid. + \details The value is used as in the state TPBuffScanSeg to loop over up to s16DTSpeed pool objects + to fill the internal TP pool buffer. The loop is also terminated if the TP pool buffer is full + or the last object of the current pool data block is processed. \n + See also #ISO_VTPO_TP_BUFFER_SIZE and IsoVtcGAux_PoolInitDirectTransfer(). + */ + iso_s16 IsoVtcGAux_SetPoolServiceDTRepeatRate(iso_s16 s16DTSpeed); + + /* ************************************************************************ */ + /*! + \brief Initialisation of a graphical auxiliary client + + With this function a VT-Client CF is added to the list of instances + which supports "VT server" connections to graphical auxiliary input devices. + + + \param[in] \wp{s16CfHandleMaster, iso_s16} + CF handle of the internal client (working set master) + \param[in] \wpp{userParam, const #ISO_USER_PARAM_T} + User parameter value for the callback function calls. \n + Use #ISO_USER_PARAM_DEFAULT if not used/needed. + \param[in] \wp{fpEventCb, IsoVtcGAuxEventCb_fpt} + Pointer to the application specific event callback function. + \param[in] \wp{fpMsgCb, IsoVtcGAuxMsgCb_fpt} + Pointer to the application specific message callback function. \n + (currently not needed. preparation for next release) + + \retval iso_s16 + - #E_NO_ERR on success + - #E_CONFIG if driver module not initialized + - #E_OVERFLOW if internal storage array is full + - #E_RANGE if one ore more parameters are not valid + - #E_WARN if the specified CF handle has already been added + + */ + iso_s16 IsoVtcGAux_CfInit(iso_s16 s16CfHandleMaster, + const ISO_USER_PARAM_T userParam, + IsoVtcGAuxEventCb_fpt fpEventCb, + IsoVtcGAuxMsgCb_fpt fpMsgCb); + + /* ************************************************************************ */ + /*! + \brief Forwards a received auxiliary assignment message to the VT server + of a graphical auxiliary input device. + + \param[in] \wp{s16CfHandleMaster, iso_s16} + CF handle of the internal client (working set master) + \param[in] \wpp{pVtMsg, const #ISOVT_MSG_STA_T*} + Pointer to the received aux assignment message + \param[in] \wp{qCheckConnection, iso_bool} + - #ISO_TRUE to forward the message only if the client has already a connection to the device. + - #ISO_FALSE forward the message also without a connection + + \retval iso_s16 + - #E_NO_ERR on success + - #E_CONFIG if driver module not initialized + - #E_NOACT if not connected and qCheckConnection is ISO_TRUE + - #E_OVERFLOW send buffer full + - #E_RANGE if one ore more parameters are not valid + - else other error + + */ + iso_s16 IsoVtcGAux_ForwardAssignment(iso_s16 s16CfHandleMaster, + const ISOVT_MSG_STA_T* pVtMsg, + iso_bool qCheckConnection); + + /* ************************************************************************ */ + /*! + \brief Sends an auxiliary assignment message to the VT server + of a graphical auxiliary input device. + + \param[in] \wp{s16CfHandleMaster, iso_s16} + CF handle of the internal client (working set master) + \param[in] \wp{s16CfHandleGAux, iso_s16} + CF handle of the external auxiliary input device + \param[in] \wp{u8Flags, iso_u8} + Flags (see byte 10 of the Auxiliary Assignment Type 2 command) + \param[in] \wp{u16IdInput, iso_u16} + Auxiliary type 2 input pool object ID + \param[in] \wp{u16IdFunction, iso_s16} + Auxiliary type 2 function pool object ID + \param[in] \wp{qCheckConnection, iso_bool} + - #ISO_TRUE to forward the message only if the client has already a connection to the device. + - #ISO_FALSE forward the message also without a connection + + \retval iso_s16 + - #E_NO_ERR on success + - #E_CONFIG if driver module not initialized + - #E_NOACT if not connected and qCheckConnection is ISO_TRUE + - #E_OVERFLOW send buffer full + - #E_RANGE if one ore more parameters are not valid + - else other error + + */ + iso_s16 IsoVtcGAux_SendAssignment(iso_s16 s16CfHandleMaster, /* sender: internal CF (implement) */ + iso_s16 s16CfHandleGAux, /* receiver: external graphical aux unit (VT service) */ + iso_u8 u8Flags, + iso_u16 u16IdInput, + iso_u16 u16IdFunction, + iso_bool qCheckConnection); + + /* ************************************************************************ */ + /*! + \brief Determining the number of objects in the pool + + This function counts the number of objects in a pool. + + \param[in] \wp{au8Pool, iso_u8 HUGE_C[]} + Pointer on first byte of pool data array + \param[in] \wp{u32Size, iso_u32} + Size of pool in bytes + + \retval iso_u16 + Number of objects in pool + \par + This function can be used before IsoVtcGAux_PoolInit() + for determining the number of objects in a pool. + */ + iso_u16 IsoVtcGAux_GetNumberOfPoolObjects(const iso_u8 HUGE_C au8Pool[], iso_u32 u32Size); + + /* ************************************************************************ */ + /*! + \brief Set object pool version label + + \param[in] \wp{s16ConnHnd, iso_s16} + Handle of the connection + \param[in] \wp{u8VersionLabelSize, iso_u8} + Length of the version label \n + Range: 7-32 bytes (normally 7 or 32 bytes) + \param[in] \wpp{au8VersionLabel, const #iso_u8[]} + Pointer to the label data byte array + + \retval iso_s16 + - #E_NO_ERR on success + - #E_RANGE if one or more parameters are not valid + \par + The Label must be set before calling one of the IsoVtcGAux_PoolInit() functions. + */ + iso_s16 IsoVtcGAux_PoolSetVersionLabel(iso_s16 s16ConnHnd, iso_u8 u8VersionLabelSize, const iso_u8 au8VersionLabel[]); + + /* ************************************************************************ */ + /*! + \brief Set object pool configuration + + \param[in] \wp{s16ConnHnd, iso_s16} + Handle of the connection + \param[in] \wp{eGraphicType, ISOGRAPH_TYPE_e} + Graphic type of this pool ( monochrome, colour_16, colour_256 ) + \param[in] \wp{u8DesignatorWidth, iso_u8} + Soft key designator width of this pool - minimum == 60 + \param[in] \wp{u8DesignatorHeight, iso_u8} + Soft key designator height of this pool - minimum == 32 + \param[in] \wp{u16MaskSize, iso_u16} + Data (and Alarm) Mask size of this pool \n + Range: Minimum 200 - Maximum (undefined depends on physical VTs) + + \retval iso_s16 + - #E_NO_ERR on success + - #E_RANGE if one or more parameters are not valid + \par + The configuration must be set before calling one of the IsoVtcGAux_PoolInit() functions. + The configuration must match with the pool which should be uploaded. + */ + iso_s16 IsoVtcGAux_PoolSetConfig(iso_s16 s16ConnHnd, ISOGRAPH_TYPE_e eGraphicType, + iso_u8 u8DesignatorWidth, iso_u8 u8DesignatorHeight, iso_u16 u16MaskSize); + + + /* ************************************************************************ */ + /*! + \brief Initializes the standard object pool upload to the server + + \param[in] \wp{s16ConnHnd, iso_s16} + Handle of the connection + \param[in] \wpp{au8PoolData, const #iso_u8 HUGE_C[]} + Pointer to the pool data array + \param[in] \wp{u16NumberObjects, iso_u16} + Number of objects in this pool. \n + Can be determined with IsoVtcGAux_GetNumberOfPoolObjects(). + \param[in] \wp{pfCBPoolLoad, ISO_POOL_CALLBACK_t} + Optional pointer to the pool service callback function to get the service events. + Can be set to NULL pointer if not needed. + + \retval iso_s16 + - #E_NO_ERR on success + - #E_NO_INSTANCE if the connection handle is not valid + - #E_RANGE if one or more parameters are not valid + - #E_CONFIG if the pool configuration or version label is not valid + - #E_NOACT if not compiled to use this mode ( ISO_POOL_BUFFERED_LOAD not defined) + - #E_OVERFLOW if no external pool buffer was set with IsoVtcGAux_SetPoolServiceBuffer() + + \par + The pool configuration and the version label must be set before calling this functions. + (see IsoVtcGAux_PoolSetConfig(), IsoVtcGAux_PoolSetVersionLabel()) + */ + iso_s16 IsoVtcGAux_PoolInit(iso_s16 s16ConnHnd, + const iso_u8 HUGE_C au8PoolData[], iso_u16 u16NumberObjects, + ISO_POOL_CALLBACK_t pfCBPoolLoad); + + + /* ************************************************************************ */ + /*! + \brief Initializes the raw object pool upload to the server + + In this mode the pool is transmitted without any manipulations. + + \param[in] \wp{s16ConnHnd, iso_s16} + Handle of the connection + \param[in] \wpp{au8PoolData, const #iso_u8 HUGE_C[]} + Pointer to the pool data array + \param[in] \wp{u32PoolSize, iso_u32} + Size of the pool data array). + \param[in] \wp{u16NumberObjects, iso_u16} + Number of objects in this pool. \n + Can be determined with IsoVtcGAux_GetNumberOfPoolObjects(). + \param[in] \wp{pfCBPoolLoad, ISO_POOL_CALLBACK_t} + Optional pointer to the pool service callback function to get the service events. + Can be set to NULL pointer if not needed. + + \retval iso_s16 + - #E_NO_ERR on success + - #E_NO_INSTANCE if the connection handle is not valid + - #E_RANGE if one or more parameters are not valid + - #E_CONFIG if the pool configuration or version label is not valid + + \par + The pool configuration and the version label must be set before calling this functions. + (see IsoVtcGAux_PoolSetConfig(), IsoVtcGAux_PoolSetVersionLabel()) + */ + iso_s16 IsoVtcGAux_PoolInitRaw(iso_s16 s16ConnHnd, + const iso_u8 HUGE_C au8PoolData[], iso_u32 u32PoolSize, iso_u16 u16NumberObjects, + ISO_POOL_CALLBACK_t pfCBPoolLoad); + + /* ************************************************************************ */ + /*! + \brief Initializes the direct transfer object pool upload to the server + + In this mode the pool is transmitted without using the big internal pool buffer. + It uses only a small buffer to store some TP packages (default 16 bytes). + The pool data given with the callback function must contain one or more complete objects. + + \param[in] \wp{s16ConnHnd, iso_s16} + Handle of the connection + \param[in] \wp{u16MaxTime, iso_u16} + Maximum time in milliseconds the application needed to load the next pool objects for the pool service. \n + - 0: The service has direct access to the pool data memory + - else: The application copies the data in a memory zone where the service has direct access. \n + Range: Minimum 0 - Maximum (undefined depends on the ECU hardware) + \param[in] \wp{pfCBPoolLoad, ISO_POOL_CALLBACK_t} + Pointer to the pool service callback function + which should be called for requesting the pool data. + + \retval iso_s16 + - #E_NO_ERR on success + - #E_NO_INSTANCE if the connection handle is not valid + - #E_RANGE if one or more parameters are not valid + - #E_CONFIG if the pool configuration or version label is not valid + - #E_NOACT if not compiled to use this mode ( ISO_POOL_BUFFERED_LOAD not defined) + + \par + The pool configuration and the version label must be set before calling this functions. + (see IsoVtcGAux_PoolSetConfig(), IsoVtcGAux_PoolSetVersionLabel()) \n + + */ + iso_s16 IsoVtcGAux_PoolInitDirectTransfer(iso_s16 s16ConnHnd, + iso_u16 u16MaxTime, ISO_POOL_CALLBACK_t pfCBPoolLoad); + + /* ************************************************************************ */ + /*! + \brief Initializes the segmented object pool upload to the server + + + \param[in] \wp{s16ConnHnd, iso_s16} + Handle of the connection + \param[in] \wp{u32BuffOffset, iso_u32} + Offset to the pool buffer -> start address/index for loaded objects \n + see also IsoPoolInitSegmented() + \param[in] \wp{u16NumberObjects, iso_u16} + Number of objects in this pool. + \param[in] \wp{pfCBPoolLoad, ISO_POOL_CALLBACK_t} + Pointer to the pool service callback function + which should be called for getting the pool data. + + \retval iso_s16 + - #E_NO_ERR on success + - #E_NO_INSTANCE if the connection handle is not valid + - #E_RANGE if one or more parameters are not valid + - #E_CONFIG if the pool configuration or version label is not valid + - #E_NOACT if not compiled to use this mode ( ISO_POOL_BUFFERED_LOAD not defined) + - #E_OVERFLOW if no external pool buffer was set with IsoVtcGAux_SetPoolServiceBuffer() + + \par + The pool configuration and the version label must be set before calling this functions + (see IsoVtcGAux_PoolSetConfig(), IsoVtcGAux_PoolSetVersionLabel()). + Add the define #ISO_POOL_DIRECT_LOAD to IsoConf.h to enable the "Direct Pool Transfer" mode + for pictures which are bigger than the internal pool buffer. + */ + iso_s16 IsoVtcGAux_PoolInitSegmented(iso_s16 s16ConnHnd, + iso_u32 u32BuffOffset, iso_u16 u16NumberObjects, ISO_POOL_CALLBACK_t pfCBPoolLoad); + + + /* ************************************************************************ */ + /*! + \brief Requesting some important and needed values from the pool - see ISOPOOLINFO_e + + \param[in] \wp{s16ConnHnd, iso_s16} + Handle of the connection + \param[in] \wp{ePoolReading, ISOPOOLINFO_e } + Enumeration which includes all value which can be requested + + \code + - PoolROMSize - Size of original pool + - PoolRAMSize - Pool size, only valid after download !!! + - ObjIDWorkingSet - Object identifier of working set + - ObjIDFirstDataMask - First data mask + - PoolGraphicType - Graphic type of pool - see IsoPoolInit () + - PoolDataMaskScalFaktor - Scaling factor of data mask (after IsoPoolInit() ) + - PoolSoftKeyMaskScalFaktor - Scaling factor of soft key mask (after IsoPoolInit() ) + - BufferUsed - Number of bytes in pool buffer + \endcode + \retval iso_u32 + - Wished value or 0 if not possible to return the value.... + */ + iso_u32 IsoVtcGAux_PoolReadInfo(iso_s16 s16ConnHnd, ISOPOOLINFO_e ePoolReading); + + /* ************************************************************************ */ + /*! + \brief Setting scaling factor and the characteristics of a object ID range + + This function is used for control the manipulation of the driver with pool objects. + First two parameter determines the range of IDs. Start ID and end ID same value means + only one Object ID. + + \param[in] \wp{s16ConnHnd, iso_s16} + Handle of the connection + \param[in] \wp{u16StartId, iso_u16} + Object ID - Start ID of range \n + Range: 0 - 65535 + \param[in] \wp{u16EndId, iso_u16} + Object ID - End ID of range \n + Range: 0 - 65535 \n + Object ID must be identical or greater than Start ID + \param[in] \wp{u16ManipulValue, iso_u16} + Manipulation value for this range depending of manipulation range: \n + \code + - Scaling factor for modes "Scaling" and "Centering" 10000 means factor 1, 20000 means factor 2 ... + - Target objectID of moved range for "LoadMoveID" + - Target objectID of copied range for "LoadCopyID" + - Colour depth see ISOGRAPH_TYPE_e for mode "ColourReduction" ( only pictures ) + - Dont care for other modes + \endcode + \param[in] \wp{eModeMani, ISOPOOLMANIMODE_e} + Manipulation mode ( NoScaling, Scaling, Centering, NotLoad, Proprietary, + LoadMoveID, LoadCopyID, ColourReduction, AuxToV2 ) + + \retval iso_s16 + - E_NO_ERR - OK + - E_OVERFLOW - Setting not possible because list is full + - E_NO_INSTANCE + \note \par + - Every call of this function is entried in a struct. Take care that the define + ISO_NO_SCALING_ELEMENTS_MAX is sufficient. This value defines the maximum number + of Ranges. + - LoadCopyID can be used multiple for the same object(s) ( -> define ISO_POOLNUMANICOPY!! ) + */ + iso_s16 IsoVtcGAux_PoolSetIDRangeMode(iso_s16 s16ConnHnd, + iso_u16 u16StartId, iso_u16 u16EndId, iso_u16 u16ManipulValue, ISOPOOLMANIMODE_e eModeMani); + + /* ************************************************************************ */ + /*! @} */ /* END grp_vtcl_gaux */ + /* ************************************************************************ */ + #ifdef __cplusplus + } /* end of extern "C" */ + #endif + + #endif /* DEF_IsoVtcApi_H */ + /* ************************************************************************ */ ++>>>>>>> rauch/jobrechner-import-20190607 diff --cc ptxdist/local_src/ecu-jobctl/extern/isobus/isobus.pro index e2ba4b8,7f68ad0..0000000 --- a/ptxdist/local_src/ecu-jobctl/extern/isobus/isobus.pro +++ b/ptxdist/local_src/ecu-jobctl/extern/isobus/isobus.pro @@@ -21,106 -21,143 +21,247 @@@ QT -= gui network cor DEPENDPATH += . ../../platform/core INCLUDEPATH += . ../../platform/core CONFIG -= qt ++<<<<<<< HEAD +CONFIG += debug ++======= + #CONFIG += debug + + # DEFINES += DEBUG_AUX_ASSIGNMENT_GET + # DEFINES += DEBUG_PRINT_OBJECT_ID_ON_ERROR + # DEFINES += DEBUG_SHOW_ID + # DEFINES += ISO_DEBUG_ENABLED + + QMAKE_CXXFLAGS += -std=c++11 ++>>>>>>> rauch/jobrechner-import-20190607 #includes Librarys LIBS += -lrt LIBS += -L../../platform/core -lCore ++<<<<<<< HEAD +# Input +SOURCES += \ + Debug.c \ + IsoAlarm.c \ + IsoAliveCtrl.c \ + IsoAux.c \ + IsoAuxOld.c \ + IsoBasicClientWrap.c \ + IsoClients.c \ + IsoClientWrap.c \ + IsoClServ.c \ + IsoClShCtrl.c \ + IsoData.c \ + IsoDataM.c \ + IsoDD.c \ + IsoDrvN.c \ + IsoFSC.c \ + IsoJ1939.c \ + IsoMnAl.c \ + IsoMnDl.c \ + IsoMnNl.c \ + IsoMnNld.c \ + IsoMnNlm.c \ + IsoMnNm.c \ + IsoMnSpn.c \ + IsoNet.c \ + IsoPoObj.c \ + IsoPool.c \ + IsoSCCtrl.c \ + IsoSCFund.c \ + IsoSCLogin.c \ + IsoSCWork.c \ + IsoSnApi.c \ + IsoTaskC.c \ + IsoTL.c \ + IsoUser.c \ + IsoUtil.c \ + IsoVt.c \ + IsoVTMsg.c \ + IsoVtUt.c \ + IsoVtXcr.c \ + IsoWoSe.c \ + UtPoPict.c \ + UtST.c + +HEADERS += \ + IsoAlarm.h \ + IsoAliveCtrl.h \ + IsoBasicClientWrap.h \ + IsoClients.h \ + IsoClientsApi.h \ + IsoClientWrap.h \ + IsoClServ.h \ + IsoClShCtrl.h \ + IsoColor.h \ + IsoConf.h \ + IsoData.h \ + IsoDataM.h \ + IsoDD.h \ + IsoDef.h \ + IsoDrv.h \ + IsoFSC.h \ + IsoFscApi.h \ + IsoJ1939.h \ + IsoMnAl.h \ + IsoMnApi.h \ + IsoMnDl.h \ + IsoMnNiuApi.h \ + IsoMnNl.h \ + IsoMnNld.h \ + IsoMnNlm.h \ + IsoNet.h \ + IsoPgnDef.h \ + IsoPoObj.h \ + IsoPool.h \ + IsoSccApi.h \ + IsoSCCtrl.h \ + IsoSCFund.h \ + IsoSCLogin.h \ + IsoSCWork.h \ + IsoSnApi.h \ + IsoTaskC.h \ + IsoTccApi.h \ + IsoTl.h \ + IsoTL.h \ + IsoUserX.h \ + IsoUtil.h \ + IsoVt.h \ + IsoVtcApi.h \ + IsoVtUt.h \ + IsoVtXcr.h \ + IsoWoSe.h \ + stdafx.h \ + typdef.h \ + UtPoPict.h \ + UtST.h + ++======= + + # Input + SOURCES += \ + Base/IsoBase.c \ + Base/IsoBaseCoreWrap.c \ + Base/IsoBaseDistributor.c \ + Base/IsoBasicClientWrap.c \ + Base/IsoHeartbeat.c \ + Base/IsoMnAl.c \ + Base/IsoMnDl.c \ + Base/IsoMnSpn.c \ + Common/Debug.c \ + Common/IsoCommon.c \ + Common/IsoUtil.c \ + Core/IsoCore.c \ + Core/IsoData.c \ + Core/IsoDataM.c \ + Core/IsoDD.c \ + Core/IsoDrvN.c \ + Core/IsoMnNm.c \ + Core/IsoNet.c \ + Core/IsoTL.c \ + Core/IsoUser.c \ + CShared/IsoAliveCtrl.c \ + CShared/IsoClients.c \ + CShared/IsoClientWrap.c \ + CShared/IsoClServ.c \ + CShared/IsoClShCtrl.c \ + CShared/IsoWoSe.c \ + CShared/UtST.c \ + FSC/IsoFSC.c \ + NIUS/IsoMnNl.c \ + NIUS/IsoMnNld.c \ + NIUS/IsoMnNlm.c \ + SQCC/IsoSCCtrl.c \ + SQCC/IsoSCFund.c \ + SQCC/IsoSCLogin.c \ + SQCC/IsoSCWork.c \ + TCC/IsoTaskC.c \ + TCC/IsoTcConn.c \ + TCC/IsoTcCtrl.c \ + TCC/IsoTcPd.c \ + TCC/IsoTcPool.c \ + VTC/IsoAlarm.c \ + VTC/IsoAux.c \ + VTC/IsoAuxOld.c \ + VTC/IsoPoObj.c \ + VTC/IsoPool.c \ + VTC/IsoVt.c \ + VTC/IsoVTCmd.c \ + VTC/IsoVTMsg.c \ + VTC/IsoVtUt.c \ + VTC/IsoVtXcr.c \ + VTC/UtPoPict.c \ + VTC/IsoVtcGraphicAux.c \ + VTC/IsoVtcPoolService.c \ + VTS/IsoVtService.c + + + HEADERS += \ + IsoConf.h \ + Base/IsoBase.h \ + Base/IsoBaseCoreWrap.h \ + Base/IsoBaseDistributor.h \ + Base/IsoBasicClientWrap.h \ + Base/IsoHeartbeat.h \ + Base/IsoMnAl.h \ + Base/IsoMnDl.h \ + Common/IsoCommon.h \ + Common/IsoUtil.h \ + Core/IsoCore.h \ + Core/IsoData.h \ + Core/IsoDataM.h \ + Core/IsoDD.h \ + Core/IsoDrv.h \ + Core/IsoNet.h \ + Core/IsoTL.h \ + CShared/IsoAliveCtrl.h \ + CShared/IsoClients.h \ + CShared/IsoClientWrap.h \ + CShared/IsoClServ.h \ + CShared/IsoClShCtrl.h \ + CShared/IsoWoSe.h \ + CShared/UtST.h \ + FSC/IsoFSC.h \ + NIUS/IsoMnNl.h \ + NIUS/IsoMnNld.h \ + NIUS/IsoMnNlm.h \ + SQCC/IsoSCCtrl.h \ + SQCC/IsoSCFund.h \ + SQCC/IsoSCLogin.h \ + SQCC/IsoSCWork.h \ + TCC/IsoTaskC.h \ + TCC/IsoTcConn.h \ + TCC/IsoTcCtrl.h \ + TCC/IsoTcPd.h \ + TCC/IsoTcPool.h \ + VTC/IsoAlarm.h \ + VTC/IsoAux.h \ + VTC/IsoColor.h \ + VTC/IsoPoObj.h \ + VTC/IsoPool.h \ + VTC/IsoVt.h \ + VTC/IsoVTCmd.h \ + VTC/IsoVTMsg.h \ + VTC/IsoVtUt.h \ + VTC/IsoVtXcr.h \ + VTC/UtPoPict.h \ + IsoBaseApi.h \ + IsoClientsApi.h \ + IsoCommonApi.h \ + IsoCommonDef.h \ + IsoCoreApi.h \ + IsoDef.h \ + IsoFscApi.h \ + IsoMnApi.h \ + IsoMnNiuApi.h \ + IsoPgnDef.h \ + IsoSccApi.h \ + IsoStdTypes.h \ + IsoTccApi.h \ + IsoVtcApi.h \ + VTC/IsoVtcGraphicAux.h \ + VTC/IsoVtcPoolService.h \ + VTS/IsoVtService.h \ + IsoPgnDef.hpp \ + IsoVtsApi.h ++>>>>>>> rauch/jobrechner-import-20190607 diff --cc ptxdist/local_src/ecu-jobctl/intern/intern.pro index df0472f,df0472f..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-jobctl/intern/intern.pro +++ b/ptxdist/local_src/ecu-jobctl/intern/intern.pro diff --cc ptxdist/local_src/ecu-jobctl/platform/core/core.pro index 1f7c1b7,6c80e1f..0000000 --- a/ptxdist/local_src/ecu-jobctl/platform/core/core.pro +++ b/ptxdist/local_src/ecu-jobctl/platform/core/core.pro @@@ -20,7 -20,8 +20,12 @@@ TARGET = Cor QT -= gui network core DEPENDPATH += . INCLUDEPATH += . ++<<<<<<< HEAD +CONFIG += debug ++======= + #INCLUDEPATH += ../../app/demo/moduleMdabis + #CONFIG += debug ++>>>>>>> rauch/jobrechner-import-20190607 CONFIG -= qt #includes Librarys diff --cc ptxdist/local_src/ecu-jobctl/platform/core/ecanbus.cpp index 961aa92,a25c71f..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-jobctl/platform/core/ecanbus.cpp +++ b/ptxdist/local_src/ecu-jobctl/platform/core/ecanbus.cpp @@@ -42,6 -42,8 +42,11 @@@ #include "ecanbus.h" ++<<<<<<< HEAD ++======= + #include <string> + ++>>>>>>> rauch/jobrechner-import-20190607 /* Diese Eintraeg sind in den Headerfiles nicht konfiguriert */ #ifndef PF_CAN #define PF_CAN 29 @@@ -158,7 -160,7 +163,11 @@@ int ECAN::htoi(const char *s, unsigned return 0; } ++<<<<<<< HEAD +int ECAN::loadFilterList(char *file, struct can_filter *c_filter, int *cnt) ++======= + int ECAN::loadFilterList(const char *file, struct can_filter *c_filter, int *cnt) ++>>>>>>> rauch/jobrechner-import-20190607 { struct stat file_stat; char *buff, *buff_search; @@@ -208,9 -210,10 +217,16 @@@ int ECAN::openSocket( int iCanPort, in struct ifreq ifr_can; int flags,i,filter_nok; static int filter_cnt=0; ++<<<<<<< HEAD + char *pInterface; + int err(0); + struct can_filter f[0xffff]; ++======= + std::string pInterface; + int err(0); + struct can_filter f[0xffff]; + (void)iTrace; ++>>>>>>> rauch/jobrechner-import-20190607 printf("Open CAN-Socket\n\n"); /********************************/ @@@ -237,14 -240,14 +253,22 @@@ } //flags |= O_NONBLOCK; ++<<<<<<< HEAD + fcntl(_iCANSocket, F_SETFL, flags); ++======= + fcntl(_iCANSocket, F_SETFL, flags|O_NONBLOCK); ++>>>>>>> rauch/jobrechner-import-20190607 if ( iCanPort == 0 ) pInterface = "can0"; else pInterface = "can1"; ++<<<<<<< HEAD + strncpy( ifr_can.ifr_name, pInterface, sizeof(ifr_can.ifr_name) ); ++======= + strncpy( ifr_can.ifr_name, pInterface.c_str(), sizeof(ifr_can.ifr_name) ); ++>>>>>>> rauch/jobrechner-import-20190607 addr_can.can_family = AF_CAN; if ( ioctl(_iCANSocket, SIOCGIFINDEX, &ifr_can) ) { @@@ -319,7 -322,7 +343,11 @@@ int ECAN::closeSocket( void } ++<<<<<<< HEAD +int ECAN::sendMsg( unsigned long ulMsgId, unsigned char *pucMsgData, int iLength ) ++======= + int ECAN::sendMsg( unsigned long ulMsgId, const unsigned char *pucMsgData, int iLength ) ++>>>>>>> rauch/jobrechner-import-20190607 { static struct can_frame frame_tx; @@@ -353,6 -356,7 +381,10 @@@ int ECAN::waitForMsg( unsigned long *pu struct can_frame frame_rx; int iMsgLength; ++<<<<<<< HEAD ++======= + (void) iTimeout; ++>>>>>>> rauch/jobrechner-import-20190607 iMsgLength = read(_iCANSocket, &frame_rx, sizeof(struct can_frame)); diff --cc ptxdist/local_src/ecu-jobctl/platform/core/ecanbus.h index e957f45,d925df1..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-jobctl/platform/core/ecanbus.h +++ b/ptxdist/local_src/ecu-jobctl/platform/core/ecanbus.h @@@ -61,7 -61,7 +61,11 @@@ public * @return 0 = successfull * -1 = error */ ++<<<<<<< HEAD + int sendMsg( unsigned long ulMsgId, unsigned char *pucMsgData, int iLength ); ++======= + int sendMsg( unsigned long ulMsgId, const unsigned char *pucMsgData, int iLength ); ++>>>>>>> rauch/jobrechner-import-20190607 /** * @brief waitForMsg() @@@ -78,7 -78,7 +82,11 @@@ private: ECAN(); ++<<<<<<< HEAD + int loadFilterList(char *file, struct can_filter *c_filter, int *cnt); ++======= + int loadFilterList(const char *file, struct can_filter *c_filter, int *cnt); ++>>>>>>> rauch/jobrechner-import-20190607 int htoi(const char *s, unsigned long *res, int cnt); int findChar(char *s, char c); diff --cc ptxdist/local_src/ecu-jobctl/platform/core/ecuio.cpp index 9eebfe5,9eebfe5..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-jobctl/platform/core/ecuio.cpp +++ b/ptxdist/local_src/ecu-jobctl/platform/core/ecuio.cpp diff --cc ptxdist/local_src/ecu-jobctl/platform/core/ecuio.h index 2b14ccb,2b14ccb..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-jobctl/platform/core/ecuio.h +++ b/ptxdist/local_src/ecu-jobctl/platform/core/ecuio.h diff --cc ptxdist/local_src/ecu-jobctl/platform/core/eculibitf.h index 794ad7c,794ad7c..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-jobctl/platform/core/eculibitf.h +++ b/ptxdist/local_src/ecu-jobctl/platform/core/eculibitf.h diff --cc ptxdist/local_src/ecu-jobctl/platform/core/ecuparameters.cpp index a89ad2d,a89ad2d..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-jobctl/platform/core/ecuparameters.cpp +++ b/ptxdist/local_src/ecu-jobctl/platform/core/ecuparameters.cpp diff --cc ptxdist/local_src/ecu-jobctl/platform/core/ecuparameters.h index 03d73a3,ea673a8..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-jobctl/platform/core/ecuparameters.h +++ b/ptxdist/local_src/ecu-jobctl/platform/core/ecuparameters.h @@@ -96,6 -96,9 +96,12 @@@ public CC2_TFB, CC3_TFB, ++<<<<<<< HEAD ++======= + PWM_HB1, + PWM_HB2, + ++>>>>>>> rauch/jobrechner-import-20190607 MAX_ECUPARAMETER16 }ECUPARAMETERS16_E; diff --cc ptxdist/local_src/ecu-jobctl/platform/core/ecuthreads.cpp index 4804856,348a151..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-jobctl/platform/core/ecuthreads.cpp +++ b/ptxdist/local_src/ecu-jobctl/platform/core/ecuthreads.cpp @@@ -35,6 -35,8 +35,11 @@@ pthread_mutex_t ECUThread::__mutex = PTHREAD_MUTEX_INITIALIZER; ++<<<<<<< HEAD ++======= + static bool _running = true; + ++>>>>>>> rauch/jobrechner-import-20190607 /*****************************************************************************/ /* here: Classes */ /*****************************************************************************/ @@@ -59,14 -61,24 +64,32 @@@ ECUThread::ECUThread(unsigned int prior _priority = _priority - 1; else _priority = 79; ++<<<<<<< HEAD +} + ++======= + + _running = true; + } + + ++>>>>>>> rauch/jobrechner-import-20190607 ECUThread::~ECUThread() { pthread_cancel(_hdl); pthread_attr_destroy(&_attrECUThread); } ++<<<<<<< HEAD ++======= + void ECUThread::stop() + { + _running = false; + pthread_cancel(_hdl); + pthread_attr_destroy(&_attrECUThread); + } + ++>>>>>>> rauch/jobrechner-import-20190607 void ECUThread::create_thread(void) { pthread_attr_init(&_attrECUThread); @@@ -117,7 -129,7 +140,11 @@@ void *ECUThread::start_thread(void *t } else { ++<<<<<<< HEAD + while (1){ ++======= + while (_running){ ++>>>>>>> rauch/jobrechner-import-20190607 pthread_mutex_lock(&__mutex); diff --cc ptxdist/local_src/ecu-jobctl/platform/core/ecuthreads.h index 388e67c,2bec578..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-jobctl/platform/core/ecuthreads.h +++ b/ptxdist/local_src/ecu-jobctl/platform/core/ecuthreads.h @@@ -113,6 -113,8 +113,11 @@@ protected void dump(); ++<<<<<<< HEAD ++======= + void stop(); + ++>>>>>>> rauch/jobrechner-import-20190607 const ECUParameters* _pParas; /*!< Pointer to global Parameters */ ECUIO* _pIOs; /*!< Pointer to globale IOs */ @@@ -126,16 -128,15 +131,27 @@@ private pthread_attr_t _attrECUThread; /*!< Attribute of Thread */ pthread_t _hdl; /*!< Handle of Thread */ unsigned int _priority; /*!< Priority of Thread in SCHED_FIFO. (99 = RT, 1 = minimum) */ ++<<<<<<< HEAD + bool _cyclic; /*!< TRUE=cyclic Thread */ ++======= + bool _cyclic; /*!< true=cyclic Thread */ ++>>>>>>> rauch/jobrechner-import-20190607 unsigned long _interval; /*!< in usec */ int _minJitter; /*!< in usec */ int _maxJitter; /*!< in usec */ char* _name; /*!< Name of Thread */ ++<<<<<<< HEAD + bool _TimersOn; /*!< TRUE => Timers for Jitter are on */ + struct timespec _tp; /*!< abs. Time when starting Thread */ + int _tracemarker; /*!< Tracemarker for using FTRACE */ + + ++======= + bool _TimersOn; /*!< true => Timers for Jitter are on */ + struct timespec _tp; /*!< abs. Time when starting Thread */ + int _tracemarker; /*!< Tracemarker for using FTRACE */ + ++>>>>>>> rauch/jobrechner-import-20190607 static pthread_mutex_t __mutex; }; diff --cc ptxdist/local_src/ecu-jobctl/platform/core/etrace.cpp index 5846427,7b3937a..0000000 --- a/ptxdist/local_src/ecu-jobctl/platform/core/etrace.cpp +++ b/ptxdist/local_src/ecu-jobctl/platform/core/etrace.cpp @@@ -908,9 -908,16 +908,22 @@@ int Agent::openSocket(unsigned short po // Polling ist doof // Signal SIGIO ist zu mächtig - Systemlast // Blocking? Keinerlei Fehlerhandling möglich ++<<<<<<< HEAD + // => select. + fcntl(_listenSocketId, F_SETFL, flags); + ++======= + // => select. + fcntl(_listenSocketId, F_SETFL, flags); + + //TEMP_DEBUG to get rid of "addres allready in use" error + int enable = 1; + if (setsockopt(_listenSocketId, SOL_SOCKET, SO_REUSEADDR, &enable, sizeof(int)) < 0){ + error(0, myErrno, "setsockopt(SO_REUSEADDR) failed\n"); + } + //END OF TEMP_DEBUG to get rid of "addres allready in use" error + ++>>>>>>> rauch/jobrechner-import-20190607 if (bind(_listenSocketId, (struct sockaddr *) &serv_addr, sizeof(serv_addr)) < 0) { myErrno = errno; diff --cc ptxdist/local_src/ecu-jobctl/platform/core/etrace.h index 228f45a,8fcecaf..0000000 --- a/ptxdist/local_src/ecu-jobctl/platform/core/etrace.h +++ b/ptxdist/local_src/ecu-jobctl/platform/core/etrace.h @@@ -59,6 -59,7 +59,10 @@@ * ETRACE( 4711, "Mein toller Trace: %d und noch ein Parameter %d", 2, param1, param2 ); * */ ++<<<<<<< HEAD ++======= + ++>>>>>>> rauch/jobrechner-import-20190607 #define ETRACE(id,msg,num_params, ...) if ( ETRACE::Controller::_traceMap[id] > 0 ) { ETRACE::Controller::traceOut(id, 1, msg, num_params, __VA_ARGS__ ); } #define ETRACE_P0(id,msg) ETRACE(id,msg,0,0) #define ETRACE_P1(id,msg,p1) ETRACE(id,msg,1,p1) diff --cc ptxdist/local_src/ecu-jobctl/platform/ecu/ecu.cpp index 89095c9,9186216..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-jobctl/platform/ecu/ecu.cpp +++ b/ptxdist/local_src/ecu-jobctl/platform/ecu/ecu.cpp @@@ -60,7 -60,7 +60,11 @@@ void LibECU::InitLibrary( memset(xfer, 0, sizeof xfer); ++<<<<<<< HEAD + fd_fram = open( MR25_DEVICEPATH, O_RDWR); ++======= + fd_fram = open("/dev/spidev0.2", O_RDWR); ++>>>>>>> rauch/jobrechner-import-20190607 if (fd_fram<=0) { printf("Device /dev/spidev0.2 not found\n"); @@@ -156,22 -156,23 +160,42 @@@ void LibECU::UpdateLibrary(void void LibECU::nvstorage_read(nvstorage_read_struct *p) { ++<<<<<<< HEAD + int return_val; + + /* zunaechst Addr und Laenge pruefen */ + if (( p->dwDestAddr != 0 ) && ( p->dwSize > 0 ) &&( p->dwSrcAddr+p->dwSize <= 0x800 )) { + + /* Daten aus NVStorage holen */ + memcpy( (char *)p->dwDestAddr, &frambuf[(p->dwSrcAddr+4)],p->dwSize ); + return_val = 0; + } + else { + printf("ReadNvStorage() Addr oder Laenge ungueltig\n"); + + /* Addr oder Laenge ungueltig */ + return_val = -1; + } + ++======= + int return_val; + + /* zunaechst Addr und Laenge pruefen */ + if (( p->dwDestAddr != 0 ) && ( p->dwSize > 0 ) &&( p->dwSrcAddr+p->dwSize <= 0x800 )) { + + /* Daten aus NVStorage holen */ + memcpy( (char *)p->dwDestAddr, &frambuf[(p->dwSrcAddr+4)],p->dwSize ); + return_val = 0; + } + else { + printf("ReadNvStorage() Addr oder Laenge ungueltig\n"); + fflush(stdout); + + /* Addr oder Laenge ungueltig */ + return_val = -1; + } + ++>>>>>>> rauch/jobrechner-import-20190607 p->NVStorage_Read = return_val; } diff --cc ptxdist/local_src/ecu-jobctl/platform/ecu/ecu.h index 2477866,2477866..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-jobctl/platform/ecu/ecu.h +++ b/ptxdist/local_src/ecu-jobctl/platform/ecu/ecu.h diff --cc ptxdist/local_src/ecu-jobctl/platform/ecu/ecu.pro index c7a5657,528c323..0000000 --- a/ptxdist/local_src/ecu-jobctl/platform/ecu/ecu.pro +++ b/ptxdist/local_src/ecu-jobctl/platform/ecu/ecu.pro @@@ -20,7 -20,8 +20,12 @@@ TARGET = EC QT -= gui network core DEPENDPATH += . ../core INCLUDEPATH += . ../core ++<<<<<<< HEAD +CONFIG += debug ++======= + INCLUDEPATH += ../../app/demo/moduleMdabis + #CONFIG += debug ++>>>>>>> rauch/jobrechner-import-20190607 CONFIG -= qt #includes Librarys diff --cc ptxdist/local_src/ecu-jobctl/platform/iodriver/IODriver.cpp index 2cd095b,c2fca82..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-jobctl/platform/iodriver/IODriver.cpp +++ b/ptxdist/local_src/ecu-jobctl/platform/iodriver/IODriver.cpp @@@ -40,6 -40,7 +40,10 @@@ #include "IODriver.h" ++<<<<<<< HEAD ++======= + ++>>>>>>> rauch/jobrechner-import-20190607 /*****************************************************************************/ /* here: Defines */ /*****************************************************************************/ @@@ -87,7 -88,7 +91,11 @@@ static bool __syncoutpwm_forced = false IODriver::IODriver(const ECUParameters* pParas, ECUIO* pIOs): ++<<<<<<< HEAD + ECULibItfIO(pParas, pIOs) ++======= + ECULibItfIO(pParas, pIOs) ++>>>>>>> rauch/jobrechner-import-20190607 { } @@@ -97,86 -98,86 +105,169 @@@ IODriver::~IODriver( void IODriver::InitLibrary() { ++<<<<<<< HEAD + int rtsResult; + int err; + struct sched_param threadSPIparam; + struct sched_param threadIOparam; + struct sched_param threadCCparam; + + // Zugriff von au�en + // Prüfen auf richtige Initialisierung + if ((_pLibIOs == NULL) || ( _pLibParas == NULL)) + return; + + /* create the threads */ + rtsResult = pthread_create( &threadHdlSpi1, NULL, threadSPI1, this); + if (rtsResult != 0) { + // error + err = errno; + error(0, err, "ERROR on IODriver::InitLibrary in function pthread_create(), SPI-Thread\n"); + } + else { + threadSPIparam.sched_priority = 55; + pthread_setschedparam(threadHdlSpi1, SCHED_FIFO, &threadSPIparam ); + + pthread_setname_np(threadHdlSpi1, threadHdlSpi1Name); + } + + rtsResult = pthread_create( &threadHdlIO, NULL, threadIO, this); + if (rtsResult != 0) { + // error + err = errno; + error(0, err, "ERROR on IODriver::InitLibrary in function pthread_create(), IO-Thread\n"); + } + else { + threadIOparam.sched_priority = 54; + pthread_setschedparam(threadHdlIO, SCHED_FIFO, &threadIOparam ); + + pthread_setname_np(threadHdlIO, threadHdlIOName); + } + + rtsResult = pthread_create( &threadHdlCC, NULL, threadCC, this); + if (rtsResult != 0) { + // error + err = errno; + error(0, err, "ERROR on IODriver::InitLibrary in function pthread_create(), CC-Thread\n"); + } + else { + threadCCparam.sched_priority = 53; + pthread_setschedparam(threadHdlCC, SCHED_FIFO, &threadCCparam ); + + pthread_setname_np(threadHdlCC, threadHdlCCName); + } + + /* we write all outputs with image at zero as defined save state */ + EcuSyncOutDigital( true ); + PCA9505::getInst().cleanUp(); + + /* update the clone of precessImage */ + _pLibIOs->ECUIO::updateClone(); + + system("ln -s /dev/ttymxc1 /dev/ttyS1"); + + // SPI-Interface arbeitet mit Systemcalls (open, ioctl). Dass hei�t kthreadd (kthread-daemon) erzeugt kworker, + // die ihm beim Abarbeiten von Anfragen helfen. Diese kworker laufen im SCHED_OTHER, Prio 20. Wir wollen aber, + // dass die SPI-Anfragen zügig abgearbeitet werden. Also setzen wir hier, - einmalig - die Priorität aller kworker u2 + // Kworker für den SPI auf die gleiche Priorität wie der SPI-Thread 1. + initKworker(); + + // �bernehmen der Parameter/Einstellwerte in die Hardwarekomponenten + for (int i = 0; i<ECUParameters::MAX_ECUPARAMETER8; i++) + { + EcuSetCoDeSysParameter((ECUParameters::ECUPARAMETERS8_E)i, _pLibParas->getParameter8(i)); + } + for (int i = 0; i<ECUParameters::MAX_ECUPARAMETER16; i++) + { + EcuSetCoDeSysParameter((ECUParameters::ECUPARAMETERS16_E)i,_pLibParas->getParameter16(i)); + } + for (int i = 0; i<ECUParameters::MAX_ECUPARAMETER32; i++) + { + EcuSetCoDeSysParameter((ECUParameters::ECUPARAMETERS32_E)i, _pLibParas->getParameter32(i)); + } + Ecu02CoDeSysConfig::getInst().activateConfiguration(); ++======= + int rtsResult; + int err; + struct sched_param threadSPIparam; + struct sched_param threadIOparam; + struct sched_param threadCCparam; + + // Zugriff von au�en + // Prüfen auf richtige Initialisierung + if ((_pLibIOs == NULL) || ( _pLibParas == NULL)) + return; + + /* create the threads */ + rtsResult = pthread_create( &threadHdlSpi1, NULL, threadSPI1, this); + if (rtsResult != 0) { + // error + err = errno; + error(0, err, "ERROR on IODriver::InitLibrary in function pthread_create(), SPI-Thread\n"); + } + else { + threadSPIparam.sched_priority = 55; + pthread_setschedparam(threadHdlSpi1, SCHED_FIFO, &threadSPIparam ); + + pthread_setname_np(threadHdlSpi1, threadHdlSpi1Name); + } + + rtsResult = pthread_create( &threadHdlIO, NULL, threadIO, this); + if (rtsResult != 0) { + // error + err = errno; + error(0, err, "ERROR on IODriver::InitLibrary in function pthread_create(), IO-Thread\n"); + } + else { + threadIOparam.sched_priority = 54; + pthread_setschedparam(threadHdlIO, SCHED_FIFO, &threadIOparam ); + + pthread_setname_np(threadHdlIO, threadHdlIOName); + } + + rtsResult = pthread_create( &threadHdlCC, NULL, threadCC, this); + if (rtsResult != 0) { + // error + err = errno; + error(0, err, "ERROR on IODriver::InitLibrary in function pthread_create(), CC-Thread\n"); + } + else { + threadCCparam.sched_priority = 53; + pthread_setschedparam(threadHdlCC, SCHED_FIFO, &threadCCparam ); + + pthread_setname_np(threadHdlCC, threadHdlCCName); + } + + /* we write all outputs with image at zero as defined save state */ + EcuSyncOutDigital( true ); + PCA9505::getInst().cleanUp(); + + /* update the clone of precessImage */ + _pLibIOs->ECUIO::updateClone(); + + system("ln -s /dev/ttymxc1 /dev/ttyS1"); + + // SPI-Interface arbeitet mit Systemcalls (open, ioctl). Dass hei�t kthreadd (kthread-daemon) erzeugt kworker, + // die ihm beim Abarbeiten von Anfragen helfen. Diese kworker laufen im SCHED_OTHER, Prio 20. Wir wollen aber, + // dass die SPI-Anfragen zügig abgearbeitet werden. Also setzen wir hier, - einmalig - die Priorität aller kworker u2 + // Kworker für den SPI auf die gleiche Priorität wie der SPI-Thread 1. + initKworker(); + + // �bernehmen der Parameter/Einstellwerte in die Hardwarekomponenten + for (int i = 0; i<ECUParameters::MAX_ECUPARAMETER8; i++) + { + EcuSetCoDeSysParameter((ECUParameters::ECUPARAMETERS8_E)i, _pLibParas->getParameter8(i)); + } + for (int i = 0; i<ECUParameters::MAX_ECUPARAMETER16; i++) + { + EcuSetCoDeSysParameter((ECUParameters::ECUPARAMETERS16_E)i,_pLibParas->getParameter16(i)); + } + for (int i = 0; i<ECUParameters::MAX_ECUPARAMETER32; i++) + { + EcuSetCoDeSysParameter((ECUParameters::ECUPARAMETERS32_E)i, _pLibParas->getParameter32(i)); + } + Ecu02CoDeSysConfig::getInst().activateConfiguration(); ++>>>>>>> rauch/jobrechner-import-20190607 } void IODriver::ExitLibrary() @@@ -186,249 -187,249 +277,483 @@@ void IODriver::UpdateLibrary() { ++<<<<<<< HEAD + // Zugriff von au�en + // Prüfen auf richtige Initialisierung + if ((_pLibIOs == NULL) || ( _pLibParas == NULL)) + return; + + // Starten der HW-Aktion + // Im folgenden rödelt der IODriver auf dem shared memory von libecore herum + // Clone-Struktur nözih um Veränderung zu sehen. + + // Send Signal to SPI2-Thread for working on Hardware-Device + pthread_mutex_lock( &_eSPIMutex ); + __threadspi_condition = 1; + pthread_cond_signal(&_eSPICondition); + pthread_mutex_unlock( &_eSPIMutex ); ++======= + // Zugriff von au�en + // Prüfen auf richtige Initialisierung + if ((_pLibIOs == NULL) || ( _pLibParas == NULL)) + return; + + // Starten der HW-Aktion + // Im folgenden rödelt der IODriver auf dem shared memory von libecore herum + // Clone-Struktur nözih um Veränderung zu sehen. + + // Send Signal to SPI2-Thread for working on Hardware-Device + pthread_mutex_lock( &_eSPIMutex ); + __threadspi_condition = 1; + pthread_cond_signal(&_eSPICondition); + pthread_mutex_unlock( &_eSPIMutex ); ++>>>>>>> rauch/jobrechner-import-20190607 } void IODriver::EcuSyncOutPwm( bool force ) { ++<<<<<<< HEAD + _pLibIOs->lockOutputs(); + + /* Bisher PWM-Frequenz=1Khz. pwm_value=61, pwm_period=249, KI_index=2 */ + /* Bug 1453: PWM-Frequenz=200Hz. pwm_value=?, pwm_period=1250, KI_index=6 */ + /* pwm_value wäre bei einer pwm_period von 1250, 1250*1000/0xFFF=305,25031. Wird daher nicht benutzt!!!! */ + + if( force || ECU02_OUTS.HS_PWM1 != ECU02_OUTS_CLONE.HS_PWM1 ){ + Ecu02Tle::getInst().setChannelValue(1,ECU02_OUTS.HS_PWM1,61); + } + + if( force || ECU02_OUTS.HS_PWM2 != ECU02_OUTS_CLONE.HS_PWM2 ){ + Ecu02Tle::getInst().setChannelValue(2,ECU02_OUTS.HS_PWM2,61); + } + + if( force || ECU02_OUTS.HS_PWM3 != ECU02_OUTS_CLONE.HS_PWM3 ){ + Ecu02Tle::getInst().setChannelValue(3,ECU02_OUTS.HS_PWM3,61); + } + + // Zeitnaher Abgleich der Outputs!!! + ECU02_OUTS_CLONE.HS_PWM1 = ECU02_OUTS.HS_PWM1; + ECU02_OUTS_CLONE.HS_PWM2 = ECU02_OUTS.HS_PWM2; + ECU02_OUTS_CLONE.HS_PWM3 = ECU02_OUTS.HS_PWM3; + + _pLibIOs->unlockOutputs(); ++======= + _pLibIOs->lockOutputs(); + + /* Bisher PWM-Frequenz=1Khz. pwm_value=61, pwm_period=249, KI_index=2 */ + /* Bug 1453: PWM-Frequenz=200Hz. pwm_value=?, pwm_period=1250, KI_index=6 */ + /* pwm_value wäre bei einer pwm_period von 1250, 1250*1000/0xFFF=305,25031. Wird daher nicht benutzt!!!! */ + + if( force || ECU02_OUTS.HS_PWM1 != ECU02_OUTS_CLONE.HS_PWM1 ){ + Ecu02Tle::getInst().setChannelValue(1,ECU02_OUTS.HS_PWM1,61); + } + + if( force || ECU02_OUTS.HS_PWM2 != ECU02_OUTS_CLONE.HS_PWM2 ){ + Ecu02Tle::getInst().setChannelValue(2,ECU02_OUTS.HS_PWM2,61); + } + + if( force || ECU02_OUTS.HS_PWM3 != ECU02_OUTS_CLONE.HS_PWM3 ){ + Ecu02Tle::getInst().setChannelValue(3,ECU02_OUTS.HS_PWM3,61); + } + + // Zeitnaher Abgleich der Outputs!!! + ECU02_OUTS_CLONE.HS_PWM1 = ECU02_OUTS.HS_PWM1; + ECU02_OUTS_CLONE.HS_PWM2 = ECU02_OUTS.HS_PWM2; + ECU02_OUTS_CLONE.HS_PWM3 = ECU02_OUTS.HS_PWM3; + + _pLibIOs->unlockOutputs(); ++>>>>>>> rauch/jobrechner-import-20190607 } void IODriver::EcuSyncOutDigital( bool force ) { _pLibIOs->lockOutputs(); ++<<<<<<< HEAD + // Ausgangswerte werden in die Klasse PCA9505 übertragen. Keine �bertragung per I2C!! + + // HighSide Switches hängen alle am I2C + if( force || BIT_CHANGED(0) ){ + PCA9505::getInst().setOutput(PCA9505::EN_HS_1, BIT_AS_I2C_VALUE(0), false); + } + + if( force || BIT_CHANGED(1) ){ + PCA9505::getInst().setOutput(PCA9505::EN_HS_2, BIT_AS_I2C_VALUE(1), false); + } + + if( force || BIT_CHANGED(2) ){ + PCA9505::getInst().setOutput(PCA9505::EN_HS_3, BIT_AS_I2C_VALUE(2), false); + } + + if( force || BIT_CHANGED(3) ){ + PCA9505::getInst().setOutput(PCA9505::EN_HS_4, BIT_AS_I2C_VALUE(3), false); + } + + if( force || BIT_CHANGED(4) ){ + PCA9505::getInst().setOutput(PCA9505::EN_HS_5, BIT_AS_I2C_VALUE(4), false); + } + + if( force || BIT_CHANGED(5) ){ + PCA9505::getInst().setOutput(PCA9505::EN_HS_6, BIT_AS_I2C_VALUE(5), false); + } + + if( force || BIT_CHANGED(6) ){ + PCA9505::getInst().setOutput(PCA9505::EN_HS_7, BIT_AS_I2C_VALUE(6), false); + } + + if( force || BIT_CHANGED(7) ){ + PCA9505::getInst().setOutput(PCA9505::EN_HS_8, BIT_AS_I2C_VALUE(7), false); + } + + if( force || BIT_CHANGED(8) ){ + PCA9505::getInst().setOutput(PCA9505::EN_HS_9, BIT_AS_I2C_VALUE(8), false); + } + + if( force || BIT_CHANGED(9) ){ + PCA9505::getInst().setOutput(PCA9505::EN_HS_10, BIT_AS_I2C_VALUE(9), false); + } + + if( force || BIT_CHANGED(10) ){ + PCA9505::getInst().setOutput(PCA9505::EN_HS_HP, BIT_AS_I2C_VALUE(10), false); + } + + if( force || BIT_CHANGED(11) ){ + PCA9505::getInst().setOutput(PCA9505::EN_HS_PWM, BIT_AS_I2C_VALUE(11), false); + // HS_PWM wurde aktiviert, nun aktualisiere AUF JEDEN FALL PWM am TLE hinter SPI2 + __syncoutpwm_forced = true; + } + else { + __syncoutpwm_forced = false; + } + + // Steuert GPIOs am PCA an. + if( force || BIT_CHANGED(12) ){ + Ecu02MotorCtl::getInst().setEnable( 0, BIT_AS_INT_VALUE(12), false ); + } + + if( force || BIT_CHANGED(13) ){ + Ecu02MotorCtl::getInst().setEnable( 1, BIT_AS_INT_VALUE(13), false ); + } + + // Steuert GPIOs am PCA an. + if( force || BIT_CHANGED(14) ){ + Ecu02MotorCtl::getInst().setDirection(0, BIT_AS_INT_VALUE(14)); + } + + if( force || BIT_CHANGED(15) ){ + Ecu02MotorCtl::getInst().setDirection(1, BIT_AS_INT_VALUE(15)); + } + + // Speed is defined by PWM-Signal, which is at CPU, controlled by Kernel-Modul ecu-motor-ctl + // Bug #1729 Motorbrücken übernehmen die Richtung nicht. + if( force || ECU02_OUTS.HB1 != ECU02_OUTS_CLONE.HB1 ){ + Ecu02MotorCtl::getInst().setSpeed( 0, ECU02_OUTS.HB1 ); + Ecu02MotorCtl::getInst().setDirection(0, BIT_AS_INT_VALUE(14)); // bei neuem Speed, Aktualisiere die Richtung. I2C-Zugriff passiert erst später + } + + if( force || ECU02_OUTS.HB2 != ECU02_OUTS_CLONE.HB2 ){ + Ecu02MotorCtl::getInst().setSpeed( 1, ECU02_OUTS.HB2 ); + Ecu02MotorCtl::getInst().setDirection(1, BIT_AS_INT_VALUE(15)); // bei neuem Speed, Aktualisiere die Richtung. I2C-Zugriff passiert erst später + } + + // Setzt nur eine Variable innerhalb der Klasse für Folgeoperationen + if( force || BIT_CHANGED(16) ){ + Ecu02Safety::getInst().setEnable( BIT_AS_INT_VALUE(16) ); + } + + if( BIT_CHANGED(17) ){ + printf("reboot"); + system("reboot"); + } + + // Zeitnaher Abgleich der Outputs!!! + ECU02_OUTS_CLONE.DigitalOutputs = ECU02_OUTS.DigitalOutputs; + ECU02_OUTS_CLONE.HB1 = ECU02_OUTS.HB1; + ECU02_OUTS_CLONE.HB2 = ECU02_OUTS.HB2; + + _pLibIOs->unlockOutputs(); ++======= + // Ausgangswerte werden in die Klasse PCA9505 übertragen. Keine �bertragung per I2C!! + + // HighSide Switches hängen alle am I2C + if( force || BIT_CHANGED(0) ){ + PCA9505::getInst().setOutput(PCA9505::EN_HS_1, BIT_AS_I2C_VALUE(0), false); + } + + if( force || BIT_CHANGED(1) ){ + PCA9505::getInst().setOutput(PCA9505::EN_HS_2, BIT_AS_I2C_VALUE(1), false); + } + + if( force || BIT_CHANGED(2) ){ + PCA9505::getInst().setOutput(PCA9505::EN_HS_3, BIT_AS_I2C_VALUE(2), false); + } + + if( force || BIT_CHANGED(3) ){ + PCA9505::getInst().setOutput(PCA9505::EN_HS_4, BIT_AS_I2C_VALUE(3), false); + } + + if( force || BIT_CHANGED(4) ){ + PCA9505::getInst().setOutput(PCA9505::EN_HS_5, BIT_AS_I2C_VALUE(4), false); + } + + if( force || BIT_CHANGED(5) ){ + PCA9505::getInst().setOutput(PCA9505::EN_HS_6, BIT_AS_I2C_VALUE(5), false); + } + + if( force || BIT_CHANGED(6) ){ + PCA9505::getInst().setOutput(PCA9505::EN_HS_7, BIT_AS_I2C_VALUE(6), false); + } + + if( force || BIT_CHANGED(7) ){ + PCA9505::getInst().setOutput(PCA9505::EN_HS_8, BIT_AS_I2C_VALUE(7), false); + } + + if( force || BIT_CHANGED(8) ){ + PCA9505::getInst().setOutput(PCA9505::EN_HS_9, BIT_AS_I2C_VALUE(8), false); + } + + if( force || BIT_CHANGED(9) ){ + PCA9505::getInst().setOutput(PCA9505::EN_HS_10, BIT_AS_I2C_VALUE(9), false); + } + + if( force || BIT_CHANGED(10) ){ + PCA9505::getInst().setOutput(PCA9505::EN_HS_HP, BIT_AS_I2C_VALUE(10), false); + } + + if( force || BIT_CHANGED(11) ){ + PCA9505::getInst().setOutput(PCA9505::EN_HS_PWM, BIT_AS_I2C_VALUE(11), false); + // HS_PWM wurde aktiviert, nun aktualisiere AUF JEDEN FALL PWM am TLE hinter SPI2 + __syncoutpwm_forced = true; + } + else { + __syncoutpwm_forced = false; + } + + // Steuert GPIOs am PCA an. + if( force || BIT_CHANGED(12) ){ + Ecu02MotorCtl::getInst().setEnable( 0, BIT_AS_INT_VALUE(12), false ); + } + + if( force || BIT_CHANGED(13) ){ + Ecu02MotorCtl::getInst().setEnable( 1, BIT_AS_INT_VALUE(13), false ); + } + + // Steuert GPIOs am PCA an. + if( force || BIT_CHANGED(14) ){ + Ecu02MotorCtl::getInst().setDirection(0, BIT_AS_INT_VALUE(14)); + } + + if( force || BIT_CHANGED(15) ){ + Ecu02MotorCtl::getInst().setDirection(1, BIT_AS_INT_VALUE(15)); + } + + // Speed is defined by PWM-Signal, which is at CPU, controlled by Kernel-Modul ecu-motor-ctl + // Bug #1729 Motorbrücken übernehmen die Richtung nicht. + if( force || ECU02_OUTS.HB1 != ECU02_OUTS_CLONE.HB1 ){ + Ecu02MotorCtl::getInst().setSpeed( 0, ECU02_OUTS.HB1 ); + Ecu02MotorCtl::getInst().setDirection(0, BIT_AS_INT_VALUE(14)); // bei neuem Speed, Aktualisiere die Richtung. I2C-Zugriff passiert erst später + } + + if( force || ECU02_OUTS.HB2 != ECU02_OUTS_CLONE.HB2 ){ + Ecu02MotorCtl::getInst().setSpeed( 1, ECU02_OUTS.HB2 ); + Ecu02MotorCtl::getInst().setDirection(1, BIT_AS_INT_VALUE(15)); // bei neuem Speed, Aktualisiere die Richtung. I2C-Zugriff passiert erst später + } + + // Setzt nur eine Variable innerhalb der Klasse für Folgeoperationen + if( force || BIT_CHANGED(16) ){ + Ecu02Safety::getInst().setEnable( BIT_AS_INT_VALUE(16) ); + } + + if( BIT_CHANGED(17) ){ + printf("reboot"); + system("reboot"); + } + + // Zeitnaher Abgleich der Outputs!!! + ECU02_OUTS_CLONE.DigitalOutputs = ECU02_OUTS.DigitalOutputs; + ECU02_OUTS_CLONE.HB1 = ECU02_OUTS.HB1; + ECU02_OUTS_CLONE.HB2 = ECU02_OUTS.HB2; + + _pLibIOs->unlockOutputs(); ++>>>>>>> rauch/jobrechner-import-20190607 } void IODriver::EcuSetCoDeSysParameter(ECUParameters::ECUPARAMETERS8_E id, bool value ) { ++<<<<<<< HEAD + Ecu02CoDeSysConfig::getInst().setParameter8( id, value ); ++======= + Ecu02CoDeSysConfig::getInst().setParameter8( id, value ); ++>>>>>>> rauch/jobrechner-import-20190607 } void IODriver::EcuSetCoDeSysParameter(ECUParameters::ECUPARAMETERS16_E id, unsigned short value ) { ++<<<<<<< HEAD + Ecu02CoDeSysConfig::getInst().setParameter16( id, value ); ++======= + Ecu02CoDeSysConfig::getInst().setParameter16( id, value ); ++>>>>>>> rauch/jobrechner-import-20190607 } void IODriver::EcuSetCoDeSysParameter(ECUParameters::ECUPARAMETERS32_E id, unsigned int value) { ++<<<<<<< HEAD + Ecu02CoDeSysConfig::getInst().setParameter32( id, value ); ++======= + Ecu02CoDeSysConfig::getInst().setParameter32( id, value ); ++>>>>>>> rauch/jobrechner-import-20190607 } int IODriver::readStringFromMR25(int addr, char *readString) { ++<<<<<<< HEAD + int iRet (1); + int fd = -1; + unsigned char wr_buf[36]; + unsigned char rd_buf[36]; + struct spi_ioc_transfer xfer; + memset(&xfer, 0, sizeof xfer); + memset(&wr_buf[0], 0, sizeof wr_buf); + memset(&rd_buf[0], 0, sizeof rd_buf); + + if(addr >= 8) return 0; + + fd = open( MR25_DEVICEPATH, O_RDWR ); + + if( fd == -1 ){ + iRet = 0; + } + else{ + + xfer.tx_buf = (__u64)&wr_buf[0]; + xfer.rx_buf = (__u64)&rd_buf[0]; + xfer.len = 36; + xfer.cs_change = 0; + + + wr_buf[0]=0x03; + wr_buf[1]=0x7f; + wr_buf[2]=(unsigned char)(addr << 5); + + + ioctl(fd, SPI_IOC_MESSAGE(1), &xfer); + + strcpy(readString,(char *)&rd_buf[3]); + iRet = 1; + close(fd); + } + + return iRet; ++======= + int iRet (1); + int fd = -1; + unsigned char wr_buf[36]; + unsigned char rd_buf[36]; + struct spi_ioc_transfer xfer; + memset(&xfer, 0, sizeof xfer); + memset(&wr_buf[0], 0, sizeof wr_buf); + memset(&rd_buf[0], 0, sizeof rd_buf); + + if(addr >= 8) return 0; + + fd = open( MR25_DEVICEPATH, O_RDWR ); + + if( fd == -1 ){ + iRet = 0; + } + else{ + + xfer.tx_buf = (__u64)&wr_buf[0]; + xfer.rx_buf = (__u64)&rd_buf[0]; + xfer.len = 36; + xfer.cs_change = 0; + + + wr_buf[0]=0x03; + wr_buf[1]=0x7f; + wr_buf[2]=(unsigned char)(addr << 5); + + + ioctl(fd, SPI_IOC_MESSAGE(1), &xfer); + + strcpy(readString,(char *)&rd_buf[3]); + iRet = 1; + close(fd); + } + + return iRet; ++>>>>>>> rauch/jobrechner-import-20190607 } /* internal functions */ void IODriver::copyAdsToProcessImage( unsigned int (*ads_data)[16] ) { ++<<<<<<< HEAD + ECU02_INS.AIN_1 = ads_data[0][0]; + ECU02_INS.AIN_2 = ads_data[0][1]; + ECU02_INS.AIN_3 = ads_data[0][2]; + ECU02_INS.AIN_4 = ads_data[0][3]; + ECU02_INS.AIN_5 = ads_data[0][4]; + ECU02_INS.AIN_6 = ads_data[0][5]; + ECU02_INS.AIN_7 = ads_data[0][6]; + ECU02_INS.AIN_8 = ads_data[0][7]; + ECU02_INS.AIN_9 = ads_data[0][8]; + ECU02_INS.AIN_10 = ads_data[0][9]; + ECU02_INS.AIN_11 = ads_data[0][10]; + ECU02_INS.AIN_12 = ads_data[0][11]; + ECU02_INS.AIN_13 = ads_data[0][12]; + ECU02_INS.AIN_14 = ads_data[0][13]; + ECU02_INS.AIN_15 = ads_data[0][14]; + ECU02_INS.AIN_16 = ads_data[0][15]; + + ECU02_INS.AIN_17 = ads_data[1][0]; + ECU02_INS.AIN_18 = ads_data[1][1]; + ECU02_INS.AIN_19 = ads_data[1][2]; + ECU02_INS.AIN_20 = ads_data[1][3]; + ECU02_INS.AIN_21 = ads_data[1][4]; + ECU02_INS.AIN_22 = ads_data[1][5]; + + ECU02_INS.VFB_12V_SENSOR = ads_data[1][6]; + ECU02_INS.VFB_5V_IO = ads_data[1][7]; + ECU02_INS.VFB_12V_ECU = ads_data[1][8]; + ECU02_INS.VFB_8V2_SENSOR = ads_data[1][9]; + ECU02_INS.VFB_5V_SENSOR = ads_data[1][10]; + ECU02_INS.VFB_3V3_IO = ads_data[1][11]; ++======= + ECU02_INS.AIN_1 = ads_data[0][0]; + ECU02_INS.AIN_2 = ads_data[0][1]; + ECU02_INS.AIN_3 = ads_data[0][2]; + ECU02_INS.AIN_4 = ads_data[0][3]; + ECU02_INS.AIN_5 = ads_data[0][4]; + ECU02_INS.AIN_6 = ads_data[0][5]; + ECU02_INS.AIN_7 = ads_data[0][6]; + ECU02_INS.AIN_8 = ads_data[0][7]; + ECU02_INS.AIN_9 = ads_data[0][8]; + ECU02_INS.AIN_10 = ads_data[0][9]; + ECU02_INS.AIN_11 = ads_data[0][10]; + ECU02_INS.AIN_12 = ads_data[0][11]; + ECU02_INS.AIN_13 = ads_data[0][12]; + ECU02_INS.AIN_14 = ads_data[0][13]; + ECU02_INS.AIN_15 = ads_data[0][14]; + ECU02_INS.AIN_16 = ads_data[0][15]; + + ECU02_INS.AIN_17 = ads_data[1][0]; + ECU02_INS.AIN_18 = ads_data[1][1]; + ECU02_INS.AIN_19 = ads_data[1][2]; + ECU02_INS.AIN_20 = ads_data[1][3]; + ECU02_INS.AIN_21 = ads_data[1][4]; + ECU02_INS.AIN_22 = ads_data[1][5]; + + ECU02_INS.VFB_12V_SENSOR = ads_data[1][6]; + ECU02_INS.VFB_5V_IO = ads_data[1][7]; + ECU02_INS.VFB_12V_ECU = ads_data[1][8]; + ECU02_INS.VFB_8V2_SENSOR = ads_data[1][9]; + ECU02_INS.VFB_5V_SENSOR = ads_data[1][10]; + ECU02_INS.VFB_3V3_IO = ads_data[1][11]; ++>>>>>>> rauch/jobrechner-import-20190607 } /* the threads */ @@@ -437,347 -438,335 +762,669 @@@ void *IODriver::threadSPI1(void *t) { ++<<<<<<< HEAD + /* Laufzeit zwischen 1ms - 1,7ms bei PERIODIC mit 200HZ. + * 1x pro Sekunde wird etwas ein Tick verschlafen => nicht zyklisch alle 5ms sondern 10ms. */ + + bool ok1; + bool ok2; + bool toggle(false); + static int count = 0; + + static unsigned int ads_data_buffer[2][16]; + static bool init(false); + struct ADS7953::ADS_CHANNEL_DATA ads_data_avr0[NUM_ADS_AVR_SETS]; + struct ADS7953::ADS_CHANNEL_DATA ads_data_avr1[NUM_ADS_AVR_SETS]; + ADS7953 ads0( ADS7953_ADC0_DEVICEPATH ); + ADS7953 ads1( ADS7953_ADC1_DEVICEPATH ); + IODriver *pContext = (IODriver*)t; + + /* this implizit sets mode2 */ + ads0.setAuto2MaxChannel( 16 ); + /* this implizit sets mode1 */ + ads1.setAuto2MaxChannel( 16 ); + + while(pContext) { + + // Beide AD-Bausteine mit je 16 Kanälen 1x einlesen. Jeder Kanal hat 2 Byte Daten + ok1 = ads0.readChannels( &ads_data_avr0[0], NUM_ADS_AVR_SETS ); + ok2 = ads1.readChannels( &ads_data_avr1[0], NUM_ADS_AVR_SETS ); + + + if (!init) + { + // Buffer ist leer. Initiale Füllung des Buffers - keine Mittelwertbdlg nötig + if( ok1 && ok2 ){ + for( int k=0; k<16; k++ ){ + ads_data_buffer[0][k] = ads_data_avr0[0].data[k]; + ads_data_buffer[1][k] = ads_data_avr1[0].data[k]; + } + init = true; + } + } + else + { + // Buffer ist bereits befüllt, bilde den Mittelwert + // NUM_ADS_AVR_SETS (1) Werte pro Kanal, werden daher nicht aufsummiert + // Alle 5ms ein Wert, diese summieren+Mittelwertbdlg, und alle 10ms nach Codesys hochkopieren. + if( ok1 && ok2 ){ + for( int k=0; k<16; k++ ){ + ads_data_buffer[0][k] += ads_data_avr0[0].data[k]; + ads_data_buffer[0][k] = ads_data_buffer[0][k] >> 1; + ads_data_buffer[1][k] += ads_data_avr1[0].data[k]; + ads_data_buffer[1][k] = ads_data_buffer[1][k] >> 1; + } + } + } + + /* copy data to adress space */ + if (toggle) + { + if( ok1 && ok2 ){ + // Werte alle 10ms nach Codesys hochkopieren + pContext->copyAdsToProcessImage(ads_data_buffer); + toggle = false; + } + } + else { + toggle = true; + } + + //Wecke Thread IO auf. + if (count == 0) + { + pthread_mutex_lock( &_eIOMutex ); + __threadio_condition = 1; + pthread_cond_signal(&_eIOCondition); + pthread_mutex_unlock( &_eIOMutex ); + } + + // Go Sleep and wait on Signal from Control-Task - AfterWritingOutputs + pthread_mutex_lock(&_eSPIMutex); + while ((__threadspi_condition == 0)) + { + pthread_cond_wait(&_eSPICondition, &_eSPIMutex); + } + if (__threadspi_condition == 2) + // Geweckt von CC-Thread + count = 1; + else + // Geweckt von Control_Task, neuer Zyklus + count = 0; + __threadspi_condition = 0; + pthread_mutex_unlock(&_eSPIMutex); + + + } + + pthread_exit((void*) t); ++======= + /* Laufzeit zwischen 1ms - 1,7ms bei PERIODIC mit 200HZ. + * 1x pro Sekunde wird etwas ein Tick verschlafen => nicht zyklisch alle 5ms sondern 10ms. */ + + bool ok1; + bool ok2; + bool toggle(false); + static int count = 0; + + static unsigned int ads_data_buffer[2][16]; + static bool init(false); + struct ADS7953::ADS_CHANNEL_DATA ads_data_avr0[NUM_ADS_AVR_SETS]; + struct ADS7953::ADS_CHANNEL_DATA ads_data_avr1[NUM_ADS_AVR_SETS]; + ADS7953 ads0( ADS7953_ADC0_DEVICEPATH ); + ADS7953 ads1( ADS7953_ADC1_DEVICEPATH ); + IODriver *pContext = (IODriver*)t; + + /* this implizit sets mode2 */ + ads0.setAuto2MaxChannel( 16 ); + /* this implizit sets mode1 */ + ads1.setAuto2MaxChannel( 16 ); + + while(pContext) { + + // Beide AD-Bausteine mit je 16 Kanälen 1x einlesen. Jeder Kanal hat 2 Byte Daten + ok1 = ads0.readChannels( &ads_data_avr0[0], NUM_ADS_AVR_SETS ); + ok2 = ads1.readChannels( &ads_data_avr1[0], NUM_ADS_AVR_SETS ); + + + if (!init) + { + // Buffer ist leer. Initiale Füllung des Buffers - keine Mittelwertbdlg nötig + if( ok1 && ok2 ){ + for( int k=0; k<16; k++ ){ + ads_data_buffer[0][k] = ads_data_avr0[0].data[k]; + ads_data_buffer[1][k] = ads_data_avr1[0].data[k]; + } + init = true; + } + } + else + { + // Buffer ist bereits befüllt, bilde den Mittelwert + // NUM_ADS_AVR_SETS (1) Werte pro Kanal, werden daher nicht aufsummiert + // Alle 5ms ein Wert, diese summieren+Mittelwertbdlg, und alle 10ms nach Codesys hochkopieren. + if( ok1 && ok2 ){ + for( int k=0; k<16; k++ ){ + ads_data_buffer[0][k] += ads_data_avr0[0].data[k]; + ads_data_buffer[0][k] = ads_data_buffer[0][k] >> 1; + ads_data_buffer[1][k] += ads_data_avr1[0].data[k]; + ads_data_buffer[1][k] = ads_data_buffer[1][k] >> 1; + } + } + } + + /* copy data to adress space */ + if (toggle) + { + if( ok1 && ok2 ){ + // Werte alle 10ms nach Codesys hochkopieren + pContext->copyAdsToProcessImage(ads_data_buffer); + toggle = false; + } + } + else { + toggle = true; + } + + //Wecke Thread IO auf. + if (count == 0) + { + pthread_mutex_lock( &_eIOMutex ); + __threadio_condition = 1; + pthread_cond_signal(&_eIOCondition); + pthread_mutex_unlock( &_eIOMutex ); + } + + // Go Sleep and wait on Signal from Control-Task - AfterWritingOutputs + pthread_mutex_lock(&_eSPIMutex); + while ((__threadspi_condition == 0)) + { + pthread_cond_wait(&_eSPICondition, &_eSPIMutex); + } + if (__threadspi_condition == 2) + // Geweckt von CC-Thread + count = 1; + else + // Geweckt von Control_Task, neuer Zyklus + count = 0; + __threadspi_condition = 0; + pthread_mutex_unlock(&_eSPIMutex); + + + } + + pthread_exit((void*) t); ++>>>>>>> rauch/jobrechner-import-20190607 } void IODriver::copyMaxToProcessImage( void* t ) { ++<<<<<<< HEAD + Ecu02Max116x::MAX116XX_CHANNEL_DATA * max_data = (Ecu02Max116x::MAX116XX_CHANNEL_DATA *) t; + + if (max_data != NULL) + { + ECU02_INS.CUR_FB_EXT = max_data->data[0]; + ECU02_INS.CUR_FB_HS_1 = max_data->data[1]; + ECU02_INS.CUR_FB_HS_2 = max_data->data[2]; + ECU02_INS.CUR_FB_HS_3 = max_data->data[3]; + ECU02_INS.CUR_FB_HS_4 = max_data->data[4]; + ECU02_INS.CUR_FB_HS_5 = max_data->data[5]; + ECU02_INS.CUR_FB_HS_6 = max_data->data[6]; + ECU02_INS.CUR_FB_HS_7 = max_data->data[7]; + ECU02_INS.CUR_FB_HS_8 = max_data->data[8]; + ECU02_INS.CUR_FB_HS_9 = max_data->data[9]; + ECU02_INS.CUR_FB_HS_10 = max_data->data[10]; + + ECU02_INS.CUR_FB_HSP_1 = max_data->data[11]; + ECU02_INS.VFB_12V_PWR = max_data->data[12]; + ECU02_INS.VFB_UB_INT = max_data->data[13]; + ECU02_INS.FB_HB_1 = max_data->data[14]; + ECU02_INS.FB_HB_2 = max_data->data[15]; + } +} + +/* + * This functionality is duplicated in: + * - ptxdist/local_src/ecu-jobctl/platform/iodriver/IODriver.cpp, function IODriver::readFeedbackHSPwm() + * - ptxdist/local_src/ecu-codesys/io_driver/IODriverECU02.cpp, function readFeedbackHSPwm() + */ +void IODriver::readFeedbackHSPwm(void) +{ + unsigned long currentFeedback0; + unsigned long periodFeedback0; + unsigned long currentFeedback1; + unsigned long periodFeedback1; + unsigned long currentFeedback2; + unsigned long periodFeedback2; + bool ok0, + ok1, + ok2; + unsigned short powerMa0 = 0; + unsigned short powerMa1 = 0; + unsigned short powerMa2 = 0; + + ok0 = Ecu02Tle::getInst().readFeedbackRegister(REGISTER_FEEDBACK_CH0, currentFeedback0, periodFeedback0); + ok1 = Ecu02Tle::getInst().readFeedbackRegister(REGISTER_FEEDBACK_CH1, currentFeedback1, periodFeedback1); + ok2 = Ecu02Tle::getInst().readFeedbackRegister(REGISTER_FEEDBACK_CH2, currentFeedback2, periodFeedback2); + if (!(ok0 && ok1 && ok2)) + return; + + /* + * Average load current = 0.75 * CurrentFB / PeriodFB + * 1000 ~ A -> mA + * 3 / 4 ~ 0,75 + */ +#define AVERAGE_LOAD_CURRENT(currentFeedback, periodFeedback) \ + (((currentFeedback) * 3000UL) / ((periodFeedback) * 4UL)) + + if (periodFeedback0 != 0) + { + powerMa0 = AVERAGE_LOAD_CURRENT(currentFeedback0, periodFeedback0); + } + + if (periodFeedback1 != 0) + { + powerMa1 = AVERAGE_LOAD_CURRENT(currentFeedback1, periodFeedback1); + } + + if (periodFeedback2 != 0) + { + powerMa2 = AVERAGE_LOAD_CURRENT(currentFeedback2, periodFeedback2); + } + + ECU02_INS.FB_HS_PWM1 = powerMa0; + ECU02_INS.FB_HS_PWM2 = powerMa1; + ECU02_INS.FB_HS_PWM3 = powerMa2; ++======= + Ecu02Max116x::MAX116XX_CHANNEL_DATA * max_data = (Ecu02Max116x::MAX116XX_CHANNEL_DATA *) t; + + if (max_data != NULL) + { + ECU02_INS.CUR_FB_EXT = max_data->data[0]; + ECU02_INS.CUR_FB_HS_1 = max_data->data[1]; + ECU02_INS.CUR_FB_HS_2 = max_data->data[2]; + ECU02_INS.CUR_FB_HS_3 = max_data->data[3]; + ECU02_INS.CUR_FB_HS_4 = max_data->data[4]; + ECU02_INS.CUR_FB_HS_5 = max_data->data[5]; + ECU02_INS.CUR_FB_HS_6 = max_data->data[6]; + ECU02_INS.CUR_FB_HS_7 = max_data->data[7]; + ECU02_INS.CUR_FB_HS_8 = max_data->data[8]; + ECU02_INS.CUR_FB_HS_9 = max_data->data[9]; + ECU02_INS.CUR_FB_HS_10 = max_data->data[10]; + + ECU02_INS.CUR_FB_HSP_1 = max_data->data[11]; + ECU02_INS.VFB_12V_PWR = max_data->data[12]; + ECU02_INS.VFB_UB_INT = max_data->data[13]; + ECU02_INS.FB_HB_1 = max_data->data[14]; + ECU02_INS.FB_HB_2 = max_data->data[15]; + } + } + + void IODriver::readFeedbackHSPwm( void ) + { + unsigned long tleFeedbackCh0; + unsigned long tleFeedbackCh1; + unsigned long tleFeedbackCh2; + bool ok1,ok2,ok3; + + ok1 = Ecu02Tle::getInst().readRegister(REGISTER_FEEDBACK_CH0,tleFeedbackCh0 ); + ok2 = Ecu02Tle::getInst().readRegister(REGISTER_FEEDBACK_CH1,tleFeedbackCh1 ); + ok3 = Ecu02Tle::getInst().readRegister(REGISTER_FEEDBACK_CH2,tleFeedbackCh2 ); + if ( ok1 && ok2 && ok3 ){ + + unsigned long currentFeedback0 = (tleFeedbackCh0 & 0x00fff000) >> 12; + unsigned long periodFeedback0 = (tleFeedbackCh0 & 0x00000fff); + unsigned short powerMa0 = 0; + unsigned long currentFeedback1 = (tleFeedbackCh1 & 0x00fff000) >> 12; + unsigned long periodFeedback1 = (tleFeedbackCh1 & 0x00000fff); + unsigned short powerMa1 = 0; + unsigned long currentFeedback2 = (tleFeedbackCh2 & 0x00fff000) >> 12; + unsigned long periodFeedback2 = (tleFeedbackCh2 & 0x00000fff); + unsigned short powerMa2 = 0; + + /* Average load current = 0.75 * CurrentFB / PeriodFB + * 1000 ~ A . mA + * 3 / 4 ~ 0,75 + */ + if( periodFeedback0 != 0 ){ + powerMa0 = (currentFeedback0 * 3000) / (periodFeedback0 * 4); + } + + if( periodFeedback1 != 0 ){ + powerMa1 = (currentFeedback1 * 3000) / (periodFeedback1 * 4); + } + + if( periodFeedback2 != 0 ){ + powerMa2 = (currentFeedback2 * 3000) / (periodFeedback2 * 4); + } + ECU02_INS.FB_HS_PWM1 = powerMa0; + ECU02_INS.FB_HS_PWM2 = powerMa1; + ECU02_INS.FB_HS_PWM3 = powerMa2; + } ++>>>>>>> rauch/jobrechner-import-20190607 } void *IODriver::threadIO(void *t) { ++<<<<<<< HEAD + static int i = 0; + int hdlTempSensor = open( FILEPATH_TEMPERATURE_SENSOR_1, O_RDONLY ); + char buffer[32]; + int numRead; + long temperatureTmp; + unsigned long value; + bool ok(false); + Ecu02Max116x::MAX116XX_CHANNEL_DATA max_data; + Ecu02Max116x max116x( MAX11628_DEVICEPATH ); + IODriver *pContext = (IODriver*)t; + + + while(pContext) { + + i++; + if(i==20) i=0; + + + // ---------------------------------------------MAX + // Alle 10ms EINEN Kanal einlesen. Pro Funktionsaufruf wird ein AI eingelesen. Hei�t nach 10*10ms sind alle Eingänge eingelesen. + // Einlesen der HS am MAX über SPI + // EN_HS und CS_HS liegen am PCA, werden innerhalb der Klasse gesetzt, aber nicht synchonisiert. + ok = max116x.readChannels(&max_data); + if( ok ){ + pContext->copyMaxToProcessImage(&max_data); + } + // ---------------------------------------------MAX + + + // ---------------------------------------------PCA + // Abgleich der Werte aus PAA und PAA_Clone (Digitals & HB) + pContext->EcuSyncOutDigital( false ); + + // SYNCHRONIZATION OF I2C!!!!! + // Dirty Banks are synchonized to PCA + PCA9505::getInst().cleanUp(); + // ---------------------------------------------PCA + + + // ---------------------------------------------TLE + // __syncoutpwm_forced: Wird AUF JEDEN FALL aktualisiert, falls EN_HS_PWM = 1 gesetzt wurde. + // Vor EcuSyncOutPwm, muss PCA synchonisiert worden sein. + // Abgleich der Werte aus PAA und PAA_Clone (HB_PWM) + pContext->EcuSyncOutPwm ( __syncoutpwm_forced ); + + // Alle 200ms lese Eingangs-Feedback von HS-PWM am TLE über SPI ein + if(i==0) + { + pContext->readFeedbackHSPwm(); + } + // Alle 200ms lese Eingangs-Diagnose-Register am TLE über SPI ein + if(i==10) + { + ok = Ecu02Tle::getInst().readRegister( REGISTER_DIAG, value); + if( ok ){ + pContext->ECU02_INS.TLE_DIAG = value; + } + } + // ---------------------------------------------TLE + + + // ---------------------------------------------TemperaturSensor + if(i==0) + { + /* Alle 200ms lese temperature input */ + if( hdlTempSensor != -1 ) + { + numRead = pread( hdlTempSensor, buffer, sizeof( buffer), 0 ); + temperatureTmp = atol(buffer); + } + if( numRead > 0 ){ + pContext->ECU02_INS.PCB_TEMPERATURE = temperatureTmp; + numRead = 0; + } + } + // ---------------------------------------------TemperaturSensor + + + // ---------------------------------------------Safety + if(i%2) { + // Verwenden eines GPIOs am PCA hinter I2C. EINGANG. Zusätzlicher I2C Zugriff. + Ecu02Safety::getInst().checkConditions(); + Ecu02Safety::getInst().toggleSSV(); + // statiche Werte aus der ECU02Safety Klasse werden hier ins Codesysabbild kopiert. Kein I2C Zugriff mehr. + pContext->updateDigitalInputs(); + } + // ---------------------------------------------Safety + + + // Wecke CC-Thread + pthread_mutex_lock( &_eCCMutex ); + __threadcc_condition = 1; + pthread_cond_signal(&_eCCCondition); + pthread_mutex_unlock( &_eCCMutex ); + + + // Go Sleep and wait on Signal from SPI-Task + pthread_mutex_lock(&_eIOMutex); + while (__threadio_condition == 0) + { + pthread_cond_wait(&_eIOCondition, &_eIOMutex); //wait for the condition + } + __threadio_condition = 0; + pthread_mutex_unlock(&_eIOMutex); + + } + + pthread_exit((void*) t); ++======= + static int i = 0; + int hdlTempSensor = open( FILEPATH_TEMPERATURE_SENSOR_1, O_RDONLY ); + char buffer[32]; + int numRead; + long temperatureTmp; + unsigned long value; + bool ok(false); + Ecu02Max116x::MAX116XX_CHANNEL_DATA max_data; + Ecu02Max116x max116x( MAX11628_DEVICEPATH ); + IODriver *pContext = (IODriver*)t; + + + while(pContext) { + + i++; + if(i==20) i=0; + + // ---------------------------------------------MAX + // Alle 10ms EINEN Kanal einlesen. Pro Funktionsaufruf wird ein AI eingelesen. Hei�t nach 10*10ms sind alle Eingänge eingelesen. + // Einlesen der HS am MAX über SPI + // EN_HS und CS_HS liegen am PCA, werden innerhalb der Klasse gesetzt, aber nicht synchonisiert. + ok = max116x.readChannels(&max_data); + if( ok ){ + pContext->copyMaxToProcessImage(&max_data); + } + // ---------------------------------------------MAX + + + // ---------------------------------------------PCA + // Abgleich der Werte aus PAA und PAA_Clone (Digitals & HB) + pContext->EcuSyncOutDigital( false ); + + // SYNCHRONIZATION OF I2C!!!!! + // Dirty Banks are synchonized to PCA + PCA9505::getInst().cleanUp(); + // ---------------------------------------------PCA + + + // ---------------------------------------------TLE + // __syncoutpwm_forced: Wird AUF JEDEN FALL aktualisiert, falls EN_HS_PWM = 1 gesetzt wurde. + // Vor EcuSyncOutPwm, muss PCA synchonisiert worden sein. + // Abgleich der Werte aus PAA und PAA_Clone (HB_PWM) + pContext->EcuSyncOutPwm ( __syncoutpwm_forced ); + + // Alle 200ms lese Eingangs-Feedback von HS-PWM am TLE über SPI ein + if(i==0) + { + pContext->readFeedbackHSPwm(); + } + // Alle 200ms lese Eingangs-Diagnose-Register am TLE über SPI ein + if(i==10) + { + ok = Ecu02Tle::getInst().readRegister( REGISTER_DIAG, value); + if( ok ){ + pContext->ECU02_INS.TLE_DIAG = value; + } + } + // ---------------------------------------------TLE + + + // ---------------------------------------------TemperaturSensor + if(i==0) + { + /* Alle 200ms lese temperature input */ + if( hdlTempSensor != -1 ) + { + numRead = pread( hdlTempSensor, buffer, sizeof( buffer), 0 ); + temperatureTmp = atol(buffer); + } + if( numRead > 0 ){ + pContext->ECU02_INS.PCB_TEMPERATURE = temperatureTmp; + numRead = 0; + } + } + // ---------------------------------------------TemperaturSensor + + + // ---------------------------------------------Safety + if(i%2) { + // Verwenden eines GPIOs am PCA hinter I2C. EINGANG. Zusätzlicher I2C Zugriff. + Ecu02Safety::getInst().checkConditions(); + Ecu02Safety::getInst().toggleSSV(); + // statiche Werte aus der ECU02Safety Klasse werden hier ins Codesysabbild kopiert. Kein I2C Zugriff mehr. + pContext->updateDigitalInputs(); + } + // ---------------------------------------------Safety + + + // Wecke CC-Thread + pthread_mutex_lock( &_eCCMutex ); + __threadcc_condition = 1; + pthread_cond_signal(&_eCCCondition); + pthread_mutex_unlock( &_eCCMutex ); + + + // Go Sleep and wait on Signal from SPI-Task + pthread_mutex_lock(&_eIOMutex); + while (__threadio_condition == 0) + { + pthread_cond_wait(&_eIOCondition, &_eIOMutex); //wait for the condition + } + __threadio_condition = 0; + pthread_mutex_unlock(&_eIOMutex); + + } + + pthread_exit((void*) t); ++>>>>>>> rauch/jobrechner-import-20190607 } void IODriver::copyCompCapToProcessImage( void) { ++<<<<<<< HEAD + ECU02_INS.CC_RES_1 = Ecu2CompCap::getInst().result(0); + ECU02_INS.CC_RES_2 = Ecu2CompCap::getInst().result(2); + ECU02_INS.CC_RES_3 = Ecu2CompCap::getInst().result(1); + ECU02_INS.CC_1 = Ecu2CompCap::getInst().value(0); + ECU02_INS.CC_2 = Ecu2CompCap::getInst().value(2); + ECU02_INS.CC_3 = Ecu2CompCap::getInst().value(1); + ECU02_INS.CC_ERR_1 = Ecu2CompCap::getInst().error(0); + ECU02_INS.CC_ERR_2 = Ecu2CompCap::getInst().error(2); + ECU02_INS.CC_ERR_3 = Ecu2CompCap::getInst().error(1); + + ECU02_INS.DINT_RES_1 = Ecu02SoftCompCap::getInst().result(0); + ECU02_INS.DINT_RES_2 = Ecu02SoftCompCap::getInst().result(1); + ECU02_INS.DINT_1 = Ecu02SoftCompCap::getInst().value(0); + ECU02_INS.DINT_2 = Ecu02SoftCompCap::getInst().value(1); + ECU02_INS.DINT_MIN_1 = Ecu02SoftCompCap::getInst().value(2); + ECU02_INS.DINT_MIN_2 = Ecu02SoftCompCap::getInst().value(3); + ECU02_INS.DINT_MAX_1 = Ecu02SoftCompCap::getInst().value(4); + ECU02_INS.DINT_MAX_2 = Ecu02SoftCompCap::getInst().value(5); ++======= + ECU02_INS.CC_RES_1 = Ecu2CompCap::getInst().result(0); + ECU02_INS.CC_RES_2 = Ecu2CompCap::getInst().result(2); + ECU02_INS.CC_RES_3 = Ecu2CompCap::getInst().result(1); + ECU02_INS.CC_1 = Ecu2CompCap::getInst().value(0); + ECU02_INS.CC_2 = Ecu2CompCap::getInst().value(2); + ECU02_INS.CC_3 = Ecu2CompCap::getInst().value(1); + ECU02_INS.CC_ERR_1 = Ecu2CompCap::getInst().error(0); + ECU02_INS.CC_ERR_2 = Ecu2CompCap::getInst().error(2); + ECU02_INS.CC_ERR_3 = Ecu2CompCap::getInst().error(1); + + ECU02_INS.DINT_RES_1 = Ecu02SoftCompCap::getInst().result(0); + ECU02_INS.DINT_RES_2 = Ecu02SoftCompCap::getInst().result(1); + ECU02_INS.DINT_1 = Ecu02SoftCompCap::getInst().value(0); + ECU02_INS.DINT_2 = Ecu02SoftCompCap::getInst().value(1); + ECU02_INS.DINT_MIN_1 = Ecu02SoftCompCap::getInst().value(2); + ECU02_INS.DINT_MIN_2 = Ecu02SoftCompCap::getInst().value(3); + ECU02_INS.DINT_MAX_1 = Ecu02SoftCompCap::getInst().value(4); + ECU02_INS.DINT_MAX_2 = Ecu02SoftCompCap::getInst().value(5); ++>>>>>>> rauch/jobrechner-import-20190607 } void IODriver::updateDigitalInputs(void) { ++<<<<<<< HEAD + //Ecu02Safety& refSafety = Ecu02Safety::getInst(); + + if( Ecu02Safety::getInst().coverStateSinCpu1() ){ + ECU02_INS.DigitalInputs |= (0x01 << 2); + } + else{ + ECU02_INS.DigitalInputs &=~ (0x01 << 2); + } + + if( Ecu02Safety::getInst().coverStateSinCpu2() ){ + ECU02_INS.DigitalInputs |= (0x01 << 3); + } + else{ + ECU02_INS.DigitalInputs &=~ (0x01 << 3); + } + + if( Ecu02Safety::getInst().v12SSVFb() ){ + ECU02_INS.DigitalInputs |= (0x01 << 4); + } + else{ + ECU02_INS.DigitalInputs &=~ (0x01 << 4); + } ++======= + //Ecu02Safety& refSafety = Ecu02Safety::getInst(); + + if( Ecu02Safety::getInst().coverStateSinCpu1() ){ + ECU02_INS.DigitalInputs |= (0x01 << 2); + } + else{ + ECU02_INS.DigitalInputs &=~ (0x01 << 2); + } + + if( Ecu02Safety::getInst().coverStateSinCpu2() ){ + ECU02_INS.DigitalInputs |= (0x01 << 3); + } + else{ + ECU02_INS.DigitalInputs &=~ (0x01 << 3); + } + + if( Ecu02Safety::getInst().v12SSVFb() ){ + ECU02_INS.DigitalInputs |= (0x01 << 4); + } + else{ + ECU02_INS.DigitalInputs &=~ (0x01 << 4); + } ++>>>>>>> rauch/jobrechner-import-20190607 } @@@ -785,41 -774,41 +1432,79 @@@ void *IODriver::threadCC(void *t) { ++<<<<<<< HEAD + IODriver *pContext = (IODriver*)t; + + if( Ecu2CompCap::getInst().isReady() && Ecu02SoftCompCap::getInst().isReady() ){ + + while(pContext) { + + /* compare capture */ + + // Auslesen der HW-CCs über direkten ioctl() (Syscall) + Ecu2CompCap::getInst().cycle(); + + // Auslesen von statichern Weren aus der Klasse cppgpio. Kein Syscall, Kein HW-ZUgriff. + Ecu02SoftCompCap::getInst().cycle(); + + // Kopieren der statischen Werte aus den obigen Klassen in das Codesysabbild + pContext->copyCompCapToProcessImage(); + + // Wecke SPI Thread auf + pthread_mutex_lock( &_eSPIMutex ); + __threadspi_condition = 2; + pthread_cond_signal(&_eSPICondition); + pthread_mutex_unlock( &_eSPIMutex ); + + // Go Sleep and wait on Signal from IO-Task + pthread_mutex_lock(&_eCCMutex); + while (__threadcc_condition == 0) + { + pthread_cond_wait(&_eCCCondition, &_eCCMutex); //wait for the condition + } + __threadcc_condition = 0; + pthread_mutex_unlock(&_eCCMutex); + } + } + + pthread_exit((void*) t); ++======= + IODriver *pContext = (IODriver*)t; + + if( Ecu2CompCap::getInst().isReady() && Ecu02SoftCompCap::getInst().isReady() ){ + + while(pContext) { + + /* compare capture */ + + // Auslesen der HW-CCs über direkten ioctl() (Syscall) + Ecu2CompCap::getInst().cycle(); + + // Auslesen von statichern Weren aus der Klasse cppgpio. Kein Syscall, Kein HW-ZUgriff. + Ecu02SoftCompCap::getInst().cycle(); + + // Kopieren der statischen Werte aus den obigen Klassen in das Codesysabbild + pContext->copyCompCapToProcessImage(); + + // Wecke SPI Thread auf + pthread_mutex_lock( &_eSPIMutex ); + __threadspi_condition = 2; + pthread_cond_signal(&_eSPICondition); + pthread_mutex_unlock( &_eSPIMutex ); + + // Go Sleep and wait on Signal from IO-Task + pthread_mutex_lock(&_eCCMutex); + while (__threadcc_condition == 0) + { + pthread_cond_wait(&_eCCCondition, &_eCCMutex); //wait for the condition + } + __threadcc_condition = 0; + pthread_mutex_unlock(&_eCCMutex); + } + } + + pthread_exit((void*) t); ++>>>>>>> rauch/jobrechner-import-20190607 } void IODriver::initKworker(void) { diff --cc ptxdist/local_src/ecu-jobctl/platform/iodriver/IODriver.h index bfa6f10,bfa6f10..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-jobctl/platform/iodriver/IODriver.h +++ b/ptxdist/local_src/ecu-jobctl/platform/iodriver/IODriver.h diff --cc ptxdist/local_src/ecu-jobctl/platform/iodriver/ecu02compcap.cpp index fd728ae,fd728ae..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-jobctl/platform/iodriver/ecu02compcap.cpp +++ b/ptxdist/local_src/ecu-jobctl/platform/iodriver/ecu02compcap.cpp diff --cc ptxdist/local_src/ecu-jobctl/platform/iodriver/ecu02compcap.h index dbe5348,dbe5348..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-jobctl/platform/iodriver/ecu02compcap.h +++ b/ptxdist/local_src/ecu-jobctl/platform/iodriver/ecu02compcap.h diff --cc ptxdist/local_src/ecu-jobctl/platform/iodriver/ecu02config.cpp index 16e443a,433fd33..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-jobctl/platform/iodriver/ecu02config.cpp +++ b/ptxdist/local_src/ecu-jobctl/platform/iodriver/ecu02config.cpp @@@ -33,6 -33,9 +33,12 @@@ #include "cppgpio.h" #include "pca9505.h" ++<<<<<<< HEAD ++======= + + #include "ecu02motorctl.h" + ++>>>>>>> rauch/jobrechner-import-20190607 /*****************************************************************************/ /* here: Defines */ /*****************************************************************************/ @@@ -216,6 -219,16 +222,19 @@@ void Ecu02CoDeSysConfig::setParameter16 return; } ++<<<<<<< HEAD ++======= + if(id == ECUParameters::PWM_HB1){ + _pwmhb[0] = value; + return; + } + + if(id == ECUParameters::PWM_HB2){ + _pwmhb[1] = value; + return; + } + ++>>>>>>> rauch/jobrechner-import-20190607 return; } @@@ -272,7 -285,8 +291,12 @@@ void Ecu02CoDeSysConfig::activateConfig Ecu2CompCap::getInst().settfb(1, _tfb[2]); Ecu2CompCap::getInst().settfb(2, _tfb[1]); ++<<<<<<< HEAD + ++======= + Ecu02MotorCtl::getInst().setPWMFrequency( 0, _pwmhb[0]); + Ecu02MotorCtl::getInst().setPWMFrequency( 1, _pwmhb[1]); ++>>>>>>> rauch/jobrechner-import-20190607 } diff --cc ptxdist/local_src/ecu-jobctl/platform/iodriver/ecu02config.h index 422b9a2,650f6d7..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-jobctl/platform/iodriver/ecu02config.h +++ b/ptxdist/local_src/ecu-jobctl/platform/iodriver/ecu02config.h @@@ -62,6 -62,7 +62,10 @@@ private Ecu02TlePeriodParameters _periodParams[3]; // for each channel Ecu02ClkDividerParameters* _pClkDividerParams; // there is only one clk divider register for all channels unsigned short _tfb[3]; ++<<<<<<< HEAD ++======= + unsigned short _pwmhb[2]; ++>>>>>>> rauch/jobrechner-import-20190607 }; diff --cc ptxdist/local_src/ecu-jobctl/platform/iodriver/ecu02max116x.cpp index b56c932,b56c932..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-jobctl/platform/iodriver/ecu02max116x.cpp +++ b/ptxdist/local_src/ecu-jobctl/platform/iodriver/ecu02max116x.cpp diff --cc ptxdist/local_src/ecu-jobctl/platform/iodriver/ecu02max116x.h index fd5beb6,fd5beb6..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-jobctl/platform/iodriver/ecu02max116x.h +++ b/ptxdist/local_src/ecu-jobctl/platform/iodriver/ecu02max116x.h diff --cc ptxdist/local_src/ecu-jobctl/platform/iodriver/ecu02motorctl.cpp index d7b4e9e,8f71ec9..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-jobctl/platform/iodriver/ecu02motorctl.cpp +++ b/ptxdist/local_src/ecu-jobctl/platform/iodriver/ecu02motorctl.cpp @@@ -163,6 -163,16 +163,19 @@@ Ecu02MotorCtl& Ecu02MotorCtl::getInst( return inst; } ++<<<<<<< HEAD ++======= + void Ecu02MotorCtl::setPWMFrequency(int index, int value) + { + if( index == 0 || index == 1 ){ + if( isOpen() ){ + ioctl(_hdls[index], MOTOR_CTL_IOCSPWM, &value); + } + } + } + + ++>>>>>>> rauch/jobrechner-import-20190607 /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-**-*-* Ecu02MotorCtl *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-**-*-*/ diff --cc ptxdist/local_src/ecu-jobctl/platform/iodriver/ecu02motorctl.h index d0101d0,445f3b3..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-jobctl/platform/iodriver/ecu02motorctl.h +++ b/ptxdist/local_src/ecu-jobctl/platform/iodriver/ecu02motorctl.h @@@ -48,6 -48,7 +48,10 @@@ public void setEnable(int index, int value, bool force ); void setDirection(int index, int value ); void setSpeed(int index, int value ); ++<<<<<<< HEAD ++======= + void setPWMFrequency(int index, int value); ++>>>>>>> rauch/jobrechner-import-20190607 private: Ecu02MotorCtl(); diff --cc ptxdist/local_src/ecu-jobctl/platform/iodriver/ecu02safety.cpp index aec6bed,aec6bed..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-jobctl/platform/iodriver/ecu02safety.cpp +++ b/ptxdist/local_src/ecu-jobctl/platform/iodriver/ecu02safety.cpp diff --cc ptxdist/local_src/ecu-jobctl/platform/iodriver/ecu02safety.h index c9a765e,c9a765e..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-jobctl/platform/iodriver/ecu02safety.h +++ b/ptxdist/local_src/ecu-jobctl/platform/iodriver/ecu02safety.h diff --cc ptxdist/local_src/ecu-jobctl/platform/iodriver/ecu02softcompcap.cpp index 418c696,418c696..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-jobctl/platform/iodriver/ecu02softcompcap.cpp +++ b/ptxdist/local_src/ecu-jobctl/platform/iodriver/ecu02softcompcap.cpp diff --cc ptxdist/local_src/ecu-jobctl/platform/iodriver/ecu02softcompcap.h index bd26edc,bd26edc..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-jobctl/platform/iodriver/ecu02softcompcap.h +++ b/ptxdist/local_src/ecu-jobctl/platform/iodriver/ecu02softcompcap.h diff --cc ptxdist/local_src/ecu-jobctl/platform/iodriver/ecu02tle.cpp index 5ca9825,74e16d9..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-jobctl/platform/iodriver/ecu02tle.cpp +++ b/ptxdist/local_src/ecu-jobctl/platform/iodriver/ecu02tle.cpp @@@ -61,12 -61,12 +61,20 @@@ Ecu02TleDitheringParameters& Ecu02TleDi } /* setter */ ++<<<<<<< HEAD +bool Ecu02TleDitheringParameters::setChannel( char ch ) ++======= + bool Ecu02TleDitheringParameters::setChannel( unsigned char ch ) ++>>>>>>> rauch/jobrechner-import-20190607 { // Select Channel Number Bit 25:24 (DITHER REGISTER) bool bRet(false); ++<<<<<<< HEAD + if(( ch >= 0 ) && ( ch < 3 )) ++======= + if( ch < 3 ) ++>>>>>>> rauch/jobrechner-import-20190607 { _rawDitherRegisterValue |= ( ch << 24 ); bRet = true; @@@ -114,7 -114,7 +122,11 @@@ bool Ecu02TleDitheringParameters::setNu // Set the dither steps of the addressed channel, Bits 15:10 (DITHER REGISTER) bool bRet(false); ++<<<<<<< HEAD + if(( num >= 0) && (num <= 0x3f )) ++======= + if(num <= 0x3f ) ++>>>>>>> rauch/jobrechner-import-20190607 { _rawDitherRegisterValue &=~ ( 0x3f << 10); _rawDitherRegisterValue |= ( num << 10 ); @@@ -128,7 -128,7 +140,11 @@@ bool Ecu02TleDitheringParameters::setDi // Set the dither stepsize of addressed channel, Bits 5:0 (DITHER REGISTER) bool bRet(false); ++<<<<<<< HEAD + if(( size >= 0 ) && (size <= 0x3f)){ ++======= + if(size <= 0x3f){ ++>>>>>>> rauch/jobrechner-import-20190607 _rawDitherRegisterValue &=~ 0x3f; _rawDitherRegisterValue |= size; bRet = true; @@@ -193,12 -193,12 +209,20 @@@ Ecu02TlePeriodParameters& Ecu02TlePerio } /* setter */ ++<<<<<<< HEAD +bool Ecu02TlePeriodParameters::setChannel( char ch ) ++======= + bool Ecu02TlePeriodParameters::setChannel( unsigned char ch ) ++>>>>>>> rauch/jobrechner-import-20190607 { // Select Channel Number Bit 25:24 (PERIOD REGISTER) bool bRet(false); ++<<<<<<< HEAD + if(( ch >= 0 ) && ( ch < 3 )){ ++======= + if( ch < 3 ){ ++>>>>>>> rauch/jobrechner-import-20190607 _rawPeriodRegisterValue |= ( ch << 24 ); @@@ -214,7 -214,7 +238,11 @@@ bool Ecu02TlePeriodParameters::setPerio // Set the period field of the addressed channel, Bits 11:0 (PERIOD REGISTER) bool bRet(false); ++<<<<<<< HEAD + if( (period >= 0) && (period <= 0x0fff) ){ ++======= + if(period <= 0x0fff){ ++>>>>>>> rauch/jobrechner-import-20190607 _rawPeriodRegisterValue &=~ ( 0x0fff ); _rawPeriodRegisterValue |= ( period ); bRet = true; @@@ -227,7 -227,7 +255,11 @@@ bool Ecu02TlePeriodParameters::setKLInd // Set the KL-Index of addressed channel, Bits 22:20 (PERIOD REGISTER) bool bRet(false); ++<<<<<<< HEAD + if( (index >= 0) && (index <= 0x0007) ){ ++======= + if(index <= 0x0007){ ++>>>>>>> rauch/jobrechner-import-20190607 _rawPeriodRegisterValue &=~ (0x0007 << 20); _rawPeriodRegisterValue |= (index << 20); bRet = true; @@@ -278,7 -278,7 +310,11 @@@ bool Ecu02ClkDividerParameters::setMfie // Set the m field, Bits 11:6 (CLK-DIVIDER REGISTER) bool bRet(false); ++<<<<<<< HEAD + if( (mfield >= 0) && (mfield <= 0x003F) ){ ++======= + if(mfield <= 0x003F){ ++>>>>>>> rauch/jobrechner-import-20190607 _rawClkDividerRegisterValue &=~ ( 0x0FC0 ); _rawClkDividerRegisterValue |= ( mfield << 6); bRet = true; @@@ -291,7 -291,7 +327,11 @@@ bool Ecu02ClkDividerParameters::setNfie // Set the n field, Bits 5:2 (CLK-DIVIDER REGISTER) bool bRet(false); ++<<<<<<< HEAD + if( (nfield >= 0) && (nfield <= 0x000F) ){ ++======= + if(nfield <= 0x000F){ ++>>>>>>> rauch/jobrechner-import-20190607 _rawClkDividerRegisterValue &=~ (0x003C); _rawClkDividerRegisterValue |= (nfield << 2); bRet = true; @@@ -319,7 -319,6 +359,10 @@@ unsigned long Ecu02ClkDividerParameters Ecu02Tle::Ecu02Tle() : _hdl(-1), ++<<<<<<< HEAD + _icVersion(0xDEADBEEF), ++======= ++>>>>>>> rauch/jobrechner-import-20190607 _hdl_mutex() { @@@ -344,31 -343,17 +387,45 @@@ Ecu02Tle::~Ecu02Tle( void Ecu02Tle::init(unsigned long value) { ++<<<<<<< HEAD + /* value == rawValue of Clk Divider Regsiter */ + + (void)pthread_mutex_lock(&_hdl_mutex); + + _hdl = open( TLE82353SA_DEVICEPATH, O_RDWR ); + if (_hdl >= 0) + { + bool ok = false; + + if (TLE82353SA::initTLE(_hdl, value, true, true)) + { + if (TLE82353SA::readICVersion(_hdl, _icVersion)) + { + ok = true; + } + } + + if (!ok) + { + (void)close(_hdl); + _hdl = -1; + } + } + + (void)pthread_mutex_unlock(&_hdl_mutex); ++======= + /* value == rawValue of Clk Divider Regsiter */ + + pthread_mutex_lock(&_hdl_mutex); + _hdl = open( TLE82353SA_DEVICEPATH, O_RDWR ); + if( isOpen() ){ + if( ! TLE82353SA::initTLE( _hdl, value, true, true ) ){ + close(_hdl); + _hdl = -1; + } + } + pthread_mutex_unlock(&_hdl_mutex); ++>>>>>>> rauch/jobrechner-import-20190607 } bool Ecu02Tle::isOpen() const @@@ -490,52 -475,6 +547,55 @@@ bool Ecu02Tle::setChannelValue(int chan return bRet; } ++<<<<<<< HEAD + +bool Ecu02Tle::readFeedbackRegister(unsigned char adr, unsigned long &currentfb_value, unsigned long &periodfb_value) +{ + unsigned long fbrv; /* feedback register value */ + + /* + * Handle a functional change in the TLE82353SA between chip version + * B13 and chip version C11. + * + * In version C11 the "Current FB" value (bits 23:12) of registers 0x40, + * 0x41 and 0x41 needs to be multiplied by factor 2 compared to the older + * chip version B13. + * + * Fortunately the chip version can be used to distinguish between + * both versions via |_icVersion|. + */ + + /* + * |readFeedbackRegister()| is for currentFB registers only, so bail + * out if someone asks for something else we cannot handle + */ + if ((adr != 0x40) && (adr != 0x41) && (adr != 0x42)) + return false; + + if (!readRegister(adr, fbrv)) + return false; + + switch(_icVersion) + { + case 4: /* B13 step = 00000100 */ + currentfb_value = (fbrv & 0x00FFF000) >> 12; + periodfb_value = (fbrv & 0x00000FFF); + return true; + case 6: /* C11 step = 00000110 */ + currentfb_value = (fbrv & 0x00FFF000) >> 12; + periodfb_value = (fbrv & 0x00000FFF); + currentfb_value *= 2; + return true; + default: /* unknown chip version, we return |false| below */ + break; + } + + return false; +} + + ++======= ++>>>>>>> rauch/jobrechner-import-20190607 /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-**-*-* Ecu02Tle *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-**-*-*/ diff --cc ptxdist/local_src/ecu-jobctl/platform/iodriver/ecu02tle.h index db65a02,ecd120a..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-jobctl/platform/iodriver/ecu02tle.h +++ b/ptxdist/local_src/ecu-jobctl/platform/iodriver/ecu02tle.h @@@ -52,7 -52,7 +52,11 @@@ public Ecu02TleDitheringParameters& operator=( const Ecu02TleDitheringParameters& ); /* setter */ ++<<<<<<< HEAD + bool setChannel( char ch ); ++======= + bool setChannel( unsigned char ch ); ++>>>>>>> rauch/jobrechner-import-20190607 void setEnabled( bool val ); void setSync( bool val ); void setCFBMode( bool val ); @@@ -83,7 -83,7 +87,11 @@@ public Ecu02TlePeriodParameters& operator=( const Ecu02TlePeriodParameters& ); /* setter */ ++<<<<<<< HEAD + bool setChannel( char ch ); ++======= + bool setChannel( unsigned char ch ); ++>>>>>>> rauch/jobrechner-import-20190607 bool setPeriodField( unsigned short period ); bool setKLIndex( unsigned short index ); @@@ -147,9 -147,7 +155,13 @@@ public bool writeRegister( unsigned char adr, unsigned long value ); bool readRegister( unsigned char adr, unsigned long &value ); ++<<<<<<< HEAD + + bool readFeedbackRegister(unsigned char adr, unsigned long &currentfb_value, unsigned long &periodfb_value); + ++======= + ++>>>>>>> rauch/jobrechner-import-20190607 bool setChannelValue(int channel, int current_value, int pwm_value ); void init(unsigned long value); @@@ -159,7 -157,6 +171,10 @@@ private Ecu02Tle(); int _hdl; ++<<<<<<< HEAD + unsigned long _icVersion; ++======= ++>>>>>>> rauch/jobrechner-import-20190607 pthread_mutex_t _hdl_mutex; }; diff --cc ptxdist/local_src/ecu-jobctl/platform/iodriver/emeasuretime.cpp index fe44ce3,fe44ce3..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-jobctl/platform/iodriver/emeasuretime.cpp +++ b/ptxdist/local_src/ecu-jobctl/platform/iodriver/emeasuretime.cpp diff --cc ptxdist/local_src/ecu-jobctl/platform/iodriver/emeasuretime.h index 504f045,504f045..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-jobctl/platform/iodriver/emeasuretime.h +++ b/ptxdist/local_src/ecu-jobctl/platform/iodriver/emeasuretime.h diff --cc ptxdist/local_src/ecu-jobctl/platform/iodriver/iodriver.pro index fbaa39d,6655d42..0000000 --- a/ptxdist/local_src/ecu-jobctl/platform/iodriver/iodriver.pro +++ b/ptxdist/local_src/ecu-jobctl/platform/iodriver/iodriver.pro @@@ -20,14 -20,17 +20,28 @@@ TARGET = IODrive QT -= gui network core DEPENDPATH += . ../core INCLUDEPATH += . ../core ++<<<<<<< HEAD +DEPENDPATH += ../../../../platform-ecu02/sysroot-target/include/common +DEPENDPATH += ../../../../platform-ecu02/sysroot-target/include/common/hw +DEPENDPATH += ../../../../platform-ecu02/sysroot-target/include/common/io +INCLUDEPATH += ../../../../platform-ecu02/sysroot-target/include/common +INCLUDEPATH += ../../../../platform-ecu02/sysroot-target/include/common/hw +INCLUDEPATH += ../../../../platform-ecu02/sysroot-target/include/common/io +CONFIG += debug +CONFIG -= qt ++======= + + SYSROOT_TARGET_PATH = ../../../../platform-ecu02/sysroot-target/ + #SYSROOT_TARGET_PATH = /home/rauch/projects/jncg/ptxdist/platform-ecu02/sysroot-target/ + + DEPENDPATH += $$SYSROOT_TARGET_PATH/include/common + DEPENDPATH += $$SYSROOT_TARGET_PATH/include/common/hw + DEPENDPATH += $$SYSROOT_TARGET_PATH/include/common/io + INCLUDEPATH += $$SYSROOT_TARGET_PATH/include/common + INCLUDEPATH += $$SYSROOT_TARGET_PATH/include/common/hw + INCLUDEPATH += $$SYSROOT_TARGET_PATH/include/common/io + #CONFIG += debug ++>>>>>>> rauch/jobrechner-import-20190607 #includes Librarys LIBS += -lrt diff --cc ptxdist/local_src/ecu-jobctl/platform/platform.pro index ac44119,ac44119..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-jobctl/platform/platform.pro +++ b/ptxdist/local_src/ecu-jobctl/platform/platform.pro diff --cc ptxdist/local_src/ecu-motor-ctl/Makefile index d178b1d,84577bd..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-motor-ctl/Makefile +++ b/ptxdist/local_src/ecu-motor-ctl/Makefile @@@ -19,7 -19,7 +19,11 @@@ clean else ++<<<<<<< HEAD +EXTRA_CFLAGS += -I$(CURDIR)/. -I$(CURDIR)../ -I$(PTXDIST_SYSROOT_TARGET)/include/common ++======= + EXTRA_CFLAGS += -I$(CURDIR)/. -I$(CURDIR)../ -I$(CURDIR)../common ++>>>>>>> rauch/jobrechner-import-20190607 ecu-motor-ctl-objs := main.o motor_ctl_pwm.o obj-m := ecu-motor-ctl.o diff --cc ptxdist/local_src/ecu-motor-ctl/ecu-motor-ctl.pro index 7098042,7098042..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-motor-ctl/ecu-motor-ctl.pro +++ b/ptxdist/local_src/ecu-motor-ctl/ecu-motor-ctl.pro diff --cc ptxdist/local_src/ecu-motor-ctl/etc/modules-load.d/ecu01_motor_ctl.conf index 6a338d5,6a338d5..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-motor-ctl/etc/modules-load.d/ecu01_motor_ctl.conf +++ b/ptxdist/local_src/ecu-motor-ctl/etc/modules-load.d/ecu01_motor_ctl.conf diff --cc ptxdist/local_src/ecu-motor-ctl/etc/modules-load.d/ecu_motor_ctl.conf index 3ef2ee9,3ef2ee9..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-motor-ctl/etc/modules-load.d/ecu_motor_ctl.conf +++ b/ptxdist/local_src/ecu-motor-ctl/etc/modules-load.d/ecu_motor_ctl.conf diff --cc ptxdist/local_src/ecu-motor-ctl/main.c index 4fad624,d1d849d..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-motor-ctl/main.c +++ b/ptxdist/local_src/ecu-motor-ctl/main.c @@@ -72,7 -72,6 +72,10 @@@ MODULE_LICENSE("GPL") /*****************************************************************************/ long setMotorSpeed( struct motor_ctl_dev *dev, int value ); ++<<<<<<< HEAD +long setMotorPWM( struct motor_ctl_dev *dev, int value ); ++======= ++>>>>>>> rauch/jobrechner-import-20190607 static struct motor_ctl_dev motor_ctl_devices[] = { { @@@ -150,24 -149,7 +153,28 @@@ long setMotorSpeed( struct motor_ctl_de if( value < MOTOR_SPEED_MIN || value > MOTOR_SPEED_MAX ) return lRet; ++<<<<<<< HEAD + pwm_setsample(dev, value); + lRet = 0; + + return lRet; +} + +long setMotorPWM( struct motor_ctl_dev *dev, int value ) +{ + + long lRet = -EINVAL; + + if( NULL == dev ) + return lRet; + + if( value < MOTOR_PWM_MIN || value > MOTOR_PWM_MAX ) + return lRet; + + pwm_setperiod(dev, value); ++======= + pwm_set(dev, value); ++>>>>>>> rauch/jobrechner-import-20190607 lRet = 0; return lRet; @@@ -217,15 -199,6 +224,18 @@@ long motor_ctl_ioctl(struct file *filp } break; ++<<<<<<< HEAD + case MOTOR_CTL_IOCSPWM: + if (! capable (CAP_SYS_ADMIN)) + return -EPERM; + retval = __get_user( user_param, (int __user *)arg ); + if( 0 == retval ){ + retval = setMotorPWM( dev, user_param ); + } + break; + ++======= ++>>>>>>> rauch/jobrechner-import-20190607 default: /* redundant, as cmd was checked against MAXNR */ return -ENOTTY; } diff --cc ptxdist/local_src/ecu-motor-ctl/motor_ctl_pwm.c index 37a3d82,af46162..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-motor-ctl/motor_ctl_pwm.c +++ b/ptxdist/local_src/ecu-motor-ctl/motor_ctl_pwm.c @@@ -86,11 -86,11 +86,19 @@@ void pwm_init ( struct motor_ctl_dev *d ulTempRegister = readl( PWMCR(dev->virt_pwm_adr) ); ++<<<<<<< HEAD + /* SET PWM Period register */ + pwm_setperiod( dev, dev->pwm_period ); + + /* SET PWM Sample register */ + pwm_setsample(dev, dev->pwm_sample ); ++======= + /* SET PWM Sample register */ + pwm_set(dev, dev->pwm_sample ); + + /* SET PWM Period register */ + writel( dev->pwm_period, PWMPR(dev->virt_pwm_adr) ); ++>>>>>>> rauch/jobrechner-import-20190607 /* SET PWM Prescaler */ ulTempRegister = PWMCR_PRESC(dev->pwm_prescaler); @@@ -132,60 -132,20 +140,75 @@@ void pwm_software_reset ( struct motor_ } ++<<<<<<< HEAD +void pwm_setsample( struct motor_ctl_dev *dev, unsigned short value ){ + + unsigned int period = 0; + unsigned int sample = 0; ++======= + void pwm_set( struct motor_ctl_dev *dev, unsigned short value ){ ++>>>>>>> rauch/jobrechner-import-20190607 if( NULL == dev ) return; if( NULL == dev->virt_pwm_adr ) return; ++<<<<<<< HEAD + /* PWM-Sample in 0,1%*/ + if( value > 1000 ) + return; + + /* Umrechnung von 0,1% in Registerwert:*/ + if (dev->pwm_period == 0) + { + // Period ist noch nich initialisiert, oder fehlerhafter Wert in Period + period = PWM_DEFAULT_PERIOD; + } + else { + period = dev->pwm_period; + } + if (value == 0) + { + // Möglich, Sample = 0%. + sample = 0; + } + else { + sample = (period * value) / 1000; + } + dev->pwm_sample = (unsigned short)sample; ++======= + if( value > 1000 ) + return; + + dev->pwm_sample = value; ++>>>>>>> rauch/jobrechner-import-20190607 /* SET PWM Sample register */ writel( dev->pwm_sample, PWMSAR(dev->virt_pwm_adr) ); ++<<<<<<< HEAD + //printk("Set pwmsample of %d bridge to: %d\n", dev->motorIndex, dev->pwm_sample); + +} + +void pwm_setperiod( struct motor_ctl_dev *dev, unsigned short value ){ + + if( NULL == dev ) return; + if( NULL == dev->virt_pwm_adr ) return; + + if( value > 10000 ) + return; + + /* A value of zero in the PWMPR will result in a period of two clock cycles for the output signal. Writing + 0xFFFF to this register will achieve the same result as writing 0xFFFE. */ + dev->pwm_period = value; + + /* SET PWM Period register */ + writel( dev->pwm_period, PWMPR(dev->virt_pwm_adr) ); + + //printk("Set pwmperiod of %d bridge to: %d, value %d\n", dev->motorIndex, dev->pwm_period, value); ++======= + //printk("Set pwm of %d bridge to: %d\n", dev->motorIndex, dev->pwm_sample); ++>>>>>>> rauch/jobrechner-import-20190607 } diff --cc ptxdist/local_src/ecu-motor-ctl/motor_ctl_pwm.h index 5b2a13c,ef9b750..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-motor-ctl/motor_ctl_pwm.h +++ b/ptxdist/local_src/ecu-motor-ctl/motor_ctl_pwm.h @@@ -70,8 -70,7 +70,12 @@@ int pwm_setup( struct motor_ctl_dev *d void pwm_release( struct motor_ctl_dev *dev ); void pwm_init ( struct motor_ctl_dev *dev ); void pwm_software_reset ( struct motor_ctl_dev *dev ); ++<<<<<<< HEAD +void pwm_setsample( struct motor_ctl_dev *dev, unsigned short value ); /* 0 < value < 1000 */ +void pwm_setperiod( struct motor_ctl_dev *dev, unsigned short value ); /* 0 < value < 10000 */ ++======= + void pwm_set( struct motor_ctl_dev *dev, unsigned short value ); /* 0 < value < 1000 */ ++>>>>>>> rauch/jobrechner-import-20190607 /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-**-*-* *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-**-*-*/ diff --cc ptxdist/local_src/ecu-motor-ctl/usr/lib/tmpfiles.d/ecu_motor_ctl.conf index cf80a67,cf80a67..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/ecu-motor-ctl/usr/lib/tmpfiles.d/ecu_motor_ctl.conf +++ b/ptxdist/local_src/ecu-motor-ctl/usr/lib/tmpfiles.d/ecu_motor_ctl.conf diff --cc ptxdist/local_src/flush_module/Makefile index 9a619f3,9a619f3..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/flush_module/Makefile +++ b/ptxdist/local_src/flush_module/Makefile diff --cc ptxdist/local_src/flush_module/flush.c index 8906384,8906384..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/flush_module/flush.c +++ b/ptxdist/local_src/flush_module/flush.c diff --cc ptxdist/local_src/flush_module/flush.conf index 1b471a6,1b471a6..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/flush_module/flush.conf +++ b/ptxdist/local_src/flush_module/flush.conf diff --cc ptxdist/local_src/rtl8188eu/COPYING index ca442d3,ca442d3..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/COPYING +++ b/ptxdist/local_src/rtl8188eu/COPYING diff --cc ptxdist/local_src/rtl8188eu/Makefile index 8209ba2,5da95c9..0000000 --- a/ptxdist/local_src/rtl8188eu/Makefile +++ b/ptxdist/local_src/rtl8188eu/Makefile @@@ -43,7 -43,6 +43,10 @@@ CONFIG_WAPI_SUPPORT = CONFIG_EFUSE_CONFIG_FILE = y CONFIG_EXT_CLK = n CONFIG_TRAFFIC_PROTECT = y ++<<<<<<< HEAD +CONFIG_LED = y ++======= ++>>>>>>> rauch/jobrechner-import-20190607 CONFIG_LOAD_PHY_PARA_FROM_FILE = y CONFIG_TXPWR_BY_RATE_EN = n CONFIG_TXPWR_LIMIT_EN = n diff --cc ptxdist/local_src/rtl8188eu/README.md index 58fbc94,58fbc94..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/README.md +++ b/ptxdist/local_src/rtl8188eu/README.md diff --cc ptxdist/local_src/rtl8188eu/core/rtw_ap.c index f75dcd0,f75dcd0..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/core/rtw_ap.c +++ b/ptxdist/local_src/rtl8188eu/core/rtw_ap.c diff --cc ptxdist/local_src/rtl8188eu/core/rtw_beamforming.c index 2ec9ba4,2ec9ba4..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/core/rtw_beamforming.c +++ b/ptxdist/local_src/rtl8188eu/core/rtw_beamforming.c diff --cc ptxdist/local_src/rtl8188eu/core/rtw_br_ext.c index 9cd8d3b,9cd8d3b..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/core/rtw_br_ext.c +++ b/ptxdist/local_src/rtl8188eu/core/rtw_br_ext.c diff --cc ptxdist/local_src/rtl8188eu/core/rtw_btcoex.c index f1a2f19,f1a2f19..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/core/rtw_btcoex.c +++ b/ptxdist/local_src/rtl8188eu/core/rtw_btcoex.c diff --cc ptxdist/local_src/rtl8188eu/core/rtw_btcoex_wifionly.c index 3dc651a,3dc651a..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/core/rtw_btcoex_wifionly.c +++ b/ptxdist/local_src/rtl8188eu/core/rtw_btcoex_wifionly.c diff --cc ptxdist/local_src/rtl8188eu/core/rtw_cmd.c index a248808,a248808..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/core/rtw_cmd.c +++ b/ptxdist/local_src/rtl8188eu/core/rtw_cmd.c diff --cc ptxdist/local_src/rtl8188eu/core/rtw_debug.c index 7aa5d57,7aa5d57..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/core/rtw_debug.c +++ b/ptxdist/local_src/rtl8188eu/core/rtw_debug.c diff --cc ptxdist/local_src/rtl8188eu/core/rtw_efuse.c index 46ffa8d,46ffa8d..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/core/rtw_efuse.c +++ b/ptxdist/local_src/rtl8188eu/core/rtw_efuse.c diff --cc ptxdist/local_src/rtl8188eu/core/rtw_ieee80211.c index 3363642,3363642..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/core/rtw_ieee80211.c +++ b/ptxdist/local_src/rtl8188eu/core/rtw_ieee80211.c diff --cc ptxdist/local_src/rtl8188eu/core/rtw_io.c index d6639ce,d6639ce..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/core/rtw_io.c +++ b/ptxdist/local_src/rtl8188eu/core/rtw_io.c diff --cc ptxdist/local_src/rtl8188eu/core/rtw_ioctl_query.c index c8a8de7,c8a8de7..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/core/rtw_ioctl_query.c +++ b/ptxdist/local_src/rtl8188eu/core/rtw_ioctl_query.c diff --cc ptxdist/local_src/rtl8188eu/core/rtw_ioctl_set.c index 9170b8c,9170b8c..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/core/rtw_ioctl_set.c +++ b/ptxdist/local_src/rtl8188eu/core/rtw_ioctl_set.c diff --cc ptxdist/local_src/rtl8188eu/core/rtw_iol.c index 44ab64c,44ab64c..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/core/rtw_iol.c +++ b/ptxdist/local_src/rtl8188eu/core/rtw_iol.c diff --cc ptxdist/local_src/rtl8188eu/core/rtw_mi.c index 327b59a,327b59a..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/core/rtw_mi.c +++ b/ptxdist/local_src/rtl8188eu/core/rtw_mi.c diff --cc ptxdist/local_src/rtl8188eu/core/rtw_mlme.c index 00eedc7,00eedc7..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/core/rtw_mlme.c +++ b/ptxdist/local_src/rtl8188eu/core/rtw_mlme.c diff --cc ptxdist/local_src/rtl8188eu/core/rtw_mp.c index eac0960,eac0960..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/core/rtw_mp.c +++ b/ptxdist/local_src/rtl8188eu/core/rtw_mp.c diff --cc ptxdist/local_src/rtl8188eu/core/rtw_odm.c index 922a7b9,922a7b9..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/core/rtw_odm.c +++ b/ptxdist/local_src/rtl8188eu/core/rtw_odm.c diff --cc ptxdist/local_src/rtl8188eu/core/rtw_p2p.c index b394135,b394135..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/core/rtw_p2p.c +++ b/ptxdist/local_src/rtl8188eu/core/rtw_p2p.c diff --cc ptxdist/local_src/rtl8188eu/core/rtw_pwrctrl.c index 5a9426b,5a9426b..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/core/rtw_pwrctrl.c +++ b/ptxdist/local_src/rtl8188eu/core/rtw_pwrctrl.c diff --cc ptxdist/local_src/rtl8188eu/core/rtw_rf.c index 1371d8a,1371d8a..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/core/rtw_rf.c +++ b/ptxdist/local_src/rtl8188eu/core/rtw_rf.c diff --cc ptxdist/local_src/rtl8188eu/core/rtw_security.c index 1c83d10,1c83d10..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/core/rtw_security.c +++ b/ptxdist/local_src/rtl8188eu/core/rtw_security.c diff --cc ptxdist/local_src/rtl8188eu/core/rtw_sreset.c index d760d8b,d760d8b..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/core/rtw_sreset.c +++ b/ptxdist/local_src/rtl8188eu/core/rtw_sreset.c diff --cc ptxdist/local_src/rtl8188eu/core/rtw_sta_mgt.c index c316874,c316874..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/core/rtw_sta_mgt.c +++ b/ptxdist/local_src/rtl8188eu/core/rtw_sta_mgt.c diff --cc ptxdist/local_src/rtl8188eu/core/rtw_tdls.c index 1725d5f,1725d5f..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/core/rtw_tdls.c +++ b/ptxdist/local_src/rtl8188eu/core/rtw_tdls.c diff --cc ptxdist/local_src/rtl8188eu/core/rtw_wlan_util.c index b0c71cb,b0c71cb..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/core/rtw_wlan_util.c +++ b/ptxdist/local_src/rtl8188eu/core/rtw_wlan_util.c diff --cc ptxdist/local_src/rtl8188eu/core/rtw_xmit.c index 1e91874,1e91874..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/core/rtw_xmit.c +++ b/ptxdist/local_src/rtl8188eu/core/rtw_xmit.c diff --cc ptxdist/local_src/rtl8188eu/dkms.conf index fabad8f,fabad8f..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/dkms.conf +++ b/ptxdist/local_src/rtl8188eu/dkms.conf diff --cc ptxdist/local_src/rtl8188eu/hal/Hal8188EPwrSeq.c index 38ca0bc,38ca0bc..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/Hal8188EPwrSeq.c +++ b/ptxdist/local_src/rtl8188eu/hal/Hal8188EPwrSeq.c diff --cc ptxdist/local_src/rtl8188eu/hal/HalEfuseMask8188E_USB.c index a86c83a,a86c83a..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/HalEfuseMask8188E_USB.c +++ b/ptxdist/local_src/rtl8188eu/hal/HalEfuseMask8188E_USB.c diff --cc ptxdist/local_src/rtl8188eu/hal/HalEfuseMask8188E_USB.h index 700d5d8,700d5d8..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/HalEfuseMask8188E_USB.h +++ b/ptxdist/local_src/rtl8188eu/hal/HalEfuseMask8188E_USB.h diff --cc ptxdist/local_src/rtl8188eu/hal/HalPwrSeqCmd.c index c42e44e,c42e44e..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/HalPwrSeqCmd.c +++ b/ptxdist/local_src/rtl8188eu/hal/HalPwrSeqCmd.c diff --cc ptxdist/local_src/rtl8188eu/hal/btc/halbtcoutsrc.h index 0f25098,0f25098..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/btc/halbtcoutsrc.h +++ b/ptxdist/local_src/rtl8188eu/hal/btc/halbtcoutsrc.h diff --cc ptxdist/local_src/rtl8188eu/hal/btc/mp_precomp.h index 17412fd,17412fd..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/btc/mp_precomp.h +++ b/ptxdist/local_src/rtl8188eu/hal/btc/mp_precomp.h diff --cc ptxdist/local_src/rtl8188eu/hal/efuse_mask.h index 0669c2e,0669c2e..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/efuse_mask.h +++ b/ptxdist/local_src/rtl8188eu/hal/efuse_mask.h diff --cc ptxdist/local_src/rtl8188eu/hal/hal8188e_s_fw.c index 23930e1,23930e1..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/hal8188e_s_fw.c +++ b/ptxdist/local_src/rtl8188eu/hal/hal8188e_s_fw.c diff --cc ptxdist/local_src/rtl8188eu/hal/hal8188e_s_fw.h index 71b0eca,71b0eca..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/hal8188e_s_fw.h +++ b/ptxdist/local_src/rtl8188eu/hal/hal8188e_s_fw.h diff --cc ptxdist/local_src/rtl8188eu/hal/hal8188e_t_fw.c index 6c5d7dd,6c5d7dd..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/hal8188e_t_fw.c +++ b/ptxdist/local_src/rtl8188eu/hal/hal8188e_t_fw.c diff --cc ptxdist/local_src/rtl8188eu/hal/hal8188e_t_fw.h index c642213,c642213..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/hal8188e_t_fw.h +++ b/ptxdist/local_src/rtl8188eu/hal/hal8188e_t_fw.h diff --cc ptxdist/local_src/rtl8188eu/hal/hal_btcoex.c index ff28b63,ff28b63..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/hal_btcoex.c +++ b/ptxdist/local_src/rtl8188eu/hal/hal_btcoex.c diff --cc ptxdist/local_src/rtl8188eu/hal/hal_btcoex_wifionly.c index 856ebd5,856ebd5..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/hal_btcoex_wifionly.c +++ b/ptxdist/local_src/rtl8188eu/hal/hal_btcoex_wifionly.c diff --cc ptxdist/local_src/rtl8188eu/hal/hal_com.c index 4e632ed,4e632ed..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/hal_com.c +++ b/ptxdist/local_src/rtl8188eu/hal/hal_com.c diff --cc ptxdist/local_src/rtl8188eu/hal/hal_com_c2h.h index 172c152,172c152..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/hal_com_c2h.h +++ b/ptxdist/local_src/rtl8188eu/hal/hal_com_c2h.h diff --cc ptxdist/local_src/rtl8188eu/hal/hal_com_phycfg.c index 5ad88c0,5ad88c0..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/hal_com_phycfg.c +++ b/ptxdist/local_src/rtl8188eu/hal/hal_com_phycfg.c diff --cc ptxdist/local_src/rtl8188eu/hal/hal_dm.c index b7dfd4f,b7dfd4f..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/hal_dm.c +++ b/ptxdist/local_src/rtl8188eu/hal/hal_dm.c diff --cc ptxdist/local_src/rtl8188eu/hal/hal_dm.h index 7f6e992,7f6e992..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/hal_dm.h +++ b/ptxdist/local_src/rtl8188eu/hal/hal_dm.h diff --cc ptxdist/local_src/rtl8188eu/hal/hal_intf.c index 9fbad0d,9fbad0d..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/hal_intf.c +++ b/ptxdist/local_src/rtl8188eu/hal/hal_intf.c diff --cc ptxdist/local_src/rtl8188eu/hal/hal_mcc.c index a564cc6,a564cc6..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/hal_mcc.c +++ b/ptxdist/local_src/rtl8188eu/hal/hal_mcc.c diff --cc ptxdist/local_src/rtl8188eu/hal/hal_mp.c index 58dd2ad,58dd2ad..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/hal_mp.c +++ b/ptxdist/local_src/rtl8188eu/hal/hal_mp.c diff --cc ptxdist/local_src/rtl8188eu/hal/hal_phy.c index 1a2385a,1a2385a..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/hal_phy.c +++ b/ptxdist/local_src/rtl8188eu/hal/hal_phy.c diff --cc ptxdist/local_src/rtl8188eu/hal/hal_usb.c index db07579,db07579..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/hal_usb.c +++ b/ptxdist/local_src/rtl8188eu/hal/hal_usb.c diff --cc ptxdist/local_src/rtl8188eu/hal/hal_usb_led.c index d777aa5,d777aa5..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/hal_usb_led.c +++ b/ptxdist/local_src/rtl8188eu/hal/hal_usb_led.c diff --cc ptxdist/local_src/rtl8188eu/hal/phydm/hal8188erateadaptive.c index 5ab0288,5ab0288..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/phydm/hal8188erateadaptive.c +++ b/ptxdist/local_src/rtl8188eu/hal/phydm/hal8188erateadaptive.c diff --cc ptxdist/local_src/rtl8188eu/hal/phydm/hal8188erateadaptive.h index 2aee71f,2aee71f..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/phydm/hal8188erateadaptive.h +++ b/ptxdist/local_src/rtl8188eu/hal/phydm/hal8188erateadaptive.h diff --cc ptxdist/local_src/rtl8188eu/hal/phydm/hal8188ereg.h index f609da8,f609da8..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/phydm/hal8188ereg.h +++ b/ptxdist/local_src/rtl8188eu/hal/phydm/hal8188ereg.h diff --cc ptxdist/local_src/rtl8188eu/hal/phydm/halhwimg.h index 3bb8856,3bb8856..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/phydm/halhwimg.h +++ b/ptxdist/local_src/rtl8188eu/hal/phydm/halhwimg.h diff --cc ptxdist/local_src/rtl8188eu/hal/phydm/halhwimg8188e_bb.c index 5f7c6ad,5f7c6ad..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/phydm/halhwimg8188e_bb.c +++ b/ptxdist/local_src/rtl8188eu/hal/phydm/halhwimg8188e_bb.c diff --cc ptxdist/local_src/rtl8188eu/hal/phydm/halhwimg8188e_bb.h index a0ad19b,a0ad19b..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/phydm/halhwimg8188e_bb.h +++ b/ptxdist/local_src/rtl8188eu/hal/phydm/halhwimg8188e_bb.h diff --cc ptxdist/local_src/rtl8188eu/hal/phydm/halhwimg8188e_mac.c index e9d3837,e9d3837..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/phydm/halhwimg8188e_mac.c +++ b/ptxdist/local_src/rtl8188eu/hal/phydm/halhwimg8188e_mac.c diff --cc ptxdist/local_src/rtl8188eu/hal/phydm/halhwimg8188e_mac.h index 40f5ab8,40f5ab8..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/phydm/halhwimg8188e_mac.h +++ b/ptxdist/local_src/rtl8188eu/hal/phydm/halhwimg8188e_mac.h diff --cc ptxdist/local_src/rtl8188eu/hal/phydm/halhwimg8188e_rf.c index da5af62,da5af62..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/phydm/halhwimg8188e_rf.c +++ b/ptxdist/local_src/rtl8188eu/hal/phydm/halhwimg8188e_rf.c diff --cc ptxdist/local_src/rtl8188eu/hal/phydm/halhwimg8188e_rf.h index 470d594,470d594..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/phydm/halhwimg8188e_rf.h +++ b/ptxdist/local_src/rtl8188eu/hal/phydm/halhwimg8188e_rf.h diff --cc ptxdist/local_src/rtl8188eu/hal/phydm/halphyrf_8188e_ce.c index 326d976,326d976..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/phydm/halphyrf_8188e_ce.c +++ b/ptxdist/local_src/rtl8188eu/hal/phydm/halphyrf_8188e_ce.c diff --cc ptxdist/local_src/rtl8188eu/hal/phydm/halphyrf_8188e_ce.h index bd40705,bd40705..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/phydm/halphyrf_8188e_ce.h +++ b/ptxdist/local_src/rtl8188eu/hal/phydm/halphyrf_8188e_ce.h diff --cc ptxdist/local_src/rtl8188eu/hal/phydm/halphyrf_ap.h index 065fe30,065fe30..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/phydm/halphyrf_ap.h +++ b/ptxdist/local_src/rtl8188eu/hal/phydm/halphyrf_ap.h diff --cc ptxdist/local_src/rtl8188eu/hal/phydm/halphyrf_ce.c index d573727,d573727..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/phydm/halphyrf_ce.c +++ b/ptxdist/local_src/rtl8188eu/hal/phydm/halphyrf_ce.c diff --cc ptxdist/local_src/rtl8188eu/hal/phydm/halphyrf_ce.h index 1287060,1287060..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/phydm/halphyrf_ce.h +++ b/ptxdist/local_src/rtl8188eu/hal/phydm/halphyrf_ce.h diff --cc ptxdist/local_src/rtl8188eu/hal/phydm/mp_precomp.h index 0b2a770,0b2a770..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/phydm/mp_precomp.h +++ b/ptxdist/local_src/rtl8188eu/hal/phydm/mp_precomp.h diff --cc ptxdist/local_src/rtl8188eu/hal/phydm/phydm.c index beab576,beab576..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/phydm/phydm.c +++ b/ptxdist/local_src/rtl8188eu/hal/phydm/phydm.c diff --cc ptxdist/local_src/rtl8188eu/hal/phydm/phydm.h index 35cde29,35cde29..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/phydm/phydm.h +++ b/ptxdist/local_src/rtl8188eu/hal/phydm/phydm.h diff --cc ptxdist/local_src/rtl8188eu/hal/phydm/phydm_acs.c index b3ae46f,b3ae46f..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_acs.c +++ b/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_acs.c diff --cc ptxdist/local_src/rtl8188eu/hal/phydm/phydm_acs.h index 29f0f79,29f0f79..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_acs.h +++ b/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_acs.h diff --cc ptxdist/local_src/rtl8188eu/hal/phydm/phydm_adaptivity.c index adfab69,adfab69..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_adaptivity.c +++ b/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_adaptivity.c diff --cc ptxdist/local_src/rtl8188eu/hal/phydm/phydm_adaptivity.h index 2a4a208,2a4a208..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_adaptivity.h +++ b/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_adaptivity.h diff --cc ptxdist/local_src/rtl8188eu/hal/phydm/phydm_adc_sampling.c index 89739a2,89739a2..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_adc_sampling.c +++ b/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_adc_sampling.c diff --cc ptxdist/local_src/rtl8188eu/hal/phydm/phydm_adc_sampling.h index 1aec843,1aec843..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_adc_sampling.h +++ b/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_adc_sampling.h diff --cc ptxdist/local_src/rtl8188eu/hal/phydm/phydm_antdect.c index 0ffd710,0ffd710..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_antdect.c +++ b/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_antdect.c diff --cc ptxdist/local_src/rtl8188eu/hal/phydm/phydm_antdect.h index fcfab48,fcfab48..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_antdect.h +++ b/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_antdect.h diff --cc ptxdist/local_src/rtl8188eu/hal/phydm/phydm_antdiv.c index 92d213b,92d213b..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_antdiv.c +++ b/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_antdiv.c diff --cc ptxdist/local_src/rtl8188eu/hal/phydm/phydm_antdiv.h index 14fc9c1,14fc9c1..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_antdiv.h +++ b/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_antdiv.h diff --cc ptxdist/local_src/rtl8188eu/hal/phydm/phydm_beamforming.h index 14a8ae8,14a8ae8..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_beamforming.h +++ b/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_beamforming.h diff --cc ptxdist/local_src/rtl8188eu/hal/phydm/phydm_ccx.c index e841749,e841749..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_ccx.c +++ b/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_ccx.c diff --cc ptxdist/local_src/rtl8188eu/hal/phydm/phydm_ccx.h index d9adf63,d9adf63..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_ccx.h +++ b/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_ccx.h diff --cc ptxdist/local_src/rtl8188eu/hal/phydm/phydm_cfotracking.c index b8782d1,b8782d1..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_cfotracking.c +++ b/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_cfotracking.c diff --cc ptxdist/local_src/rtl8188eu/hal/phydm/phydm_cfotracking.h index f59da57,f59da57..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_cfotracking.h +++ b/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_cfotracking.h diff --cc ptxdist/local_src/rtl8188eu/hal/phydm/phydm_debug.c index 81361ee,81361ee..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_debug.c +++ b/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_debug.c diff --cc ptxdist/local_src/rtl8188eu/hal/phydm/phydm_debug.h index 6611395,6611395..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_debug.h +++ b/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_debug.h diff --cc ptxdist/local_src/rtl8188eu/hal/phydm/phydm_dfs.c index 5b1f6f4,5b1f6f4..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_dfs.c +++ b/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_dfs.c diff --cc ptxdist/local_src/rtl8188eu/hal/phydm/phydm_dfs.h index b89ccea,b89ccea..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_dfs.h +++ b/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_dfs.h diff --cc ptxdist/local_src/rtl8188eu/hal/phydm/phydm_dig.c index f13f77c,f13f77c..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_dig.c +++ b/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_dig.c diff --cc ptxdist/local_src/rtl8188eu/hal/phydm/phydm_dig.h index bf76595,bf76595..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_dig.h +++ b/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_dig.h diff --cc ptxdist/local_src/rtl8188eu/hal/phydm/phydm_dynamic_rx_path.c index f68783f,f68783f..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_dynamic_rx_path.c +++ b/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_dynamic_rx_path.c diff --cc ptxdist/local_src/rtl8188eu/hal/phydm/phydm_dynamic_rx_path.h index 0502cf9,0502cf9..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_dynamic_rx_path.h +++ b/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_dynamic_rx_path.h diff --cc ptxdist/local_src/rtl8188eu/hal/phydm/phydm_dynamicbbpowersaving.c index 7544d20,7544d20..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_dynamicbbpowersaving.c +++ b/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_dynamicbbpowersaving.c diff --cc ptxdist/local_src/rtl8188eu/hal/phydm/phydm_dynamicbbpowersaving.h index fe5f156,fe5f156..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_dynamicbbpowersaving.h +++ b/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_dynamicbbpowersaving.h diff --cc ptxdist/local_src/rtl8188eu/hal/phydm/phydm_dynamictxpower.c index 6829d1b,6829d1b..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_dynamictxpower.c +++ b/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_dynamictxpower.c diff --cc ptxdist/local_src/rtl8188eu/hal/phydm/phydm_dynamictxpower.h index b8a82c5,b8a82c5..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_dynamictxpower.h +++ b/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_dynamictxpower.h diff --cc ptxdist/local_src/rtl8188eu/hal/phydm/phydm_edcaturbocheck.c index 2da41a0,2da41a0..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_edcaturbocheck.c +++ b/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_edcaturbocheck.c diff --cc ptxdist/local_src/rtl8188eu/hal/phydm/phydm_edcaturbocheck.h index 82ccd73,82ccd73..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_edcaturbocheck.h +++ b/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_edcaturbocheck.h diff --cc ptxdist/local_src/rtl8188eu/hal/phydm/phydm_features.h index 6339c4b,6339c4b..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_features.h +++ b/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_features.h diff --cc ptxdist/local_src/rtl8188eu/hal/phydm/phydm_hwconfig.c index 7e89c48,7e89c48..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_hwconfig.c +++ b/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_hwconfig.c diff --cc ptxdist/local_src/rtl8188eu/hal/phydm/phydm_hwconfig.h index b1964a1,b1964a1..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_hwconfig.h +++ b/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_hwconfig.h diff --cc ptxdist/local_src/rtl8188eu/hal/phydm/phydm_interface.c index e4a18e5,e4a18e5..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_interface.c +++ b/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_interface.c diff --cc ptxdist/local_src/rtl8188eu/hal/phydm/phydm_interface.h index 232da6f,232da6f..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_interface.h +++ b/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_interface.h diff --cc ptxdist/local_src/rtl8188eu/hal/phydm/phydm_iqk.h index 2c63381,2c63381..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_iqk.h +++ b/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_iqk.h diff --cc ptxdist/local_src/rtl8188eu/hal/phydm/phydm_kfree.c index 31d3311,31d3311..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_kfree.c +++ b/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_kfree.c diff --cc ptxdist/local_src/rtl8188eu/hal/phydm/phydm_kfree.h index 6de330d,6de330d..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_kfree.h +++ b/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_kfree.h diff --cc ptxdist/local_src/rtl8188eu/hal/phydm/phydm_noisemonitor.c index f9cd06f,f9cd06f..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_noisemonitor.c +++ b/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_noisemonitor.c diff --cc ptxdist/local_src/rtl8188eu/hal/phydm/phydm_noisemonitor.h index bab7cae,bab7cae..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_noisemonitor.h +++ b/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_noisemonitor.h diff --cc ptxdist/local_src/rtl8188eu/hal/phydm/phydm_pathdiv.c index 81a4901,81a4901..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_pathdiv.c +++ b/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_pathdiv.c diff --cc ptxdist/local_src/rtl8188eu/hal/phydm/phydm_pathdiv.h index 97a160d,97a160d..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_pathdiv.h +++ b/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_pathdiv.h diff --cc ptxdist/local_src/rtl8188eu/hal/phydm/phydm_powertracking_ce.c index 3f0ae11,3f0ae11..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_powertracking_ce.c +++ b/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_powertracking_ce.c diff --cc ptxdist/local_src/rtl8188eu/hal/phydm/phydm_powertracking_ce.h index ca45b6b,ca45b6b..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_powertracking_ce.h +++ b/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_powertracking_ce.h diff --cc ptxdist/local_src/rtl8188eu/hal/phydm/phydm_pre_define.h index de83ea4,de83ea4..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_pre_define.h +++ b/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_pre_define.h diff --cc ptxdist/local_src/rtl8188eu/hal/phydm/phydm_precomp.h index 7bd1d4b,7bd1d4b..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_precomp.h +++ b/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_precomp.h diff --cc ptxdist/local_src/rtl8188eu/hal/phydm/phydm_rainfo.c index dcfe419,dcfe419..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_rainfo.c +++ b/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_rainfo.c diff --cc ptxdist/local_src/rtl8188eu/hal/phydm/phydm_rainfo.h index 9eda17d,9eda17d..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_rainfo.h +++ b/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_rainfo.h diff --cc ptxdist/local_src/rtl8188eu/hal/phydm/phydm_reg.h index 1e0c230,1e0c230..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_reg.h +++ b/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_reg.h diff --cc ptxdist/local_src/rtl8188eu/hal/phydm/phydm_regconfig8188e.c index 90d6239,90d6239..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_regconfig8188e.c +++ b/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_regconfig8188e.c diff --cc ptxdist/local_src/rtl8188eu/hal/phydm/phydm_regconfig8188e.h index a530c3b,a530c3b..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_regconfig8188e.h +++ b/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_regconfig8188e.h diff --cc ptxdist/local_src/rtl8188eu/hal/phydm/phydm_regdefine11ac.h index 596b07a,596b07a..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_regdefine11ac.h +++ b/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_regdefine11ac.h diff --cc ptxdist/local_src/rtl8188eu/hal/phydm/phydm_regdefine11n.h index 90d7535,90d7535..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_regdefine11n.h +++ b/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_regdefine11n.h diff --cc ptxdist/local_src/rtl8188eu/hal/phydm/phydm_rtl8188e.c index 43f5ba1,43f5ba1..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_rtl8188e.c +++ b/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_rtl8188e.c diff --cc ptxdist/local_src/rtl8188eu/hal/phydm/phydm_rtl8188e.h index c131632,c131632..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_rtl8188e.h +++ b/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_rtl8188e.h diff --cc ptxdist/local_src/rtl8188eu/hal/phydm/phydm_types.h index f5fe639,f5fe639..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_types.h +++ b/ptxdist/local_src/rtl8188eu/hal/phydm/phydm_types.h diff --cc ptxdist/local_src/rtl8188eu/hal/phydm/rtchnlplan.c index 20c2a5d,20c2a5d..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/phydm/rtchnlplan.c +++ b/ptxdist/local_src/rtl8188eu/hal/phydm/rtchnlplan.c diff --cc ptxdist/local_src/rtl8188eu/hal/phydm/rtchnlplan.h index 5d9d049,5d9d049..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/phydm/rtchnlplan.h +++ b/ptxdist/local_src/rtl8188eu/hal/phydm/rtchnlplan.h diff --cc ptxdist/local_src/rtl8188eu/hal/phydm/txbf/halcomtxbf.h index a303e54,a303e54..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/phydm/txbf/halcomtxbf.h +++ b/ptxdist/local_src/rtl8188eu/hal/phydm/txbf/halcomtxbf.h diff --cc ptxdist/local_src/rtl8188eu/hal/phydm/txbf/haltxbfinterface.h index 4bf9502,4bf9502..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/phydm/txbf/haltxbfinterface.h +++ b/ptxdist/local_src/rtl8188eu/hal/phydm/txbf/haltxbfinterface.h diff --cc ptxdist/local_src/rtl8188eu/hal/phydm/txbf/haltxbfjaguar.h index 7c7f73e,7c7f73e..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/phydm/txbf/haltxbfjaguar.h +++ b/ptxdist/local_src/rtl8188eu/hal/phydm/txbf/haltxbfjaguar.h diff --cc ptxdist/local_src/rtl8188eu/hal/phydm/txbf/phydm_hal_txbf_api.c index 36ccbde,36ccbde..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/phydm/txbf/phydm_hal_txbf_api.c +++ b/ptxdist/local_src/rtl8188eu/hal/phydm/txbf/phydm_hal_txbf_api.c diff --cc ptxdist/local_src/rtl8188eu/hal/phydm/txbf/phydm_hal_txbf_api.h index b91a6de,b91a6de..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/phydm/txbf/phydm_hal_txbf_api.h +++ b/ptxdist/local_src/rtl8188eu/hal/phydm/txbf/phydm_hal_txbf_api.h diff --cc ptxdist/local_src/rtl8188eu/hal/phydm/version_rtl8188e.h index 0facf23,0facf23..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/phydm/version_rtl8188e.h +++ b/ptxdist/local_src/rtl8188eu/hal/phydm/version_rtl8188e.h diff --cc ptxdist/local_src/rtl8188eu/hal/rtl8188e_cmd.c index 51863cd,51863cd..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/rtl8188e_cmd.c +++ b/ptxdist/local_src/rtl8188eu/hal/rtl8188e_cmd.c diff --cc ptxdist/local_src/rtl8188eu/hal/rtl8188e_dm.c index 36a0790,36a0790..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/rtl8188e_dm.c +++ b/ptxdist/local_src/rtl8188eu/hal/rtl8188e_dm.c diff --cc ptxdist/local_src/rtl8188eu/hal/rtl8188e_hal_init.c index f039dd8,f039dd8..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/rtl8188e_hal_init.c +++ b/ptxdist/local_src/rtl8188eu/hal/rtl8188e_hal_init.c diff --cc ptxdist/local_src/rtl8188eu/hal/rtl8188e_phycfg.c index 907434c,907434c..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/rtl8188e_phycfg.c +++ b/ptxdist/local_src/rtl8188eu/hal/rtl8188e_phycfg.c diff --cc ptxdist/local_src/rtl8188eu/hal/rtl8188e_rf6052.c index b696800,b696800..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/rtl8188e_rf6052.c +++ b/ptxdist/local_src/rtl8188eu/hal/rtl8188e_rf6052.c diff --cc ptxdist/local_src/rtl8188eu/hal/rtl8188e_rxdesc.c index e6b0f77,e6b0f77..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/rtl8188e_rxdesc.c +++ b/ptxdist/local_src/rtl8188eu/hal/rtl8188e_rxdesc.c diff --cc ptxdist/local_src/rtl8188eu/hal/rtl8188e_sreset.c index 8879174,8879174..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/rtl8188e_sreset.c +++ b/ptxdist/local_src/rtl8188eu/hal/rtl8188e_sreset.c diff --cc ptxdist/local_src/rtl8188eu/hal/rtl8188e_xmit.c index cad2ac0,cad2ac0..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/rtl8188e_xmit.c +++ b/ptxdist/local_src/rtl8188eu/hal/rtl8188e_xmit.c diff --cc ptxdist/local_src/rtl8188eu/hal/rtl8188eu_led.c index d787787,d787787..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/rtl8188eu_led.c +++ b/ptxdist/local_src/rtl8188eu/hal/rtl8188eu_led.c diff --cc ptxdist/local_src/rtl8188eu/hal/rtl8188eu_recv.c index 6c2e042,6c2e042..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/rtl8188eu_recv.c +++ b/ptxdist/local_src/rtl8188eu/hal/rtl8188eu_recv.c diff --cc ptxdist/local_src/rtl8188eu/hal/rtl8188eu_xmit.c index ed9a5fa,ed9a5fa..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/rtl8188eu_xmit.c +++ b/ptxdist/local_src/rtl8188eu/hal/rtl8188eu_xmit.c diff --cc ptxdist/local_src/rtl8188eu/hal/usb_halinit.c index 3e037e5,3e037e5..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/usb_halinit.c +++ b/ptxdist/local_src/rtl8188eu/hal/usb_halinit.c diff --cc ptxdist/local_src/rtl8188eu/hal/usb_ops_linux.c index 021e737,021e737..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hal/usb_ops_linux.c +++ b/ptxdist/local_src/rtl8188eu/hal/usb_ops_linux.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/COPYING index 14f5453,14f5453..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/COPYING +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/COPYING diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/README index 94ef1a7,94ef1a7..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/README +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/README diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/Android.mk index aa9d5ba,aa9d5ba..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/Android.mk +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/Android.mk diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/ChangeLog index a8417d6,a8417d6..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/ChangeLog +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/ChangeLog diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/Makefile index d05975b,d05975b..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/Makefile +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/Makefile diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/README index a211cdd,a211cdd..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/README +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/README diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/README-WPS index 17988d4,17988d4..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/README-WPS +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/README-WPS diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/config_file.c index 11c8bf0,11c8bf0..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/config_file.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/config_file.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/config_file.h index 7111a9a,7111a9a..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/config_file.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/config_file.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/ctrl_iface.c index 195b8a7,195b8a7..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/ctrl_iface.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/ctrl_iface.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/ctrl_iface.h index c997141,c997141..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/ctrl_iface.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/ctrl_iface.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/defconfig index 47d1a6f,47d1a6f..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/defconfig +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/defconfig diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/dump_state.c index 73aa93d,73aa93d..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/dump_state.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/dump_state.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/dump_state.h index e14f08a,e14f08a..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/dump_state.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/dump_state.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/eap_register.c index bab2871,bab2871..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/eap_register.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/eap_register.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/eap_register.h index 82e7171,82e7171..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/eap_register.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/eap_register.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/eap_testing.txt index 04468c3,04468c3..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/eap_testing.txt +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/eap_testing.txt diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/hlr_auc_gw.c index 2919122,2919122..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/hlr_auc_gw.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/hlr_auc_gw.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/hlr_auc_gw.milenage_db index ecd06d7,ecd06d7..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/hlr_auc_gw.milenage_db +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/hlr_auc_gw.milenage_db diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/hostapd.8 index b4456bb,b4456bb..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/hostapd.8 +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/hostapd.8 diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/hostapd.accept index 2d2a0a2,2d2a0a2..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/hostapd.accept +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/hostapd.accept diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/hostapd.conf index 6d7263a,6d7263a..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/hostapd.conf +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/hostapd.conf diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/hostapd.deny index 1616678,1616678..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/hostapd.deny +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/hostapd.deny diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/hostapd.eap_user index ac9a5d8,ac9a5d8..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/hostapd.eap_user +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/hostapd.eap_user diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/hostapd.radius_clients index 3980427,3980427..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/hostapd.radius_clients +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/hostapd.radius_clients diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/hostapd.sim_db index 01c593d,01c593d..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/hostapd.sim_db +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/hostapd.sim_db diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/hostapd.vlan index 98254fa,98254fa..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/hostapd.vlan +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/hostapd.vlan diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/hostapd.wpa_psk index 0a9499a,0a9499a..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/hostapd.wpa_psk +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/hostapd.wpa_psk diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/hostapd_cli.1 index 218ea15,218ea15..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/hostapd_cli.1 +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/hostapd_cli.1 diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/hostapd_cli.c index a48d773,a48d773..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/hostapd_cli.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/hostapd_cli.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/logwatch/README index 3cba511,3cba511..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/logwatch/README +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/logwatch/README diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/logwatch/hostapd index 97b24ef,97b24ef..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/logwatch/hostapd +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/logwatch/hostapd diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/logwatch/hostapd.conf index 5bebe6a,5bebe6a..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/logwatch/hostapd.conf +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/logwatch/hostapd.conf diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/main.c index 7a4cfb0,7a4cfb0..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/main.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/main.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/nt_password_hash.c index 839802a,839802a..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/nt_password_hash.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/nt_password_hash.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/wired.conf index 956f8c5,956f8c5..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/wired.conf +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/hostapd/wired.conf diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/Makefile index d73a175,d73a175..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/Makefile +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/Makefile diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/Makefile index 9c41962,9c41962..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/Makefile +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/Makefile diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/accounting.c index dbfb058,dbfb058..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/accounting.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/accounting.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/accounting.h index f3d60f0,f3d60f0..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/accounting.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/accounting.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/ap_config.c index e77716b,e77716b..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/ap_config.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/ap_config.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/ap_config.h index 25720b8,25720b8..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/ap_config.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/ap_config.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/ap_drv_ops.c index 0b6836c,0b6836c..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/ap_drv_ops.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/ap_drv_ops.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/ap_drv_ops.h index 36bb826,36bb826..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/ap_drv_ops.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/ap_drv_ops.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/ap_list.c index 9b9fc9e,9b9fc9e..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/ap_list.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/ap_list.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/ap_list.h index 6df8981,6df8981..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/ap_list.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/ap_list.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/ap_mlme.c index 2b09b11,2b09b11..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/ap_mlme.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/ap_mlme.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/ap_mlme.h index c77a939,c77a939..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/ap_mlme.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/ap_mlme.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/authsrv.c index 7c87fde,7c87fde..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/authsrv.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/authsrv.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/authsrv.h index be3051e,be3051e..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/authsrv.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/authsrv.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/beacon.c index 784f134,784f134..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/beacon.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/beacon.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/beacon.h index c1510e1,c1510e1..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/beacon.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/beacon.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/ctrl_iface_ap.c index d348dc1,d348dc1..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/ctrl_iface_ap.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/ctrl_iface_ap.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/ctrl_iface_ap.h index 8690bea,8690bea..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/ctrl_iface_ap.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/ctrl_iface_ap.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/drv_callbacks.c index 02b7ecf,02b7ecf..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/drv_callbacks.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/drv_callbacks.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/hostapd.c index 4e5eb01,4e5eb01..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/hostapd.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/hostapd.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/hostapd.h index d4501a1,d4501a1..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/hostapd.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/hostapd.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/hw_features.c index 30af9d2,30af9d2..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/hw_features.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/hw_features.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/hw_features.h index 88c2322,88c2322..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/hw_features.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/hw_features.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/iapp.c index 115d91e,115d91e..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/iapp.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/iapp.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/iapp.h index 5fc01cb,5fc01cb..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/iapp.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/iapp.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/ieee802_11.c index 1fd4dab,1fd4dab..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/ieee802_11.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/ieee802_11.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/ieee802_11.h index 157198c8,157198c8..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/ieee802_11.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/ieee802_11.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/ieee802_11_auth.c index b933263,b933263..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/ieee802_11_auth.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/ieee802_11_auth.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/ieee802_11_auth.h index b2971e5,b2971e5..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/ieee802_11_auth.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/ieee802_11_auth.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/ieee802_11_ht.c index 3dce5cb,3dce5cb..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/ieee802_11_ht.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/ieee802_11_ht.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/ieee802_1x.c index ac0c127,ac0c127..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/ieee802_1x.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/ieee802_1x.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/ieee802_1x.h index 1a4d2eb,1a4d2eb..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/ieee802_1x.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/ieee802_1x.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/p2p_hostapd.c index 6f8b778,6f8b778..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/p2p_hostapd.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/p2p_hostapd.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/p2p_hostapd.h index 95b31d9,95b31d9..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/p2p_hostapd.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/p2p_hostapd.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/peerkey_auth.c index b8fa5a9,b8fa5a9..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/peerkey_auth.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/peerkey_auth.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/pmksa_cache_auth.c index 22f44b7,22f44b7..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/pmksa_cache_auth.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/pmksa_cache_auth.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/pmksa_cache_auth.h index 9628b13,9628b13..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/pmksa_cache_auth.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/pmksa_cache_auth.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/preauth_auth.c index 8e13315,8e13315..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/preauth_auth.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/preauth_auth.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/preauth_auth.h index 5348bee,5348bee..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/preauth_auth.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/preauth_auth.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/sta_info.c index e829447,e829447..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/sta_info.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/sta_info.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/sta_info.h index 9ec4fe3,9ec4fe3..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/sta_info.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/sta_info.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/tkip_countermeasures.c index 1925217,1925217..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/tkip_countermeasures.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/tkip_countermeasures.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/tkip_countermeasures.h index 5a1afce,5a1afce..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/tkip_countermeasures.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/tkip_countermeasures.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/utils.c index 0ff48ae,0ff48ae..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/utils.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/utils.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/vlan_init.c index f2f766f,f2f766f..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/vlan_init.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/vlan_init.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/vlan_init.h index 382d5de,382d5de..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/vlan_init.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/vlan_init.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/wmm.c index a6d9b89,a6d9b89..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/wmm.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/wmm.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/wmm.h index 96b04e8,96b04e8..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/wmm.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/wmm.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/wpa_auth.c index cfb2cad,cfb2cad..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/wpa_auth.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/wpa_auth.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/wpa_auth.h index b3e1ff0,b3e1ff0..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/wpa_auth.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/wpa_auth.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/wpa_auth_ft.c index 65f5f4c,65f5f4c..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/wpa_auth_ft.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/wpa_auth_ft.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/wpa_auth_glue.c index bdb3ed2,bdb3ed2..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/wpa_auth_glue.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/wpa_auth_glue.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/wpa_auth_glue.h index 79d7e05,79d7e05..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/wpa_auth_glue.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/wpa_auth_glue.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/wpa_auth_i.h index 67a5c3b,67a5c3b..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/wpa_auth_i.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/wpa_auth_i.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/wpa_auth_ie.c index 5e8d134,5e8d134..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/wpa_auth_ie.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/wpa_auth_ie.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/wpa_auth_ie.h index 61d4cb4,61d4cb4..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/wpa_auth_ie.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/wpa_auth_ie.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/wps_hostapd.c index fcbd89b,fcbd89b..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/wps_hostapd.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/wps_hostapd.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/wps_hostapd.h index 338a220,338a220..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/wps_hostapd.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/ap/wps_hostapd.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/common/Makefile index 9c41962,9c41962..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/common/Makefile +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/common/Makefile diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/common/defs.h index 8abec07,8abec07..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/common/defs.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/common/defs.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/common/eapol_common.h index d70e62d,d70e62d..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/common/eapol_common.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/common/eapol_common.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/common/ieee802_11_common.c index ee41b3a,ee41b3a..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/common/ieee802_11_common.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/common/ieee802_11_common.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/common/ieee802_11_common.h index 0c90fa4,0c90fa4..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/common/ieee802_11_common.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/common/ieee802_11_common.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/common/ieee802_11_defs.h index 86868c0,86868c0..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/common/ieee802_11_defs.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/common/ieee802_11_defs.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/common/privsep_commands.h index cc900be,cc900be..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/common/privsep_commands.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/common/privsep_commands.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/common/version.h index ba2d2c0,ba2d2c0..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/common/version.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/common/version.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/common/wpa_common.c index eb2745e,eb2745e..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/common/wpa_common.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/common/wpa_common.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/common/wpa_common.h index fe79cee,fe79cee..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/common/wpa_common.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/common/wpa_common.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/common/wpa_ctrl.c index 88d3a02,88d3a02..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/common/wpa_ctrl.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/common/wpa_ctrl.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/common/wpa_ctrl.h index 528cc16,528cc16..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/common/wpa_ctrl.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/common/wpa_ctrl.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/.gitignore index ee60604,ee60604..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/.gitignore +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/.gitignore diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/Makefile index 69aa16a,69aa16a..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/Makefile +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/Makefile diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/aes-cbc.c index bd74769,bd74769..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/aes-cbc.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/aes-cbc.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/aes-ctr.c index 468f877,468f877..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/aes-ctr.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/aes-ctr.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/aes-eax.c index d5c3971,d5c3971..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/aes-eax.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/aes-eax.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/aes-encblock.c index 8f35caa,8f35caa..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/aes-encblock.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/aes-encblock.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/aes-internal-dec.c index 2d32c03,2d32c03..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/aes-internal-dec.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/aes-internal-dec.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/aes-internal-enc.c index 2f19826,2f19826..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/aes-internal-enc.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/aes-internal-enc.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/aes-internal.c index 4161220,4161220..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/aes-internal.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/aes-internal.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/aes-omac1.c index f775296,f775296..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/aes-omac1.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/aes-omac1.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/aes-unwrap.c index f233ffa,f233ffa..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/aes-unwrap.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/aes-unwrap.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/aes-wrap.c index 28d0c89,28d0c89..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/aes-wrap.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/aes-wrap.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/aes.h index ba384a9,ba384a9..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/aes.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/aes.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/aes_i.h index 6b40bc7,6b40bc7..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/aes_i.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/aes_i.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/aes_wrap.h index 4b1c7b0,4b1c7b0..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/aes_wrap.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/aes_wrap.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/crypto.h index 587b5a9,587b5a9..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/crypto.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/crypto.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/crypto_cryptoapi.c index 2a8d200,2a8d200..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/crypto_cryptoapi.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/crypto_cryptoapi.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/crypto_gnutls.c index 0998cca,0998cca..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/crypto_gnutls.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/crypto_gnutls.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/crypto_internal-cipher.c index 75134f0,75134f0..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/crypto_internal-cipher.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/crypto_internal-cipher.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/crypto_internal-modexp.c index 3124742,3124742..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/crypto_internal-modexp.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/crypto_internal-modexp.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/crypto_internal-rsa.c index 205042c,205042c..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/crypto_internal-rsa.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/crypto_internal-rsa.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/crypto_internal.c index 8fdba65,8fdba65..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/crypto_internal.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/crypto_internal.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/crypto_libtomcrypt.c index 52b67a7,52b67a7..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/crypto_libtomcrypt.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/crypto_libtomcrypt.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/crypto_none.c index 9f43775,9f43775..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/crypto_none.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/crypto_none.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/crypto_nss.c index fee4195,fee4195..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/crypto_nss.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/crypto_nss.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/crypto_openssl.c index 08c98af,08c98af..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/crypto_openssl.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/crypto_openssl.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/des-internal.c index ccea950,ccea950..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/des-internal.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/des-internal.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/des_i.h index 6f27414,6f27414..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/des_i.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/des_i.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/dh_group5.c index 8c475bf,8c475bf..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/dh_group5.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/dh_group5.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/dh_group5.h index 595f111,595f111..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/dh_group5.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/dh_group5.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/dh_groups.c index e5b7d4c,e5b7d4c..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/dh_groups.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/dh_groups.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/dh_groups.h index 5c61539,5c61539..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/dh_groups.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/dh_groups.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/fips_prf_cryptoapi.c index 17d3116,17d3116..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/fips_prf_cryptoapi.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/fips_prf_cryptoapi.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/fips_prf_gnutls.c index f742e98,f742e98..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/fips_prf_gnutls.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/fips_prf_gnutls.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/fips_prf_internal.c index a85cb14,a85cb14..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/fips_prf_internal.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/fips_prf_internal.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/fips_prf_nss.c index f941983,f941983..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/fips_prf_nss.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/fips_prf_nss.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/fips_prf_openssl.c index d0af983,d0af983..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/fips_prf_openssl.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/fips_prf_openssl.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/md4-internal.c index d9f499f,d9f499f..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/md4-internal.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/md4-internal.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/md5-internal.c index 05f4fc2,05f4fc2..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/md5-internal.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/md5-internal.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/md5-non-fips.c index 6f29201,6f29201..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/md5-non-fips.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/md5-non-fips.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/md5.c index 7f14e9b,7f14e9b..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/md5.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/md5.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/md5.h index 8952590,8952590..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/md5.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/md5.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/md5_i.h index b7f6596,b7f6596..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/md5_i.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/md5_i.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/milenage.c index cf0c60e,cf0c60e..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/milenage.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/milenage.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/milenage.h index d5054d6,d5054d6..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/milenage.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/milenage.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/ms_funcs.c index dae15ab,dae15ab..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/ms_funcs.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/ms_funcs.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/ms_funcs.h index 298dbcf,298dbcf..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/ms_funcs.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/ms_funcs.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/random.c index a30afde,a30afde..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/random.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/random.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/random.h index 5dabd2b,5dabd2b..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/random.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/random.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/rc4.c index 5ab1be1,5ab1be1..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/rc4.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/rc4.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/sha1-internal.c index 3f05ca1,3f05ca1..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/sha1-internal.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/sha1-internal.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/sha1-pbkdf2.c index 11323de,11323de..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/sha1-pbkdf2.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/sha1-pbkdf2.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/sha1-tlsprf.c index 2c8c029,2c8c029..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/sha1-tlsprf.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/sha1-tlsprf.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/sha1-tprf.c index 4a80e96,4a80e96..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/sha1-tprf.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/sha1-tprf.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/sha1.c index fe00bdb,fe00bdb..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/sha1.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/sha1.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/sha1.h index c1a6233,c1a6233..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/sha1.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/sha1.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/sha1_i.h index ec2f82f,ec2f82f..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/sha1_i.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/sha1_i.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/sha256-internal.c index b061373,b061373..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/sha256-internal.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/sha256-internal.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/sha256.c index 7f320f9,7f320f9..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/sha256.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/sha256.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/sha256.h index dc597f0,dc597f0..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/sha256.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/sha256.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/tls.h index 0928b5b,0928b5b..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/tls.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/tls.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/tls_gnutls.c index c3a7358,c3a7358..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/tls_gnutls.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/tls_gnutls.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/tls_internal.c index 64124d8,64124d8..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/tls_internal.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/tls_internal.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/tls_none.c index 0c836bb,0c836bb..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/tls_none.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/tls_none.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/tls_nss.c index ad834b6,ad834b6..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/tls_nss.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/tls_nss.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/tls_openssl.c index bf92a11,bf92a11..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/tls_openssl.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/tls_openssl.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/tls_schannel.c index 4a94e99,4a94e99..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/tls_schannel.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/crypto/tls_schannel.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/.gitignore index 1d9e0e6,1d9e0e6..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/.gitignore +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/.gitignore diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/Apple80211.h index 2a612e7,2a612e7..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/Apple80211.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/Apple80211.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/Makefile index 07600e5,07600e5..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/Makefile +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/Makefile diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/MobileApple80211.c index ce004fe,ce004fe..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/MobileApple80211.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/MobileApple80211.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/MobileApple80211.h index 64d439d,64d439d..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/MobileApple80211.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/MobileApple80211.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/driver.h index 8efd697,8efd697..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/driver.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/driver.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/driver_atheros.c index 6ac1cea,6ac1cea..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/driver_atheros.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/driver_atheros.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/driver_broadcom.c index cb88543,cb88543..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/driver_broadcom.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/driver_broadcom.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/driver_bsd.c index 1b52865,1b52865..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/driver_bsd.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/driver_bsd.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/driver_hostap.c index e855c1b,e855c1b..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/driver_hostap.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/driver_hostap.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/driver_hostap.h index 66b2bb3,66b2bb3..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/driver_hostap.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/driver_hostap.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/driver_iphone.m index 8213fda,8213fda..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/driver_iphone.m +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/driver_iphone.m diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/driver_madwifi.c index 630fbf4,630fbf4..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/driver_madwifi.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/driver_madwifi.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/driver_ndis.c index aeb7304,aeb7304..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/driver_ndis.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/driver_ndis.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/driver_ndis.h index f263f0e,f263f0e..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/driver_ndis.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/driver_ndis.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/driver_ndis_.c index 4bee9aa,4bee9aa..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/driver_ndis_.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/driver_ndis_.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/driver_nl80211.c index 90b3f20,90b3f20..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/driver_nl80211.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/driver_nl80211.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/driver_none.c index aaeacd6,aaeacd6..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/driver_none.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/driver_none.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/driver_osx.m index 69ca4b5,69ca4b5..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/driver_osx.m +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/driver_osx.m diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/driver_privsep.c index 2848521,2848521..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/driver_privsep.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/driver_privsep.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/driver_ralink.c index a1e27be,a1e27be..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/driver_ralink.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/driver_ralink.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/driver_ralink.h index d13df28,d13df28..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/driver_ralink.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/driver_ralink.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/driver_roboswitch.c index c014b96,c014b96..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/driver_roboswitch.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/driver_roboswitch.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/driver_rtl.h index efcd38f,efcd38f..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/driver_rtl.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/driver_rtl.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/driver_rtw.c index e683e6d,e683e6d..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/driver_rtw.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/driver_rtw.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/driver_test.c index 6bfa46d,6bfa46d..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/driver_test.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/driver_test.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/driver_wext.c index d9f12bc,d9f12bc..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/driver_wext.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/driver_wext.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/driver_wext.h index 89c13eb,89c13eb..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/driver_wext.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/driver_wext.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/driver_wired.c index 618db26,618db26..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/driver_wired.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/driver_wired.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/drivers.c index 2d29452,2d29452..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/drivers.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/drivers.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/drivers.mak index 98d4079,98d4079..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/drivers.mak +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/drivers.mak diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/drivers.mk index c690e1c,c690e1c..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/drivers.mk +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/drivers.mk diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/linux_ioctl.c index 0d6cf54,0d6cf54..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/linux_ioctl.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/linux_ioctl.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/linux_ioctl.h index a555738,a555738..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/linux_ioctl.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/linux_ioctl.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/ndis_events.c index f6eaa7c,f6eaa7c..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/ndis_events.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/ndis_events.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/netlink.c index ad15b1d,ad15b1d..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/netlink.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/netlink.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/netlink.h index ccf12a5,ccf12a5..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/netlink.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/netlink.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/nl80211_copy.h index 7483a89,7483a89..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/nl80211_copy.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/nl80211_copy.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/priv_netlink.h index 23eff83,23eff83..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/priv_netlink.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/priv_netlink.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/rfkill.c index 8818311,8818311..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/rfkill.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/rfkill.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/rfkill.h index 7a984a6,7a984a6..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/rfkill.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/rfkill.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/wireless_copy.h index 201719b,201719b..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/wireless_copy.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/drivers/wireless_copy.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_common/Makefile index 9c41962,9c41962..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_common/Makefile +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_common/Makefile diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_common/chap.c index 60bfc1c,60bfc1c..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_common/chap.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_common/chap.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_common/chap.h index b9c400c,b9c400c..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_common/chap.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_common/chap.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_common/eap_common.c index 4afa1dd,4afa1dd..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_common/eap_common.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_common/eap_common.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_common/eap_common.h index b95e76b,b95e76b..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_common/eap_common.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_common/eap_common.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_common/eap_defs.h index 3035301,3035301..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_common/eap_defs.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_common/eap_defs.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_common/eap_fast_common.c index 4de34a8,4de34a8..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_common/eap_fast_common.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_common/eap_fast_common.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_common/eap_fast_common.h index c85fd37,c85fd37..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_common/eap_fast_common.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_common/eap_fast_common.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_common/eap_gpsk_common.c index 4076262,4076262..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_common/eap_gpsk_common.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_common/eap_gpsk_common.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_common/eap_gpsk_common.h index a30ab97,a30ab97..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_common/eap_gpsk_common.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_common/eap_gpsk_common.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_common/eap_ikev2_common.c index e9a9c55,e9a9c55..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_common/eap_ikev2_common.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_common/eap_ikev2_common.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_common/eap_ikev2_common.h index a9fc2ca,a9fc2ca..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_common/eap_ikev2_common.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_common/eap_ikev2_common.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_common/eap_pax_common.c index 32dc80c,32dc80c..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_common/eap_pax_common.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_common/eap_pax_common.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_common/eap_pax_common.h index dcc171e,dcc171e..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_common/eap_pax_common.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_common/eap_pax_common.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_common/eap_peap_common.c index 3a64b8e,3a64b8e..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_common/eap_peap_common.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_common/eap_peap_common.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_common/eap_peap_common.h index f59afb0,f59afb0..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_common/eap_peap_common.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_common/eap_peap_common.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_common/eap_psk_common.c index 7417d5c,7417d5c..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_common/eap_psk_common.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_common/eap_psk_common.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_common/eap_psk_common.h index 8adc054,8adc054..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_common/eap_psk_common.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_common/eap_psk_common.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_common/eap_pwd_common.c index c24b146,c24b146..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_common/eap_pwd_common.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_common/eap_pwd_common.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_common/eap_pwd_common.h index 971386d,971386d..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_common/eap_pwd_common.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_common/eap_pwd_common.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_common/eap_sake_common.c index 9002b0c,9002b0c..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_common/eap_sake_common.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_common/eap_sake_common.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_common/eap_sake_common.h index 201e207,201e207..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_common/eap_sake_common.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_common/eap_sake_common.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_common/eap_sim_common.c index 0b37b0b,0b37b0b..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_common/eap_sim_common.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_common/eap_sim_common.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_common/eap_sim_common.h index 48c8eaa,48c8eaa..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_common/eap_sim_common.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_common/eap_sim_common.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_common/eap_tlv_common.h index f86015d,f86015d..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_common/eap_tlv_common.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_common/eap_tlv_common.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_common/eap_ttls.h index 797d084,797d084..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_common/eap_ttls.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_common/eap_ttls.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_common/eap_wsc_common.c index 5d4e8cc,5d4e8cc..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_common/eap_wsc_common.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_common/eap_wsc_common.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_common/eap_wsc_common.h index fdf61d3,fdf61d3..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_common/eap_wsc_common.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_common/eap_wsc_common.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_common/ikev2_common.c index 003c288,003c288..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_common/ikev2_common.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_common/ikev2_common.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_common/ikev2_common.h index c96a070,c96a070..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_common/ikev2_common.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_common/ikev2_common.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/Makefile index 3651056,3651056..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/Makefile +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/Makefile diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/eap.c index 8a9826f,8a9826f..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/eap.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/eap.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/eap.h index 3550909,3550909..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/eap.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/eap.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/eap_aka.c index 182f01a,182f01a..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/eap_aka.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/eap_aka.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/eap_config.h index b64b68f,b64b68f..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/eap_config.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/eap_config.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/eap_fast.c index 5d3e69d,5d3e69d..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/eap_fast.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/eap_fast.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/eap_fast_pac.c index 4037288,4037288..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/eap_fast_pac.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/eap_fast_pac.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/eap_fast_pac.h index 9483f96,9483f96..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/eap_fast_pac.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/eap_fast_pac.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/eap_gpsk.c index 5037c60,5037c60..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/eap_gpsk.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/eap_gpsk.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/eap_gtc.c index b2b554b,b2b554b..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/eap_gtc.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/eap_gtc.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/eap_i.h index afca611,afca611..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/eap_i.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/eap_i.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/eap_ikev2.c index bb49a66,bb49a66..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/eap_ikev2.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/eap_ikev2.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/eap_leap.c index 6a8efcd,6a8efcd..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/eap_leap.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/eap_leap.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/eap_md5.c index 0edbae8,0edbae8..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/eap_md5.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/eap_md5.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/eap_methods.c index 3b0af05,3b0af05..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/eap_methods.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/eap_methods.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/eap_methods.h index 4330b57,4330b57..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/eap_methods.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/eap_methods.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/eap_mschapv2.c index 321e9f7,321e9f7..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/eap_mschapv2.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/eap_mschapv2.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/eap_otp.c index 556c22f,556c22f..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/eap_otp.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/eap_otp.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/eap_pax.c index d42a7f8,d42a7f8..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/eap_pax.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/eap_pax.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/eap_peap.c index 2b72084,2b72084..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/eap_peap.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/eap_peap.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/eap_psk.c index 592ef13,592ef13..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/eap_psk.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/eap_psk.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/eap_pwd.c index e4705b7,e4705b7..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/eap_pwd.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/eap_pwd.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/eap_sake.c index 1474b7f,1474b7f..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/eap_sake.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/eap_sake.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/eap_sim.c index 6677063,6677063..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/eap_sim.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/eap_sim.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/eap_tls.c index 20b2212,20b2212..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/eap_tls.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/eap_tls.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/eap_tls_common.c index d1567e9,d1567e9..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/eap_tls_common.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/eap_tls_common.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/eap_tls_common.h index e9e0998,e9e0998..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/eap_tls_common.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/eap_tls_common.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/eap_tnc.c index 6c95f72,6c95f72..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/eap_tnc.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/eap_tnc.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/eap_ttls.c index e8f0f38,e8f0f38..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/eap_ttls.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/eap_ttls.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/eap_vendor_test.c index 3e114c1,3e114c1..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/eap_vendor_test.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/eap_vendor_test.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/eap_wsc.c index 09d8a1c,09d8a1c..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/eap_wsc.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/eap_wsc.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/ikev2.c index 1e169a0,1e169a0..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/ikev2.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/ikev2.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/ikev2.h index 9ca0ca5,9ca0ca5..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/ikev2.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/ikev2.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/mschapv2.c index b8fb075,b8fb075..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/mschapv2.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/mschapv2.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/mschapv2.h index 90dad31,90dad31..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/mschapv2.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/mschapv2.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/tncc.c index a70d70c,a70d70c..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/tncc.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/tncc.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/tncc.h index 4d42a05,4d42a05..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/tncc.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_peer/tncc.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/Makefile index 9c41962,9c41962..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/Makefile +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/Makefile diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/eap.h index 6b29075,6b29075..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/eap.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/eap.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/eap_i.h index daac746,daac746..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/eap_i.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/eap_i.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/eap_methods.h index 4a5296e,4a5296e..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/eap_methods.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/eap_methods.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/eap_server.c index 41416b1,41416b1..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/eap_server.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/eap_server.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/eap_server_aka.c index 42cbdce,42cbdce..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/eap_server_aka.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/eap_server_aka.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/eap_server_fast.c index ba17e98,ba17e98..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/eap_server_fast.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/eap_server_fast.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/eap_server_gpsk.c index a794806,a794806..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/eap_server_gpsk.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/eap_server_gpsk.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/eap_server_gtc.c index 79b9696,79b9696..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/eap_server_gtc.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/eap_server_gtc.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/eap_server_identity.c index cd8da2a,cd8da2a..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/eap_server_identity.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/eap_server_identity.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/eap_server_ikev2.c index ec4fa87,ec4fa87..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/eap_server_ikev2.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/eap_server_ikev2.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/eap_server_md5.c index d03ec53,d03ec53..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/eap_server_md5.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/eap_server_md5.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/eap_server_methods.c index 900a5dd,900a5dd..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/eap_server_methods.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/eap_server_methods.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/eap_server_mschapv2.c index 64120a4,64120a4..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/eap_server_mschapv2.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/eap_server_mschapv2.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/eap_server_pax.c index 4d64269,4d64269..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/eap_server_pax.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/eap_server_pax.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/eap_server_peap.c index 8a7d626,8a7d626..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/eap_server_peap.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/eap_server_peap.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/eap_server_psk.c index efc7a82,efc7a82..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/eap_server_psk.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/eap_server_psk.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/eap_server_pwd.c index dd2557a,dd2557a..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/eap_server_pwd.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/eap_server_pwd.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/eap_server_sake.c index a9b515f,a9b515f..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/eap_server_sake.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/eap_server_sake.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/eap_server_sim.c index 29df2ff,29df2ff..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/eap_server_sim.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/eap_server_sim.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/eap_server_tls.c index c98fa18,c98fa18..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/eap_server_tls.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/eap_server_tls.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/eap_server_tls_common.c index e149ee3,e149ee3..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/eap_server_tls_common.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/eap_server_tls_common.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/eap_server_tnc.c index a2d6f17,a2d6f17..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/eap_server_tnc.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/eap_server_tnc.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/eap_server_ttls.c index 702c50c,702c50c..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/eap_server_ttls.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/eap_server_ttls.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/eap_server_vendor_test.c index 0dd0aca,0dd0aca..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/eap_server_vendor_test.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/eap_server_vendor_test.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/eap_server_wsc.c index e944a4d,e944a4d..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/eap_server_wsc.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/eap_server_wsc.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/eap_sim_db.c index 248b216,248b216..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/eap_sim_db.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/eap_sim_db.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/eap_sim_db.h index ab89ae9,ab89ae9..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/eap_sim_db.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/eap_sim_db.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/eap_tls_common.h index c34c401,c34c401..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/eap_tls_common.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/eap_tls_common.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/ikev2.c index 9624d53,9624d53..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/ikev2.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/ikev2.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/ikev2.h index 8349fbe,8349fbe..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/ikev2.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/ikev2.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/tncs.c index 637b6f8,637b6f8..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/tncs.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/tncs.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/tncs.h index 18a3a1f,18a3a1f..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/tncs.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eap_server/tncs.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eapol_auth/Makefile index 9c41962,9c41962..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eapol_auth/Makefile +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eapol_auth/Makefile diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eapol_auth/eapol_auth_dump.c index a0f0e8d,a0f0e8d..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eapol_auth/eapol_auth_dump.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eapol_auth/eapol_auth_dump.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eapol_auth/eapol_auth_sm.c index 841a1c5,841a1c5..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eapol_auth/eapol_auth_sm.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eapol_auth/eapol_auth_sm.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eapol_auth/eapol_auth_sm.h index 59a10b4,59a10b4..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eapol_auth/eapol_auth_sm.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eapol_auth/eapol_auth_sm.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eapol_auth/eapol_auth_sm_i.h index 1000da4,1000da4..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eapol_auth/eapol_auth_sm_i.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eapol_auth/eapol_auth_sm_i.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eapol_supp/Makefile index 9c41962,9c41962..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eapol_supp/Makefile +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eapol_supp/Makefile diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eapol_supp/eapol_supp_sm.c index 18abb4e,18abb4e..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eapol_supp/eapol_supp_sm.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eapol_supp/eapol_supp_sm.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eapol_supp/eapol_supp_sm.h index 1bdf8cd,1bdf8cd..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eapol_supp/eapol_supp_sm.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/eapol_supp/eapol_supp_sm.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/l2_packet/Makefile index 9c41962,9c41962..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/l2_packet/Makefile +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/l2_packet/Makefile diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/l2_packet/l2_packet.h index c7b5014,c7b5014..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/l2_packet/l2_packet.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/l2_packet/l2_packet.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/l2_packet/l2_packet_freebsd.c index e24277c,e24277c..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/l2_packet/l2_packet_freebsd.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/l2_packet/l2_packet_freebsd.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/l2_packet/l2_packet_linux.c index 93e15eb,93e15eb..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/l2_packet/l2_packet_linux.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/l2_packet/l2_packet_linux.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/l2_packet/l2_packet_ndis.c index 6ce29aa,6ce29aa..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/l2_packet/l2_packet_ndis.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/l2_packet/l2_packet_ndis.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/l2_packet/l2_packet_none.c index 5e3f6e9,5e3f6e9..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/l2_packet/l2_packet_none.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/l2_packet/l2_packet_none.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/l2_packet/l2_packet_pcap.c index 8156e29,8156e29..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/l2_packet/l2_packet_pcap.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/l2_packet/l2_packet_pcap.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/l2_packet/l2_packet_privsep.c index 79d2968,79d2968..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/l2_packet/l2_packet_privsep.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/l2_packet/l2_packet_privsep.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/l2_packet/l2_packet_winpcap.c index f76b386,f76b386..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/l2_packet/l2_packet_winpcap.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/l2_packet/l2_packet_winpcap.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/lib.rules index b260d25,b260d25..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/lib.rules +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/lib.rules diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/p2p/Makefile index cffba62,cffba62..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/p2p/Makefile +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/p2p/Makefile diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/p2p/p2p.c index 653609e,653609e..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/p2p/p2p.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/p2p/p2p.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/p2p/p2p.h index 954f562,954f562..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/p2p/p2p.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/p2p/p2p.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/p2p/p2p_build.c index c34db91,c34db91..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/p2p/p2p_build.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/p2p/p2p_build.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/p2p/p2p_dev_disc.c index 47cc0fd,47cc0fd..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/p2p/p2p_dev_disc.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/p2p/p2p_dev_disc.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/p2p/p2p_go_neg.c index 1c96486,1c96486..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/p2p/p2p_go_neg.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/p2p/p2p_go_neg.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/p2p/p2p_group.c index 14a475d,14a475d..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/p2p/p2p_group.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/p2p/p2p_group.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/p2p/p2p_i.h index 68b1194,68b1194..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/p2p/p2p_i.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/p2p/p2p_i.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/p2p/p2p_invitation.c index bb2767d,bb2767d..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/p2p/p2p_invitation.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/p2p/p2p_invitation.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/p2p/p2p_parse.c index 5c5445a,5c5445a..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/p2p/p2p_parse.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/p2p/p2p_parse.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/p2p/p2p_pd.c index e064216,e064216..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/p2p/p2p_pd.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/p2p/p2p_pd.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/p2p/p2p_sd.c index 926fc03,926fc03..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/p2p/p2p_sd.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/p2p/p2p_sd.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/p2p/p2p_utils.c index da4b6ed,da4b6ed..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/p2p/p2p_utils.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/p2p/p2p_utils.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/radius/.gitignore index a89a1f9,a89a1f9..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/radius/.gitignore +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/radius/.gitignore diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/radius/Makefile index b199be8,b199be8..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/radius/Makefile +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/radius/Makefile diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/radius/radius.c index 70754ef,70754ef..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/radius/radius.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/radius/radius.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/radius/radius.h index a3cdac0,a3cdac0..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/radius/radius.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/radius/radius.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/radius/radius_client.c index 691f77a,691f77a..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/radius/radius_client.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/radius/radius_client.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/radius/radius_client.h index 18e7290,18e7290..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/radius/radius_client.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/radius/radius_client.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/radius/radius_server.c index 6f1c3a5,6f1c3a5..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/radius/radius_server.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/radius/radius_server.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/radius/radius_server.h index 126e314,126e314..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/radius/radius_server.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/radius/radius_server.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/rsn_supp/Makefile index 9c41962,9c41962..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/rsn_supp/Makefile +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/rsn_supp/Makefile diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/rsn_supp/peerkey.c index 2b3332e,2b3332e..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/rsn_supp/peerkey.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/rsn_supp/peerkey.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/rsn_supp/peerkey.h index 2613127,2613127..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/rsn_supp/peerkey.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/rsn_supp/peerkey.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/rsn_supp/pmksa_cache.c index cac8c83,cac8c83..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/rsn_supp/pmksa_cache.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/rsn_supp/pmksa_cache.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/rsn_supp/pmksa_cache.h index a1447e5,a1447e5..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/rsn_supp/pmksa_cache.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/rsn_supp/pmksa_cache.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/rsn_supp/preauth.c index 6109f5e,6109f5e..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/rsn_supp/preauth.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/rsn_supp/preauth.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/rsn_supp/preauth.h index f8240ab,f8240ab..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/rsn_supp/preauth.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/rsn_supp/preauth.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/rsn_supp/tdls.c index e751867,e751867..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/rsn_supp/tdls.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/rsn_supp/tdls.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/rsn_supp/wpa.c index 01a46dc,01a46dc..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/rsn_supp/wpa.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/rsn_supp/wpa.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/rsn_supp/wpa.h index 111597c,111597c..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/rsn_supp/wpa.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/rsn_supp/wpa.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/rsn_supp/wpa_ft.c index da6e966,da6e966..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/rsn_supp/wpa_ft.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/rsn_supp/wpa_ft.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/rsn_supp/wpa_i.h index 09a2e4f,09a2e4f..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/rsn_supp/wpa_i.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/rsn_supp/wpa_i.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/rsn_supp/wpa_ie.c index 654cc1f,654cc1f..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/rsn_supp/wpa_ie.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/rsn_supp/wpa_ie.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/rsn_supp/wpa_ie.h index f939b13,f939b13..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/rsn_supp/wpa_ie.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/rsn_supp/wpa_ie.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/.gitignore index d43242d,d43242d..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/.gitignore +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/.gitignore diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/Makefile index a2da096,a2da096..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/Makefile +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/Makefile diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/asn1.c index 3391245,3391245..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/asn1.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/asn1.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/asn1.h index 2ff571e,2ff571e..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/asn1.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/asn1.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/bignum.c index 5c0fc62,5c0fc62..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/bignum.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/bignum.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/bignum.h index f25e267,f25e267..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/bignum.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/bignum.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/libtommath.c index 2b23f30,2b23f30..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/libtommath.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/libtommath.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/pkcs1.c index 72ebd87,72ebd87..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/pkcs1.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/pkcs1.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/pkcs1.h index 68872b1,68872b1..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/pkcs1.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/pkcs1.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/pkcs5.c index 4291b84,4291b84..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/pkcs5.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/pkcs5.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/pkcs5.h index 6ed3923,6ed3923..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/pkcs5.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/pkcs5.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/pkcs8.c index 69ab262,69ab262..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/pkcs8.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/pkcs8.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/pkcs8.h index dac517c,dac517c..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/pkcs8.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/pkcs8.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/rsa.c index 3084adc,3084adc..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/rsa.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/rsa.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/rsa.h index ac50dfd,ac50dfd..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/rsa.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/rsa.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/tlsv1_client.c index afb6031,afb6031..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/tlsv1_client.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/tlsv1_client.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/tlsv1_client.h index 16ad57d,16ad57d..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/tlsv1_client.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/tlsv1_client.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/tlsv1_client_i.h index 7fe179f,7fe179f..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/tlsv1_client_i.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/tlsv1_client_i.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/tlsv1_client_read.c index ed3f260,ed3f260..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/tlsv1_client_read.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/tlsv1_client_read.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/tlsv1_client_write.c index 0898df9,0898df9..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/tlsv1_client_write.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/tlsv1_client_write.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/tlsv1_common.c index 2f9dd0f,2f9dd0f..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/tlsv1_common.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/tlsv1_common.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/tlsv1_common.h index 763a4af,763a4af..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/tlsv1_common.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/tlsv1_common.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/tlsv1_cred.c index aa467ef,aa467ef..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/tlsv1_cred.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/tlsv1_cred.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/tlsv1_cred.h index 8425fe4,8425fe4..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/tlsv1_cred.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/tlsv1_cred.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/tlsv1_record.c index e811f0e,e811f0e..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/tlsv1_record.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/tlsv1_record.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/tlsv1_record.h index 9c7c0a4,9c7c0a4..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/tlsv1_record.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/tlsv1_record.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/tlsv1_server.c index 6a61235,6a61235..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/tlsv1_server.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/tlsv1_server.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/tlsv1_server.h index 00c536c,00c536c..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/tlsv1_server.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/tlsv1_server.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/tlsv1_server_i.h index d11ea75,d11ea75..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/tlsv1_server_i.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/tlsv1_server_i.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/tlsv1_server_read.c index 49e811f,49e811f..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/tlsv1_server_read.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/tlsv1_server_read.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/tlsv1_server_write.c index e89e52e,e89e52e..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/tlsv1_server_write.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/tlsv1_server_write.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/x509v3.c index bc93df6,bc93df6..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/x509v3.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/x509v3.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/x509v3.h index 37292d7,37292d7..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/x509v3.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/tls/x509v3.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/.gitignore index 833734f,833734f..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/.gitignore +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/.gitignore diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/Makefile index 0f1f191,0f1f191..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/Makefile +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/Makefile diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/base64.c index 155bfce,155bfce..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/base64.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/base64.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/base64.h index b87a168,b87a168..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/base64.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/base64.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/build_config.h index 3666778,3666778..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/build_config.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/build_config.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/common.c index 89eca1c,89eca1c..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/common.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/common.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/common.h index 14ab297,14ab297..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/common.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/common.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/edit.c index 8f9e4ed,8f9e4ed..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/edit.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/edit.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/edit.h index fc4474b,fc4474b..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/edit.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/edit.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/edit_readline.c index 1fef7b9,1fef7b9..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/edit_readline.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/edit_readline.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/edit_simple.c index 61fb24e,61fb24e..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/edit_simple.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/edit_simple.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/eloop.c index b550c63,b550c63..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/eloop.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/eloop.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/eloop.h index 1228f24,1228f24..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/eloop.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/eloop.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/eloop_none.c index 18eae4e,18eae4e..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/eloop_none.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/eloop_none.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/eloop_win.c index c726ece,c726ece..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/eloop_win.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/eloop_win.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/includes.h index 63b5c23,63b5c23..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/includes.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/includes.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/ip_addr.c index 158fd57,158fd57..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/ip_addr.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/ip_addr.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/ip_addr.h index 28ccaef,28ccaef..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/ip_addr.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/ip_addr.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/list.h index ded7846,ded7846..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/list.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/list.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/os.h index f4723d8,f4723d8..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/os.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/os.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/os_internal.c index 5260e23,5260e23..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/os_internal.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/os_internal.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/os_none.c index bab8f17,bab8f17..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/os_none.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/os_none.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/os_unix.c index 4e11758,4e11758..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/os_unix.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/os_unix.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/os_win32.c index 0740964,0740964..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/os_win32.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/os_win32.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/pcsc_funcs.c index bf9f04a,bf9f04a..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/pcsc_funcs.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/pcsc_funcs.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/pcsc_funcs.h index 543f7c5,543f7c5..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/pcsc_funcs.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/pcsc_funcs.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/radiotap.c index 804473f,804473f..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/radiotap.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/radiotap.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/radiotap.h index 508264c,508264c..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/radiotap.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/radiotap.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/radiotap_iter.h index 92a798a,92a798a..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/radiotap_iter.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/radiotap_iter.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/state_machine.h index 31f6672,31f6672..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/state_machine.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/state_machine.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/trace.c index bb3eb24,bb3eb24..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/trace.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/trace.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/trace.h index 22d3de0,22d3de0..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/trace.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/trace.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/uuid.c index d8cc267,d8cc267..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/uuid.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/uuid.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/uuid.h index 0759165,0759165..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/uuid.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/uuid.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/wpa_debug.c index b8c5e2f,b8c5e2f..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/wpa_debug.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/wpa_debug.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/wpa_debug.h index ae36afe,ae36afe..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/wpa_debug.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/wpa_debug.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/wpabuf.c index eda779e,eda779e..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/wpabuf.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/wpabuf.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/wpabuf.h index cccfcc8,cccfcc8..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/wpabuf.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/utils/wpabuf.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/Makefile index 9c41962,9c41962..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/Makefile +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/Makefile diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/http.h index 2fee3a8,2fee3a8..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/http.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/http.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/http_client.c index 9b53b80,9b53b80..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/http_client.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/http_client.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/http_client.h index 924d6ab,924d6ab..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/http_client.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/http_client.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/http_server.c index 356f599,356f599..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/http_server.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/http_server.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/http_server.h index 219941c,219941c..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/http_server.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/http_server.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/httpread.c index 40422e4,40422e4..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/httpread.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/httpread.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/httpread.h index 51aa214,51aa214..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/httpread.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/httpread.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/ndef.c index 9baec7f,9baec7f..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/ndef.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/ndef.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/upnp_xml.c index b1b1e2b,b1b1e2b..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/upnp_xml.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/upnp_xml.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/upnp_xml.h index 62dbe60,62dbe60..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/upnp_xml.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/upnp_xml.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/wps.c index 7564d60,7564d60..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/wps.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/wps.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/wps.h index 918273d,918273d..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/wps.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/wps.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/wps_attr_build.c index d2ca31a,d2ca31a..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/wps_attr_build.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/wps_attr_build.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/wps_attr_parse.c index 7b462d3,7b462d3..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/wps_attr_parse.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/wps_attr_parse.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/wps_attr_process.c index 07e087d,07e087d..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/wps_attr_process.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/wps_attr_process.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/wps_common.c index 5d0508c,5d0508c..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/wps_common.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/wps_common.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/wps_defs.h index 43311f3,43311f3..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/wps_defs.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/wps_defs.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/wps_dev_attr.c index f2fb03a,f2fb03a..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/wps_dev_attr.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/wps_dev_attr.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/wps_dev_attr.h index f26a05b,f26a05b..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/wps_dev_attr.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/wps_dev_attr.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/wps_enrollee.c index 390254e,390254e..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/wps_enrollee.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/wps_enrollee.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/wps_er.c index a461836,a461836..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/wps_er.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/wps_er.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/wps_er.h index 5388ed1,5388ed1..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/wps_er.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/wps_er.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/wps_er_ssdp.c index 83de9ad,83de9ad..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/wps_er_ssdp.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/wps_er_ssdp.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/wps_i.h index 437999b,437999b..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/wps_i.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/wps_i.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/wps_nfc.c index ff12000,ff12000..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/wps_nfc.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/wps_nfc.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/wps_nfc_pn531.c index 7e05e4d,7e05e4d..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/wps_nfc_pn531.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/wps_nfc_pn531.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/wps_registrar.c index 65ff40d,65ff40d..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/wps_registrar.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/wps_registrar.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/wps_ufd.c index 1a911e1,1a911e1..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/wps_ufd.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/wps_ufd.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/wps_upnp.c index 763dcaf,763dcaf..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/wps_upnp.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/wps_upnp.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/wps_upnp.h index 87b7ab1,87b7ab1..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/wps_upnp.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/wps_upnp.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/wps_upnp_ap.c index 501ecbc,501ecbc..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/wps_upnp_ap.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/wps_upnp_ap.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/wps_upnp_event.c index 2c8ed4f,2c8ed4f..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/wps_upnp_event.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/wps_upnp_event.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/wps_upnp_i.h index 3ecf05d,3ecf05d..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/wps_upnp_i.h +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/wps_upnp_i.h diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/wps_upnp_ssdp.c index c7fb158,c7fb158..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/wps_upnp_ssdp.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/wps_upnp_ssdp.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/wps_upnp_web.c index 917f60b,917f60b..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/wps_upnp_web.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/wps_upnp_web.c diff --cc ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/wps_validate.c index c3071a0,c3071a0..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/wps_validate.c +++ b/ptxdist/local_src/rtl8188eu/hostapd-0.8/src/wps/wps_validate.c diff --cc ptxdist/local_src/rtl8188eu/include/Hal8188EPhyCfg.h index bc592b0,bc592b0..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/Hal8188EPhyCfg.h +++ b/ptxdist/local_src/rtl8188eu/include/Hal8188EPhyCfg.h diff --cc ptxdist/local_src/rtl8188eu/include/Hal8188EPhyReg.h index 9d6f0c1,9d6f0c1..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/Hal8188EPhyReg.h +++ b/ptxdist/local_src/rtl8188eu/include/Hal8188EPhyReg.h diff --cc ptxdist/local_src/rtl8188eu/include/Hal8188EPwrSeq.h index af8eace,af8eace..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/Hal8188EPwrSeq.h +++ b/ptxdist/local_src/rtl8188eu/include/Hal8188EPwrSeq.h diff --cc ptxdist/local_src/rtl8188eu/include/Hal8188FPhyCfg.h index e483d67,e483d67..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/Hal8188FPhyCfg.h +++ b/ptxdist/local_src/rtl8188eu/include/Hal8188FPhyCfg.h diff --cc ptxdist/local_src/rtl8188eu/include/Hal8188FPhyReg.h index 4127491,4127491..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/Hal8188FPhyReg.h +++ b/ptxdist/local_src/rtl8188eu/include/Hal8188FPhyReg.h diff --cc ptxdist/local_src/rtl8188eu/include/Hal8188FPwrSeq.h index 81e6132,81e6132..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/Hal8188FPwrSeq.h +++ b/ptxdist/local_src/rtl8188eu/include/Hal8188FPwrSeq.h diff --cc ptxdist/local_src/rtl8188eu/include/HalPwrSeqCmd.h index 9979545,9979545..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/HalPwrSeqCmd.h +++ b/ptxdist/local_src/rtl8188eu/include/HalPwrSeqCmd.h diff --cc ptxdist/local_src/rtl8188eu/include/HalVerDef.h index 5b7c1b5,5b7c1b5..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/HalVerDef.h +++ b/ptxdist/local_src/rtl8188eu/include/HalVerDef.h diff --cc ptxdist/local_src/rtl8188eu/include/autoconf.h index 4c14a52,75f1071..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/autoconf.h +++ b/ptxdist/local_src/rtl8188eu/include/autoconf.h @@@ -148,7 -148,7 +148,11 @@@ #define CONFIG_SKB_COPY /* for amsdu */ ++<<<<<<< HEAD +#define CONFIG_LED ++======= + /* #define CONFIG_LED */ ++>>>>>>> rauch/jobrechner-import-20190607 #ifdef CONFIG_LED #define CONFIG_SW_LED #ifdef CONFIG_SW_LED diff --cc ptxdist/local_src/rtl8188eu/include/basic_types.h index 8026062,8026062..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/basic_types.h +++ b/ptxdist/local_src/rtl8188eu/include/basic_types.h diff --cc ptxdist/local_src/rtl8188eu/include/circ_buf.h index 7831cd1,7831cd1..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/circ_buf.h +++ b/ptxdist/local_src/rtl8188eu/include/circ_buf.h diff --cc ptxdist/local_src/rtl8188eu/include/cmd_osdep.h index 9d491ac,9d491ac..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/cmd_osdep.h +++ b/ptxdist/local_src/rtl8188eu/include/cmd_osdep.h diff --cc ptxdist/local_src/rtl8188eu/include/custom_gpio.h index bc8002f,bc8002f..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/custom_gpio.h +++ b/ptxdist/local_src/rtl8188eu/include/custom_gpio.h diff --cc ptxdist/local_src/rtl8188eu/include/drv_conf.h index e7f8364,e7f8364..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/drv_conf.h +++ b/ptxdist/local_src/rtl8188eu/include/drv_conf.h diff --cc ptxdist/local_src/rtl8188eu/include/drv_types.h index 0a75f13,0a75f13..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/drv_types.h +++ b/ptxdist/local_src/rtl8188eu/include/drv_types.h diff --cc ptxdist/local_src/rtl8188eu/include/drv_types_linux.h index 8747696,8747696..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/drv_types_linux.h +++ b/ptxdist/local_src/rtl8188eu/include/drv_types_linux.h diff --cc ptxdist/local_src/rtl8188eu/include/ethernet.h index fcb8274,fcb8274..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/ethernet.h +++ b/ptxdist/local_src/rtl8188eu/include/ethernet.h diff --cc ptxdist/local_src/rtl8188eu/include/h2clbk.h index b9ff407,b9ff407..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/h2clbk.h +++ b/ptxdist/local_src/rtl8188eu/include/h2clbk.h diff --cc ptxdist/local_src/rtl8188eu/include/hal_btcoex.h index a8013f4,a8013f4..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/hal_btcoex.h +++ b/ptxdist/local_src/rtl8188eu/include/hal_btcoex.h diff --cc ptxdist/local_src/rtl8188eu/include/hal_btcoex_wifionly.h index d708411,d708411..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/hal_btcoex_wifionly.h +++ b/ptxdist/local_src/rtl8188eu/include/hal_btcoex_wifionly.h diff --cc ptxdist/local_src/rtl8188eu/include/hal_com.h index 7c4f2c5,7c4f2c5..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/hal_com.h +++ b/ptxdist/local_src/rtl8188eu/include/hal_com.h diff --cc ptxdist/local_src/rtl8188eu/include/hal_com_h2c.h index 1568122,1568122..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/hal_com_h2c.h +++ b/ptxdist/local_src/rtl8188eu/include/hal_com_h2c.h diff --cc ptxdist/local_src/rtl8188eu/include/hal_com_led.h index 9df9836,9df9836..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/hal_com_led.h +++ b/ptxdist/local_src/rtl8188eu/include/hal_com_led.h diff --cc ptxdist/local_src/rtl8188eu/include/hal_com_phycfg.h index 8354ff6,8354ff6..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/hal_com_phycfg.h +++ b/ptxdist/local_src/rtl8188eu/include/hal_com_phycfg.h diff --cc ptxdist/local_src/rtl8188eu/include/hal_com_reg.h index a4a4e04,a4a4e04..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/hal_com_reg.h +++ b/ptxdist/local_src/rtl8188eu/include/hal_com_reg.h diff --cc ptxdist/local_src/rtl8188eu/include/hal_ic_cfg.h index 57db1f2,57db1f2..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/hal_ic_cfg.h +++ b/ptxdist/local_src/rtl8188eu/include/hal_ic_cfg.h diff --cc ptxdist/local_src/rtl8188eu/include/hal_intf.h index 3975e36,3975e36..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/hal_intf.h +++ b/ptxdist/local_src/rtl8188eu/include/hal_intf.h diff --cc ptxdist/local_src/rtl8188eu/include/hal_pg.h index 7df93fa,7df93fa..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/hal_pg.h +++ b/ptxdist/local_src/rtl8188eu/include/hal_pg.h diff --cc ptxdist/local_src/rtl8188eu/include/hal_phy.h index 277f508,277f508..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/hal_phy.h +++ b/ptxdist/local_src/rtl8188eu/include/hal_phy.h diff --cc ptxdist/local_src/rtl8188eu/include/hal_phy_reg.h index 234b791,234b791..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/hal_phy_reg.h +++ b/ptxdist/local_src/rtl8188eu/include/hal_phy_reg.h diff --cc ptxdist/local_src/rtl8188eu/include/hal_sdio.h index 66878fa,66878fa..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/hal_sdio.h +++ b/ptxdist/local_src/rtl8188eu/include/hal_sdio.h diff --cc ptxdist/local_src/rtl8188eu/include/ieee80211.h index 47bb568,47bb568..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/ieee80211.h +++ b/ptxdist/local_src/rtl8188eu/include/ieee80211.h diff --cc ptxdist/local_src/rtl8188eu/include/ieee80211_ext.h index f182457,f182457..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/ieee80211_ext.h +++ b/ptxdist/local_src/rtl8188eu/include/ieee80211_ext.h diff --cc ptxdist/local_src/rtl8188eu/include/if_ether.h index ace899b,ace899b..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/if_ether.h +++ b/ptxdist/local_src/rtl8188eu/include/if_ether.h diff --cc ptxdist/local_src/rtl8188eu/include/ip.h index 8d33d42,8d33d42..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/ip.h +++ b/ptxdist/local_src/rtl8188eu/include/ip.h diff --cc ptxdist/local_src/rtl8188eu/include/linux/wireless.h index de76fe1,de76fe1..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/linux/wireless.h +++ b/ptxdist/local_src/rtl8188eu/include/linux/wireless.h diff --cc ptxdist/local_src/rtl8188eu/include/mlme_osdep.h index 21a90bf,21a90bf..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/mlme_osdep.h +++ b/ptxdist/local_src/rtl8188eu/include/mlme_osdep.h diff --cc ptxdist/local_src/rtl8188eu/include/mp_custom_oid.h index c21591c,c21591c..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/mp_custom_oid.h +++ b/ptxdist/local_src/rtl8188eu/include/mp_custom_oid.h diff --cc ptxdist/local_src/rtl8188eu/include/nic_spec.h index e535e42,e535e42..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/nic_spec.h +++ b/ptxdist/local_src/rtl8188eu/include/nic_spec.h diff --cc ptxdist/local_src/rtl8188eu/include/osdep_intf.h index 3d09e23,3d09e23..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/osdep_intf.h +++ b/ptxdist/local_src/rtl8188eu/include/osdep_intf.h diff --cc ptxdist/local_src/rtl8188eu/include/osdep_service.h index b972ff4,b972ff4..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/osdep_service.h +++ b/ptxdist/local_src/rtl8188eu/include/osdep_service.h diff --cc ptxdist/local_src/rtl8188eu/include/osdep_service_linux.h index 4a51c1d,4a51c1d..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/osdep_service_linux.h +++ b/ptxdist/local_src/rtl8188eu/include/osdep_service_linux.h diff --cc ptxdist/local_src/rtl8188eu/include/recv_osdep.h index cd290d8,cd290d8..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/recv_osdep.h +++ b/ptxdist/local_src/rtl8188eu/include/recv_osdep.h diff --cc ptxdist/local_src/rtl8188eu/include/rtl8188e_cmd.h index 609c5be,609c5be..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/rtl8188e_cmd.h +++ b/ptxdist/local_src/rtl8188eu/include/rtl8188e_cmd.h diff --cc ptxdist/local_src/rtl8188eu/include/rtl8188e_dm.h index 40f27bc,40f27bc..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/rtl8188e_dm.h +++ b/ptxdist/local_src/rtl8188eu/include/rtl8188e_dm.h diff --cc ptxdist/local_src/rtl8188eu/include/rtl8188e_hal.h index 65ee51f,65ee51f..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/rtl8188e_hal.h +++ b/ptxdist/local_src/rtl8188eu/include/rtl8188e_hal.h diff --cc ptxdist/local_src/rtl8188eu/include/rtl8188e_led.h index ef9ca0b,ef9ca0b..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/rtl8188e_led.h +++ b/ptxdist/local_src/rtl8188eu/include/rtl8188e_led.h diff --cc ptxdist/local_src/rtl8188eu/include/rtl8188e_recv.h index b05f715,b05f715..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/rtl8188e_recv.h +++ b/ptxdist/local_src/rtl8188eu/include/rtl8188e_recv.h diff --cc ptxdist/local_src/rtl8188eu/include/rtl8188e_rf.h index 92075ca,92075ca..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/rtl8188e_rf.h +++ b/ptxdist/local_src/rtl8188eu/include/rtl8188e_rf.h diff --cc ptxdist/local_src/rtl8188eu/include/rtl8188e_spec.h index 0ed7899,0ed7899..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/rtl8188e_spec.h +++ b/ptxdist/local_src/rtl8188eu/include/rtl8188e_spec.h diff --cc ptxdist/local_src/rtl8188eu/include/rtl8188e_sreset.h index b3e367d,b3e367d..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/rtl8188e_sreset.h +++ b/ptxdist/local_src/rtl8188eu/include/rtl8188e_sreset.h diff --cc ptxdist/local_src/rtl8188eu/include/rtl8188e_xmit.h index 76f90af,76f90af..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/rtl8188e_xmit.h +++ b/ptxdist/local_src/rtl8188eu/include/rtl8188e_xmit.h diff --cc ptxdist/local_src/rtl8188eu/include/rtw_android.h index bff49b6,bff49b6..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/rtw_android.h +++ b/ptxdist/local_src/rtl8188eu/include/rtw_android.h diff --cc ptxdist/local_src/rtl8188eu/include/rtw_ap.h index ca95e2f,ca95e2f..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/rtw_ap.h +++ b/ptxdist/local_src/rtl8188eu/include/rtw_ap.h diff --cc ptxdist/local_src/rtl8188eu/include/rtw_beamforming.h index ea566d3,ea566d3..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/rtw_beamforming.h +++ b/ptxdist/local_src/rtl8188eu/include/rtw_beamforming.h diff --cc ptxdist/local_src/rtl8188eu/include/rtw_br_ext.h index 547bdb3,547bdb3..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/rtw_br_ext.h +++ b/ptxdist/local_src/rtl8188eu/include/rtw_br_ext.h diff --cc ptxdist/local_src/rtl8188eu/include/rtw_bt_mp.h index e010a7e,e010a7e..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/rtw_bt_mp.h +++ b/ptxdist/local_src/rtl8188eu/include/rtw_bt_mp.h diff --cc ptxdist/local_src/rtl8188eu/include/rtw_btcoex.h index fb30add,fb30add..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/rtw_btcoex.h +++ b/ptxdist/local_src/rtl8188eu/include/rtw_btcoex.h diff --cc ptxdist/local_src/rtl8188eu/include/rtw_btcoex_wifionly.h index 4d4059f,4d4059f..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/rtw_btcoex_wifionly.h +++ b/ptxdist/local_src/rtl8188eu/include/rtw_btcoex_wifionly.h diff --cc ptxdist/local_src/rtl8188eu/include/rtw_cmd.h index dfadd5b,dfadd5b..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/rtw_cmd.h +++ b/ptxdist/local_src/rtl8188eu/include/rtw_cmd.h diff --cc ptxdist/local_src/rtl8188eu/include/rtw_debug.h index ad60609,ad60609..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/rtw_debug.h +++ b/ptxdist/local_src/rtl8188eu/include/rtw_debug.h diff --cc ptxdist/local_src/rtl8188eu/include/rtw_eeprom.h index 70750b5,70750b5..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/rtw_eeprom.h +++ b/ptxdist/local_src/rtl8188eu/include/rtw_eeprom.h diff --cc ptxdist/local_src/rtl8188eu/include/rtw_efuse.h index b70b905,b70b905..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/rtw_efuse.h +++ b/ptxdist/local_src/rtl8188eu/include/rtw_efuse.h diff --cc ptxdist/local_src/rtl8188eu/include/rtw_event.h index 1244aa0,1244aa0..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/rtw_event.h +++ b/ptxdist/local_src/rtl8188eu/include/rtw_event.h diff --cc ptxdist/local_src/rtl8188eu/include/rtw_ht.h index 44a4777,44a4777..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/rtw_ht.h +++ b/ptxdist/local_src/rtl8188eu/include/rtw_ht.h diff --cc ptxdist/local_src/rtl8188eu/include/rtw_io.h index 42859f8,42859f8..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/rtw_io.h +++ b/ptxdist/local_src/rtl8188eu/include/rtw_io.h diff --cc ptxdist/local_src/rtl8188eu/include/rtw_ioctl.h index 0fb73d8,0fb73d8..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/rtw_ioctl.h +++ b/ptxdist/local_src/rtl8188eu/include/rtw_ioctl.h diff --cc ptxdist/local_src/rtl8188eu/include/rtw_ioctl_query.h index 0ae178a,0ae178a..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/rtw_ioctl_query.h +++ b/ptxdist/local_src/rtl8188eu/include/rtw_ioctl_query.h diff --cc ptxdist/local_src/rtl8188eu/include/rtw_ioctl_rtl.h index ff935c5,ff935c5..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/rtw_ioctl_rtl.h +++ b/ptxdist/local_src/rtl8188eu/include/rtw_ioctl_rtl.h diff --cc ptxdist/local_src/rtl8188eu/include/rtw_ioctl_set.h index da87a90,da87a90..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/rtw_ioctl_set.h +++ b/ptxdist/local_src/rtl8188eu/include/rtw_ioctl_set.h diff --cc ptxdist/local_src/rtl8188eu/include/rtw_iol.h index 89a1a0c,89a1a0c..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/rtw_iol.h +++ b/ptxdist/local_src/rtl8188eu/include/rtw_iol.h diff --cc ptxdist/local_src/rtl8188eu/include/rtw_mcc.h index e4cabd0,e4cabd0..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/rtw_mcc.h +++ b/ptxdist/local_src/rtl8188eu/include/rtw_mcc.h diff --cc ptxdist/local_src/rtl8188eu/include/rtw_mem.h index 88625a0,88625a0..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/rtw_mem.h +++ b/ptxdist/local_src/rtl8188eu/include/rtw_mem.h diff --cc ptxdist/local_src/rtl8188eu/include/rtw_mi.h index e66870f,e66870f..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/rtw_mi.h +++ b/ptxdist/local_src/rtl8188eu/include/rtw_mi.h diff --cc ptxdist/local_src/rtl8188eu/include/rtw_mlme.h index 2f75bf2,2f75bf2..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/rtw_mlme.h +++ b/ptxdist/local_src/rtl8188eu/include/rtw_mlme.h diff --cc ptxdist/local_src/rtl8188eu/include/rtw_mlme_ext.h index 14ffc6c,14ffc6c..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/rtw_mlme_ext.h +++ b/ptxdist/local_src/rtl8188eu/include/rtw_mlme_ext.h diff --cc ptxdist/local_src/rtl8188eu/include/rtw_mp.h index bc8c7bc,bc8c7bc..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/rtw_mp.h +++ b/ptxdist/local_src/rtl8188eu/include/rtw_mp.h diff --cc ptxdist/local_src/rtl8188eu/include/rtw_mp_ioctl.h index 301b1b0,301b1b0..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/rtw_mp_ioctl.h +++ b/ptxdist/local_src/rtl8188eu/include/rtw_mp_ioctl.h diff --cc ptxdist/local_src/rtl8188eu/include/rtw_mp_phy_regdef.h index 4d698f5,4d698f5..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/rtw_mp_phy_regdef.h +++ b/ptxdist/local_src/rtl8188eu/include/rtw_mp_phy_regdef.h diff --cc ptxdist/local_src/rtl8188eu/include/rtw_odm.h index 14cf059,14cf059..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/rtw_odm.h +++ b/ptxdist/local_src/rtl8188eu/include/rtw_odm.h diff --cc ptxdist/local_src/rtl8188eu/include/rtw_p2p.h index 4b3c8d0,4b3c8d0..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/rtw_p2p.h +++ b/ptxdist/local_src/rtl8188eu/include/rtw_p2p.h diff --cc ptxdist/local_src/rtl8188eu/include/rtw_pwrctrl.h index 4230028,4230028..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/rtw_pwrctrl.h +++ b/ptxdist/local_src/rtl8188eu/include/rtw_pwrctrl.h diff --cc ptxdist/local_src/rtl8188eu/include/rtw_qos.h index b52d515,b52d515..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/rtw_qos.h +++ b/ptxdist/local_src/rtl8188eu/include/rtw_qos.h diff --cc ptxdist/local_src/rtl8188eu/include/rtw_recv.h index 74f3df4,74f3df4..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/rtw_recv.h +++ b/ptxdist/local_src/rtl8188eu/include/rtw_recv.h diff --cc ptxdist/local_src/rtl8188eu/include/rtw_rf.h index 8e7ad35,8e7ad35..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/rtw_rf.h +++ b/ptxdist/local_src/rtl8188eu/include/rtw_rf.h diff --cc ptxdist/local_src/rtl8188eu/include/rtw_sdio.h index c915d08,c915d08..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/rtw_sdio.h +++ b/ptxdist/local_src/rtl8188eu/include/rtw_sdio.h diff --cc ptxdist/local_src/rtl8188eu/include/rtw_security.h index 7610e6d,7610e6d..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/rtw_security.h +++ b/ptxdist/local_src/rtl8188eu/include/rtw_security.h diff --cc ptxdist/local_src/rtl8188eu/include/rtw_sreset.h index 5a4ddd3,5a4ddd3..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/rtw_sreset.h +++ b/ptxdist/local_src/rtl8188eu/include/rtw_sreset.h diff --cc ptxdist/local_src/rtl8188eu/include/rtw_tdls.h index 5dbb478,5dbb478..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/rtw_tdls.h +++ b/ptxdist/local_src/rtl8188eu/include/rtw_tdls.h diff --cc ptxdist/local_src/rtl8188eu/include/rtw_version.h index b252feb,b252feb..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/rtw_version.h +++ b/ptxdist/local_src/rtl8188eu/include/rtw_version.h diff --cc ptxdist/local_src/rtl8188eu/include/rtw_vht.h index 02b08f7,02b08f7..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/rtw_vht.h +++ b/ptxdist/local_src/rtl8188eu/include/rtw_vht.h diff --cc ptxdist/local_src/rtl8188eu/include/rtw_wapi.h index e53b6a0,e53b6a0..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/rtw_wapi.h +++ b/ptxdist/local_src/rtl8188eu/include/rtw_wapi.h diff --cc ptxdist/local_src/rtl8188eu/include/rtw_wifi_regd.h index 2182712,2182712..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/rtw_wifi_regd.h +++ b/ptxdist/local_src/rtl8188eu/include/rtw_wifi_regd.h diff --cc ptxdist/local_src/rtl8188eu/include/rtw_xmit.h index 2064ca1,2064ca1..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/rtw_xmit.h +++ b/ptxdist/local_src/rtl8188eu/include/rtw_xmit.h diff --cc ptxdist/local_src/rtl8188eu/include/sta_info.h index b390663,b390663..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/sta_info.h +++ b/ptxdist/local_src/rtl8188eu/include/sta_info.h diff --cc ptxdist/local_src/rtl8188eu/include/usb_hal.h index ccb3132,ccb3132..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/usb_hal.h +++ b/ptxdist/local_src/rtl8188eu/include/usb_hal.h diff --cc ptxdist/local_src/rtl8188eu/include/usb_ops.h index aadbb38,aadbb38..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/usb_ops.h +++ b/ptxdist/local_src/rtl8188eu/include/usb_ops.h diff --cc ptxdist/local_src/rtl8188eu/include/usb_ops_linux.h index 5074779,5074779..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/usb_ops_linux.h +++ b/ptxdist/local_src/rtl8188eu/include/usb_ops_linux.h diff --cc ptxdist/local_src/rtl8188eu/include/usb_osintf.h index 94ff336,94ff336..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/usb_osintf.h +++ b/ptxdist/local_src/rtl8188eu/include/usb_osintf.h diff --cc ptxdist/local_src/rtl8188eu/include/usb_vendor_req.h index b5cc7c2,b5cc7c2..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/usb_vendor_req.h +++ b/ptxdist/local_src/rtl8188eu/include/usb_vendor_req.h diff --cc ptxdist/local_src/rtl8188eu/include/wifi.h index a6fc5b4,a6fc5b4..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/wifi.h +++ b/ptxdist/local_src/rtl8188eu/include/wifi.h diff --cc ptxdist/local_src/rtl8188eu/include/wlan_bssdef.h index 293de03,293de03..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/wlan_bssdef.h +++ b/ptxdist/local_src/rtl8188eu/include/wlan_bssdef.h diff --cc ptxdist/local_src/rtl8188eu/include/xmit_osdep.h index 5c85804,5c85804..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/include/xmit_osdep.h +++ b/ptxdist/local_src/rtl8188eu/include/xmit_osdep.h diff --cc ptxdist/local_src/rtl8188eu/os_dep/ioctl_cfg80211.c index 15fa429,15fa429..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/os_dep/ioctl_cfg80211.c +++ b/ptxdist/local_src/rtl8188eu/os_dep/ioctl_cfg80211.c diff --cc ptxdist/local_src/rtl8188eu/os_dep/ioctl_cfg80211.h index a4baf5d,a4baf5d..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/os_dep/ioctl_cfg80211.h +++ b/ptxdist/local_src/rtl8188eu/os_dep/ioctl_cfg80211.h diff --cc ptxdist/local_src/rtl8188eu/os_dep/ioctl_linux.c index e74c5b7,e74c5b7..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/os_dep/ioctl_linux.c +++ b/ptxdist/local_src/rtl8188eu/os_dep/ioctl_linux.c diff --cc ptxdist/local_src/rtl8188eu/os_dep/ioctl_mp.c index ed7664f,ed7664f..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/os_dep/ioctl_mp.c +++ b/ptxdist/local_src/rtl8188eu/os_dep/ioctl_mp.c diff --cc ptxdist/local_src/rtl8188eu/os_dep/mlme_linux.c index 12fe369,12fe369..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/os_dep/mlme_linux.c +++ b/ptxdist/local_src/rtl8188eu/os_dep/mlme_linux.c diff --cc ptxdist/local_src/rtl8188eu/os_dep/os_intfs.c index 1a67e8e,1a67e8e..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/os_dep/os_intfs.c +++ b/ptxdist/local_src/rtl8188eu/os_dep/os_intfs.c diff --cc ptxdist/local_src/rtl8188eu/os_dep/osdep_service.c index 97b740c,97b740c..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/os_dep/osdep_service.c +++ b/ptxdist/local_src/rtl8188eu/os_dep/osdep_service.c diff --cc ptxdist/local_src/rtl8188eu/os_dep/recv_linux.c index c2da1a4,c2da1a4..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/os_dep/recv_linux.c +++ b/ptxdist/local_src/rtl8188eu/os_dep/recv_linux.c diff --cc ptxdist/local_src/rtl8188eu/os_dep/rtw_android.c index 5c55717,5c55717..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/os_dep/rtw_android.c +++ b/ptxdist/local_src/rtl8188eu/os_dep/rtw_android.c diff --cc ptxdist/local_src/rtl8188eu/os_dep/rtw_cfgvendor.c index c1ac7bd,c1ac7bd..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/os_dep/rtw_cfgvendor.c +++ b/ptxdist/local_src/rtl8188eu/os_dep/rtw_cfgvendor.c diff --cc ptxdist/local_src/rtl8188eu/os_dep/rtw_cfgvendor.h index 8caacca,8caacca..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/os_dep/rtw_cfgvendor.h +++ b/ptxdist/local_src/rtl8188eu/os_dep/rtw_cfgvendor.h diff --cc ptxdist/local_src/rtl8188eu/os_dep/rtw_proc.c index 2124d82,2124d82..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/os_dep/rtw_proc.c +++ b/ptxdist/local_src/rtl8188eu/os_dep/rtw_proc.c diff --cc ptxdist/local_src/rtl8188eu/os_dep/rtw_proc.h index daba6f2,daba6f2..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/os_dep/rtw_proc.h +++ b/ptxdist/local_src/rtl8188eu/os_dep/rtw_proc.h diff --cc ptxdist/local_src/rtl8188eu/os_dep/usb_intf.c index 32b98d5,32b98d5..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/os_dep/usb_intf.c +++ b/ptxdist/local_src/rtl8188eu/os_dep/usb_intf.c diff --cc ptxdist/local_src/rtl8188eu/os_dep/usb_ops_linux.c index 10705b3,10705b3..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/os_dep/usb_ops_linux.c +++ b/ptxdist/local_src/rtl8188eu/os_dep/usb_ops_linux.c diff --cc ptxdist/local_src/rtl8188eu/os_dep/wifi_regd.c index 24b6799,24b6799..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/os_dep/wifi_regd.c +++ b/ptxdist/local_src/rtl8188eu/os_dep/wifi_regd.c diff --cc ptxdist/local_src/rtl8188eu/os_dep/xmit_linux.c index d7690a3,d7690a3..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/os_dep/xmit_linux.c +++ b/ptxdist/local_src/rtl8188eu/os_dep/xmit_linux.c diff --cc ptxdist/local_src/rtl8188eu/rtl8188eufw.bin index 4ae7e1c,4ae7e1c..0000000 mode 100644,100755..100644 Binary files differ diff --cc ptxdist/local_src/rtl8188eu/rtl_hostapd.conf index 172dda7,172dda7..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/rtl8188eu/rtl_hostapd.conf +++ b/ptxdist/local_src/rtl8188eu/rtl_hostapd.conf diff --cc ptxdist/local_src/socketcan-test/install.pri index c3d2340,c3d2340..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/socketcan-test/install.pri +++ b/ptxdist/local_src/socketcan-test/install.pri diff --cc ptxdist/local_src/socketcan-test/socketcan-test.cpp index 78cb24c,78cb24c..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/socketcan-test/socketcan-test.cpp +++ b/ptxdist/local_src/socketcan-test/socketcan-test.cpp diff --cc ptxdist/local_src/socketcan-test/socketcan-test.pro index 603ce52,603ce52..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/socketcan-test/socketcan-test.pro +++ b/ptxdist/local_src/socketcan-test/socketcan-test.pro diff --cc ptxdist/local_src/socketcan-test/socketcan-test.pro.user index 6c9e104,6c9e104..0000000 mode 100644,100755..100644 --- a/ptxdist/local_src/socketcan-test/socketcan-test.pro.user +++ b/ptxdist/local_src/socketcan-test/socketcan-test.pro.user diff --cc ptxdist/make_firmware_zip.sh index bb10674,2d9da6f..0000000 --- a/ptxdist/make_firmware_zip.sh +++ b/ptxdist/make_firmware_zip.sh @@@ -45,7 -45,7 +45,11 @@@ md5sum $ROOTFS_FILENAME > $ROOTFS_MD5_F source $INFO_FILENAME source $PTXDIST_WORKSPACE/selected_ptxconfig ++<<<<<<< HEAD +rm -f $PTXDIST_BSP_NAME-*.zip ++======= + rm -f $PTXDIST_BSP_NAME$PTXDIST_BSP_VERSION.zip ++>>>>>>> rauch/jobrechner-import-20190607 rm -f $PTXDIST_BSP_NAME/$BOOTLOADER_FILENAME rm -f $PTXDIST_BSP_NAME/$BOOTLOADER_MD5_FILENAME rm -f $PTXDIST_BSP_NAME/$KERNEL_FILENAME @@@ -102,12 -102,8 +106,17 @@@ f # Version file cp work_dir/home/$VERSION_FILENAME $TARGETDIR/ ++<<<<<<< HEAD +CURRENT=$(git describe --dirty) +[ -z "$CURRENT" ] && CURRENT=${PTXDIST_BSP_VERSION:1} +[ -z "$CURRENT" ] && CURRENT=$(date +%Y-%m-%d_%H-%M) + +#NEW_ZIP_FILENAME="$TARGETDIR$PTXDIST_BSP_VERSION.zip" +NEW_ZIP_FILENAME="$TARGETDIR-$CURRENT.zip" ++======= + CURRENT=$(date +%Y-%m-%d_%H-%M) + NEW_ZIP_FILENAME="$TARGETDIR$PTXDIST_BSP_VERSION.zip" ++>>>>>>> rauch/jobrechner-import-20190607 echo "Generating $NEW_ZIP_FILENAME" zip -r $NEW_ZIP_FILENAME $TARGETDIR/* md5sum $NEW_ZIP_FILENAME > $NEW_ZIP_FILENAME.md5 diff --cc ptxdist/patches/busybox-1.20.1/0001-loginuitils-passwd.patch index 4a4eee0,4a4eee0..0000000 mode 100644,100755..100644 --- a/ptxdist/patches/busybox-1.20.1/0001-loginuitils-passwd.patch +++ b/ptxdist/patches/busybox-1.20.1/0001-loginuitils-passwd.patch diff --cc ptxdist/patches/busybox-1.20.1/series index d83d60e,d83d60e..0000000 mode 100644,100755..100644 --- a/ptxdist/patches/busybox-1.20.1/series +++ b/ptxdist/patches/busybox-1.20.1/series diff --cc ptxdist/patches/busybox-1.20.1/series.ecu index d83d60e,d83d60e..0000000 mode 100644,100755..100644 --- a/ptxdist/patches/busybox-1.20.1/series.ecu +++ b/ptxdist/patches/busybox-1.20.1/series.ecu diff --cc ptxdist/patches/linux-3.14/0001-extending-flags-for-hwinit.patch index ce2fa51,ce2fa51..0000000 mode 100644,100755..100644 --- a/ptxdist/patches/linux-3.14/0001-extending-flags-for-hwinit.patch +++ b/ptxdist/patches/linux-3.14/0001-extending-flags-for-hwinit.patch diff --cc ptxdist/patches/linux-3.14/0002-adding-support-options-in-mxc_ehci.h.patch index ac97aea,ac97aea..0000000 mode 100644,100755..100644 --- a/ptxdist/patches/linux-3.14/0002-adding-support-options-in-mxc_ehci.h.patch +++ b/ptxdist/patches/linux-3.14/0002-adding-support-options-in-mxc_ehci.h.patch diff --cc ptxdist/patches/linux-3.14/0003-register-missing-clockdefinitions.patch index 5f22481,5f22481..0000000 mode 100644,100755..100644 --- a/ptxdist/patches/linux-3.14/0003-register-missing-clockdefinitions.patch +++ b/ptxdist/patches/linux-3.14/0003-register-missing-clockdefinitions.patch diff --cc ptxdist/patches/linux-3.14/0004-switched-system-timer-to-GPT3.patch index fdca8ac,fdca8ac..0000000 mode 100644,100755..100644 --- a/ptxdist/patches/linux-3.14/0004-switched-system-timer-to-GPT3.patch +++ b/ptxdist/patches/linux-3.14/0004-switched-system-timer-to-GPT3.patch diff --cc ptxdist/patches/linux-3.14/0005-initial-support-for-platforms-ecu01-and-ecu02.patch index 4f8bfa9,4f8bfa9..0000000 mode 100644,100755..100644 --- a/ptxdist/patches/linux-3.14/0005-initial-support-for-platforms-ecu01-and-ecu02.patch +++ b/ptxdist/patches/linux-3.14/0005-initial-support-for-platforms-ecu01-and-ecu02.patch diff --cc ptxdist/patches/linux-3.14/series index e69de29,e69de29..0000000 mode 100644,100755..100644 --- a/ptxdist/patches/linux-3.14/series +++ b/ptxdist/patches/linux-3.14/series diff --cc ptxdist/patches/linux-3.14/series.ecu02 index ea34338,ea34338..0000000 mode 100644,100755..100644 --- a/ptxdist/patches/linux-3.14/series.ecu02 +++ b/ptxdist/patches/linux-3.14/series.ecu02 diff --cc ptxdist/patches/linux-3.2/0001-EAG-Jobrechner-Initial-Patch.patch index 5fcb9f2,5fcb9f2..0000000 mode 100644,100755..100644 --- a/ptxdist/patches/linux-3.2/0001-EAG-Jobrechner-Initial-Patch.patch +++ b/ptxdist/patches/linux-3.2/0001-EAG-Jobrechner-Initial-Patch.patch diff --cc ptxdist/patches/linux-3.2/0002-Bugfix1.patch index 08101b3,08101b3..0000000 mode 100644,100755..100644 --- a/ptxdist/patches/linux-3.2/0002-Bugfix1.patch +++ b/ptxdist/patches/linux-3.2/0002-Bugfix1.patch diff --cc ptxdist/patches/linux-3.2/0003-Bugfix.patch index e410fa7,e410fa7..0000000 mode 100644,100755..100644 --- a/ptxdist/patches/linux-3.2/0003-Bugfix.patch +++ b/ptxdist/patches/linux-3.2/0003-Bugfix.patch diff --cc ptxdist/patches/linux-3.2/0004-jobrechner-ng-pin-muxing.patch index 614d3cf,614d3cf..0000000 mode 100644,100755..100644 --- a/ptxdist/patches/linux-3.2/0004-jobrechner-ng-pin-muxing.patch +++ b/ptxdist/patches/linux-3.2/0004-jobrechner-ng-pin-muxing.patch diff --cc ptxdist/patches/linux-3.2/0005-Ported-spi-master-and-beautified-code.patch index 0dee6f4,0dee6f4..0000000 mode 100644,100755..100644 --- a/ptxdist/patches/linux-3.2/0005-Ported-spi-master-and-beautified-code.patch +++ b/ptxdist/patches/linux-3.2/0005-Ported-spi-master-and-beautified-code.patch diff --cc ptxdist/patches/linux-3.2/0006-mxc_ehci.h-extending-flags-for-hwinit.patch index 87abf4e,87abf4e..0000000 mode 100644,100755..100644 --- a/ptxdist/patches/linux-3.2/0006-mxc_ehci.h-extending-flags-for-hwinit.patch +++ b/ptxdist/patches/linux-3.2/0006-mxc_ehci.h-extending-flags-for-hwinit.patch diff --cc ptxdist/patches/linux-3.2/0007-ehci-imx25.c-adding-support-options-in-mxc_ehci.h.patch index aeaa18c,aeaa18c..0000000 mode 100644,100755..100644 --- a/ptxdist/patches/linux-3.2/0007-ehci-imx25.c-adding-support-options-in-mxc_ehci.h.patch +++ b/ptxdist/patches/linux-3.2/0007-ehci-imx25.c-adding-support-options-in-mxc_ehci.h.patch diff --cc ptxdist/patches/linux-3.2/0008-proper-initialization-of-usb-hw.patch index 49a3700,49a3700..0000000 mode 100644,100755..100644 --- a/ptxdist/patches/linux-3.2/0008-proper-initialization-of-usb-hw.patch +++ b/ptxdist/patches/linux-3.2/0008-proper-initialization-of-usb-hw.patch diff --cc ptxdist/patches/linux-3.2/0009-fixed-width-in-mx25pdk_nand_board_info.patch index e421ed3,e421ed3..0000000 mode 100644,100755..100644 --- a/ptxdist/patches/linux-3.2/0009-fixed-width-in-mx25pdk_nand_board_info.patch +++ b/ptxdist/patches/linux-3.2/0009-fixed-width-in-mx25pdk_nand_board_info.patch diff --cc ptxdist/patches/linux-3.2/0010-SPI-Devices-added.patch index 86b9d87,86b9d87..0000000 mode 100644,100755..100644 --- a/ptxdist/patches/linux-3.2/0010-SPI-Devices-added.patch +++ b/ptxdist/patches/linux-3.2/0010-SPI-Devices-added.patch diff --cc ptxdist/patches/linux-3.2/0011-IO-Muxing-for-CompCap-and-PWM-Bridge.patch index e891a62,e891a62..0000000 mode 100644,100755..100644 --- a/ptxdist/patches/linux-3.2/0011-IO-Muxing-for-CompCap-and-PWM-Bridge.patch +++ b/ptxdist/patches/linux-3.2/0011-IO-Muxing-for-CompCap-and-PWM-Bridge.patch diff --cc ptxdist/patches/linux-3.2/0012-Fix-CAN_RAW_RECV_OWN_MSGS-and-CAN_RAW_LOOPBACK.patch index 84bf018,84bf018..0000000 mode 100644,100755..100644 --- a/ptxdist/patches/linux-3.2/0012-Fix-CAN_RAW_RECV_OWN_MSGS-and-CAN_RAW_LOOPBACK.patch +++ b/ptxdist/patches/linux-3.2/0012-Fix-CAN_RAW_RECV_OWN_MSGS-and-CAN_RAW_LOOPBACK.patch diff --cc ptxdist/patches/linux-3.2/0013-can-dev-let-can_get_echo_skb-return-dlc-of-CAN-frame.patch index 48cc1ee,48cc1ee..0000000 mode 100644,100755..100644 --- a/ptxdist/patches/linux-3.2/0013-can-dev-let-can_get_echo_skb-return-dlc-of-CAN-frame.patch +++ b/ptxdist/patches/linux-3.2/0013-can-dev-let-can_get_echo_skb-return-dlc-of-CAN-frame.patch diff --cc ptxdist/patches/linux-3.2/series index f211c41,f211c41..0000000 mode 100644,100755..100644 --- a/ptxdist/patches/linux-3.2/series +++ b/ptxdist/patches/linux-3.2/series diff --cc ptxdist/patches/linux-3.2/series.ecu01 index a370aa5,a370aa5..0000000 mode 100644,100755..100644 --- a/ptxdist/patches/linux-3.2/series.ecu01 +++ b/ptxdist/patches/linux-3.2/series.ecu01 diff --cc ptxdist/patches/systemd-195/0001-service-realy-stop-watchdog-timer-when-stopping-the-.patch index c6fe366,c6fe366..0000000 mode 100644,100755..100644 --- a/ptxdist/patches/systemd-195/0001-service-realy-stop-watchdog-timer-when-stopping-the-.patch +++ b/ptxdist/patches/systemd-195/0001-service-realy-stop-watchdog-timer-when-stopping-the-.patch diff --cc ptxdist/patches/systemd-195/0002-service-cleanup-processes-when-the-watchdog-is-trigg.patch index 88e2eae,88e2eae..0000000 mode 100644,100755..100644 --- a/ptxdist/patches/systemd-195/0002-service-cleanup-processes-when-the-watchdog-is-trigg.patch +++ b/ptxdist/patches/systemd-195/0002-service-cleanup-processes-when-the-watchdog-is-trigg.patch diff --cc ptxdist/patches/systemd-195/0003-ratelimit-fix-of-by-one.patch index feb586c,feb586c..0000000 mode 100644,100755..100644 --- a/ptxdist/patches/systemd-195/0003-ratelimit-fix-of-by-one.patch +++ b/ptxdist/patches/systemd-195/0003-ratelimit-fix-of-by-one.patch diff --cc ptxdist/patches/systemd-195/0004-service-reset-failure-counter-on-stop.patch index 54fb76d,54fb76d..0000000 mode 100644,100755..100644 --- a/ptxdist/patches/systemd-195/0004-service-reset-failure-counter-on-stop.patch +++ b/ptxdist/patches/systemd-195/0004-service-reset-failure-counter-on-stop.patch diff --cc ptxdist/patches/systemd-195/series index f409cdf,f409cdf..0000000 mode 100644,100755..100644 --- a/ptxdist/patches/systemd-195/series +++ b/ptxdist/patches/systemd-195/series diff --cc ptxdist/projectroot/etc/dhcpd.conf index 622be1d,c1ecff4..0000000 mode 100644,100755..100644 --- a/ptxdist/projectroot/etc/dhcpd.conf +++ b/ptxdist/projectroot/etc/dhcpd.conf @@@ -1,17 -1,23 +1,42 @@@ # dhcpd.conf ++<<<<<<< HEAD +# +# Sample configuration file for ISC dhcpd +# +subnet 152.21.0.0 netmask 255.255.255.0 { + + range 152.21.0.100 152.21.0.200; + + option domain-name "jncg.org"; + option domain-name-servers 152.21.0.31, 152.21.0.1; + option broadcast-address 152.21.0.255; +# option routers 152.21.0.1; + option subnet-mask 255.255.255.0; + default-lease-time 600; + max-lease-time 7200; +} + ++======= + + # 152.21.0.31 is the ip address of our wlan0 interface + option domain-name-servers 152.21.0.31; + + default-lease-time 600; + max-lease-time 7200; + + authoritative; + + log-facility local7; + + subnet 152.21.0.0 netmask 255.255.255.0 { + #option domain-name "wifi.localhost"; + option routers 152.21.0.31; + option subnet-mask 255.255.255.0; + option broadcast-address 152.21.0.0; + option domain-name-servers 152.21.0.31; + # from 32 to 100 are available + range dynamic-bootp 152.21.0.32 152.21.0.100; + # only one address (client) is available + # range dynamic-bootp 152.21.0.32; + } ++>>>>>>> rauch/jobrechner-import-20190607 diff --cc ptxdist/projectroot/etc/fstab index 4953d25,7a75b02..0000000 mode 100644,100755..100644 --- a/ptxdist/projectroot/etc/fstab +++ b/ptxdist/projectroot/etc/fstab @@@ -3,13 -3,12 +3,20 @@@ # # rootfs flags ++<<<<<<< HEAD +root / ubifs ro,sync,noatime,nodiratime 0 0 ++======= + root / ubifs defaults,ro,noatime,nodiratime 0 0 ++>>>>>>> rauch/jobrechner-import-20190607 # special filesystems proc /proc proc defaults 0 0 devpts /dev/pts devpts defaults 0 0 none /tmp tmpfs defaults,mode=1777,uid=0,gid=0 0 0 ++<<<<<<< HEAD +none /run tmpfs defaults,mode=0755,uid=0,gid=0 0 0 ++======= ++>>>>>>> rauch/jobrechner-import-20190607 none /sys sysfs defaults 0 0 #usbfs /proc/bus/usb usbfs devgid=14,devmode=0660 0 0 @@@ -19,5 -18,5 +26,10 @@@ none /var/lib tmpfs defaults,mode=0 none /var/log tmpfs defaults,mode=0755,uid=0,gid=0 0 0 none /var/run tmpfs defaults,mode=0755,uid=0,gid=0 0 0 none /var/lock tmpfs defaults,mode=0755,uid=0,gid=0 0 0 ++<<<<<<< HEAD +none /var/tmp tmpfs defaults,mode=1777,uid=0,gid=0 0 0 + ++======= + none /var/db tmpfs defaults,mode=1777,uid=0,gid=0 0 0 + none /var/tmp tmpfs defaults,mode=1777,uid=0,gid=0 0 0 ++>>>>>>> rauch/jobrechner-import-20190607 diff --cc ptxdist/projectroot/etc/passwd index 1d394b8,5df5a35..0000000 mode 100644,100755..100644 --- a/ptxdist/projectroot/etc/passwd +++ b/ptxdist/projectroot/etc/passwd @@@ -1,4 -1,4 +1,8 @@@ ++<<<<<<< HEAD +root:x:0:0:root:/home:/bin/bash ++======= + root:x:0:0:root:/home:/bin/sh ++>>>>>>> rauch/jobrechner-import-20190607 daemon:x:1:1:daemon:/usr/sbin:/bin/sh ftp:x:11:101:ftp user:/home:/bin/false www:x:12:102:www user:/home:/bin/false diff --cc ptxdist/projectroot/etc/profile.environment index cb47464,e4b85cc..0000000 mode 100644,100755..100644 --- a/ptxdist/projectroot/etc/profile.environment +++ b/ptxdist/projectroot/etc/profile.environment @@@ -1,11 -1,13 +1,27 @@@ ++<<<<<<< HEAD +# +# /etc/profile.environment +# + +# do not set interactive shell properties like HISTFILE, PS1, PS2, +# ..., or aliases here. +# Such stuff belongs into the startup files for *interactive* shell +# sessions/etc/bash.bashrc or /etc/ksh.kshrc + +# EOF. + ++======= + # /etc/profile.environment - config for sub-shells + #PS1="\\u@\\h:\\w " + PS1='\u \t : \w # ' + PS2=" >" + PS4="+ " + + alias vim='vi' + alias l='ls -l' + alias ll='ls -al' + alias ..='cd ..' + alias ...='cd ../..' + alias md='mkdir' + alias rd='rmdir' ++>>>>>>> rauch/jobrechner-import-20190607 diff --cc ptxdist/projectroot/etc/shadow index f9575de,f9575de..0000000 mode 100644,100755..100644 --- a/ptxdist/projectroot/etc/shadow +++ b/ptxdist/projectroot/etc/shadow diff --cc ptxdist/projectroot/etc/systemd/system.conf index 5ab3512,3e63049..0000000 mode 100644,100755..100644 --- a/ptxdist/projectroot/etc/systemd/system.conf +++ b/ptxdist/projectroot/etc/systemd/system.conf @@@ -21,7 -21,7 +21,11 @@@ #DefaultStandardOutput=journal #DefaultStandardError=inherit #JoinControllers=cpu,cpuacct,cpuset net_cls,net_prio ++<<<<<<< HEAD +RuntimeWatchdogSec=10s ++======= + RuntimeWatchdogSec=5s ++>>>>>>> rauch/jobrechner-import-20190607 ShutdownWatchdogSec=3min #CapabilityBoundingSet= #TimerSlackNSec= diff --cc ptxdist/projectroot/lib/systemd/system/codesys3-rt.service index 9cd72b9,bc7402e..0000000 mode 100644,100755..100644 --- a/ptxdist/projectroot/lib/systemd/system/codesys3-rt.service +++ b/ptxdist/projectroot/lib/systemd/system/codesys3-rt.service @@@ -1,41 -1,31 +1,75 @@@ ++<<<<<<< HEAD +[Unit] +Description=CoDeSys 3 runtime +# - multi-user.target is required to ensure codesys only runs when all +# other stuff like logins&co are ready +# - we cannot use application.target here since it causes a dependicy loop +# - getty.target is required so we wait until all logins are active, +# including those using the serial lines, before we start codesyscontrol, +# which itself might mess with the serial lines +# - var-dyn.mount&&var-stat.mount are required by the CodeSys application +After=basic.target local-fs.target multi-user.target getty.target var-dyn.mount var-stat.mount +Requires=systemd-modules-load.service ubi-check-partitions.service var-dyn.mount var-stat.mount +Conflicts=testing.target emvtest.target maintenance.target +ConditionPathExists=!/tmp/first_boot + +[Service] +Type=notify +Restart=always +RestartSec=3 +TimeoutStartSec=120 +TimeoutStopSec=1 +WorkingDirectory=@CODESYS3_RT_HOME@ +ControlGroup=cpu:/ +#CPUSchedulingPolicy=fifo +#CPUSchedulingPriority=50 +LimitNICE=infinity +LimitRTPRIO=infinity +LimitRTTIME=infinity +LimitCPU=infinity +LimitMSGQUEUE=infinity +Environment=CODESYS_RT_BIN_PATH=@CODESYS3_RT_BIN_PATH@ +Environment=CODESYS_RT_LIB_PATH=@CODESYS3_RT_LIB_PATH@ +Environment=CODESYS_RT_EXECUTABLE=@CODESYS3_RT_EXECUTABLE@ +Environment=CODESYS_RT_HOME=@CODESYS3_RT_HOME@ +Environment=CODESYS_RT_APP=@CODESYS3_RT_APP@ +Environment=CODESYS_RT_OUTPUT=@CODESYS3_RT_OUTPUT@ +Environment=LD_LIBRARY_PATH=@CODESYS3_RT_LIB_PATH@ +EnvironmentFile=/etc/os-release +#ExecCondition=/sbin/update_splash_helper.sh +ExecStartPre=/sbin/codesys3-rt_service_disable_ttymxc4_helper.sh startpre +ExecStopPost=/sbin/codesys3-rt_service_disable_ttymxc4_helper.sh stoppost +ExecStart=@CODESYS3_RT_BIN_PATH@/@CODESYS3_RT_EXECUTABLE@ ++======= + [Unit] + Description=CoDeSys 3 runtime + After=basic.target loadenv.service + Conflicts=testing.target emvtest.target maintenance.target + PartOf=application.target + + [Service] + Restart=always + RestartSec=3 + TimeoutSec=10 + WorkingDirectory=@CODESYS3_RT_HOME@ + ControlGroup=cpu:/ + #CPUSchedulingPolicy=fifo + #CPUSchedulingPriority=50 + LimitNICE=infinity + LimitRTPRIO=infinity + LimitRTTIME=infinity + LimitCPU=infinity + LimitMSGQUEUE=infinity + Environment=CODESYS_RT_BIN_PATH=@CODESYS3_RT_BIN_PATH@ + Environment=CODESYS_RT_LIB_PATH=@CODESYS3_RT_LIB_PATH@ + Environment=CODESYS_RT_EXECUTABLE=@CODESYS3_RT_EXECUTABLE@ + Environment=CODESYS_RT_HOME=@CODESYS3_RT_HOME@ + Environment=CODESYS_RT_APP=@CODESYS3_RT_APP@ + Environment=CODESYS_RT_OUTPUT=@CODESYS3_RT_OUTPUT@ + Environment=LD_LIBRARY_PATH=@CODESYS3_RT_LIB_PATH@ + EnvironmentFile=/etc/os-release + ExecStart=@CODESYS3_RT_BIN_PATH@/@CODESYS3_RT_EXECUTABLE@ + + [Install] + WantedBy=application.target ++>>>>>>> rauch/jobrechner-import-20190607 diff --cc ptxdist/projectroot/lib/systemd/system/ifupdown.service index 4531ef4,4531ef4..0000000 mode 100644,100755..100644 --- a/ptxdist/projectroot/lib/systemd/system/ifupdown.service +++ b/ptxdist/projectroot/lib/systemd/system/ifupdown.service diff --cc ptxdist/projectroot/lib/systemd/system/serial-getty@.service index 4a6385c,4a6385c..0000000 mode 100644,100755..100644 --- a/ptxdist/projectroot/lib/systemd/system/serial-getty@.service +++ b/ptxdist/projectroot/lib/systemd/system/serial-getty@.service diff --cc ptxdist/rules/Kconfig index 0285af3,0fe18b8..0000000 --- a/ptxdist/rules/Kconfig +++ b/ptxdist/rules/Kconfig @@@ -40,7 -40,8 +40,12 @@@ comment "------------------------------ comment "--- Eckelmann AG project specific---" ++<<<<<<< HEAD +menu "JNCG(ecu02) Applications" ++======= + menu "Platform ECUXX" + source "workspace/rules/common.in" ++>>>>>>> rauch/jobrechner-import-20190607 source "workspace/rules/ecu-basicsys.in" source "workspace/rules/ecu-explore.in" source "workspace/rules/ecu-codesys.in" @@@ -48,23 -49,6 +53,26 @@@ source "workspace/rules/ecu-jobctl.in source "workspace/rules/ecu-motor-ctl.in" source "workspace/rules/ecu-comp-cap.in" source "workspace/rules/ecu-control.in" ++<<<<<<< HEAD +endmenu + +menu "QA(ecu01) Applications" +source "workspace/rules/ecu01-basicsys.in" +source "workspace/rules/ecu01-codesys.in" +source "workspace/rules/ecu01-motor-ctl.in" +source "workspace/rules/ecu01-comp-cap.in" +source "workspace/rules/libvt.in" +source "workspace/rules/qadriver.in" +source "workspace/rules/power-button.in" +source "workspace/rules/ads7953.in" +source "workspace/rules/teststand.in" +source "workspace/rules/ecu01-control.in" +endmenu + +menu "EAG(common) Applications" +source "workspace/rules/common.in" ++======= ++>>>>>>> rauch/jobrechner-import-20190607 source "workspace/rules/backup-etc.in" source "workspace/rules/flush_module.in" source "workspace/rules/ebashlib.in" diff --cc ptxdist/rules/backup-etc.in index 6900501,6900501..0000000 mode 100644,100755..100644 --- a/ptxdist/rules/backup-etc.in +++ b/ptxdist/rules/backup-etc.in diff --cc ptxdist/rules/backup-etc.make index 00fe43a,00fe43a..0000000 mode 100644,100755..100644 --- a/ptxdist/rules/backup-etc.make +++ b/ptxdist/rules/backup-etc.make diff --cc ptxdist/rules/barebox.make index 77f622f,37e97c1..0000000 mode 100644,100755..100644 --- a/ptxdist/rules/barebox.make +++ b/ptxdist/rules/barebox.make @@@ -123,18 -123,18 +123,30 @@@ endi $(STATEDIR)/barebox.targetinstall: @$(call targetinfo) ++<<<<<<< HEAD ++======= + ifdef PTXCONF_BAREBOX_BAREBOXENV ++>>>>>>> rauch/jobrechner-import-20190607 @$(call install_init, barebox) @$(call install_fixup, barebox,PRIORITY,optional) @$(call install_fixup, barebox,SECTION,base) @$(call install_fixup, barebox,AUTHOR,"Robert Schwebel <r.schwebel@pengutronix.de>") @$(call install_fixup, barebox,DESCRIPTION,missing) ++<<<<<<< HEAD +ifdef PTXCONF_BAREBOX_BAREBOXENV ++======= ++>>>>>>> rauch/jobrechner-import-20190607 @$(call install_copy, barebox, 0, 0, 0755, $(BAREBOX_DIR)/scripts/bareboxenv-target, \ /usr/bin/bareboxenv) ++<<<<<<< HEAD +endif + ++======= + @$(call install_finish, barebox) + endif ++>>>>>>> rauch/jobrechner-import-20190607 @rm -f $(IMAGEDIR)/barebox-image @for image in `ls $(BAREBOX_DIR)/images/barebox-*.img`; do \ install -D -m644 $$image $(IMAGEDIR)/`basename $$image`; \ @@@ -157,8 -157,6 +169,11 @@@ elif [ -e $(BAREBOX_DIR)/barebox_default_env ]; then \ install -D -m644 $(BAREBOX_DIR)/barebox_default_env $(IMAGEDIR)/barebox-default-environment; \ fi ++<<<<<<< HEAD + @$(call install_copy, barebox, 0, 0, 0755, $(IMAGEDIR)/barebox-image, /usr/bl/barebox-image ) + @$(call install_finish, barebox) ++======= ++>>>>>>> rauch/jobrechner-import-20190607 @$(call touch) # ---------------------------------------------------------------------------- diff --cc ptxdist/rules/codesys3-rt.in index 8d319fb,8d319fb..0000000 mode 100644,100755..100644 --- a/ptxdist/rules/codesys3-rt.in +++ b/ptxdist/rules/codesys3-rt.in diff --cc ptxdist/rules/codesys3-rt.make index c33dc1b,4d5d1e5..0000000 mode 100644,100755..100644 --- a/ptxdist/rules/codesys3-rt.make +++ b/ptxdist/rules/codesys3-rt.make @@@ -16,30 -16,25 +16,50 @@@ PACKAGES-$(PTXCONF_CODESYS3_RT) += code CODESYS3_RT_VERSION := 3.5.8.0 CODESYS3_RT := codesys3-rt-$(CODESYS3_RT_VERSION) CODESYS3_RT_LICENSE := unknown ++<<<<<<< HEAD +CODESYS3_RT_URL := file://$(PTXDIST_WORKSPACE)/local_src/svneag_codesys3 +CODESYS3_RT_DIR := $(BUILDDIR)/$(CODESYS3_RT) ++======= + CODESYS3_RT_DIR := $(BUILDDIR)/$(CODESYS3_RT) ++>>>>>>> rauch/jobrechner-import-20190607 #CODESYS3_RT_CONF_TOOL := NO #CODESYS3_RT_MAKE_ENV := $(CROSS_ENV) # ---------------------------------------------------------------------------- ++<<<<<<< HEAD +# Prepare +# ---------------------------------------------------------------------------- + +$(STATEDIR)/codesys3-rt.prepare: + @$(call targetinfo) + @$(call touch) + +# ---------------------------------------------------------------------------- +# Compile +# ---------------------------------------------------------------------------- + +# +# this is not a compile stage in the traditional sense - we unpack binaries +# here and shuffle them around. We cannot do this in codesys3-rt.extract +# because we need the default rules to apply for that make rule +# +$(STATEDIR)/codesys3-rt.compile: ++======= + # Get + # ---------------------------------------------------------------------------- + + $(STATEDIR)/codesys3-rt.get: + @$(call targetinfo) + svn export --force https://svn.eckelmann.group/svn/allgemein/LinuxWorkgroup/commons/ptxdist/projects/codesys3-rt/tags/$(CODESYS3_RT_VERSION) $(CODESYS3_RT_DIR) + @$(call touch) + + # ---------------------------------------------------------------------------- + # Extract + # ---------------------------------------------------------------------------- + + $(STATEDIR)/codesys3-rt.extract: ++>>>>>>> rauch/jobrechner-import-20190607 @$(call targetinfo) unzip -q -o $(CODESYS3_RT_DIR)/CoDeSysControl_V3.zip -d $(CODESYS3_RT_DIR)/ mkdir -p $(CODESYS3_RT_DIR)/arm_runtime @@@ -54,6 -49,22 +74,25 @@@ endi @$(call touch) # ---------------------------------------------------------------------------- ++<<<<<<< HEAD ++======= + # Prepare + # ---------------------------------------------------------------------------- + + #$(STATEDIR)/codesys3-rt.prepare: + # @$(call targetinfo) + # @$(call touch) + + # ---------------------------------------------------------------------------- + # Compile + # ---------------------------------------------------------------------------- + + $(STATEDIR)/codesys3-rt.compile: + @$(call targetinfo) + @$(call touch) + + # ---------------------------------------------------------------------------- ++>>>>>>> rauch/jobrechner-import-20190607 # Install # ---------------------------------------------------------------------------- @@@ -135,7 -146,6 +174,10 @@@ endi ifdef PTXCONF_CODESYS3_RT_SYSTEMD_UNIT @$(call install_alternative, codesys3-rt, 0, 0, 0755, /lib/systemd/system/codesys3-rt.service) ++<<<<<<< HEAD + @$(call install_alternative, codesys3-rt, 0, 0, 0755, /lib/systemd/system/codesys-stick-missing.service) ++======= ++>>>>>>> rauch/jobrechner-import-20190607 @$(call install_replace, codesys3-rt, /lib/systemd/system/codesys3-rt.service, \ @CODESYS3_RT_BIN_PATH@, \ @@@ -172,8 -182,6 +214,11 @@@ endi $(STATEDIR)/codesys3-rt.clean: @$(call targetinfo) ++<<<<<<< HEAD + rm -rf $(CODESYS3_RT_DIR)/arm_runtime + rm -rf $(CODESYS3_RT_DIR)/Files ++======= ++>>>>>>> rauch/jobrechner-import-20190607 @$(call clean_pkg, CODESYS3_RT) # vim: syntax=make diff --cc ptxdist/rules/common.in index 2fe8a0d,2fe8a0d..0000000 mode 100644,100755..100644 --- a/ptxdist/rules/common.in +++ b/ptxdist/rules/common.in diff --cc ptxdist/rules/common.make index be97280,9f02172..0000000 mode 100644,100755..100644 --- a/ptxdist/rules/common.make +++ b/ptxdist/rules/common.make @@@ -65,8 -65,8 +65,13 @@@ $(STATEDIR)/common.install cp $(COMMON_DIR)/io/*.h $(PTXDIST_SYSROOT_TARGET)/include/common/io cp $(COMMON_DIR)-build/libcommon.so.$(COMMON_VERSION) $(PTXDIST_SYSROOT_TARGET)/usr/lib/libcommon.so ++<<<<<<< HEAD + ln -fs libcommon.so $(PTXDIST_SYSROOT_TARGET)/usr/lib/libcommon.so.1 + ln -fs libcommon.so $(PTXDIST_SYSROOT_TARGET)/usr/lib/libcommon.so.1.0 ++======= + ln -s libcommon.so $(PTXDIST_SYSROOT_TARGET)/usr/lib/libcommon.so.1 + ln -s libcommon.so $(PTXDIST_SYSROOT_TARGET)/usr/lib/libcommon.so.1.0 ++>>>>>>> rauch/jobrechner-import-20190607 @$(call touch) diff --cc ptxdist/rules/cppcms.in index 16e22cb,16e22cb..0000000 mode 100644,100755..100644 --- a/ptxdist/rules/cppcms.in +++ b/ptxdist/rules/cppcms.in diff --cc ptxdist/rules/cppcms.make index ca2c28c,ca2c28c..0000000 mode 100644,100755..100644 --- a/ptxdist/rules/cppcms.make +++ b/ptxdist/rules/cppcms.make diff --cc ptxdist/rules/dbus_mech.in index 59d42e3,59d42e3..0000000 mode 100644,100755..100644 --- a/ptxdist/rules/dbus_mech.in +++ b/ptxdist/rules/dbus_mech.in diff --cc ptxdist/rules/dbus_mech.make index aa3114a,aa3114a..0000000 mode 100644,100755..100644 --- a/ptxdist/rules/dbus_mech.make +++ b/ptxdist/rules/dbus_mech.make diff --cc ptxdist/rules/display-test.in index dbfe055,dbfe055..0000000 mode 100644,100755..100644 --- a/ptxdist/rules/display-test.in +++ b/ptxdist/rules/display-test.in diff --cc ptxdist/rules/display-test.make index 8e4309b,8e4309b..0000000 mode 100644,100755..100644 --- a/ptxdist/rules/display-test.make +++ b/ptxdist/rules/display-test.make diff --cc ptxdist/rules/ebashlib.in index d1c4332,d1c4332..0000000 mode 100644,100755..100644 --- a/ptxdist/rules/ebashlib.in +++ b/ptxdist/rules/ebashlib.in diff --cc ptxdist/rules/ebashlib.make index b0d0a3b,b0d0a3b..0000000 mode 100644,100755..100644 --- a/ptxdist/rules/ebashlib.make +++ b/ptxdist/rules/ebashlib.make diff --cc ptxdist/rules/econfigure.in index 8c34865,8c34865..0000000 mode 100644,100755..100644 --- a/ptxdist/rules/econfigure.in +++ b/ptxdist/rules/econfigure.in diff --cc ptxdist/rules/econfigure.make index 54fb8cd,54fb8cd..0000000 mode 100644,100755..100644 --- a/ptxdist/rules/econfigure.make +++ b/ptxdist/rules/econfigure.make diff --cc ptxdist/rules/ecu-basicsys.in index 5a33277,4398b76..0000000 mode 100644,100755..100644 --- a/ptxdist/rules/ecu-basicsys.in +++ b/ptxdist/rules/ecu-basicsys.in @@@ -4,5 -4,15 +4,19 @@@ config ECU_BASICSY bool prompt "ecu-basicsys" help ++<<<<<<< HEAD + Basic systemconfiguration for the platform type ECU02 ++======= + Basic systemconfiguration for the platform type ECUXX + + + choice + prompt "Choose your ECU platform:" + config ECU_PLATFORM_ECU01 + bool "ECU01" + + config ECU_PLATFORM_ECU02 + bool "ECU02" + endchoice ++>>>>>>> rauch/jobrechner-import-20190607 diff --cc ptxdist/rules/ecu-basicsys.make index 7114553,4985e8e..0000000 mode 100644,100755..100644 --- a/ptxdist/rules/ecu-basicsys.make +++ b/ptxdist/rules/ecu-basicsys.make @@@ -83,6 -83,9 +83,12 @@@ $(STATEDIR)/ecu-basicsys.targetinstall # tmpdir.d $(call install_copy, ecu-basicsys, 0, 0, 0640, $(ECU_BASICSYS_DIR)/usr/lib/tmpfiles.d/sshd.conf, /usr/lib/tmpfiles.d/sshd.conf) ++<<<<<<< HEAD ++======= + # Copy Rauch-Lib + $(call install_copy, ecu-basicsys, 0, 0, 0644, $(ECU_BASICSYS_DIR)/usr/lib/libEMC, /usr/lib/libEMC.so) + ++>>>>>>> rauch/jobrechner-import-20190607 #init sys-V compat $(call install_copy, ecu-basicsys, 0, 0, 0755, /etc/init.d) $(call install_copy, ecu-basicsys, 0, 0, 0755, $(ECU_BASICSYS_DIR)/etc/init.d/rc, \ @@@ -94,7 -97,7 +100,11 @@@ #rc.once.d @$(call install_copy, ecu-basicsys, 0, 0, 0755, $(ECU_BASICSYS_DIR)/etc/rc.once.d/device-id, /etc/rc.once.d/device-id) ++<<<<<<< HEAD + @$(call install_copy, ecu-basicsys, 0, 0, 0755, $(ECU_BASICSYS_DIR)/etc/rc.once.d/check_bl_version, /etc/rc.once.d/check_bl_version) ++======= + #@$(call install_copy, ecu-basicsys, 0, 0, 0755, $(ECU_BASICSYS_DIR)/etc/rc.once.d/check_bl_version, /etc/rc.once.d/check_bl_version) ++>>>>>>> rauch/jobrechner-import-20190607 #udev-rules @$(call install_copy, ecu-basicsys, 0, 0, 0755, /etc/udev/rules.d) @@@ -137,26 -140,22 +147,42 @@@ @$(call install_copy, ecu-basicsys, 0, 0, 0640, $(ECU_BASICSYS_DIR)/lib/systemd/system/ubi-check-partitions.service, /lib/systemd/system/ubi-check-partitions.service) @$(call install_copy, ecu-basicsys, 0, 0, 0640, $(ECU_BASICSYS_DIR)/lib/systemd/system/var-dyn.mount, /lib/systemd/system/var-dyn.mount) @$(call install_copy, ecu-basicsys, 0, 0, 0640, $(ECU_BASICSYS_DIR)/lib/systemd/system/var-stat.mount, /lib/systemd/system/var-stat.mount) ++<<<<<<< HEAD + @$(call install_copy, ecu-basicsys, 0, 0, 0640, $(ECU_BASICSYS_DIR)/lib/systemd/system/udp.socket, /lib/systemd/system/udp.socket) + @$(call install_copy, ecu-basicsys, 0, 0, 0640, $(ECU_BASICSYS_DIR)/lib/systemd/system/emvtest.service, /lib/systemd/system/emvtest.service) + @$(call install_copy, ecu-basicsys, 0, 0, 0640, $(ECU_BASICSYS_DIR)/lib/systemd/system/loadenv.service, /lib/systemd/system/loadenv.service) + + $(call install_copy, ecu-basicsys, 0, 0, 0640, $(ECU_BASICSYS_DIR)/lib/systemd/system/wlan.target, /lib/systemd/system/wlan.target) + $(call install_copy, ecu-basicsys, 0, 0, 0640, $(ECU_BASICSYS_DIR)/lib/systemd/system/hostapd.service, /lib/systemd/system/hostapd.service) + $(call install_copy, ecu-basicsys, 0, 0, 0640, $(ECU_BASICSYS_DIR)/lib/systemd/system/dhcpd.service, /lib/systemd/system/dhcpd.service) + + #firmware files + $(call install_copy, ecu-basicsys, 0, 0, 0640, $(ECU_BASICSYS_DIR)/lib/firmware/rt2870.bin, /lib/firmware/rt2870.bin) + $(call install_copy, ecu-basicsys, 0, 0, 0640, $(ECU_BASICSYS_DIR)/lib/firmware/rtlwifi/rtl8192cufw.bin, /lib/firmware/rtlwifi/rtl8192cufw.bin) ++======= + @$(call install_copy, ecu-basicsys, 0, 0, 0640, $(ECU_BASICSYS_DIR)/lib/systemd/system/hostapd.service, /lib/systemd/system/hostapd.service) + @$(call install_copy, ecu-basicsys, 0, 0, 0640, $(ECU_BASICSYS_DIR)/lib/systemd/system/reconfig-wlan.service, /lib/systemd/system/reconfig-wlan.service) + @$(call install_copy, ecu-basicsys, 0, 0, 0640, $(ECU_BASICSYS_DIR)/lib/systemd/system/udp.socket, /lib/systemd/system/udp.socket) + @$(call install_copy, ecu-basicsys, 0, 0, 0640, $(ECU_BASICSYS_DIR)/lib/systemd/system/emvtest.service, /lib/systemd/system/emvtest.service) + @$(call install_copy, ecu-basicsys, 0, 0, 0640, $(ECU_BASICSYS_DIR)/lib/systemd/system/loadenv.service, /lib/systemd/system/loadenv.service) + @$(call install_copy, ecu-basicsys, 0, 0, 0640, $(ECU_BASICSYS_DIR)/lib/systemd/system/dhcpd.service, /lib/systemd/system/dhcpd.service) + + #firmware files + @$(call install_copy, ecu-basicsys, 0, 0, 0640, $(ECU_BASICSYS_DIR)/lib/firmware/rt2870.bin, /lib/firmware/rt2870.bin) + @$(call install_copy, ecu-basicsys, 0, 0, 0640, $(ECU_BASICSYS_DIR)/lib/firmware/rtlwifi/rtl8192cufw.bin, /lib/firmware/rtlwifi/rtl8192cufw.bin) ++>>>>>>> rauch/jobrechner-import-20190607 #systemd links $(call install_link, ecu-basicsys, /lib/systemd/system/var-dyn.mount, /lib/systemd/system/local-fs.target.wants/var-dyn.mount) $(call install_link, ecu-basicsys, /lib/systemd/system/var-stat.mount, /lib/systemd/system/local-fs.target.wants/var-stat.mount) $(call install_link, ecu-basicsys, /lib/systemd/system/loadenv.service, /lib/systemd/system/application.target.wants/loadenv.service) ++<<<<<<< HEAD + $(call install_link, ecu-basicsys, /lib/systemd/system/hostapd.service, /lib/systemd/system/wlan.target.wants/hostapd.service) + $(call install_link, ecu-basicsys, /lib/systemd/system/dhcpd.service, /lib/systemd/system/wlan.target.wants/dhcpd.service) + ++======= ++>>>>>>> rauch/jobrechner-import-20190607 #create empty directory $(call install_copy, ecu-basicsys, 0, 0, 0755, /etc/systemd/system/getty.target.wants) @$(call install_copy, ecu-basicsys, 0, 0, 0640, $(ECU_BASICSYS_DIR)/etc/systemd/system/getty-udev-trigger-devices.service, /etc/systemd/system/getty.target.wants/getty-udev-trigger-devices.service) @@@ -170,7 -169,26 +196,30 @@@ @$(call install_copy, ecu-basicsys, 0, 0, 0755, $(ECU_BASICSYS_DIR)/etc/usbmount/umount.d/10_check_systemd_control, /etc/usbmount/umount.d/10_check_systemd_control) #sbin scripts ++<<<<<<< HEAD + @$(call install_tree, ecu-basicsys, 0, 0, $(ECU_BASICSYS_DIR)/sbin, /sbin) ++======= + # @$(call install_tree, ecu-basicsys, 0, 0, $(ECU_BASICSYS_DIR)/sbin, /sbin) + # @$(call install_tree, ecu-basicsys, 0, 0, $(ECU_BASICSYS_DIR)/usr/bl, /usr/bl) + @$(call install_copy, ecu-basicsys, 0, 0, 0755, $(ECU_BASICSYS_DIR)/sbin/bareboxenv, /sbin/bareboxenv) + @$(call install_copy, ecu-basicsys, 0, 0, 0755, $(ECU_BASICSYS_DIR)/sbin/can_loop_test.sh, /sbin/can_loop_test.sh) + @$(call install_copy, ecu-basicsys, 0, 0, 0755, $(ECU_BASICSYS_DIR)/sbin/check_ubi_partitions, /sbin/check_ubi_partitions) + @$(call install_copy, ecu-basicsys, 0, 0, 0755, $(ECU_BASICSYS_DIR)/sbin/emvtest.sh, /sbin/emvtest.sh) + @$(call install_copy, ecu-basicsys, 0, 0, 0755, $(ECU_BASICSYS_DIR)/sbin/generate_ssid, /sbin/generate_ssid) + @$(call install_copy, ecu-basicsys, 0, 0, 0755, $(ECU_BASICSYS_DIR)/sbin/hostapd_action_file, /sbin/hostapd_action_file) + @$(call install_copy, ecu-basicsys, 0, 0, 0755, $(ECU_BASICSYS_DIR)/sbin/loadenv.sh, /sbin/loadenv.sh) + @$(call install_copy, ecu-basicsys, 0, 0, 0755, $(ECU_BASICSYS_DIR)/sbin/reconfig_wlan.sh, /sbin/reconfig_wlan.sh) + @$(call install_copy, ecu-basicsys, 0, 0, 0755, $(ECU_BASICSYS_DIR)/sbin/rootfs.readonly, /sbin/rootfs.readonly) + @$(call install_copy, ecu-basicsys, 0, 0, 0755, $(ECU_BASICSYS_DIR)/sbin/rootfs.readonly.ignore_errors, /sbin/rootfs.readonly.ignore_errors) + @$(call install_copy, ecu-basicsys, 0, 0, 0755, $(ECU_BASICSYS_DIR)/sbin/rootfs.writable, /sbin/rootfs.writable) + @$(call install_copy, ecu-basicsys, 0, 0, 0755, $(ECU_BASICSYS_DIR)/sbin/set_console, /sbin/set_console) + @$(call install_copy, ecu-basicsys, 0, 0, 0755, $(ECU_BASICSYS_DIR)/sbin/start_tracing, /sbin/start_tracing) + @$(call install_copy, ecu-basicsys, 0, 0, 0755, $(ECU_BASICSYS_DIR)/sbin/stop_tracing, /sbin/stop_tracing) + @$(call install_copy, ecu-basicsys, 0, 0, 0755, $(ECU_BASICSYS_DIR)/sbin/sys_update, /sbin/sys_update) + @$(call install_copy, ecu-basicsys, 0, 0, 0755, $(ECU_BASICSYS_DIR)/sbin/update_bl, /sbin/update_bl) + @$(call install_copy, ecu-basicsys, 0, 0, 0755, $(ECU_BASICSYS_DIR)/sbin/update_bl_env, /sbin/update_bl_env) + @$(call install_copy, ecu-basicsys, 0, 0, 0755, $(ECU_BASICSYS_DIR)/usr/bl/barebox-image, /usr/bl/barebox-image) ++>>>>>>> rauch/jobrechner-import-20190607 #local environment @$(call install_copy, ecu-basicsys, 0, 0, 0755, $(ECU_BASICSYS_DIR)/etc/profile.local, \ @@@ -178,7 -196,9 +227,13 @@@ # home dir @$(call install_copy, ecu-basicsys, 0, 0, 0755, $(ECU_BASICSYS_DIR)/home/version.txt, /home/version.txt) ++<<<<<<< HEAD + @$(call install_replace, ecu-basicsys, /home/version.txt, @ECU02_PROJECT_VERSION@, $(PTXCONF_PROJECT_VERSION) ) ++======= + + # /var/db dir (used for the dhcpd server - dhcpd.leases) + $(call install_copy, ecu-basicsys, 0, 0, 0755, /var/db) ++>>>>>>> rauch/jobrechner-import-20190607 @$(call install_finish,ecu-basicsys) diff --cc ptxdist/rules/ecu-codesys.in index 2397757,463e5e4..0000000 mode 100644,100755..100644 --- a/ptxdist/rules/ecu-codesys.in +++ b/ptxdist/rules/ecu-codesys.in @@@ -6,7 -6,6 +6,10 @@@ config ECU_CODESY bool prompt "ecu-codesys" select CODESYS3_RT ++<<<<<<< HEAD + select CODESYS3_RT_SYSTEMD_UNIT ++======= ++>>>>>>> rauch/jobrechner-import-20190607 select COMMON help Codesys3 related libaries and configurations diff --cc ptxdist/rules/ecu-codesys.make index 5d2b021,2a51154..0000000 mode 100644,100755..100644 --- a/ptxdist/rules/ecu-codesys.make +++ b/ptxdist/rules/ecu-codesys.make @@@ -17,10 -17,10 +17,17 @@@ PACKAGES-$(PTXCONF_ECU_CODESYS) += ecu- # Paths and names # ECU_CODESYS_VERSION := 1.0 ++<<<<<<< HEAD +ECU_CODESYS_MD5 := +ECU_CODESYS := ecu-codesys +ECU_CODESYS_URL := file://local_src/$(ECU_CODESYS) +ECU_CODESYS_DIR := $(BUILDDIR)/$(ECU_CODESYS) ++======= + ECU_CODESYS_MD5 := + ECU_CODESYS := ecu-codesys + ECU_CODESYS_URL := file://local_src/$(ECU_CODESYS) + ECU_CODESYS_DIR := $(BUILDDIR)/$(ECU_CODESYS) ++>>>>>>> rauch/jobrechner-import-20190607 ECU_CODESYS_LICENSE := unknown @@@ -96,11 -96,21 +103,29 @@@ $(STATEDIR)/ecu-codesys.targetinstall @$(call install_copy, ecu-codesys, 0, 0, 0644, $(ECU_CODESYS_DIR)/optipoint/libOptiPoint.so, $(PTXCONF_CODESYS3_RT_LIB_PATH)/libOptiPoint.so) @$(call install_copy, ecu-codesys, 0, 0, 0644, $(ECU_CODESYS_DIR)/varispread/libVariSpread.so, $(PTXCONF_CODESYS3_RT_LIB_PATH)/libVariSpread.so) ++<<<<<<< HEAD + @$(call install_tree, ecu-codesys, 0, 0, $(ECU_CODESYS_DIR)/target_rootfs, $(PTXCONF_CODESYS3_RT_HOME)) + + @$(call install_copy, ecu-codesys, 0, 0, 0755, $(ECU_CODESYS_DIR)/update-ecu-codesys-application.sh, /sbin/update-ecu-codesys-application.sh) + @$(call install_replace, ecu-codesys, /sbin/update-ecu-codesys-application.sh, @ECU_PATH_ON_STICK@, "ecu02" ) + @$(call install_copy, ecu-codesys, 0, 0, 0755, $(ECU_CODESYS_DIR)/90_update_codesys_application, /etc/usbmount/mount.d/90_update_codesys_application) ++======= + @$(call install_copy, ecu-codesys, 0, 0, 0644, $(ECU_CODESYS_DIR)/target_rootfs/CODESYSControl.cfg, $(PTXCONF_CODESYS3_RT_HOME)/CODESYSControl.cfg) + #@$(call install_copy, ecu-codesys, 0, 0, 0644, $(ECU_CODESYS_DIR)/target_rootfs/Axent.ini, $(PTXCONF_CODESYS3_RT_HOME)/Axent.ini) + @$(call install_copy, ecu-codesys, 0, 0, 0644, $(ECU_CODESYS_DIR)/target_rootfs/SysFileMap.cfg, $(PTXCONF_CODESYS3_RT_HOME)/SysFileMap.cfg) + @$(call install_copy, ecu-codesys, 0, 0, 0755, $(ECU_CODESYS_DIR)/target_rootfs/rts_set_baud.sh, $(PTXCONF_CODESYS3_RT_HOME)/rts_set_baud.sh) + + @$(call install_copy, ecu-codesys, 0, 0, 0755, $(ECU_CODESYS_DIR)/target_rootfs/update-ecu-codesys-application.sh, /sbin/update-ecu-codesys-application.sh) + ifdef PTXCONF_ECU_PLATFORM_ECU01 + @$(call install_replace, ecu-codesys, /sbin/update-ecu-codesys-application.sh, @ECU_PATH_ON_STICK@, "ecu01" ) + endif + ifdef PTXCONF_ECU_PLATFORM_ECU02 + @$(call install_replace, ecu-codesys, /sbin/update-ecu-codesys-application.sh, @ECU_PATH_ON_STICK@, "ecu02" ) + endif + + + @$(call install_copy, ecu-codesys, 0, 0, 0755, $(ECU_CODESYS_DIR)/target_rootfs/90_update_codesys_application, /etc/usbmount/mount.d/90_update_codesys_application) ++>>>>>>> rauch/jobrechner-import-20190607 @$(call install_link, ecu-codesys, /lib/systemd/system/codesys3-rt.service, /etc/systemd/system/application.target.wants/codesys3-rt.service) diff --cc ptxdist/rules/ecu-comp-cap.in index 5d3c299,5d3c299..0000000 mode 100644,100755..100644 --- a/ptxdist/rules/ecu-comp-cap.in +++ b/ptxdist/rules/ecu-comp-cap.in diff --cc ptxdist/rules/ecu-comp-cap.make index 35a74c9,35a74c9..0000000 mode 100644,100755..100644 --- a/ptxdist/rules/ecu-comp-cap.make +++ b/ptxdist/rules/ecu-comp-cap.make diff --cc ptxdist/rules/ecu-control.in index abd9348,abd9348..0000000 mode 100644,100755..100644 --- a/ptxdist/rules/ecu-control.in +++ b/ptxdist/rules/ecu-control.in diff --cc ptxdist/rules/ecu-control.make index efa6e99,efa6e99..0000000 mode 100644,100755..100644 --- a/ptxdist/rules/ecu-control.make +++ b/ptxdist/rules/ecu-control.make diff --cc ptxdist/rules/ecu-explore.in index d148c0a,d148c0a..0000000 mode 100644,100755..100644 --- a/ptxdist/rules/ecu-explore.in +++ b/ptxdist/rules/ecu-explore.in diff --cc ptxdist/rules/ecu-explore.make index 7e84e89,7e84e89..0000000 mode 100644,100755..100644 --- a/ptxdist/rules/ecu-explore.make +++ b/ptxdist/rules/ecu-explore.make diff --cc ptxdist/rules/ecu-jobctl.in index ef8973f,ef8973f..0000000 mode 100644,100755..100644 --- a/ptxdist/rules/ecu-jobctl.in +++ b/ptxdist/rules/ecu-jobctl.in diff --cc ptxdist/rules/ecu-jobctl.make index efcdc11,7252e29..0000000 mode 100644,100755..100644 --- a/ptxdist/rules/ecu-jobctl.make +++ b/ptxdist/rules/ecu-jobctl.make @@@ -66,6 -66,38 +66,41 @@@ $(STATEDIR)/ecu-jobctl.install cp $(ECU_JOBCTL_DIR)-build/extern/isobus/libIsobus.so.$(ECU_JOBCTL_VERSION) $(PTXDIST_SYSROOT_TARGET)/usr/lib/libIsobus.so ln -sf libIsobus.so $(PTXDIST_SYSROOT_TARGET)/usr/lib/libIsobus.so.1 ln -sf libIsobus.so $(PTXDIST_SYSROOT_TARGET)/usr/lib/libIsobus.so.1.0 ++<<<<<<< HEAD ++======= + + cp $(ECU_JOBCTL_DIR)-build/extern/linbus/liblinbus.so.$(ECU_JOBCTL_VERSION) $(PTXDIST_SYSROOT_TARGET)/usr/lib/liblinbus.so + ln -sf liblinbus.so $(PTXDIST_SYSROOT_TARGET)/usr/lib/liblinbus.so.1 + ln -sf liblinbus.so $(PTXDIST_SYSROOT_TARGET)/usr/lib/liblinbus.so.1.0 + + cp $(ECU_JOBCTL_DIR)-build/extern/emc/libemc.so.$(ECU_JOBCTL_VERSION) $(PTXDIST_SYSROOT_TARGET)/usr/lib/libemc.so + ln -sf libemc.so $(PTXDIST_SYSROOT_TARGET)/usr/lib/libemc.so.1 + ln -sf libemc.so $(PTXDIST_SYSROOT_TARGET)/usr/lib/libemc.so.1.0 + + cp $(ECU_JOBCTL_DIR)-build/extern/optipoint/liboptipoint.so.$(ECU_JOBCTL_VERSION) $(PTXDIST_SYSROOT_TARGET)/usr/lib/liboptipoint.so + ln -sf liboptipoint.so $(PTXDIST_SYSROOT_TARGET)/usr/lib/liboptipoint.so.1 + ln -sf liboptipoint.so $(PTXDIST_SYSROOT_TARGET)/usr/lib/liboptipoint.so.1.0 + + cp $(ECU_JOBCTL_DIR)-build/extern/pid_control/libpid_control.so.$(ECU_JOBCTL_VERSION) $(PTXDIST_SYSROOT_TARGET)/usr/lib/libpid_control.so + ln -sf libpid_control.so $(PTXDIST_SYSROOT_TARGET)/usr/lib/libpid_control.so.1 + ln -sf libpid_control.so $(PTXDIST_SYSROOT_TARGET)/usr/lib/libpid_control.so.1.0 + + cp $(ECU_JOBCTL_DIR)-build/extern/pos_control/libpos_control.so.$(ECU_JOBCTL_VERSION) $(PTXDIST_SYSROOT_TARGET)/usr/lib/libpos_control.so + ln -sf libpos_control.so $(PTXDIST_SYSROOT_TARGET)/usr/lib/libpos_control.so.1 + ln -sf libpos_control.so $(PTXDIST_SYSROOT_TARGET)/usr/lib/libpos_control.so.1.0 + + cp $(ECU_JOBCTL_DIR)-build/extern/varispread/libvarispread.so.$(ECU_JOBCTL_VERSION) $(PTXDIST_SYSROOT_TARGET)/usr/lib/libvarispread.so + ln -sf libvarispread.so $(PTXDIST_SYSROOT_TARGET)/usr/lib/libvarispread.so.1 + ln -sf libvarispread.so $(PTXDIST_SYSROOT_TARGET)/usr/lib/libvarispread.so.1.0 + + cp $(ECU_JOBCTL_DIR)-build/extern/axmat/libaxmat.so.$(ECU_JOBCTL_VERSION) $(PTXDIST_SYSROOT_TARGET)/usr/lib/libaxmat.so + ln -sf libaxmat.so $(PTXDIST_SYSROOT_TARGET)/usr/lib/libaxmat.so.1 + ln -sf libaxmat.so $(PTXDIST_SYSROOT_TARGET)/usr/lib/libaxmat.so.1.0 + + cp $(ECU_JOBCTL_DIR)-build/extern/predos_control/libpredos_control.so.$(ECU_JOBCTL_VERSION) $(PTXDIST_SYSROOT_TARGET)/usr/lib/libpredos_control.so + ln -sf libpredos_control.so $(PTXDIST_SYSROOT_TARGET)/usr/lib/libpredos_control.so.1 + ln -sf libpredos_control.so $(PTXDIST_SYSROOT_TARGET)/usr/lib/libpredos_control.so.1.0 ++>>>>>>> rauch/jobrechner-import-20190607 @$(call touch) # ---------------------------------------------------------------------------- @@@ -123,6 -155,94 +158,97 @@@ endi @$(call install_copy, ecu-jobctl, 0, 0, 0755, $(ECU_JOBCTL_DIR)-build/extern/isobus/libIsobus.so.$(ECU_JOBCTL_VERSION), /usr/lib/libIsobus.so) @$(call install_link, ecu-jobctl, libIsobus.so, /usr/lib/libIsobus.so.1) @$(call install_link, ecu-jobctl, libIsobus.so, /usr/lib/libIsobus.so.1.0) ++<<<<<<< HEAD ++======= + + # install libIsobus + @$(call install_copy, ecu-jobctl, 0, 0, 0755, $(ECU_JOBCTL_DIR)-build/extern/isobus/libIsobus.so.$(ECU_JOBCTL_VERSION), /usr/lib/libIsobus.so) + @$(call install_link, ecu-jobctl, libIsobus.so, /usr/lib/libIsobus.so.1) + @$(call install_link, ecu-jobctl, libIsobus.so, /usr/lib/libIsobus.so.1.0) + + # install liblinbus + @$(call install_copy, ecu-jobctl, 0, 0, 0755, $(ECU_JOBCTL_DIR)-build/extern/linbus/liblinbus.so.$(ECU_JOBCTL_VERSION), /usr/lib/liblinbus.so) + @$(call install_link, ecu-jobctl, liblinbus.so, /usr/lib/liblinbus.so.1) + @$(call install_link, ecu-jobctl, liblinbus.so, /usr/lib/liblinbus.so.1.0) + + # install libemc + @$(call install_copy, ecu-jobctl, 0, 0, 0755, $(ECU_JOBCTL_DIR)-build/extern/emc/libemc.so.$(ECU_JOBCTL_VERSION), /usr/lib/libemc.so) + @$(call install_link, ecu-jobctl, libemc.so, /usr/lib/libemc.so.1) + @$(call install_link, ecu-jobctl, libemc.so, /usr/lib/libemc.so.1.0) + + # install liboptipoint + @$(call install_copy, ecu-jobctl, 0, 0, 0755, $(ECU_JOBCTL_DIR)-build/extern/optipoint/liboptipoint.so.$(ECU_JOBCTL_VERSION), /usr/lib/liboptipoint.so) + @$(call install_link, ecu-jobctl, liboptipoint.so, /usr/lib/liboptipoint.so.1) + @$(call install_link, ecu-jobctl, liboptipoint.so, /usr/lib/liboptipoint.so.1.0) + + # install libpid_control + @$(call install_copy, ecu-jobctl, 0, 0, 0755, $(ECU_JOBCTL_DIR)-build/extern/pid_control/libpid_control.so.$(ECU_JOBCTL_VERSION), /usr/lib/libpid_control.so) + @$(call install_link, ecu-jobctl, libpid_control.so, /usr/lib/libpid_control.so.1) + @$(call install_link, ecu-jobctl, libpid_control.so, /usr/lib/libpid_control.so.1.0) + + # install libpos_control + @$(call install_copy, ecu-jobctl, 0, 0, 0755, $(ECU_JOBCTL_DIR)-build/extern/pos_control/libpos_control.so.$(ECU_JOBCTL_VERSION), /usr/lib/libpos_control.so) + @$(call install_link, ecu-jobctl, libpos_control.so, /usr/lib/libpos_control.so.1) + @$(call install_link, ecu-jobctl, libpos_control.so, /usr/lib/libpos_control.so.1.0) + + # install libvarispread + @$(call install_copy, ecu-jobctl, 0, 0, 0755, $(ECU_JOBCTL_DIR)-build/extern/varispread/libvarispread.so.$(ECU_JOBCTL_VERSION), /usr/lib/libvarispread.so) + @$(call install_link, ecu-jobctl, libvarispread.so, /usr/lib/libvarispread.so.1) + @$(call install_link, ecu-jobctl, libvarispread.so, /usr/lib/libvarispread.so.1.0) + + # install libaxmat + @$(call install_copy, ecu-jobctl, 0, 0, 0755, $(ECU_JOBCTL_DIR)-build/extern/axmat/libaxmat.so.$(ECU_JOBCTL_VERSION), /usr/lib/libaxmat.so) + @$(call install_link, ecu-jobctl, libaxmat.so, /usr/lib/libaxmat.so.1) + @$(call install_link, ecu-jobctl, libaxmat.so, /usr/lib/libaxmat.so.1.0) + + # install libpredos_control + @$(call install_copy, ecu-jobctl, 0, 0, 0755, $(ECU_JOBCTL_DIR)-build/extern/predos_control/libpredos_control.so.$(ECU_JOBCTL_VERSION), /usr/lib/libpredos_control.so) + @$(call install_link, ecu-jobctl, libpredos_control.so, /usr/lib/libpredos_control.so.1) + @$(call install_link, ecu-jobctl, libpredos_control.so, /usr/lib/libpredos_control.so.1.0) + + # install iops (pool files) + @$(call install_copy, ecu-jobctl, 0, 0, 0755, $(ECU_JOBCTL_DIR)/pool/AxisAxent.iop, /home/AxisAxent.iop) + @$(call install_copy, ecu-jobctl, 0, 0, 0755, $(ECU_JOBCTL_DIR)/pool/AxisAxentAUX.iop, /home/AxisAxentAUX.iop) + @$(call install_copy, ecu-jobctl, 0, 0, 0755, $(ECU_JOBCTL_DIR)/pool/AxisAxentBG.iop, /home/AxisAxentBG.iop) + @$(call install_copy, ecu-jobctl, 0, 0, 0755, $(ECU_JOBCTL_DIR)/pool/AxisAxentCS.iop, /home/AxisAxentCS.iop) + @$(call install_copy, ecu-jobctl, 0, 0, 0755, $(ECU_JOBCTL_DIR)/pool/AxisAxentDA.iop, /home/AxisAxentDA.iop) + @$(call install_copy, ecu-jobctl, 0, 0, 0755, $(ECU_JOBCTL_DIR)/pool/AxisAxentDE.iop, /home/AxisAxentDE.iop) + @$(call install_copy, ecu-jobctl, 0, 0, 0755, $(ECU_JOBCTL_DIR)/pool/AxisAxentEL.iop, /home/AxisAxentEL.iop) + @$(call install_copy, ecu-jobctl, 0, 0, 0755, $(ECU_JOBCTL_DIR)/pool/AxisAxentEN.iop, /home/AxisAxentEN.iop) + @$(call install_copy, ecu-jobctl, 0, 0, 0755, $(ECU_JOBCTL_DIR)/pool/AxisAxentES.iop, /home/AxisAxentES.iop) + @$(call install_copy, ecu-jobctl, 0, 0, 0755, $(ECU_JOBCTL_DIR)/pool/AxisAxentET.iop, /home/AxisAxentET.iop) + @$(call install_copy, ecu-jobctl, 0, 0, 0755, $(ECU_JOBCTL_DIR)/pool/AxisAxentFI.iop, /home/AxisAxentFI.iop) + @$(call install_copy, ecu-jobctl, 0, 0, 0755, $(ECU_JOBCTL_DIR)/pool/AxisAxentFR.iop, /home/AxisAxentFR.iop) + @$(call install_copy, ecu-jobctl, 0, 0, 0755, $(ECU_JOBCTL_DIR)/pool/AxisAxentHR.iop, /home/AxisAxentHR.iop) + @$(call install_copy, ecu-jobctl, 0, 0, 0755, $(ECU_JOBCTL_DIR)/pool/AxisAxentHU.iop, /home/AxisAxentHU.iop) + @$(call install_copy, ecu-jobctl, 0, 0, 0755, $(ECU_JOBCTL_DIR)/pool/AxisAxentIS.iop, /home/AxisAxentIS.iop) + @$(call install_copy, ecu-jobctl, 0, 0, 0755, $(ECU_JOBCTL_DIR)/pool/AxisAxentIT.iop, /home/AxisAxentIT.iop) + @$(call install_copy, ecu-jobctl, 0, 0, 0755, $(ECU_JOBCTL_DIR)/pool/AxisAxentLT.iop, /home/AxisAxentLT.iop) + @$(call install_copy, ecu-jobctl, 0, 0, 0755, $(ECU_JOBCTL_DIR)/pool/AxisAxentLV.iop, /home/AxisAxentLV.iop) + @$(call install_copy, ecu-jobctl, 0, 0, 0755, $(ECU_JOBCTL_DIR)/pool/AxisAxentNL.iop, /home/AxisAxentNL.iop) + @$(call install_copy, ecu-jobctl, 0, 0, 0755, $(ECU_JOBCTL_DIR)/pool/AxisAxentNO.iop, /home/AxisAxentNO.iop) + @$(call install_copy, ecu-jobctl, 0, 0, 0755, $(ECU_JOBCTL_DIR)/pool/AxisAxentPL.iop, /home/AxisAxentPL.iop) + @$(call install_copy, ecu-jobctl, 0, 0, 0755, $(ECU_JOBCTL_DIR)/pool/AxisAxentPT.iop, /home/AxisAxentPT.iop) + @$(call install_copy, ecu-jobctl, 0, 0, 0755, $(ECU_JOBCTL_DIR)/pool/AxisAxentRO.iop, /home/AxisAxentRO.iop) + @$(call install_copy, ecu-jobctl, 0, 0, 0755, $(ECU_JOBCTL_DIR)/pool/AxisAxentRU.iop, /home/AxisAxentRU.iop) + @$(call install_copy, ecu-jobctl, 0, 0, 0755, $(ECU_JOBCTL_DIR)/pool/AxisAxentSK.iop, /home/AxisAxentSK.iop) + @$(call install_copy, ecu-jobctl, 0, 0, 0755, $(ECU_JOBCTL_DIR)/pool/AxisAxentSL.iop, /home/AxisAxentSL.iop) + @$(call install_copy, ecu-jobctl, 0, 0, 0755, $(ECU_JOBCTL_DIR)/pool/AxisAxentSR.iop, /home/AxisAxentSR.iop) + @$(call install_copy, ecu-jobctl, 0, 0, 0755, $(ECU_JOBCTL_DIR)/pool/AxisAxentSV.iop, /home/AxisAxentSV.iop) + @$(call install_copy, ecu-jobctl, 0, 0, 0755, $(ECU_JOBCTL_DIR)/pool/AxisAxentTR.iop, /home/AxisAxentTR.iop) + @$(call install_copy, ecu-jobctl, 0, 0, 0755, $(ECU_JOBCTL_DIR)/pool/AxisAxentUK.iop, /home/AxisAxentUK.iop) + @$(call install_copy, ecu-jobctl, 0, 0, 0755, $(ECU_JOBCTL_DIR)/pool/AxisAxentBR.iop, /home/AxisAxentBR.iop) + @$(call install_copy, ecu-jobctl, 0, 0, 0755, $(ECU_JOBCTL_DIR)/pool/Imperial.iop, /home/Imperial.iop) + @$(call install_copy, ecu-jobctl, 0, 0, 0755, $(ECU_JOBCTL_DIR)/pool/Metric.iop, /home/Metric.iop) + @$(call install_copy, ecu-jobctl, 0, 0, 0755, $(ECU_JOBCTL_DIR)/pool/SKs_5x2.iop, /home/SKs_5x2.iop) + @$(call install_copy, ecu-jobctl, 0, 0, 0755, $(ECU_JOBCTL_DIR)/pool/SKs_6x2.iop, /home/SKs_6x2.iop) + @$(call install_copy, ecu-jobctl, 0, 0, 0755, $(ECU_JOBCTL_DIR)/pool/Not_supported_Display.iop, /home/Not_supported_Display.iop) + + # install configuration + @$(call install_copy, ecu-jobctl, 0, 0, 0755, $(ECU_JOBCTL_DIR)/configuration/can_filter.txt, /home/can_filter.txt) + @$(call install_copy, ecu-jobctl, 0, 0, 0755, $(ECU_JOBCTL_DIR)/configuration/PreferredAssignment.txt, /home/PreferredAssignment.txt) + @$(call install_copy, ecu-jobctl, 0, 0, 0755, $(ECU_JOBCTL_DIR)/configuration/PreferredAssignmentAPA.txt, /home/PreferredAssignmentAPA.txt) ++>>>>>>> rauch/jobrechner-import-20190607 @$(call install_finish, ecu-jobctl) @@@ -151,6 -271,38 +277,41 @@@ $(STATEDIR)/ecu-jobctl.clean rm -f $(PTXDIST_SYSROOT_TARGET)/usr/lib/libIsobus.so rm -f $(PTXDIST_SYSROOT_TARGET)/usr/lib/libIsobus.so.1 rm -f $(PTXDIST_SYSROOT_TARGET)/usr/lib/libIsobus.so.1.0 ++<<<<<<< HEAD ++======= + + rm -f $(PTXDIST_SYSROOT_TARGET)/usr/lib/liblinbus.so + rm -f $(PTXDIST_SYSROOT_TARGET)/usr/lib/liblinbus.so.1 + rm -f $(PTXDIST_SYSROOT_TARGET)/usr/lib/liblinbus.so.1.0 + + rm -f $(PTXDIST_SYSROOT_TARGET)/usr/lib/libemc.so + rm -f $(PTXDIST_SYSROOT_TARGET)/usr/lib/libemc.so.1 + rm -f $(PTXDIST_SYSROOT_TARGET)/usr/lib/libemc.so.1.0 + + rm -f $(PTXDIST_SYSROOT_TARGET)/usr/lib/liboptipoint.so + rm -f $(PTXDIST_SYSROOT_TARGET)/usr/lib/liboptipoint.so.1 + rm -f $(PTXDIST_SYSROOT_TARGET)/usr/lib/liboptipoint.so.1.0 + + rm -f $(PTXDIST_SYSROOT_TARGET)/usr/lib/libpid_control.so + rm -f $(PTXDIST_SYSROOT_TARGET)/usr/lib/libpid_control.so.1 + rm -f $(PTXDIST_SYSROOT_TARGET)/usr/lib/libpid_control.so.1.0 + + rm -f $(PTXDIST_SYSROOT_TARGET)/usr/lib/libpos_control.so + rm -f $(PTXDIST_SYSROOT_TARGET)/usr/lib/libpos_control.so.1 + rm -f $(PTXDIST_SYSROOT_TARGET)/usr/lib/libpos_control.so.1.0 + + rm -f $(PTXDIST_SYSROOT_TARGET)/usr/lib/libvarispread.so + rm -f $(PTXDIST_SYSROOT_TARGET)/usr/lib/libvarispread.so.1 + rm -f $(PTXDIST_SYSROOT_TARGET)/usr/lib/libvarispread.so.1.0 + + rm -f $(PTXDIST_SYSROOT_TARGET)/usr/lib/libaxmat.so + rm -f $(PTXDIST_SYSROOT_TARGET)/usr/lib/libaxmat.so.1 + rm -f $(PTXDIST_SYSROOT_TARGET)/usr/lib/libaxmat.so.1.0 + + rm -f $(PTXDIST_SYSROOT_TARGET)/usr/lib/libpredos_control.so + rm -f $(PTXDIST_SYSROOT_TARGET)/usr/lib/libpredos_control.so.1 + rm -f $(PTXDIST_SYSROOT_TARGET)/usr/lib/libpredos_control.so.1.0 ++>>>>>>> rauch/jobrechner-import-20190607 # Root, Debug-Root rm -f $(ROOTDIR)/etc/systemd/system/application.target.wants/ecu-jobctl-demo.service diff --cc ptxdist/rules/ecu-motor-ctl.in index ef8ed7e,ef8ed7e..0000000 mode 100644,100755..100644 --- a/ptxdist/rules/ecu-motor-ctl.in +++ b/ptxdist/rules/ecu-motor-ctl.in diff --cc ptxdist/rules/ecu-motor-ctl.make index 7a2a10f,7a2a10f..0000000 mode 100644,100755..100644 --- a/ptxdist/rules/ecu-motor-ctl.make +++ b/ptxdist/rules/ecu-motor-ctl.make diff --cc ptxdist/rules/emicrobench.in index a1e4859,a1e4859..0000000 mode 100644,100755..100644 --- a/ptxdist/rules/emicrobench.in +++ b/ptxdist/rules/emicrobench.in diff --cc ptxdist/rules/emicrobench.make index b4b0db7,b4b0db7..0000000 mode 100644,100755..100644 --- a/ptxdist/rules/emicrobench.make +++ b/ptxdist/rules/emicrobench.make diff --cc ptxdist/rules/enetconfig.in index e4290ad,e4290ad..0000000 mode 100644,100755..100644 --- a/ptxdist/rules/enetconfig.in +++ b/ptxdist/rules/enetconfig.in diff --cc ptxdist/rules/enetconfig.make index 5976fac,5976fac..0000000 mode 100644,100755..100644 --- a/ptxdist/rules/enetconfig.make +++ b/ptxdist/rules/enetconfig.make diff --cc ptxdist/rules/eupdate.in index 7a42b4b,7a42b4b..0000000 mode 100644,100755..100644 --- a/ptxdist/rules/eupdate.in +++ b/ptxdist/rules/eupdate.in diff --cc ptxdist/rules/eupdate.make index def705b,def705b..0000000 mode 100644,100755..100644 --- a/ptxdist/rules/eupdate.make +++ b/ptxdist/rules/eupdate.make diff --cc ptxdist/rules/flush_module.in index 459a004,459a004..0000000 mode 100644,100755..100644 --- a/ptxdist/rules/flush_module.in +++ b/ptxdist/rules/flush_module.in diff --cc ptxdist/rules/flush_module.make index 3d717dc,3d717dc..0000000 mode 100644,100755..100644 --- a/ptxdist/rules/flush_module.make +++ b/ptxdist/rules/flush_module.make diff --cc ptxdist/rules/gettext.in index 5b971f7,5b971f7..0000000 mode 100644,100755..100644 --- a/ptxdist/rules/gettext.in +++ b/ptxdist/rules/gettext.in diff --cc ptxdist/rules/gettext.make index e4b47fa,e4b47fa..0000000 mode 100644,100755..100644 --- a/ptxdist/rules/gettext.make +++ b/ptxdist/rules/gettext.make diff --cc ptxdist/rules/host-workaround-host-libusb.in index eb49cc4,eb49cc4..0000000 mode 100644,100755..100644 --- a/ptxdist/rules/host-workaround-host-libusb.in +++ b/ptxdist/rules/host-workaround-host-libusb.in diff --cc ptxdist/rules/host-workaround-host-libusb.make index 1cfe0e9,1cfe0e9..0000000 mode 100644,100755..100644 --- a/ptxdist/rules/host-workaround-host-libusb.make +++ b/ptxdist/rules/host-workaround-host-libusb.make diff --cc ptxdist/rules/hostapd.in index fb7b7f0,a752fc1..0000000 mode 100644,100755..100644 --- a/ptxdist/rules/hostapd.in +++ b/ptxdist/rules/hostapd.in @@@ -3,7 -3,7 +3,11 @@@ config HOSTAPD bool prompt "hostapd" ++<<<<<<< HEAD + select LIBNL if HOSTAPD_DRIVER_NL80211 ++======= + select LIBNL if HOSTAPD_DRIVER_NL80211 ++>>>>>>> rauch/jobrechner-import-20190607 help FIXME @@@ -23,7 -23,8 +27,12 @@@ if HOSTAP config HOSTAPD_DRIVER_NL80211 bool ++<<<<<<< HEAD + prompt "NL80211 driver" ++======= + prompt "NL80211 driver" + select LIBNL ++>>>>>>> rauch/jobrechner-import-20190607 help Driver interface for drivers using the nl80211 kernel interface diff --cc ptxdist/rules/hostapd.make index ed6884a,ed6884a..0000000 mode 100644,100755..100644 --- a/ptxdist/rules/hostapd.make +++ b/ptxdist/rules/hostapd.make diff --cc ptxdist/rules/iproute2.in index 52be69c,52be69c..0000000 mode 100644,100755..100644 --- a/ptxdist/rules/iproute2.in +++ b/ptxdist/rules/iproute2.in diff --cc ptxdist/rules/iproute2.make index aa7b0d3,aa7b0d3..0000000 mode 100644,100755..100644 --- a/ptxdist/rules/iproute2.make +++ b/ptxdist/rules/iproute2.make diff --cc ptxdist/rules/kbd.in index 5257728,5257728..0000000 mode 100644,100755..100644 --- a/ptxdist/rules/kbd.in +++ b/ptxdist/rules/kbd.in diff --cc ptxdist/rules/kbd.make index f79f2ed,f79f2ed..0000000 mode 100644,100755..100644 --- a/ptxdist/rules/kbd.make +++ b/ptxdist/rules/kbd.make diff --cc ptxdist/rules/kernel-header.in index 88ef95b,88ef95b..0000000 mode 100644,100755..100644 --- a/ptxdist/rules/kernel-header.in +++ b/ptxdist/rules/kernel-header.in diff --cc ptxdist/rules/kernel-header.make index 819a5e8,819a5e8..0000000 mode 100644,100755..100644 --- a/ptxdist/rules/kernel-header.make +++ b/ptxdist/rules/kernel-header.make diff --cc ptxdist/rules/libctemplate.in index 2189005,2189005..0000000 mode 100644,100755..100644 --- a/ptxdist/rules/libctemplate.in +++ b/ptxdist/rules/libctemplate.in diff --cc ptxdist/rules/libctemplate.make index f1eb8b3,f1eb8b3..0000000 mode 100644,100755..100644 --- a/ptxdist/rules/libctemplate.make +++ b/ptxdist/rules/libctemplate.make diff --cc ptxdist/rules/libfcgi.in index 1251132,1251132..0000000 mode 100644,100755..100644 --- a/ptxdist/rules/libfcgi.in +++ b/ptxdist/rules/libfcgi.in diff --cc ptxdist/rules/libfcgi.make index a1b7cab,a1b7cab..0000000 mode 100644,100755..100644 --- a/ptxdist/rules/libfcgi.make +++ b/ptxdist/rules/libfcgi.make diff --cc ptxdist/rules/libmbus.in index 60826e0,60826e0..0000000 mode 100644,100755..100644 --- a/ptxdist/rules/libmbus.in +++ b/ptxdist/rules/libmbus.in diff --cc ptxdist/rules/libmbus.make index bcdd422,bcdd422..0000000 mode 100644,100755..100644 --- a/ptxdist/rules/libmbus.make +++ b/ptxdist/rules/libmbus.make diff --cc ptxdist/rules/libqrencode.in index 8d9b7e4,8d9b7e4..0000000 mode 100644,100755..100644 --- a/ptxdist/rules/libqrencode.in +++ b/ptxdist/rules/libqrencode.in diff --cc ptxdist/rules/libqrencode.make index 12a08d7,12a08d7..0000000 mode 100644,100755..100644 --- a/ptxdist/rules/libqrencode.make +++ b/ptxdist/rules/libqrencode.make diff --cc ptxdist/rules/libquazip.in index d22ca21,d22ca21..0000000 mode 100644,100755..100644 --- a/ptxdist/rules/libquazip.in +++ b/ptxdist/rules/libquazip.in diff --cc ptxdist/rules/libquazip.make index e35b88d,e35b88d..0000000 mode 100644,100755..100644 --- a/ptxdist/rules/libquazip.make +++ b/ptxdist/rules/libquazip.make diff --cc ptxdist/rules/memtool.in index f520650,f520650..0000000 mode 100644,100755..100644 --- a/ptxdist/rules/memtool.in +++ b/ptxdist/rules/memtool.in diff --cc ptxdist/rules/memtool.make index 8571e07,8571e07..0000000 mode 100644,100755..100644 --- a/ptxdist/rules/memtool.make +++ b/ptxdist/rules/memtool.make diff --cc ptxdist/rules/netconfig.in index d7ee9dd,a50296b..0000000 mode 100644,100755..100644 --- a/ptxdist/rules/netconfig.in +++ b/ptxdist/rules/netconfig.in @@@ -21,6 -21,13 +21,16 @@@ config NETCONFIG_CONFIG_FILEPAT prompt "File where netconfig get its settings from" default "/etc/enet.conf" ++<<<<<<< HEAD ++======= + config NETCONFIG_TRUNK + bool + prompt "Use svn trunk instead of Tag" + help + With this option the head is checked out with co instead of using + an export with label. + ++>>>>>>> rauch/jobrechner-import-20190607 config NETCONFIG_BIN_DIR string prompt "Path to install on target" diff --cc ptxdist/rules/netconfig.make index c6a94b1,475a00e..0000000 mode 100644,100755..100644 --- a/ptxdist/rules/netconfig.make +++ b/ptxdist/rules/netconfig.make @@@ -18,14 -18,34 +18,45 @@@ PACKAGES-$(PTXCONF_NETCONFIG) += netcon # Paths and names # NETCONFIG_VERSION := 1.0.0 ++<<<<<<< HEAD +NETCONFIG := netconfig + +NETCONFIG_URL := file://$(PTXDIST_WORKSPACE)/local_src/svneag_netconfig +NETCONFIG_DIR := $(BUILDDIR)/$(NETCONFIG) + + +NETCONFIG_LICENSE := *ignore* EAG license + ++======= + NETCONFIG_SVN_URL := https://svn.eckelmann.group/svn/allgemein/LinuxWorkgroup/netconfig + NETCONFIG := netconfig + + ifdef PTXCONF_NETCONFIG_TRUNK + NETCONFIG_SVN_COMMAND := co --force + NETCONFIG_SVN_SUB_URL := trunk + NETCONFIG_DIR := $(BUILDDIR)/$(NETCONFIG)-TRUNK + else + NETCONFIG_SVN_COMMAND := export --force + NETCONFIG_SVN_SUB_URL := `echo "tags/NETCONFIG_$(NETCONFIG_VERSION)"|sed 's/\./_/g'` + NETCONFIG_DIR := $(BUILDDIR)/$(NETCONFIG)-$(NETCONFIG_VERSION) + endif + + NETCONFIG_LICENSE := *ignore* EAG license + + # ---------------------------------------------------------------------------- + # Get + # ---------------------------------------------------------------------------- + $(STATEDIR)/netconfig.get: + @$(call targetinfo) + @$(call touch) + + $(STATEDIR)/netconfig.extract: + @$(call targetinfo) + @echo "svn $(NETCONFIG_SVN_COMMAND) $(NETCONFIG_SVN_URL)/$(NETCONFIG_SVN_SUB_URL) $(NETCONFIG_DIR)" + svn $(NETCONFIG_SVN_COMMAND) $(NETCONFIG_SVN_URL)/$(NETCONFIG_SVN_SUB_URL) $(NETCONFIG_DIR) + @$(call touch) + ++>>>>>>> rauch/jobrechner-import-20190607 #$(NETCONFIG_SOURCE): # @$(call targetinfo) # @$(call get, NETCONFIG) @@@ -75,10 -95,8 +106,16 @@@ $(STATEDIR)/netconfig.targetinstall # Clean # ---------------------------------------------------------------------------- ++<<<<<<< HEAD +$(STATEDIR)/netconfig.clean: + @$(call targetinfo) + rm -f $(BUILDDIR)/$(NETCONFIG)/netconfig + rm -rf $(BUILDDIR)/$(NETCONFIG)/qt_generated + @$(call clean_pkg, NETCONFIG) ++======= + #$(STATEDIR)/netconfig.clean: + # @$(call targetinfo) + # @$(call clean_pkg, NETCONFIG) ++>>>>>>> rauch/jobrechner-import-20190607 # vim: syntax=make diff --cc ptxdist/rules/openssl.in index a17c05d,a17c05d..0000000 mode 100644,100755..100644 --- a/ptxdist/rules/openssl.in +++ b/ptxdist/rules/openssl.in diff --cc ptxdist/rules/openssl.make index 3f782b8,3f782b8..0000000 mode 100644,100755..100644 --- a/ptxdist/rules/openssl.make +++ b/ptxdist/rules/openssl.make diff --cc ptxdist/rules/oprofile.in index 40ce606,40ce606..0000000 mode 100644,100755..100644 --- a/ptxdist/rules/oprofile.in +++ b/ptxdist/rules/oprofile.in diff --cc ptxdist/rules/oprofile.make index bb9d111,bb9d111..0000000 mode 100644,100755..100644 --- a/ptxdist/rules/oprofile.make +++ b/ptxdist/rules/oprofile.make diff --cc ptxdist/rules/post/image_ubi.make index 29eb02c,29eb02c..0000000 mode 100644,100755..100644 --- a/ptxdist/rules/post/image_ubi.make +++ b/ptxdist/rules/post/image_ubi.make diff --cc ptxdist/rules/pwm.in index 4639754,4639754..0000000 mode 100644,100755..100644 --- a/ptxdist/rules/pwm.in +++ b/ptxdist/rules/pwm.in diff --cc ptxdist/rules/pwm.make index 4deb6da,4deb6da..0000000 mode 100644,100755..100644 --- a/ptxdist/rules/pwm.make +++ b/ptxdist/rules/pwm.make diff --cc ptxdist/rules/qextserialport.in index 6dbfd19,6dbfd19..0000000 mode 100644,100755..100644 --- a/ptxdist/rules/qextserialport.in +++ b/ptxdist/rules/qextserialport.in diff --cc ptxdist/rules/qextserialport.make index ea78d3d,ea78d3d..0000000 mode 100644,100755..100644 --- a/ptxdist/rules/qextserialport.make +++ b/ptxdist/rules/qextserialport.make diff --cc ptxdist/rules/qextserialport12.in index 724a488,724a488..0000000 mode 100644,100755..100644 --- a/ptxdist/rules/qextserialport12.in +++ b/ptxdist/rules/qextserialport12.in diff --cc ptxdist/rules/qextserialport12.make index 4375f1e,4375f1e..0000000 mode 100644,100755..100644 --- a/ptxdist/rules/qextserialport12.make +++ b/ptxdist/rules/qextserialport12.make diff --cc ptxdist/rules/qextserialport12rc.in index ea327c7,ea327c7..0000000 mode 100644,100755..100644 --- a/ptxdist/rules/qextserialport12rc.in +++ b/ptxdist/rules/qextserialport12rc.in diff --cc ptxdist/rules/qextserialport12rc.make index 2f3ad27,2f3ad27..0000000 mode 100644,100755..100644 --- a/ptxdist/rules/qextserialport12rc.make +++ b/ptxdist/rules/qextserialport12rc.make diff --cc ptxdist/rules/qtcommon.in index 8e96300,8e96300..0000000 mode 100644,100755..100644 --- a/ptxdist/rules/qtcommon.in +++ b/ptxdist/rules/qtcommon.in diff --cc ptxdist/rules/rt_mech.in index 9127ee6,9127ee6..0000000 mode 100644,100755..100644 --- a/ptxdist/rules/rt_mech.in +++ b/ptxdist/rules/rt_mech.in diff --cc ptxdist/rules/rt_mech.make index 2299d26,2299d26..0000000 mode 100644,100755..100644 --- a/ptxdist/rules/rt_mech.make +++ b/ptxdist/rules/rt_mech.make diff --cc ptxdist/rules/rtl8188eu.in index 34fba26,13f26d8..0000000 mode 100644,100755..100644 --- a/ptxdist/rules/rtl8188eu.in +++ b/ptxdist/rules/rtl8188eu.in @@@ -6,3 -6,4 +6,7 @@@ config RTL8188E prompt "rtl8188eu" help FIXME ++<<<<<<< HEAD ++======= + ++>>>>>>> rauch/jobrechner-import-20190607 diff --cc ptxdist/rules/rtl8188eu.make index 4e2a192,9c11c4c..0000000 mode 100644,100755..100644 --- a/ptxdist/rules/rtl8188eu.make +++ b/ptxdist/rules/rtl8188eu.make @@@ -54,14 -54,6 +54,17 @@@ $(STATEDIR)/rtl8188eu.compile $(STATEDIR)/rtl8188eu.install: @$(call targetinfo) ++<<<<<<< HEAD + @$(call touch) + +# ---------------------------------------------------------------------------- +# Target-Install +# ---------------------------------------------------------------------------- + +$(STATEDIR)/rtl8188eu.targetinstall: + @$(call targetinfo) ++======= ++>>>>>>> rauch/jobrechner-import-20190607 @$(call install_init, rtl8188eu) $(KERNEL_PATH) $(KERNEL_ENV) $(MAKE) $(KERNEL_MAKEVARS) \ -C $(KERNEL_DIR) \ @@@ -74,6 -66,14 +77,17 @@@ @$(call touch) # ---------------------------------------------------------------------------- ++<<<<<<< HEAD ++======= + # Target-Install + # ---------------------------------------------------------------------------- + + $(STATEDIR)/rtl8188eu.targetinstall: + @$(call targetinfo) + @$(call touch) + + # ---------------------------------------------------------------------------- ++>>>>>>> rauch/jobrechner-import-20190607 # Clean # ---------------------------------------------------------------------------- @@@ -82,3 -82,4 +96,7 @@@ # @$(call clean_pkg, RTL8188EU) # vim: syntax=make ++<<<<<<< HEAD ++======= + ++>>>>>>> rauch/jobrechner-import-20190607 diff --cc ptxdist/rules/ser2net.in index b652563,b652563..0000000 mode 100644,100755..100644 --- a/ptxdist/rules/ser2net.in +++ b/ptxdist/rules/ser2net.in diff --cc ptxdist/rules/ser2net.make index c3533f1,4322e86..0000000 mode 100644,100755..100644 --- a/ptxdist/rules/ser2net.make +++ b/ptxdist/rules/ser2net.make @@@ -17,14 -17,13 +17,22 @@@ PACKAGES-$(PTXCONF_SER2NET) += ser2ne # # Paths and names # ++<<<<<<< HEAD +SER2NET_VERSION := 2.10.1 +SER2NET_MD5 := d5bfd6b303f432547e5480343b4395ed ++======= + SER2NET_VERSION := 2.9.1 + SER2NET_MD5 := 80011ac0e60bbdcb65f1d7a86251e3f3 ++>>>>>>> rauch/jobrechner-import-20190607 SER2NET := ser2net-$(SER2NET_VERSION) SER2NET_SUFFIX := tar.gz SER2NET_URL := http://downloads.sourceforge.net/project/ser2net/ser2net/$(SER2NET).$(SER2NET_SUFFIX) SER2NET_SOURCE := $(SRCDIR)/$(SER2NET).$(SER2NET_SUFFIX) SER2NET_DIR := $(BUILDDIR)/$(SER2NET) ++<<<<<<< HEAD +SER2NET_LICENSE := GPLv2 ++======= ++>>>>>>> rauch/jobrechner-import-20190607 # ---------------------------------------------------------------------------- # Get diff --cc ptxdist/rules/smstools3.in index 417978b,417978b..0000000 mode 100644,100755..100644 --- a/ptxdist/rules/smstools3.in +++ b/ptxdist/rules/smstools3.in diff --cc ptxdist/rules/smstools3.make index 9976319,9976319..0000000 mode 100644,100755..100644 --- a/ptxdist/rules/smstools3.make +++ b/ptxdist/rules/smstools3.make diff --cc ptxdist/rules/socketcan-test.in index 7d7fd43,7d7fd43..0000000 mode 100644,100755..100644 --- a/ptxdist/rules/socketcan-test.in +++ b/ptxdist/rules/socketcan-test.in diff --cc ptxdist/rules/socketcan-test.make index 39c58d7,39c58d7..0000000 mode 100644,100755..100644 --- a/ptxdist/rules/socketcan-test.make +++ b/ptxdist/rules/socketcan-test.make diff --cc ptxdist/rules/systemd.in index fc5080a,ace14d9..0000000 mode 100644,100755..100644 --- a/ptxdist/rules/systemd.in +++ b/ptxdist/rules/systemd.in @@@ -12,16 -12,16 +12,27 @@@ menuconfig SYSTEM select LIBCAP select UDEV if RUNTIME select UDEV_LIBUDEV ++<<<<<<< HEAD + select MACHINE_ID if RUNTIME + select TCPWRAPPER if SYSTEMD_TCPWRAP + select XZ if SYSTEMD_XZ + select LIBSELINUX if GLOBAL_SELINUX ++======= + select DBUS_PYTHON if SYSTEMD_ANALYZE && RUNTIME + select TCPWRAPPER if SYSTEMD_TCPWRAP + select XZ if SYSTEMD_XZ ++>>>>>>> rauch/jobrechner-import-20190607 # for udev: select ROOTFS_DEV select LIBKMOD select LIBBLKID select GLIB if UDEV_LIBGUDEV ++<<<<<<< HEAD + select HOST_SYSTEMD if UDEV_HWDB ++======= + select PCIUTILS if UDEV_PERSISTENT_PCI && RUNTIME + select USBUTILS if UDEV_PERSISTENT_USB && RUNTIME ++>>>>>>> rauch/jobrechner-import-20190607 prompt "systemd " help systemd is a system and session manager for Linux, compatible with SysV @@@ -59,4 -59,11 +70,15 @@@ config SYSTEMD_DISABLE_RANDOM_SEE the random seed is not possible. Warning: enabling this option may be insecure. ++<<<<<<< HEAD +endif ++======= + config SYSTEMD_ANALYZE + bool + prompt "systemd-analyze" + help + Install the systemd-analyze tool. This feature requires python. + + endif + ++>>>>>>> rauch/jobrechner-import-20190607 diff --cc ptxdist/rules/systemd.make index 4fb9b07,67355dd..0000000 mode 100644,100755..100644 --- a/ptxdist/rules/systemd.make +++ b/ptxdist/rules/systemd.make @@@ -16,8 -16,8 +16,13 @@@ PACKAGES-$(PTXCONF_SYSTEMD) += system # # Paths and names # ++<<<<<<< HEAD +SYSTEMD_VERSION := 204 +SYSTEMD_MD5 := a07619bb19f48164fbf0761d12fd39a8 ++======= + SYSTEMD_VERSION := 195 + SYSTEMD_MD5 := 38e8c8144e7e6e5bc3ce32eb4260e680 ++>>>>>>> rauch/jobrechner-import-20190607 SYSTEMD := systemd-$(SYSTEMD_VERSION) SYSTEMD_SUFFIX := tar.xz SYSTEMD_URL := http://www.freedesktop.org/software/systemd/$(SYSTEMD).$(SYSTEMD_SUFFIX) @@@ -35,10 -35,24 +40,30 @@@ ifneq ($(PTXCONF_ARCH_X86)$(PTXCONF_ARC SYSTEMD_WRAPPER_BLACKLIST := TARGET_HARDEN_PIE endif ++<<<<<<< HEAD ++======= + # python is used for the journal python bindings, which are not installed + ifdef PTXCONF_SYSTEMD_CGOSWD + SYSTEMD_CONF_ENV := \ + $(CROSS_ENV) \ + ac_cv_path_PYTHON=: \ + LIBS=-lcgos \ + CFLAGS=-DCGOSWD + else + SYSTEMD_CONF_ENV := \ + $(CROSS_ENV) \ + ac_cv_path_PYTHON=: + endif + ++>>>>>>> rauch/jobrechner-import-20190607 # # autoconf # SYSTEMD_CONF_TOOL := autoconf ++<<<<<<< HEAD ++======= + ++>>>>>>> rauch/jobrechner-import-20190607 SYSTEMD_CONF_OPT := \ $(CROSS_AUTOCONF_USR) \ $(GLOBAL_LARGE_FILE_OPTION) \ @@@ -49,10 -63,7 +74,14 @@@ --disable-gtk-doc-html \ --disable-gtk-doc-pdf \ --disable-introspection \ ++<<<<<<< HEAD + --enable-kmod \ + --enable-blkid \ --disable-ima \ + --disable-chkconfig \ ++======= ++ --disable-ima \ ++>>>>>>> rauch/jobrechner-import-20190607 $(GLOBAL_SELINUX_OPTION) \ --$(call ptx/endis,PTXCONF_SYSTEMD_XZ)-xz \ --$(call ptx/endis,PTXCONF_SYSTEMD_TCPWRAP)-tcpwrap \ @@@ -67,7 -78,6 +96,10 @@@ --enable-binfmt \ --$(call ptx/endis,PTXCONF_SYSTEMD_VCONSOLE)-vconsole \ --enable-readahead \ ++<<<<<<< HEAD + --enable-bootchart \ ++======= ++>>>>>>> rauch/jobrechner-import-20190607 --enable-quotacheck \ --$(call ptx/disen,PTXCONF_SYSTEMD_DISABLE_RANDOM_SEED)-randomseed \ --enable-logind \ @@@ -75,18 -85,15 +107,29 @@@ --enable-timedated \ --enable-localed \ --disable-coredump \ ++<<<<<<< HEAD + --enable-polkit \ + --disable-efi \ + --enable-myhostname \ ++======= ++>>>>>>> rauch/jobrechner-import-20190607 --$(call ptx/endis,PTXCONF_UDEV_LIBGUDEV)-gudev \ --$(call ptx/endis,PTXCONF_UDEV_KEYMAPS)-keymap \ --disable-manpages \ --enable-split-usr \ ++<<<<<<< HEAD + --disable-tests \ + --with-firmware-path=/lib/firmware \ + --with-sysvinit-path="" \ + --with-sysvrcnd-path="" \ + --without-python \ ++======= + --with-usb-ids-path=/usr/share/usb.ids \ + --with-pci-ids-path=/usr/share/pci.ids$(call ptx/ifdef, PTXCONF_PCIUTILS_COMPRESS,.gz,) \ + --with-distro=other \ + --with-sysvinit-path="" \ + --with-sysvrcd-path="" \ ++>>>>>>> rauch/jobrechner-import-20190607 --with-dbuspolicydir=/etc/dbus-1/system.d \ --with-dbussessionservicedir=/usr/share/dbus-1/services \ --with-dbussystemservicedir=/usr/share/dbus-1/system-services \ @@@ -113,12 -120,6 +156,15 @@@ $(STATEDIR)/systemd.install @$(call targetinfo) @$(call world/install, SYSTEMD) @ln -sf multi-user.target "$(SYSTEMD_PKGDIR)/lib/systemd/system/default.target" ++<<<<<<< HEAD +ifdef PTXCONF_UDEV_HWDB + @udevadm hwdb --update --root $(SYSTEMD_PKGDIR) +endif +ifndef PTXCONF_SYSTEMD_VCONSOLE + @rm -v $(SYSTEMD_PKGDIR)/etc/systemd/system/getty.target.wants/getty@tty1.service +endif ++======= ++>>>>>>> rauch/jobrechner-import-20190607 @$(call touch) # ---------------------------------------------------------------------------- @@@ -128,9 -129,7 +174,13 @@@ SYSTEMD_HELPER := \ systemd \ systemd-ac-power \ ++<<<<<<< HEAD + systemd-activate \ systemd-binfmt \ + systemd-bootchart \ ++======= ++ systemd-binfmt \ ++>>>>>>> rauch/jobrechner-import-20190607 systemd-cgroups-agent \ systemd-fsck \ systemd-hostnamed \ @@@ -141,7 -140,6 +191,10 @@@ systemd-modules-load \ systemd-multi-seat-x \ systemd-quotacheck \ ++<<<<<<< HEAD + $(call ptx/ifdef, PTXCONF_SYSTEMD_DISABLE_RANDOM_SEED,,systemd-random-seed) \ ++======= ++>>>>>>> rauch/jobrechner-import-20190607 systemd-readahead \ systemd-remount-fs \ systemd-reply-password \ @@@ -175,8 -173,6 +228,11 @@@ $(STATEDIR)/systemd.targetinstall @$(call install_lib, systemd, 0, 0, 0644, libsystemd-journal) @$(call install_lib, systemd, 0, 0, 0644, libsystemd-login) ++<<<<<<< HEAD + @$(call install_lib, systemd, 0, 0, 0644, libnss_myhostname) + ++======= ++>>>>>>> rauch/jobrechner-import-20190607 # # daemon + tools @$(call install_copy, systemd, 0, 0, 0755, -, /bin/systemctl) @$(call install_copy, systemd, 0, 0, 0755, -, /bin/journalctl) @@@ -187,9 -183,6 +243,12 @@@ @$(call install_copy, systemd, 0, 0, 0755, -, /bin/systemd-tmpfiles) @$(call install_copy, systemd, 0, 0, 0755, -, /bin/systemd-notify) @$(call install_copy, systemd, 0, 0, 0755, -, /bin/systemd-tty-ask-password-agent) ++<<<<<<< HEAD + @$(call install_copy, systemd, 0, 0, 0755, -, /usr/bin/hostnamectl) + @$(call install_copy, systemd, 0, 0, 0755, -, /usr/bin/localectl) + @$(call install_copy, systemd, 0, 0, 0755, -, /usr/bin/timedatectl) ++======= ++>>>>>>> rauch/jobrechner-import-20190607 @$(call install_copy, systemd, 0, 0, 0755, -, /usr/bin/systemd-cat) @$(call install_copy, systemd, 0, 0, 0755, -, /usr/bin/systemd-cgls) @$(call install_copy, systemd, 0, 0, 0755, -, /usr/bin/systemd-cgtop) @@@ -197,7 -190,9 +256,13 @@@ @$(call install_copy, systemd, 0, 0, 0755, -, /usr/bin/systemd-detect-virt) @$(call install_copy, systemd, 0, 0, 0755, -, /usr/bin/systemd-nspawn) @$(call install_copy, systemd, 0, 0, 0755, -, /usr/bin/systemd-stdio-bridge) ++<<<<<<< HEAD + @$(call install_copy, systemd, 0, 0, 0755, -, /usr/bin/systemd-analyze) ++======= + ifdef PTXCONF_SYSTEMD_ANALYZE + @$(call install_copy, systemd, 0, 0, 0755, -, /usr/bin/systemd-analyze) + endif ++>>>>>>> rauch/jobrechner-import-20190607 @$(call install_tree, systemd, 0, 0, -, /lib/systemd/system-generators/) @$(foreach helper, $(SYSTEMD_HELPER), \ @@@ -210,28 -205,23 +275,40 @@@ ifdef PTXCONF_INITMETHOD_SYSTEM @$(call install_link, systemd, ../bin/systemctl, /sbin/halt) @$(call install_link, systemd, ../bin/systemctl, /sbin/poweroff) @$(call install_link, systemd, ../bin/systemctl, /sbin/reboot) ++<<<<<<< HEAD + @$(call install_link, systemd, ../bin/systemctl, /sbin/shutdown) ++======= ++>>>>>>> rauch/jobrechner-import-20190607 endif # # configuration @$(call install_alternative, systemd, 0, 0, 0644, \ /etc/systemd/system.conf) @$(call install_alternative, systemd, 0, 0, 0644, \ ++<<<<<<< HEAD + /etc/systemd/bootchart.conf) + @$(call install_alternative, systemd, 0, 0, 0644, \ ++======= ++>>>>>>> rauch/jobrechner-import-20190607 /etc/systemd/journald.conf) @$(call install_alternative, systemd, 0, 0, 0644, \ /etc/systemd/logind.conf) @$(call install_tree, systemd, 0, 0, -, /etc/systemd/system/) @$(call install_tree, systemd, 0, 0, -, /usr/lib/tmpfiles.d/) ++<<<<<<< HEAD + @$(call install_copy, systemd, 0, 0, 0644, -, /lib/udev/rules.d/50-firmware.rules) ++======= ++>>>>>>> rauch/jobrechner-import-20190607 @$(call install_copy, systemd, 0, 0, 0644, -, /lib/udev/rules.d/99-systemd.rules) @$(call install_tree, systemd, 0, 0, -, /etc/dbus-1/system.d/) @$(call install_tree, systemd, 0, 0, -, /usr/share/polkit-1/actions/) @$(call install_tree, systemd, 0, 0, -, /usr/share/dbus-1/services/) @$(call install_tree, systemd, 0, 0, -, /usr/share/dbus-1/system-services/) @$(call install_copy, systemd, 0, 0, 0644, -, /usr/share/systemd/kbd-model-map) ++<<<<<<< HEAD + @$(call install_copy, systemd, 0, 0, 0644, -, /usr/lib/sysctl.d/50-default.conf) ++======= ++>>>>>>> rauch/jobrechner-import-20190607 # # units @$(call install_tree, systemd, 0, 0, -, /lib/systemd/system/) diff --cc ptxdist/rules/usbmount.in index ebcca42,86ff6a6..0000000 mode 100644,100755..100644 --- a/ptxdist/rules/usbmount.in +++ b/ptxdist/rules/usbmount.in @@@ -21,16 -21,4 +21,19 @@@ if USBMOUN prompt "Install systemd unitfiles for usbmount" help FIXME ++<<<<<<< HEAD + + config USBMOUNT_DISABLED + bool + prompt "usbmount disabled by default" + help + FIXME + + config USBMOUNT_STORAGE_USB + bool + prompt "/media/usbstick as the only mountpoint" + help + FIXME ++======= ++>>>>>>> rauch/jobrechner-import-20190607 endif diff --cc ptxdist/rules/usbmount.make index dce2d7a,821cef5..0000000 mode 100644,100755..100644 --- a/ptxdist/rules/usbmount.make +++ b/ptxdist/rules/usbmount.make @@@ -13,15 -13,31 +13,42 @@@ # PACKAGES-$(PTXCONF_USBMOUNT) += usbmount ++<<<<<<< HEAD +USBMOUNT_VERSION := 0.0.19.5 +USBMOUNT := usbmount-$(USBMOUNT_VERSION) +#ATOP_URL := http://www.atoptool.nl/download/$(ATOP).tar.gz +#ATOP_SOURCE := $(SRCDIR)/$(ATOP).tar.gz +USBMOUNT_URL := file://$(PTXDIST_WORKSPACE)/local_src/eag_usbmount ++======= + USBMOUNT_VERSION := 0.0.19.4 + USBMOUNT := usbmount-$(USBMOUNT_VERSION) + #ATOP_URL := http://www.atoptool.nl/download/$(ATOP).tar.gz + #ATOP_SOURCE := $(SRCDIR)/$(ATOP).tar.gz ++>>>>>>> rauch/jobrechner-import-20190607 USBMOUNT_DIR := $(BUILDDIR)/$(USBMOUNT) # ---------------------------------------------------------------------------- ++<<<<<<< HEAD ++======= + # Get + # ---------------------------------------------------------------------------- + + $(STATEDIR)/usbmount.get: + @$(call targetinfo) + svn export --force https://svn.eckelmann.group/svn/allgemein/LinuxWorkgroup/commons/ptxdist/projects/usbmount/tags/$(USBMOUNT_VERSION) $(USBMOUNT_DIR) + @$(call touch) + + # ---------------------------------------------------------------------------- + # Extract + # ---------------------------------------------------------------------------- + + $(STATEDIR)/usbmount.extract: + @$(call targetinfo) + @$(call touch) + + # ---------------------------------------------------------------------------- ++>>>>>>> rauch/jobrechner-import-20190607 # Prepare # ---------------------------------------------------------------------------- @@@ -98,24 -114,6 +125,27 @@@ $(STATEDIR)/usbmount.targetinstall #/etc @$(call install_copy, usbmount, 0, 0, 0755, $(USBMOUNT_DIR)/root/etc/usbmount/usbmount.conf, /etc/usbmount/usbmount.conf) ++<<<<<<< HEAD + +ifdef PTXCONF_USBMOUNT_DISABLED + @$(call install_replace, usbmount, /etc/usbmount/usbmount.conf, @ENABLED@, 0) +else + @$(call install_replace, usbmount, /etc/usbmount/usbmount.conf, @ENABLED@, 1) +endif + +ifdef PTXCONF_USBMOUNT_STORAGE_USB + @$(call install_replace, usbmount, /etc/usbmount/usbmount.conf, @MOUNTPOINTS@, "/media/usbstick") + @$(call install_copy, usbmount, 0, 0, 0755, /media/usbstick) +else + @$(call install_replace, usbmount, /etc/usbmount/usbmount.conf, @MOUNTPOINTS@, "/media/usb0 /media/usb1 /media/usb2 /media/usb3 /media/usb4 /media/usb5 /media/usb6 /media/usb7") +ifdef PTXCONF_USBMOUNT_SYSTEMD_UNIT + @$(call install_copy, usbmount, 0, 0, 0644, $(USBMOUNT_DIR)/root/usr/lib/tmpfiles.d/usbmount.conf, /usr/lib/tmpfiles.d/usbmount.conf) + @$(call install_copy, usbmount, 0, 0, 0644, $(USBMOUNT_DIR)/root/usr/lib/tmpfiles.d/usbmount_mountpoints.conf, /usr/lib/tmpfiles.d/usbmount_mountpoints.conf) +endif +endif + ++======= ++>>>>>>> rauch/jobrechner-import-20190607 @$(call install_copy, usbmount, 0, 0, 0755, $(USBMOUNT_DIR)/root/etc/usbmount/mount.d/00_create_model_symlink, /etc/usbmount/mount.d/00_create_model_symlink) @$(call install_copy, usbmount, 0, 0, 0755, $(USBMOUNT_DIR)/root/etc/usbmount/umount.d/00_remove_model_symlink, /etc/usbmount/umount.d/00_remove_model_symlink) #/lib @@@ -125,13 -123,14 +155,21 @@@ #/sbin @$(call install_copy, usbmount, 0, 0, 0755, $(USBMOUNT_DIR)/root/sbin/udev-trigger-massstorage.sh, /sbin/udev-trigger-massstorage.sh) ++<<<<<<< HEAD + @$(call install_copy, usbmount, 0, 0, 0755, $(USBMOUNT_DIR)/root/sbin/eag_usbstick, /sbin/eag_usbstick) ++======= ++>>>>>>> rauch/jobrechner-import-20190607 #/systemd unitfiles ifdef PTXCONF_USBMOUNT_SYSTEMD_UNIT @$(call install_copy, usbmount, 0, 0, 0644, $(USBMOUNT_DIR)/root/usr/lib/tmpfiles.d/usbmount.conf, /usr/lib/tmpfiles.d/usbmount.conf) @$(call install_copy, usbmount, 0, 0, 0755, $(USBMOUNT_DIR)/root/lib/systemd/system/udev-trigger-massstorage.service, /lib/systemd/system/udev-trigger-massstorage.service) @$(call install_link, usbmount, /lib/systemd/system/udev-trigger-massstorage.service, /lib/systemd/system/basic.target.wants/udev-trigger-massstorage.service) ++<<<<<<< HEAD ++======= + + ++>>>>>>> rauch/jobrechner-import-20190607 else #/mountpoints @$(call install_copy, usbmount, 0, 0, 0755, /media/usb0) diff --cc ptxdist/rules/vpnc.in index dff074b,dff074b..0000000 mode 100644,100755..100644 --- a/ptxdist/rules/vpnc.in +++ b/ptxdist/rules/vpnc.in diff --cc ptxdist/rules/vpnc.make index 06321ae,06321ae..0000000 mode 100644,100755..100644 --- a/ptxdist/rules/vpnc.make +++ b/ptxdist/rules/vpnc.make

Title:

Privacy: Public Private

How long should your post be retained?

15 mins an hour a day a week a month forever

All content is user-submitted.
The administrators of this site (kpaste.net) are not responsible for their content.
Abuse reports should be emailed to us at