Big changes

2025-03-13 12:04:22 -07:00
parent c689fcb7f9
commit ffa9905494
748 changed files with 199255 additions and 3743 deletions
--- a/Source/Program/InstrumentConfigFiles/ADVANTECH_DIO_1.xml
+++ b/Source/Program/InstrumentConfigFiles/ADVANTECH_DIO_1.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Configurations>
+  <IniConfiguration>
+    <section name="ADVANTECH_DIO_1">
+      <key name="DIO_MODULE_DEF_FILEPATH" value=".\InstrumentConfig\DIO_MODULES.ini" />
+    </section>
+  </IniConfiguration>
+  <XmlConfigurations />
+</Configurations>
--- a/Source/Program/InstrumentConfigFiles/DIO_MODULES.ini
+++ b/Source/Program/InstrumentConfigFiles/DIO_MODULES.ini
@@ -0,0 +1,45 @@
+; ===============================================================================================================
+; This name must match the name specified in the Instrument.xml for an instrument of type DIO
+[PICKERING_DIO_1]
+PXI_CARD_SLOT_INDEX = 0
+SHALL_WE_DRIVE_OUTPUT_UPON_INITIALIZATION = false
+; number channels per port
+NUM_CHANNELS_PER_PORT=8
+; either 0 or 1 as the starting channel index
+CHANNEL_START_INDEX=0
+NUM_OUTPUT_CHANNELS = 32
+NUM_INPUT_CHANNELS = 32
+
+;format is <signal_name> = <Channel Number>|<Initial State>
+;<Initial State> is either 0 or 1 or 2(Logic Z)
+[PICKERING_DIO_1.OUTPUT_SIGNALS]
+SIGNAL_1 = 0|1
+SIGNAL_2 = 1|0
+
+;format is <signal_name> = <Channel Number>
+[PICKERING_DIO_1.INPUT_SIGNALS]
+SIGNAL_3 = 0
+SIGNAL_4 = 0
+
+; ===============================================================================================================
+; This name must match the name specified in the Instrument.xml for an instrument of type DIO
+[ADVANTECH_DIO_1]
+DEVICE_NUMBER = 0
+SHALL_WE_DRIVE_OUTPUT_UPON_INITIALIZATION = false
+; number channels per port
+NUM_CHANNELS_PER_PORT=8
+; either 0 or 1 as the starting channel index
+CHANNEL_START_INDEX=0
+NUM_OUTPUT_CHANNELS = 32
+NUM_INPUT_CHANNELS = 32
+
+;format is <signal_name> = <Channel Number>|<Initial State>
+;<Initial State> is either 0 or 1 or 2(Logic Z)
+[ADVANTECH_DIO_1.OUTPUT_SIGNALS]
+SIGNAL_5 = 0|1
+SIGNAL_6 = 1|0
+
+;format is <signal_name> = <Channel Number>
+[ADVANTECH_DIO_1.INPUT_SIGNALS]
+SIGNAL_7 = 0
+SIGNAL_8 = 0
--- a/Source/Program/InstrumentConfigFiles/Instruments.xml
+++ b/Source/Program/InstrumentConfigFiles/Instruments.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Configurations>
+   <IniConfiguration>
+      <section name="Parts">
+         <key name="Location" value="C:\Program Files (x86)\Raytheon\RINSS\Parts" />
+      </section>
+   </IniConfiguration>
+   <XmlConfigurations>
+      <XmlConfiguration name="Instruments">
+         <Instrument>
+            <Name>STE_POWER_SUPPLY_SYSTEM</Name>
+            <Factory>PowerSupplySystemKeysightFactory</Factory>
+         </Instrument>
+         <Instrument>
+            <Name>UUT_POWER_SUPPLY_SYSTEM</Name>
+            <Factory>PowerSupplySystemKeysightFactory</Factory>
+         </Instrument>
+         <Instrument>
+            <Name>PICKERING_DIO_1</Name>
+            <Factory>DIOPickering40xFactory</Factory>
+         </Instrument>
+         <Instrument>
+            <Name>ADVANTECH_DIO_1</Name>
+            <Factory>DIOAdvantechFactory</Factory>
+         </Instrument>
+         <Instrument>
+            <Name>PICKERING_SWITCH_1</Name>
+            <Factory>SwitchPickeringPipx40Factory</Factory>
+         </Instrument>
+         <Instrument>
+            <Name>KEYSIGHT_DMM_1</Name>
+            <Factory>DMMKeysightScpiFactory</Factory>
+         </Instrument>
+      </XmlConfiguration>
+   </XmlConfigurations>
+</Configurations>
--- a/Source/Program/InstrumentConfigFiles/KEYSIGHT_DMM_1.xml
+++ b/Source/Program/InstrumentConfigFiles/KEYSIGHT_DMM_1.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Configurations>
+  <IniConfiguration>
+    <section name="KEYSIGHT_DMM_1">
+      
+    </section>
+  </IniConfiguration>
+  <XmlConfigurations />
+</Configurations>
--- a/Source/Program/InstrumentConfigFiles/KEYSIGHT_SCPI_DEF.ini
+++ b/Source/Program/InstrumentConfigFiles/KEYSIGHT_SCPI_DEF.ini
@@ -0,0 +1,56 @@
+[SYSTEM]
+;system commands
+CLEAR_CMD = *CLS
+RESET_CMD = *RST
+SELFTEST_CMD = *TST?
+READ_ERROR_CODE_CMD = SYST:ERR?
+REBOOT_CMD = SYST:REB
+
+;panel disable/enable commands
+SET_FRONTPANEL_DISABLE_CMD = SYST:COMM:RLST RWL
+SET_FRONTPANEL_ENABLE_CMD = SYST:COMM:RLST REM
+
+;watchdog commands
+SET_WATCHDOGDELAY_CMD = OUTP:PROT:WDOG:DEL
+SET_WATCHDOGON_CMD = OUTP:PROT:WDOG ON
+SET_WATCHDOGOFF_CMD = OUTP:PROT:WDOG OFF
+
+;coupling commands
+SET_COUPLE_CHANNELS_CMD = OUTP:COUP:CHAN
+SET_COUPLE_ON_CMD = OUTP:COUP ON
+SET_COUPLE_OUTPUT_PROTECT_ON_CMD = OUTP:PROT:COUP ON
+QUERY_COUPLE_CHANNELS = OUTP:COUP:CHAN?
+QUERY_COUPLE_STATE = OUTP:COUP?
+
+; Grouping Commands
+SET_GROUP_DEFINE_CMD = SYST:GRO:DEF
+UNGROUP_ALL_CHANNELS_CMD = SYST:GRO:DEL:ALL
+QUERY_GROUP_CHANNELS = SYST:GRO:CAT?
+
+[MODULE]
+; current commands
+SET_INRUSH_DELAY_CMD = CURR:PROT:DEL
+READ_INRUSH_DELAY_CMD = CURR:PROT:DEL?
+READ_CURRENT_CMD = MEAS:CURR?
+SET_OCP_CMD = CURR:LEV
+READ_OCP_CMD = CURR:LEV?
+SET_OCP_ON_CMD = CURR:PROT:STAT ON
+
+; voltage commands
+SET_OVP_CMD = VOLT:PROT
+SET_VOLTAGE_SLEW_CMD = VOLT:SLEW
+SET_VOLTAGE_SETPOINT_CMD = VOLT:LEV
+SET_CONSTANT_VOLTAGE_CMD = STAT:OPER:ENAB 1
+READ_VOLTAGE_CMD = MEAS:VOLT?
+READ_VOLTAGE_SETPOINT_CMD = VOLT?
+READ_OVP_CMD = VOLT:PROT?
+READ_VOLTAGE_SLEW_CMD = VOLT:SLEW?
+
+; set output commands
+SET_OUTPUT_DISABLE_CMD = OUTP OFF
+SET_OUTPUT_ENABLE_CMD = OUTP ON
+
+; query status
+READ_OUTPUT_STATUS_CMD = OUTP?
+READ_ERROR_STATUS_CMD = SYST:ERR?
+READ_PROTECTION_STATUS_CMD = STAT:QUES:COND?
--- a/Source/Program/InstrumentConfigFiles/PICKERING_DIO_1.xml
+++ b/Source/Program/InstrumentConfigFiles/PICKERING_DIO_1.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Configurations>
+  <IniConfiguration>
+    <section name="PICKERING_DIO_1">
+      <key name="DIO_MODULE_DEF_FILEPATH" value=".\InstrumentConfig\DIO_MODULES.ini" />
+    </section>
+  </IniConfiguration>
+  <XmlConfigurations />
+</Configurations>
--- a/Source/Program/InstrumentConfigFiles/PICKERING_SWITCH_1.xml
+++ b/Source/Program/InstrumentConfigFiles/PICKERING_SWITCH_1.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Configurations>
+  <IniConfiguration>
+    <section name="PICKERING_SWITCH_1">
+      
+    </section>
+  </IniConfiguration>
+  <XmlConfigurations />
+</Configurations>
--- a/Source/Program/InstrumentConfigFiles/POWER_SUPPLY_SYSTEMS.ini
+++ b/Source/Program/InstrumentConfigFiles/POWER_SUPPLY_SYSTEMS.ini
@@ -0,0 +1,95 @@
+; ===============================================================================================================
+; This name must match the name specified in the Instrument.xml that is associated with the power supply system
+[STE_POWER_SUPPLY_SYSTEM]
+SCPI_DEF_FILEPATH = .\InstrumentConfig\KEYSIGHT_SCPI_DEF.ini
+ETHERNET_ADDRESS = localhost
+ETHERNET_PORT = 5025
+MODULE_DEFINITION = UUT_REF_3_3V, STE_PVM_5V, STE_GU_INTERFACE_RELAYS_25V, STE_GU_INTERFACE_RF_INTERFACE_5V
+; 0 means no coupled modules.
+; couple means turning on/off any one of the module, turns on/off the others
+COUPLED_MODULES = STE_PVM_5V, STE_GU_INTERFACE_RELAYS_25V, STE_GU_INTERFACE_RF_INTERFACE_5V
+; 0 means no grouped modules.
+; group means turning combining 2 or more modules thus acting as one module
+GROUPED_MODULES = 0
+INTERFACE = ETHERNET
+
+[STE_POWER_SUPPLY_SYSTEM.UUT_REF_3_3V]
+INDEX = 1
+OCP = 2.0
+OVP = 4.0
+VOLTAGE_SETPOINT = 3.3
+
+MIN_VOLTAGE = 3.0
+MAX_VOLTAGE = 3.75
+MAX_CURRENT = 2.0
+MIN_CURRENT = -0.25
+
+[STE_POWER_SUPPLY_SYSTEM.STE_PVM_5V]
+INDEX = 2
+OCP = 2.0
+OVP = 8.0
+VOLTAGE_SETPOINT = 5.0
+
+MIN_VOLTAGE = 4.0
+MAX_VOLTAGE = 5.5
+MAX_CURRENT = 1.5
+MIN_CURRENT = -.25
+
+[STE_POWER_SUPPLY_SYSTEM.STE_GU_INTERFACE_RELAYS_25V]
+INDEX = 3
+OCP = 3.0
+OVP = 34.0
+VOLTAGE_SETPOINT = 25.0
+
+MIN_VOLTAGE = 22.0
+MAX_VOLTAGE = 30.0
+MAX_CURRENT = 3.0
+MIN_CURRENT = -0.25
+
+[STE_POWER_SUPPLY_SYSTEM.STE_GU_INTERFACE_RF_INTERFACE_5V]
+INDEX = 4
+OCP = 5.0
+OVP = 6.5
+VOLTAGE_SETPOINT = 5.0
+
+MIN_VOLTAGE = 4.0
+MAX_VOLTAGE = 6.3
+MAX_CURRENT = 4.5
+MIN_CURRENT = -.25
+
+; ===============================================================================================================
+; This name must match the name specified in the Instrument.xml that is associated with the power supply system
+[UUT_POWER_SUPPLY_SYSTEM]
+SCPI_DEF_FILEPATH = .\InstrumentConfig\KEYSIGHT_SCPI_DEF.ini
+ETHERNET_ADDRESS = localhost
+ETHERNET_PORT = 5026
+MODULE_DEFINITION = UUT_P20V, UUT_N20V
+; 0 means no coupled modules.
+; couple means turning on/off any one of the module, turns on/off the others
+COUPLED_MODULES = 0
+; 0 means no grouped modules.
+; group means turning combining 2 or more modules thus acting as one module
+GROUPED_MODULES = 0
+INTERFACE = ETHERNET
+
+[UUT_POWER_SUPPLY_SYSTEM.UUT_P20V]
+INDEX = 1
+OCP = 1.5
+OVP = 22.0
+VOLTAGE_SETPOINT = 20.0
+
+MIN_VOLTAGE = 19.0
+MAX_VOLTAGE = 22.75
+MAX_CURRENT = 2.3
+MIN_CURRENT = -0.25
+
+[UUT_POWER_SUPPLY_SYSTEM.UUT_N20V]
+INDEX = 2
+OCP = 1.8
+OVP = 22.5
+VOLTAGE_SETPOINT = 20.0
+
+MIN_VOLTAGE = 18.0
+MAX_VOLTAGE = 23.0
+MAX_CURRENT = 2.5
+MIN_CURRENT = -.25
--- a/Source/Program/InstrumentConfigFiles/STE_POWER_SUPPLY_SYSTEM.xml
+++ b/Source/Program/InstrumentConfigFiles/STE_POWER_SUPPLY_SYSTEM.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Configurations>
+  <IniConfiguration>
+    <section name="STE_POWER_SUPPLY_SYSTEM">
+      <key name="POWER_SUPPLY_SYSTEM_DEF_FILEPATH" value=".\InstrumentConfig\POWER_SUPPLY_SYSTEMS.ini" />
+    </section>
+  </IniConfiguration>
+  <XmlConfigurations />
+</Configurations>
--- a/Source/Program/InstrumentConfigFiles/UUT_POWER_SUPPLY_SYSTEM.xml
+++ b/Source/Program/InstrumentConfigFiles/UUT_POWER_SUPPLY_SYSTEM.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Configurations>
+  <IniConfiguration>
+    <section name="UUT_POWER_SUPPLY_SYSTEM">
+      <key name="POWER_SUPPLY_SYSTEM_DEF_FILEPATH" value=".\InstrumentConfig\POWER_SUPPLY_SYSTEMS.ini" />
+    </section>
+  </IniConfiguration>
+  <XmlConfigurations />
+</Configurations>