Commit 46c57a56 authored by Guillaume Blanchy's avatar Guillaume Blanchy
Browse files

Update gitlab-ci (try to fix missing OhmPi API reference)

Showing with 35 additions and 46 deletions
+35 -46
...@@ -7,10 +7,8 @@ pages: ...@@ -7,10 +7,8 @@ pages:
script: script:
- apt-get update - apt-get update
- apt-get install --assume-yes pandoc - apt-get install --assume-yes pandoc
- pip install numpy pandas termcolor paho-mqtt zmq # top import of Ohmpi.py - pip install numpy pandas termcolor paho-mqtt zmq tqdm # top import of Ohmpi.py
- pip install sphinx numpydoc sphinx_rtd_theme pandoc recommonmark linuxdoc - pip install sphinx numpydoc sphinx_rtd_theme pandoc recommonmark linuxdoc
- cp configs/config_default.py ohmpi/config.py # only compile doc with dummy if not on rpi with correct config.py
- export PYTHONPATH=`pwd`
- cd doc - cd doc
- make html - make html
......
...@@ -17,58 +17,49 @@ OHMPI_CONFIG = { ...@@ -17,58 +17,49 @@ OHMPI_CONFIG = {
} }
r_shunt = 2. r_shunt = 2.
# default properties of system components that will be
# overwritten by properties defined in each the board dict below.
# if bounds are defined in board specs, values out of specs will be bounded to remain in specs
# omitted properties in config will be set to board specs default values if they exist
HARDWARE_CONFIG = { HARDWARE_CONFIG = {
'ctl': {'model': 'raspberry_pi'}, 'ctl': {'model': 'raspberry_pi'},
'pwr': {'model': 'pwr_batt', 'voltage': 12., 'interface_name': 'none'}, 'pwr': {'model': 'pwr_batt', 'voltage': 12., 'interface_name': 'none'},
'tx': {'model': 'mb_2024_0_2', 'tx': {'model': 'mb_2024_0_2',
'voltage_max': 50., # Maximum voltage supported by the TX board [V] 'voltage_max': 50., # Maximum voltage supported by the TX board [V]
'current_max': 4.80/(50*r_shunt), # Maximum voltage read by the current ADC on the TX board [A] 'current_max': 4.80/(50*r_shunt), # Maximum voltage read by the current ADC on the TX board [A]
'r_shunt': r_shunt, # Shunt resistance in Ohms 'r_shunt': r_shunt, # Shunt resistance in Ohms
'interface_name': 'i2c', 'interface_name': 'i2c'
'vmn_hardware_offset': 2500. },
},
'rx': {'model': 'mb_2024_0_2', 'rx': {'model': 'mb_2024_0_2',
'latency': 0.010, # latency in seconds in continuous mode 'latency': 0.010, # latency in seconds in continuous mode
'sampling_rate': 50, # number of samples per second 'sampling_rate': 200, # number of samples per second
'interface_name': 'i2c', 'interface_name': 'i2c'
}, },
'mux': {'boards': 'mux': {'boards':
{'mux_A': {'mux_A':
{'model': 'mux_2023_0_X', {'model': 'mux_2023_0_X',
'mux_tca_address': 0x70, 'mux_tca_address': 0x70,
'roles': 'A', 'roles': 'A',
'electrodes': range(1, 65), 'electrodes': range(1, 65)},
},
'mux_B': 'mux_B':
{'model': 'mux_2023_0_X', {'model': 'mux_2023_0_X',
'mux_tca_address': 0x71, 'mux_tca_address': 0x71,
'roles': 'B', 'roles': 'B',
'electrodes': range(1, 65), 'electrodes': range(1, 65)},
},
'mux_M': 'mux_M':
{'model': 'mux_2023_0_X', {'model': 'mux_2023_0_X',
'mux_tca_address': 0x72, 'mux_tca_address': 0x72,
'roles': 'M', 'roles': 'M',
'electrodes': range(1, 65), 'electrodes': range(1, 65)},
},
'mux_N': 'mux_N':
{'model': 'mux_2023_0_X', {'model': 'mux_2023_0_X',
'mux_tca_address': 0x73, 'mux_tca_address': 0x73,
'roles': 'N', 'roles': 'N',
'electrodes': range(1, 65), 'electrodes': range(1, 65),
} }
}, },
'default': {'interface_name': 'i2c', 'default': {'interface_name': 'i2c_ext',
'voltage_max': 50., 'voltage_max': 50.,
'current_max': 3.} 'current_max': 3.}
} }
} }
# SET THE LOGGING LEVELS, MQTT BROKERS AND MQTT OPTIONS ACCORDING TO YOUR NEEDS # SET THE LOGGING LEVELS, MQTT BROKERS AND MQTT OPTIONS ACCORDING TO YOUR NEEDS
# Execution logging configuration # Execution logging configuration
EXEC_LOGGING_CONFIG = { EXEC_LOGGING_CONFIG = {
...@@ -97,7 +88,7 @@ DATA_LOGGING_CONFIG = { ...@@ -97,7 +88,7 @@ DATA_LOGGING_CONFIG = {
SOH_LOGGING_CONFIG = { SOH_LOGGING_CONFIG = {
'logging_level': logging.INFO, 'logging_level': logging.INFO,
'logging_to_console': True, 'logging_to_console': True,
'log_file_logging_level': logging.INFO, 'log_file_logging_level': logging.DEBUG,
'file_name': f'soh{logging_suffix}.log', 'file_name': f'soh{logging_suffix}.log',
'max_bytes': 16777216, 'max_bytes': 16777216,
'backup_count': 1024, 'backup_count': 1024,
......
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