Merge branch 'master' into develop

Merge pull request 'v1.7.1' (#9 ) from v1.7.1 into develop
Reviewed-on: #9
2021-07-27 09:39:44 +02:00 · 2021-07-26 18:17:33 +02:00 · 2021-07-26 18:17:08 +02:00 · 2021-07-26 17:57:19 +02:00 · 2021-07-26 17:53:38 +02:00 · 2021-07-26 17:29:49 +02:00
3 changed files with 4 additions and 4 deletions
--- a/config/hook_implementations.py
+++ b/config/hook_implementations.py
@@ -138,7 +138,7 @@ class EiveHookObject(TmTcHookBase):
        from tmtccmd.config.com_if import create_communication_interface_default
        return create_communication_interface_default(
            com_if_key=com_if_key, tmtc_printer=tmtc_printer,
-            json_cfg_path=self.get_json_config_file_path()
+            json_cfg_path=self.get_json_config_file_path(), space_packet_id=0x0865
        )

    def perform_mode_operation(self, tmtc_backend: TmTcHandler, mode: int):
--- a/config/version.py
+++ b/config/version.py
@@ -1,6 +1,6 @@
 SW_NAME = "eive"
 VERSION_MAJOR = 1
 VERSION_MINOR = 7
-VERSION_SUBMINOR = 0
+VERSION_SUBMINOR = 1

-__version__ = "1.7.0"
+__version__ = "1.7.1"
--- a/2
+++ b/2
Author	SHA1	Message	Date
Robin Müller	ed1d9a81ed	Merge branch 'master' into develop	2021-07-27 09:39:44 +02:00
Jakob.Meier	132d9d2456	Merge pull request 'v1.7.1' (#9 ) from v1.7.1 into develop Reviewed-on: #9	2021-07-26 18:17:33 +02:00
Jakob.Meier	6f8d63ba87	Merge pull request 'v1.7.0' (#8 ) from develop into master Reviewed-on: #8 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2021-07-26 18:17:08 +02:00
Robin Mueller	1f990e9647	v1.7.1	2021-07-26 17:57:19 +02:00
Robin Mueller	2a6c0a6cab	tmtccmd update	2021-07-26 17:53:38 +02:00
Robin Mueller	9aaf3cfa7a	tmtccmd update	2021-07-26 17:29:49 +02:00
Robin Mueller	a81b8b608d	assigned packet ID for tcp com if	2021-07-26 17:24:53 +02:00