ariel-tcu 0.17.2__tar.gz → 0.17.4__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (16) hide show
  1. {ariel_tcu-0.17.2 → ariel_tcu-0.17.4}/PKG-INFO +1 -1
  2. {ariel_tcu-0.17.2 → ariel_tcu-0.17.4}/README.md +1 -1
  3. {ariel_tcu-0.17.2 → ariel_tcu-0.17.4}/pyproject.toml +3 -3
  4. {ariel_tcu-0.17.2 → ariel_tcu-0.17.4}/src/ariel_tcu/settings.yaml +4 -0
  5. {ariel_tcu-0.17.2 → ariel_tcu-0.17.4}/src/egse/ariel/tcu/__init__.py +12 -7
  6. {ariel_tcu-0.17.2 → ariel_tcu-0.17.4}/src/egse/ariel/tcu/tcu.py +108 -16
  7. {ariel_tcu-0.17.2 → ariel_tcu-0.17.4}/src/egse/ariel/tcu/tcu_cmd_utils.py +65 -8
  8. {ariel_tcu-0.17.2 → ariel_tcu-0.17.4}/src/egse/ariel/tcu/tcu_cs.py +56 -32
  9. {ariel_tcu-0.17.2 → ariel_tcu-0.17.4}/src/egse/ariel/tcu/tcu_devif.py +27 -0
  10. {ariel_tcu-0.17.2 → ariel_tcu-0.17.4}/src/egse/ariel/tcu/tcu_protocol.py +2 -2
  11. ariel_tcu-0.17.4/src/egse/ariel/tcu/tcu_ui.py +693 -0
  12. {ariel_tcu-0.17.2 → ariel_tcu-0.17.4}/.gitignore +0 -0
  13. {ariel_tcu-0.17.2 → ariel_tcu-0.17.4}/src/ariel_tcu/__init__.py +0 -0
  14. {ariel_tcu-0.17.2 → ariel_tcu-0.17.4}/src/ariel_tcu/cgse_explore.py +0 -0
  15. {ariel_tcu-0.17.2 → ariel_tcu-0.17.4}/src/ariel_tcu/cgse_services.py +0 -0
  16. {ariel_tcu-0.17.2 → ariel_tcu-0.17.4}/src/egse/ariel/tcu/tcu.yaml +0 -0
{ariel_tcu-0.17.2 → ariel_tcu-0.17.4}/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: ariel-tcu
3
- Version: 0.17.2
3
+ Version: 0.17.4
4
4
  Summary: Telescope Control Unit (TCU) for Ariel
5
5
  Author: IVS KU Leuven
6
6
  Maintainer-email: Rik Huygen <rik.huygen@kuleuven.be>, Sara Regibo <sara.regibo@kuleuven.be>
{ariel_tcu-0.17.2 → ariel_tcu-0.17.4}/README.md RENAMED
@@ -6,7 +6,7 @@
6
6
  - RD02: ARIEL TCU Data Handling (ARIEL-IEEC-PL-TN-007), v1.0
7
7
  - RD03: TCU code provided by Vladimiro Noce (priv. comm.)
8
8
  - RD04: ARIEL Telescope Control Unit Design Description Document (ARIEL-IEEC-PL-DD-001), v1.10
9
- - RD05: ARIEL TCU FW Architecture Design(ARIEL-IEEC-PL-DD-002), v1.5
9
+ - RD05: ARIEL TCU FW Architecture Design (ARIEL-IEEC-PL-DD-002), v1.5
10
10
 
11
11
 
12
12
  ## Boards
{ariel_tcu-0.17.2 → ariel_tcu-0.17.4}/pyproject.toml RENAMED
@@ -1,6 +1,6 @@
1
1
  [project]
2
2
  name = "ariel-tcu"
3
- version = "0.17.2"
3
+ version = "0.17.4"
4
4
  description = "Telescope Control Unit (TCU) for Ariel"
