diff --git a/.gitignore b/.gitignore
index 4b4be21..5a8db5d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,9 @@
 Tests/DCX81/dcx81_spi_test_with_dbmd6.py
 *.txt
+<<<<<<< HEAD
+=======
 *.bak
 Tests/DCX81/spi_read_fifo.cmm
 Tests/DCX81/spi2_slave.cmm
+>>>>>>> refs/remotes/origin/master
 *.xlsx
\ No newline at end of file
diff --git a/DVF101 MIPS Test.py b/DVF101 MIPS Test.py
new file mode 100644
index 0000000..921c861
--- /dev/null
+++ b/DVF101 MIPS Test.py	
@@ -0,0 +1,12 @@
+################################################################
+## Test ID:
+FOLDER_PATH = r"C:\GitHub\Python\functionality_test"
+FOLDER_NAME = "Log"
+TEST_NAME = "dmm_test"
+
+#################################################################
+
+execfile(r"C:\GitHub\Python\init.py")
+
+
+########################
\ No newline at end of file
diff --git a/DVF101_MIPS.py b/DVF101_MIPS.py
new file mode 100644
index 0000000..5f4b798
--- /dev/null
+++ b/DVF101_MIPS.py
@@ -0,0 +1,76 @@
+################################################################
+## Test ID:
+FOLDER_PATH = r"C:\GitHub\Python\DVF101"
+FOLDER_NAME = "Log"
+TEST_NAME = "DVF101_MIPS_test"
+
+#################################################################
+
+execfile(r"C:\GitHub\Python\init.py")
+
+
+########################
+DMM = Agillent34401A(DMM_ADDRESS, RESOURCE_MANAGER) #init DMM
+dvf101 = Lauterbach("DVF101")                       #from test1.py
+address = '5301000'
+
+
+
+cmm_path = r"G:\Chip_Validation\sasone\DVF101\MIPS\DVF101_PLL1_Configuration.cmm" #changing frequency and measure the current on VDD_1V1
+dvf101.execute_cmm_file(cmm_path)
+
+configuration_list = ['b03c083', '903c083',
+                      '1200c083', '1100c083',
+                      '1000c083', 'f00c083',
+                      'e00c083', 'd00c083',
+                      'c00c083', 'b00c083',
+                      'a00c083', '900c083',
+                      '800c083', '700c083',
+                      '600c083', '500c083',
+                      '400c083', '300c083',
+                      '200c083', '100c083',
+                      'C083']
+
+
+wb1, excel_full_path = create_excel_file(DIR_NAME, LOG_NAME_EXCEL)
+ws1 = wb1.create_sheet("DVF101")
+row_idx = 3
+
+for config in configuration_list:
+    dvf101.write_register(address, config)
+    time.sleep(0.5)
+    dmm_value = DMM.meas("DCV")
+    ws1.cell(row=row_idx, column=3).value = dmm_value
+    row_idx = row_idx+1
+
+ws1.cell(row=2,column=3).value="DVF101_MIPS_test"
+wb1.save(excel_full_path)
+
+## Excel:
+
+
+# wb1, full_path = create_excel_file(DIR_NAME, LOG_NAME_EXCEL)
+# ws1 = wb1.create_sheet("new sheet is the new shit!")
+# ws1.cell(row=3,column=3).value="write something"
+# wb1.save(full_path)
+# wb = open_excel_file(full_path)
+# print wb.get_sheet_names()
+
+    ## Lauterbach:
+
+    # DVF101 = Lauterbach("DVF101")
+    # DVF101.write_register("5300000", "5555")
+    # DVF101.set_bits("5300000", "410", "40")
+    # print DVF101.read_register("5300000")
+    # DVF101.execute_cmm_file(br"T:\barkristal\DVF101\SPI\clkout.cmm")
+    # DVF101.close()
+
+########################
+## Excel:
+
+# wb1, full_path = create_excel_file(DIR_NAME, LOG_NAME_EXCEL)
+# ws1 = wb1.create_sheet("new sheet is the new shit!")
+# ws1.cell(row=1,column=1).value="write something"
+# wb1.save(full_path)
+# wb=open_excel_file(full_path)
+# print wb.get_sheet_names()
diff --git a/Tests/DCX81/spi2_slave.cmm b/Tests/DCX81/spi2_slave.cmm
index 92e226f..071f3d7 100644
--- a/Tests/DCX81/spi2_slave.cmm
+++ b/Tests/DCX81/spi2_slave.cmm
@@ -5,19 +5,19 @@ wait 1s
 d.s 0x00ce000c %LONG 0xff                   //enable all interrupts
 PER.Set.Field A:00ce0004 %Long 0x8000 0x1   //rx_thr =24
 PER.Set.Field A:00ce0004 %Long 0x4000 0x1   //tx_thr =8
