diff --git a/.env_exemple b/.env_exemple new file mode 100644 index 0000000..e69de29 diff --git a/.gitignore b/.gitignore index d5abac8..caadbd8 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,5 @@ O.* .cvsignore testenv/ __pycache__ -.pytest_cache \ No newline at end of file +.pytest_cache +.env diff --git a/db/socket_record.db b/db/socket_record.db index aa7bdf6..ee1bbfc 100644 --- a/db/socket_record.db +++ b/db/socket_record.db @@ -1,9 +1,6 @@ record(stringout, "$(DEVICE_NAME)_set_$(PARAMETER_NAME)_$(PARAMETER_ID)") { field(DTYP, "stream") - - field(VAL, "Off") - field(PINI, "YES") - + field(PINI, "NO") field(OUT, "@$(DB)command.proto set($(PARAMETER_ID)) $(PORT)") } diff --git a/sim/ePowerSwitch8_sim.py b/sim/ePowerSwitch8_sim.py index d188c7b..8d4a0a6 100644 --- a/sim/ePowerSwitch8_sim.py +++ b/sim/ePowerSwitch8_sim.py @@ -16,11 +16,15 @@ def readAscii(connexion_client : socket): match message[24]: case 'n': outlet_state[outlet_index] = 'On' + print("powering on " + str(outlet_index)) case 'f': outlet_state[outlet_index] = 'Off' + print("powering off " + str(outlet_index)) case 'e': outlet_state[outlet_index] = 'Restart' + print("restarting " + str(outlet_index)) if message[0] == 'G': + print("sending current state report") time = datetime.datetime.now().strftime('%d %B %Y %H:%M:%S') connexion_client.send(bytes("Hidden Page\n" + time + "\nVersion: 1.5.0.1\n" + "M0:O1=" + outlet_state[0] + "\n"+ diff --git a/st.cmd b/st.cmd deleted file mode 100644 index 3a192db..0000000 --- a/st.cmd +++ /dev/null @@ -1,11 +0,0 @@ -require ePowerSwitch,ponsin_h - -epicsEnvSet("ASYN_PORT", "myDriverPort") -epicsEnvSet("DB", "$(ePowerSwitch_DB)") - -# I use HTTP to use TCP and disconnect after, but no disconnection is done, so I disconnect manually. -drvAsynIPPortConfigure("$(ASYN_PORT)","127.0.0.1:55555 http", 0, 0, 0) - -dbLoadTemplate("$(DB)template$(EPOWERSWITCH_SOCKET_NUMBER).substitutions", "PORT=$(ASYN_PORT), DEVICE_NAME=$(DEVICE_NAME), DB=$(DB)") - -iocInit() diff --git a/startioc.sh b/startioc.sh index 5ba9359..a245171 100755 --- a/startioc.sh +++ b/startioc.sh @@ -2,8 +2,10 @@ if [ $1 -eq 4 -o $1 -eq 8 ] then + source .env export DEVICE_NAME="ePowerSwitch" export EPOWERSWITCH_SOCKET_NUMBER=$1 + export echo "Starting ePowerSwitch drivers with $1 outlets" iocsh st.cmd else