Merge branch 'master' into 'L2SS-202-SDP-SST-points-update'
# Conflicts: # devices/SDP.py
Showing
- CDB/thijs_ConfigDb.json 140 additions, 0 deletionsCDB/thijs_ConfigDb.json
- devices/APSCTL.py 59 additions, 59 deletionsdevices/APSCTL.py
- devices/PCC.py 2 additions, 2 deletionsdevices/PCC.py
- devices/SDP.py 38 additions, 36 deletionsdevices/SDP.py
- devices/SNMP.py 112 additions, 0 deletionsdevices/SNMP.py
- devices/clients/SNMP_client.py 160 additions, 0 deletionsdevices/clients/SNMP_client.py
- devices/clients/ini_client.py 192 additions, 0 deletionsdevices/clients/ini_client.py
- devices/clients/opcua_connection.py 25 additions, 2 deletionsdevices/clients/opcua_connection.py
- devices/examples/HW_device_template.py 6 additions, 5 deletionsdevices/examples/HW_device_template.py
- devices/ini_device.py 128 additions, 0 deletionsdevices/ini_device.py
- devices/test_device.py 1 addition, 1 deletiondevices/test_device.py
- devices/util/archiver.py 0 additions, 0 deletionsdevices/util/archiver.py
- devices/util/get_internal_attribute_history.py 0 additions, 0 deletionsdevices/util/get_internal_attribute_history.py
- devices/util/hardware_device.py 8 additions, 8 deletionsdevices/util/hardware_device.py
- devices/util/lofar2_config.py 0 additions, 0 deletionsdevices/util/lofar2_config.py
- devices/util/lofar_logging.py 2 additions, 1 deletiondevices/util/lofar_logging.py
- devices/util/startup.py 0 additions, 1 deletiondevices/util/startup.py
- docker-compose/Makefile 70 additions, 47 deletionsdocker-compose/Makefile
- docker-compose/device-pcc.yml 5 additions, 1 deletiondocker-compose/device-pcc.yml
- docker-compose/device-sdp.yml 5 additions, 1 deletiondocker-compose/device-sdp.yml
Loading
Please register or sign in to comment