-PER.Set.Field A:00ce0004 %Long 0x7f 0x8     //set RATE
+PER.Set.Field A:00ce0004 %Long 0x7f 0x1     //set RATE
 PER.Set.Field A:00ce0004 %Long 0x1E00 0x7   //set BITNUM = 7(+1)
 PER.Set.Field A:00ce0004 %Long 0x100 0      //set to mode 0
 
 ;d.s 0x00ce0004 %LONG 0xce08
 
-d.s 0x00ce0008 %LONG 0x8  	            //set FRAME to 8
+d.s 0x00ce0008 %LONG 0x5  	            //set FRAME to 5
 
-d.s 0x00ce0014 %WORD 0x61 
-d.s 0x00ce0014 %WORD 0x62 
-d.s 0x00ce0014 %WORD 0x63 
-d.s 0x00ce0014 %WORD 0x64 
-d.s 0x00ce0014 %WORD 0x65 
+d.s 0x00ce0014 %WORD 0x51 
+d.s 0x00ce0014 %WORD 0x41 
+d.s 0x00ce0014 %WORD 0x53 
+d.s 0x00ce0014 %WORD 0x53 
+d.s 0x00ce0014 %WORD 0x21 
 
 
 ;wait 5s
@@ -34,4 +34,3 @@ d.s 0x00ce0014 %WORD 0x65
 
 
 
-
diff --git a/dmm_test.py b/dmm_test.py
new file mode 100644
index 0000000..6238eda
--- /dev/null
+++ b/dmm_test.py
@@ -0,0 +1,53 @@
+################################################################
+## Test ID:
+FOLDER_PATH = r"C:\GitHub\Python\functionality_test"
+FOLDER_NAME = "Log"
+TEST_NAME = "dmm_test"
+
+#################################################################
+
+execfile(r"C:\GitHub\Python\init.py")
+
+
+########################
+## Power Supply:
+
+# pwr_sply = QL355TPPwrSply(POWER_SUPLLY_ADDRESS, RESOURCE_MANAGER)   #init power supply
+# DMM = Agillent34401A(DMM_ADDRESS, RESOURCE_MANAGER)                 #init DMM
+# print pwr_sply.name
+# pwr_sply.channel_on('1')
+# volt_list=[0.5, 1, 2, 3.5]
+# for voltage in volt_list:
+#     pwr_sply.set_volt(1,voltage)
+#     time.sleep(0.5)
+#     DMM.meas("DCV")
+#     print pwr_sply.read_current(1)
+#     print voltage
+
+
+
+
+
+
+
+
+
+# print pwr_sply.name
+# pwr_sply.channel_on('1')
+# volt_list=[0.5, 1, 2, 1.5]
+# for voltage in volt_list:
+#     pwr_sply.set_volt(1,voltage)
+#     time.sleep(0.1)
+#     print pwr_sply.read_current(1)
+# pwr_sply.sense(1,1)
+# pwr_sply.set_current_lim(1,1.32)
+# pwr_sply.close()
+
+
+##HEWLETT PACKARD 34401A
+
+
+# print DMM.name
+# DMM.meas("DCV")
+# a= dmm_multimeter.meas("volt_min_peak")
+# dmm_multimeter.meas("phase")
\ No newline at end of file
diff --git a/init.py b/init.py
index f7b9cf0..d259ab4 100644
--- a/init.py
+++ b/init.py
@@ -11,9 +11,9 @@
 #######################################################################################
 ### home-made modules:
 ######################
