Skip to content

Commit 1a21812

Browse files
committed
changed the addresses to fit my computer
1 parent b0cfc1f commit 1a21812

2 files changed

Lines changed: 12 additions & 10 deletions

File tree

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1-
Tests/DCX81/dcx81_spi_test_with_dbmd6.py
1+
Tests/DCX81/dcx81_spi_test_with_dbmd6.py
2+
*.txt
3+
*.xlsx

init.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
#######################################################################################
1212
### home-made modules:
1313
######################
14-
execfile(r"C:\Users\bar.kristal\Documents\GitHub\Python\devices.py")
15-
execfile(r"C:\Users\bar.kristal\Documents\GitHub\Python\utilities.py")
16-
execfile(r"C:\Users\bar.kristal\Documents\GitHub\Python\lab_equipment.py")
14+
execfile(r"C:\GitHub\Python\devices.py")
15+
execfile(r"C:\GitHub\Python\utilities.py")
16+
execfile(r"C:\GitHub\Python\lab_equipment.py")
1717

1818

1919
#######################################################################################
@@ -71,18 +71,18 @@
7171
##### defines:
7272
#############
7373

74-
T32_APP_CMM_PATH = r"T:\\Barkristal\DVF101\SPI\scripts\dvf101_app.cmm"
75-
POWER_SUPPLY_FOR_RESET = ["GPIB0::29::INSTR", 2] #(addres, channel)
74+
T32_APP_CMM_PATH = r"C:\T32\DVF101\script_from_lautherbach_support.cmm"
75+
7676

7777
#lab_equipment GPIB addresses:
78-
POWER_SUPLLY_ADDRESS = "GPIB0::29::INSTR"
79-
DMM_ADDRESS = "GPIB0::22::INSTR"
78+
POWER_SUPLLY_ADDRESS = "GPIB0::2::INSTR"
79+
DMM_ADDRESS = "GPIB1::22::INSTR"
8080
FREQUENCY_COUNTER_ADDRESS = "GPIB0::27::INSTR"
8181
WAVE_GENERATOR_ADDRESS = "GPIB0::1::INSTR"
8282
ELECTRONIC_LOAD = "GPIB0::3::INSTR"
8383

8484
#TCP_IP addresses:
85-
#TERMOTRON_TCP_IP = ("172.19.5.237" ,8080) # (ip, port) , (Sas)
86-
TERMOTRON_TCP_IP = ("172.19.5.240" ,8080) # (ip, port) , (Ronny)
85+
TERMOTRON_TCP_IP = ("172.19.5.237", 8080) # (ip, port) , (Sas)
86+
#TERMOTRON_TCP_IP = ("172.19.5.240", 8080) # (ip, port) , (Ronny)
8787
#############################################################################################
8888

0 commit comments

Comments
 (0)