Commit 3b621d6b authored by Guillaume Blanchy's avatar Guillaume Blanchy
Browse files

Merge branch 'devGB' into 'master'

v2024.0.20

See merge request ohmpi/ohmpi!52
Showing with 3 additions and 2 deletions
+3 -2
...@@ -113,6 +113,7 @@ class Mux(MuxAbstract): ...@@ -113,6 +113,7 @@ class Mux(MuxAbstract):
self._i2c_ext_tca_channel = int(kwargs['i2c_ext_tca_channel']) self._i2c_ext_tca_channel = int(kwargs['i2c_ext_tca_channel'])
self._i2c_ext_tca = None self._i2c_ext_tca = None
if self.connect: if self.connect:
self.soh_logger.info(colored(f'{self.model} - {self.board_id}', 'blue'))
try: try:
self.reset_i2c_ext_tca() self.reset_i2c_ext_tca()
if self._i2c_ext_tca is None: if self._i2c_ext_tca is None:
......
...@@ -53,7 +53,7 @@ except Exception as error: ...@@ -53,7 +53,7 @@ except Exception as error:
print(colored(f'Unexpected error: {error}', 'red')) print(colored(f'Unexpected error: {error}', 'red'))
arm64_imports = None arm64_imports = None
VERSION = 'v2024.0.18' VERSION = 'v2024.0.20'
class OhmPi(object): class OhmPi(object):
......
...@@ -9,7 +9,7 @@ branch = subprocess.check_output(['git', 'branch', '--show-current']).decode().s ...@@ -9,7 +9,7 @@ branch = subprocess.check_output(['git', 'branch', '--show-current']).decode().s
# merge master to avoid merge conflicts later # merge master to avoid merge conflicts later
print('===== Fetch master, then merge it ====') print('===== Fetch master, then merge it ====')
os.system('git fetch origin/master') os.system('git fetch origin master')
os.system('git merge origin/master') os.system('git merge origin/master')
print("=== Update version number ===") print("=== Update version number ===")
......
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