-execfile(r"C:\Users\bar.kristal\Documents\GitHub\Python\devices.py")
-execfile(r"C:\Users\bar.kristal\Documents\GitHub\Python\utilities.py")
-execfile(r"C:\Users\bar.kristal\Documents\GitHub\Python\lab_equipment.py")
+execfile(r"C:\GitHub\Python\devices.py")
+execfile(r"C:\GitHub\Python\utilities.py")
+execfile(r"C:\GitHub\Python\lab_equipment.py")
 
 
 #######################################################################################
@@ -69,19 +69,24 @@
 ##### defines: 
 #############
 
+<<<<<<< HEAD
+T32_APP_CMM_PATH = r"C:\T32\DVF101\script_from_lautherbach_support.cmm"
+=======
 T32_APP_CMM_PATH = r"T:\\Barkristal\DVF101\SPI\scripts\dvf101_app.cmm"
+>>>>>>> refs/remotes/origin/master
 
 
 #lab_equipment GPIB addresses:
-POWER_SUPLLY_ADDRESS = "GPIB0::29::INSTR"
-DMM_ADDRESS = "GPIB0::22::INSTR"
+POWER_SUPLLY_ADDRESS = "GPIB1::4::INSTR"
+DMM_ADDRESS = "GPIB1::22::INSTR"
 FREQUENCY_COUNTER_ADDRESS = "GPIB0::27::INSTR"
 WAVE_GENERATOR_ADDRESS = "GPIB0::1::INSTR"
 ELECTRONIC_LOAD_ADDRESS = "GPIB0::3::INSTR"
 SCOPE_ADDRESS = "GPIB0::9::INSTR"
 
 #TCP_IP addresses:
-#TERMOTRON_TCP_IP =  ("172.19.5.237" ,8080)  # (ip, port) , (Sas)
-TERMOTRON_TCP_IP =  ("172.19.5.240" ,8080)  # (ip, port) , (Ronny)
+#TERMOTRON_TCP_IP = ("172.19.5.237", 8080)  # (ip, port) , (Sas)
+#TERMOTRON_TCP_IP = ("172.19.5.239", 8080)  # (ip, port) , (Bisset)
+TERMOTRON_TCP_IP =  ("172.19.5.240", 8080)  # (ip, port) , (Ronny)
 #############################################################################################
 
diff --git a/test1.py b/test1.py
index ca15536..f1dab99 100644
--- a/test1.py
+++ b/test1.py
@@ -1,14 +1,13 @@
 
 ################################################################
 ## Test ID:
-FOLDER_PATH = r"C:\\Users\bar.kristal\Documents\GitHub\Python\Tests\functionality_test"
+FOLDER_PATH = r"C:\GitHub\Python\functionality_test"
 FOLDER_NAME = "Log"
 TEST_NAME = "test1"
 
-T32_APP_CMM_PATH = r"T:\\barkristal\DVF101\SPI\scripts\dvf101_app.cmm"
 #################################################################
 
-execfile(r"C:\Users\bar.kristal\Documents\GitHub\Python\init.py")
+execfile(r"C:\GitHub\Python\init.py")
 
 
 
@@ -101,6 +100,12 @@
 # termotron = Termotron3800(TERMOTRON_TCP_IP)
 # termotron.stop_chamber()
 # termotron.set_temp(23)
+<<<<<<< HEAD
+# termotron.wait_for_temp(29)
+# print termotron.read_temp()
+# time.sleep(3)
+# termotron.stop_chamber()
+=======
 # termotron.wait_for_temp(22)
 # write_to_log(termotron.read_temp())
 # time.sleep(1)
@@ -116,3 +121,4 @@
 # dmm.meas("frequency")
 # dmm.close()
 
+>>>>>>> refs/remotes/origin/master