Improves folder structure and replaces OhmPi imports with ohmpi imports

0f6e4e1e · Olivier Kaufmann · 7982bdb2 · 0f6e4e1e · 0f6e4e1e · 0f6e4e1e
Commit 0f6e4e1e authored 1 year ago by Olivier Kaufmann
Hide whitespace changes
Inline Side-by-side

Showing

with 52 additions and 3 deletions
+52 -3
--- a/dev/test_measure_with_ohmpi_card_3_15.py
+++ b/dev/test_measure_with_ohmpi_card_3_15.py
 import numpy as np
 import logging
 import matplotlib.pyplot as plt
-from utils import change_config
+from ohmpi.utils import change_config
 change_config('config_mb_2023_mux_2024.py', verbose=False)
-from OhmPi.hardware_system import OhmPiHardware
+from ohmpi.hardware_system import OhmPiHardware
 k = OhmPiHardware()
 k.exec_logger.setLevel(logging.INFO)

--- a/ohmpi/ohmpi/__init__.py
+++ b/ohmpi/ohmpi/__init__.py
--- a/ohmpi/config.py
+++ b/ohmpi/config.py
 import logging
-from OhmPi.utils import get_platform
+from ohmpi.utils import get_platform
 from paho.mqtt.client import MQTTv31

--- a/ohmpi/data/data.log
+++ b/ohmpi/data/data.log
+2023-04-15 07:14:58 UTC | 454119 | INFO: Starting_session
--- a/ohmpi/data/data_interactive.log
+++ b/ohmpi/data/data_interactive.log
+2022/10/30 10:37:58 UTC | 382172 | INFO: Starting_session
+2022-10-30 10:41:26 UTC | 388820 | INFO: Starting_session
+2022-10-30 11:26:42 UTC | 391301 | INFO: Starting_session
+2022-10-30 11:33:50 UTC | 391708 | INFO: Starting_session
+2022-10-30 11:47:59 UTC | 392353 | INFO: Starting_session
+2022-10-30 11:49:21 UTC | 392353 | INFO: Starting_session
+2022-10-30 11:49:21 UTC | 392353 | INFO: Starting_session
+2022-10-30 11:49:59 UTC | 392480 | INFO: Starting_session
+2022-10-30 11:51:49 UTC | 393094 | INFO: Starting_session
+2022-10-30 11:53:52 UTC | 393416 | INFO: Starting_session
+2022-10-30 11:56:15 UTC | 393541 | INFO: Starting_session
+2022-10-30 11:57:59 UTC | 393666 | INFO: Starting_session
+2022-10-30 11:58:35 UTC | 393746 | INFO: Starting_session
+2022-10-30 12:08:56 UTC | 394278 | INFO: Starting_session
+2022-10-30 12:11:17 UTC | 394477 | INFO: Starting_session
+2022-10-30 12:13:00 UTC | 394553 | INFO: Starting_session
+2022-10-30 12:13:17 UTC | 394574 | INFO: Starting_session
+2022-10-30 12:14:53 UTC | 394637 | INFO: Starting_session
+2022-10-30 12:19:11 UTC | 394827 | INFO: Starting_session
--- a/ohmpi/data/data_log
+++ b/ohmpi/data/data_log
+2022/10/27 08:58:05 UTC | 277407 | INFO: Starting_session
--- a/ohmpi/data/measurement_20220508T234313.csv
+++ b/ohmpi/data/measurement_20220508T234313.csv
+A,B,M,N,R [ohm],cmd_id
+[1],[2],[3],[4],[0.13985799],001
--- a/ohmpi/data/measurement_20220508T234314.csv
+++ b/ohmpi/data/measurement_20220508T234314.csv
+A,B,M,N,R [ohm],cmd_id
+[1],[2],[3],[4],[1.065914],001
--- a/ohmpi/data/measurement_20220508T234315.csv
+++ b/ohmpi/data/measurement_20220508T234315.csv
+A,B,M,N,R [ohm],cmd_id
+[1],[2],[3],[4],[2.64801312],001
--- a/ohmpi/data/measurement_20220508T234316.csv
+++ b/ohmpi/data/measurement_20220508T234316.csv
+A,B,M,N,R [ohm],cmd_id
+[1],[2],[3],[4],[0.41564175],001
--- a/ohmpi/data/measurement_20220508T234317.csv
+++ b/ohmpi/data/measurement_20220508T234317.csv
+A,B,M,N,R [ohm],cmd_id
+[1],[2],[3],[4],[1.02271717],001
--- a/ohmpi/data/measurement_20220508T234318.csv
+++ b/ohmpi/data/measurement_20220508T234318.csv
+A,B,M,N,R [ohm],cmd_id
+[1],[2],[3],[4],[1.0930598],001
--- a/ohmpi/data/measurement_20220508T234319.csv
+++ b/ohmpi/data/measurement_20220508T234319.csv
+A,B,M,N,R [ohm],cmd_id
+[1],[2],[3],[4],[0.7949517],001
--- a/ohmpi/data/measurement_20220508T234320.csv
+++ b/ohmpi/data/measurement_20220508T234320.csv
+A,B,M,N,R [ohm],cmd_id
+[1],[2],[3],[4],[0.57598347],001
--- a/ohmpi/data/measurement_20220508T234321.csv
+++ b/ohmpi/data/measurement_20220508T234321.csv
+A,B,M,N,R [ohm],cmd_id
+[1],[2],[3],[4],[0.48525216],001
--- a/ohmpi/data/measurement_20220508T234322.csv
+++ b/ohmpi/data/measurement_20220508T234322.csv
+A,B,M,N,R [ohm],cmd_id
+[1],[2],[3],[4],[0.45566561],001
--- a/ohmpi/data/measurement_20220508T234323.csv
+++ b/ohmpi/data/measurement_20220508T234323.csv
+A,B,M,N,R [ohm],cmd_id
+[1],[2],[3],[4],[0.48780537],001
--- a/ohmpi/data/measurement_20220508T234324.csv
+++ b/ohmpi/data/measurement_20220508T234324.csv
+A,B,M,N,R [ohm],cmd_id
+[1],[2],[3],[4],[1.66004777],001
--- a/ohmpi/data/measurement_20220508T234325.csv
+++ b/ohmpi/data/measurement_20220508T234325.csv
+A,B,M,N,R [ohm],cmd_id
+[1],[2],[3],[4],[0.32724811],001
--- a/ohmpi/data/measurement_20220508T234326.csv
+++ b/ohmpi/data/measurement_20220508T234326.csv
+A,B,M,N,R [ohm],cmd_id
+[1],[2],[3],[4],[0.55912001],001