5
5
  authors = [
6
6
  {name = "IVS KU Leuven"}
@@ -29,8 +29,8 @@ dependencies = [
29
29
  [project.scripts]
30
30
  tcu_cs = 'egse.ariel.tcu.tcu_cs:app'
31
31
 
32
- #[project.gui-scripts]
33
- #tcu_ui = "egse.ariel.tcu.tcu_ui:main"
32
+ [project.gui-scripts]
33
+ tcu_ui = "egse.ariel.tcu.tcu_ui:main"
34
34
 
35
35
  [project.entry-points."cgse.version"]
36
36
  ariel-tcu = 'egse.version:get_version_installed'
{ariel_tcu-0.17.2 → ariel_tcu-0.17.4}/src/ariel_tcu/settings.yaml RENAMED
@@ -8,6 +8,10 @@ Ariel TCU Controller:
8
8
  NUM_DATA_BITS: 8
9
9
  NUM_STOP_BITS: 1
10
10
  PARITY: N
11
+ NUM_TSM_FRAMES: 2
12
+ NUM_TSM_PROBES_PER_FRAME: 22
13
+ NUM_M2MD_POSITIONS: 18
14
+ NUM_M2MD_AXES: 3
11
15
 
12
16
  Ariel TCU Control Server:
13
17
  PROTOCOL: tcp
{ariel_tcu-0.17.2 → ariel_tcu-0.17.4}/src/egse/ariel/tcu/__init__.py RENAMED
@@ -3,7 +3,9 @@
3
3
  Reference documents:
4
4
  - RD01: TCU User Manual (ARIEL-IEEC-PL-TN-002), v1.2
5
5
  - RD02: ARIEL TCU Data Handling (ARIEL-IEEC-PL-TN-007), v1.0
6
- - RD02: TCU code provided by Vladimiro Noce (priv. comm.)
6
+ - RD03: TCU code provided by Vladimiro Noce (priv. comm.)
7
+ - RD04: ARIEL Telescope Control Unit Design Description Document (ARIEL-IEEC-PL-DD-001), v1.10
8
+ - RD05: ARIEL TCU FW Architecture Design(ARIEL-IEEC-PL-DD-002), v1.5
7
9
  """
8
10
 
9
11
  from enum import IntEnum
@@ -27,13 +29,12 @@ SERVICE_PORT = settings.get("SERVICE_PORT", 0) # Service port (as per settings
27
29
  MONITORING_PORT = settings.get("MONITORING_PORT", 0) # Monitoring port (as per settings or dynamically assigned)
28
30
  STORAGE_MNEMONIC = settings.get("STORAGE_MNEMONIC", "TCU") # Storage mnemonic (used in the HK filenames)
29
31
 
30
- PROXY_TIMEOUT = 10
31
-
32
- NUM_TSM_FRAMES = 2
33
- NUM_TSM_PROBES_PER_FRAME = 22
34
- NUM_M2MD_POSITIONS = 18
32
+ NUM_TSM_FRAMES = settings.get("NUM_TSM_FRAMES", 2)
33
+ NUM_TSM_PROBES_PER_FRAME = settings.get("NUM_TSM_PROBES_PER_FRAME", 22)
34
+ NUM_M2MD_POSITIONS = settings.get("NUM_M2MD_POSITIONS", 18)
35
+ NUM_M2MD_AXES = settings.get("NUM_M2MD_AXES", 3)
35
36
 
36
- NUM_M2MD_AXES = 3
37
+ PROXY_TIMEOUT = 10
37
38
 
38
39
 
39
40
  class TcuMode(IntEnum):
@@ -67,6 +68,10 @@ class MotorState(IntEnum):
67
68
  OPERATION = 0x0010 # Motor moving
68
69
 
69
70
 
71
+ # Axis velocity settings
72
+ # - Keys: Axis speed in Hz
73
+ # - Values: Hex string representing the axis speed
74
+ # -> This has to be used as cargo2 in the hex command that is sent to the Arduino
70
75
  AXIS_VELOCITY = {
71
76
  1: 0x5DC0, # Writing @ 1Hz
72
77
  2: 0x2EE0, # Writing @ 2Hz