diff --git a/Configurations/RTApp-AtcaIop.cfg b/Configurations/RTApp-AtcaIop.cfg index 149cc25..a5f3c10 100644 --- a/Configurations/RTApp-AtcaIop.cfg +++ b/Configurations/RTApp-AtcaIop.cfg @@ -29,6 +29,17 @@ } } } +//WARNING: Change values according to your local setup ++LoggerService = { + Class = PlainLoggerService //See note 1 + +UDPLogger = { + Class = UDPLogger + Address = "127.0.0.1" //MARTe2 LogView receiver address + Port = 32767 //MARTe2 LogView receiver port + Format = "EtOofFRmCP" //See note 2 + PrintKeys = 1 //This **must** be enabled, see note 3 + } +} +WebRoot = { Class = "HttpObjectBrowser" Root = "." @@ -143,8 +154,8 @@ Mode = "ExpectsReply" +Parameters = { Class = "ConfigurationDatabase" - //param1 = "100" - param1 = "-1" // param1 = "-1" Auto number +// param1 = "51605" + param1 = "-1" // "-1" Auto number } } +WriteEoWoMsg = { diff --git a/Startup/AtcaIop.sh b/Startup/AtcaIop.sh index 83d6056..f76a700 100755 --- a/Startup/AtcaIop.sh +++ b/Startup/AtcaIop.sh @@ -7,6 +7,20 @@ #MARTe2_Components_DIR=$MARTe2_HOME/MARTe2-components #MARTe2_Demos_DIR=$MARTe2_HOME/MARTe2-demos-padova #EPICS_BASE= +MARTe2_HOME=$HOME/git-repos + +MARTe2_DIR=$MARTe2_HOME/MARTe2-dev +MARTe2_Components_DIR=$MARTe2_HOME/MARTe2-components +# export MARTe2_Demos_DIR=~/git-repos/MARTe2-demos-padova + +export EPICS_BASE=/opt/epics/epics-base +export EPICSPVA=/opt/epics/epics-base +export EPICS_HOST_ARCH=linux-x86_64 + +EPICS_CA_ADDR_LIST="localhost 192.168.1.110" +# export EPICS_CA_ADDR_LIST="localhost" +EPICS_CA_AUTO_ADDR_LIST="NO" +isttokmarte_path=/home/oper/mdsplus-trees MDS=0 DEBUG="" diff --git a/Startup/pulse-ketchup.py b/Startup/pulse-ketchup.py index 626b2e5..09f6c0a 100755 --- a/Startup/pulse-ketchup.py +++ b/Startup/pulse-ketchup.py @@ -7,7 +7,8 @@ from MDSplus.mdsExceptions import TreeFOPENR import argparse -MDSTREENAME = 'rtappisttok' +# MDSTREENAME = 'isttokmdsplus' +MDSTREENAME = 'isttokmarte' def main(args): @@ -25,7 +26,7 @@ def main(args): f'pulse number {mdsPulseNumber:d}') exit() - print(f'Last Pulse for {MDSTREENAME} is {mdsPulseNumber:d}') + print(f'Last Pulse for {MDSTREENAME} is now {mdsPulseNumber:d}') if __name__ == '__main__': diff --git a/marte2-exports.sh b/marte2-exports.sh index a3efa7e..c5dc12d 100755 --- a/marte2-exports.sh +++ b/marte2-exports.sh @@ -1,29 +1,27 @@ # MARTe2 local envs for running/compiling MARTe2 Rt Apps export TARGET=x86-linux -export MARTe2_HOME=~/git-repos/MARTe2 +export MARTe2_HOME=$HOME/git-repos -export MARTe2_DIR=$MARTe2_HOME/MARTe2 +export MARTe2_DIR=$MARTe2_HOME/MARTe2-dev export MARTe2_Components_DIR=$MARTe2_HOME/MARTe2-components -export MARTe2_Demos_DIR=~/git-repos/MARTe2-demos-padova +# export MARTe2_Demos_DIR=~/git-repos/MARTe2-demos-padova export EPICS_BASE=/opt/epics/epics-base export EPICSPVA=/opt/epics/epics-base export EPICS_HOST_ARCH=linux-x86_64 -#export EPICS_CA_ADDR_LIST="localhost 192.168.1.110 efda-marte.ipfn.tecnico.ulisboa.pt" -export EPICS_CA_ADDR_LIST="localhost" +export EPICS_CA_ADDR_LIST="localhost 192.168.1.110" +# export EPICS_CA_ADDR_LIST="localhost" export EPICS_CA_AUTO_ADDR_LIST="NO" export MDSPLUS_DIR=/usr/local/mdsplus # export default_tree_path=$MARTe2_HOME/mdsplus-trees -export default_tree_path=$MARTe2_HOME/mdsplus-trees -export rtappdemo_path=~/git-repos/MARTe2-isttok/Trees -export rtappwriter_path=~/git-repos/MARTe2-isttok/Trees -# export isttoksdas_path=~/git-repos/MARTe2-isttok/Trees -export isttoksdas_path=/home/mdsplus/Trees -# export isttokoutput_path=~/git-repos/MARTe2-isttok/Trees -export isttokoutput_path=/home/mdsplus/Trees -export isttokmarte_path=/home/mdsplus/Trees +export default_tree_path=$HOME/mdsplus-trees +#export rtappdemo_path=~/git-repos/MARTe2-isttok/Trees +#export rtappwriter_path=~/git-repos/MARTe2-isttok/Trees +#export isttoksdas_path=~/git-repos/MARTe2-isttok/Trees +#export isttokoutput_path=~/git-repos/MARTe2-isttok/Trees +export isttokmarte_path=/home/oper/mdsplus-trees # export rtappisttok_path=$MARTe2_HOME/mdsplus-trees export PATH=$MDSPLUS_DIR/bin:$EPICS_BASE/bin/$EPICS_HOST_ARCH:$PATH