Commit 986ac206 authored by Arnaud WATLET's avatar Arnaud WATLET
Browse files

Updates test

Showing with 5 additions and 5 deletions
+5 -5
...@@ -105,12 +105,12 @@ if within_ohmpi: ...@@ -105,12 +105,12 @@ if within_ohmpi:
# k._hw.switch_mux([A, B, M, N], state='off') # k._hw.switch_mux([A, B, M, N], state='off')
# print(f'OhmPiHardware Resistance: {k._hw.last_rho :.2f} ohm, dev. {k._hw.last_dev:.2f} %, rx bias: {k._hw.rx._bias:.2f} mV') # print(f'OhmPiHardware Resistance: {k._hw.last_rho :.2f} ohm, dev. {k._hw.last_dev:.2f} %, rx bias: {k._hw.rx._bias:.2f} mV')
# k._hw._plot_readings() # k._hw._plot_readings()
k.load_sequence('sequences/9991_GRAD_16_s1_a1.txt') # k.load_sequence('sequences/9991_GRAD_16_s1_a1.txt')
k.run_sequence(tx_volt=5, injection_duration=1., nb_stack=2, duty_cycle=0.5) # k.run_sequence(tx_volt=5, injection_duration=1., nb_stack=2, duty_cycle=0.5)
print('using OhmPi') print('using OhmPi')
#d = k.run_measurement([A, B, M, N], injection_duration=1., nb_stack=2, duty_cycle=0.5) d = k.run_measurement([A, B, M, N], injection_duration=3., nb_stack=2, duty_cycle=0.5, tx_volt=5.)
# print(d) # print(d)
# k._hw._plot_readings() k._hw._plot_readings()
print(f'OhmPiHardware: Resistance: {k._hw.last_resistance() :.2f} ohm, dev. {k._hw.last_dev():.2f} %, sp: {k._hw.sp:.2f} mV, rx bias: {k._hw.rx._bias:.2f} mV') print(f'OhmPiHardware: Resistance: {k._hw.last_resistance() :.2f} ohm, dev. {k._hw.last_dev():.2f} %, sp: {k._hw.sp:.2f} mV, rx bias: {k._hw.rx._bias:.2f} mV')
print(f'OhmPi: Resistance: {d["R [ohm]"] :.2f} ohm, dev. {d["R_std [%]"]:.2f} %, rx bias: {k._hw.rx._bias:.2f} mV') print(f'OhmPi: Resistance: {d["R [ohm]"] :.2f} ohm, dev. {d["R_std [%]"]:.2f} %, rx bias: {k._hw.rx._bias:.2f} mV')
# k._hw._plot_readings(save_fig=False) # k._hw._plot_readings(save_fig=False)
......
...@@ -26,7 +26,7 @@ SPECS = {'rx': {'model': {'default': os.path.basename(__file__).rstrip('.py')}, ...@@ -26,7 +26,7 @@ SPECS = {'rx': {'model': {'default': os.path.basename(__file__).rstrip('.py')},
'tx': {'model': {'default': os.path.basename(__file__).rstrip('.py')}, 'tx': {'model': {'default': os.path.basename(__file__).rstrip('.py')},
'adc_voltage_min': {'default': 10.}, # Minimum voltage value used in vmin strategy 'adc_voltage_min': {'default': 10.}, # Minimum voltage value used in vmin strategy
'adc_voltage_max': {'default': 4500.}, # Maximum voltage on ads1115 used to measure current 'adc_voltage_max': {'default': 4500.}, # Maximum voltage on ads1115 used to measure current
'voltage_max': {'min': 0., 'default': 12., 'max': 12.}, # Maximum input voltage 'voltage_max': {'min': 0., 'default': 12., 'max': 50.}, # Maximum input voltage
'data_rate': {'default': 860.}, 'data_rate': {'default': 860.},
'mcp_address': {'default': 0x21}, 'mcp_address': {'default': 0x21},
'ads_address': {'default': 0x48}, 'ads_address': {'default': 0x48},
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment