eive/eive-tmtc
eive
/
eive-tmtc
13
0
Fork 0
Code Issues Pull Requests 2 Projects Releases 97 Wiki Activity

Merge pull request 'added none entry for new enum' (#230) from submode-enum-none-entry into main
EIVE/-/pipeline/head This commit looks good Details 

Reviewed-on: #230
This commit is contained in:
Robin Müller 2023-08-15 13:58:07 +02:00
parent f76cd94535 4b08f5dd5b
commit bc1a1774a6
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@ -10,6 +10,12 @@ list yields a list of all related PRs for each release.
# [unreleased] # [unreleased]
# [v5.4.2] 2023-08-15
## Added
- New NONE entry for PL PCDU submode enum.
# [v5.4.1] 2023-08-15 # [v5.4.1] 2023-08-15
## Added ## Added

4
eive_tmtc/__init__.py
View File

@ -1,4 +1,4 @@
__version__ = "5.4.1" __version__ = "5.4.2"
import logging import logging
from pathlib import Path from pathlib import Path
@ -6,7 +6,7 @@ from pathlib import Path
SW_NAME = "eive-tmtc" SW_NAME = "eive-tmtc"
VERSION_MAJOR = 5 VERSION_MAJOR = 5
VERSION_MINOR = 4 VERSION_MINOR = 4
VERSION_REVISION = 1 VERSION_REVISION = 2
EIVE_TMTC_ROOT = Path(__file__).parent EIVE_TMTC_ROOT = Path(__file__).parent
PACKAGE_ROOT = EIVE_TMTC_ROOT.parent PACKAGE_ROOT = EIVE_TMTC_ROOT.parent

1
eive_tmtc/tmtc/power/plpcdu.py
View File

@ -86,6 +86,7 @@ class NormalSubmodesMask(enum.IntEnum):
class SubmodeForNormalMode(enum.IntEnum): class SubmodeForNormalMode(enum.IntEnum):
NONE = 0
SSR_ON = 1 << NormalSubmodesMask.SOLID_STATE_RELAYS_ADC_ON SSR_ON = 1 << NormalSubmodesMask.SOLID_STATE_RELAYS_ADC_ON
DRO_ON = 1 << NormalSubmodesMask.DRO_ON | ( DRO_ON = 1 << NormalSubmodesMask.DRO_ON | (
1 << NormalSubmodesMask.SOLID_STATE_RELAYS_ADC_ON 1 << NormalSubmodesMask.SOLID_STATE_RELAYS_ADC_ON