remotivelabs-cli 0.0.9__py3-none-any.whl → 0.0.11__py3-none-any.whl

cli/broker/scripting.py

@@ -33,7 +33,7 @@ def new_script(
     def to_subscribable_signal(sig: str) -> tuple[str, str]:
         arr = sig.split(":")
         if len(arr) != 2:
-            ErrorPrinter.print_hint(f"--signal must have format namespace:signal ({sig})")
+            ErrorPrinter.print_hint(f"--input-signal must have format namespace:signal ({sig})")
             exit(1)
         return arr[0], arr[1]
 
@@ -53,6 +53,9 @@ def new_script(
 
     template = Template(
         """
+--
+-- Docs available at https://docs.remotivelabs.com/docs/remotive-broker/scripted_signals
+--
 
 local local_signals = {$local_signals
 }
@@ -63,10 +66,24 @@ function input_signals()
 end
 
 -- Provided parameters are used for populating metadata when listing signals.
-function output_signals()
+function output_signal()
     return "$output_signal"
 end
 
+local local_frequency_hz = 0
+
+-- Required, declare what frequency you like to get "timer" invoked. 0 means no calls to "timer".
+function timer_frequency_hz()
+    return local_frequency_hz
+end
+
+-- Invoked with the frequecy returned by "timer_frequency_hz".
+-- @param system_timestamp_us: system time stamp.
+function timer(system_timestamp_us)
+    return return_value_or_bytes("your value")
+end
+
+
 -- Invoked when ANY signal declared in "local_signals" arrive
 -- @param signals_timestamp_us: signal time stamp
 -- @param system_timestamp_us

cli/connect/protopie/protopie.py

@@ -37,10 +37,7 @@ def on_connect():
     is_connected = True
 
 
-@io.on("ppMessage")
-def on_message(data):
-    # Not used but possible. Could be used to send commands like start, pause, stop
-    print(f"message from connect: {data}")
+# TODO - Receive message from ProtoPie connect
 
 
 def get_signals_and_namespaces(

{remotivelabs_cli-0.0.9.dist-info → remotivelabs_cli-0.0.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: remotivelabs-cli
-Version: 0.0.9
+Version: 0.0.11
 Summary: CLI for operating RemotiveCloud and RemotiveBroker
 Author: Johan Rask
 Author-email: johan.rask@remotivelabs.com

{remotivelabs_cli-0.0.9.dist-info → remotivelabs_cli-0.0.11.dist-info}/RECORD

@@ -7,7 +7,7 @@ cli/broker/lib/__about__.py,sha256=xnZ5V6ZcHW9dhWLWdMzVjYJbEnMKpeXm0_S_mbNzypE,1
 cli/broker/lib/broker.py,sha256=65Y2MqwPNk0XGv284gKkIJuMeFMYcMdBFRYizzIm_3w,19713
 cli/broker/playback.py,sha256=oOfC8Jn4Ib-nc9T6ob_uNXZSeCWfft7MrMQPafH4U2I,4846
 cli/broker/record.py,sha256=gEvo3myHbIl6UyXzhJE741NiwRrFf7doBg6HXzzp5z0,1382
-cli/broker/scripting.py,sha256=shNEzjXjXKjyOUzbKjXc6_l83qbMyRP-01BVSUkevFU,2897
+cli/broker/scripting.py,sha256=sLDtuktWsVk0fJ3RW4kYyh-_YAVJP3VM0xFIQR499Oo,3392
 cli/broker/signals.py,sha256=vQAxnxNYzrtuSTGua5MUXWbacF9mZ6WnLSq7lRmUVUQ,6792
 cli/cloud/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 cli/cloud/auth.py,sha256=xi47cQWjs6q7Kje4XUbTqEk_BgG3NJ1gMOYPU-_4tgw,3470
@@ -23,7 +23,7 @@ cli/cloud/service_account_tokens.py,sha256=7vjoMd6Xq7orWCUP7TVUVa86JA0OiX8O10NZc
 cli/cloud/service_accounts.py,sha256=GCYdYPnP5uWVsg1bTIS67CmoPWDng5dupJHmlThrJ80,1606
 cli/connect/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 cli/connect/connect.py,sha256=CAPh8d-pqCTQrPVZiX5j3J9lT-NdzGYp519eJdPmvXY,3805
-cli/connect/protopie/protopie.py,sha256=dbw_VhTPHlBrqVB4aDafXqhCryN9R9oZ2UHJiaONd9o,5768
+cli/connect/protopie/protopie.py,sha256=aMF7rQHX4xLN9ylijJB1SMNlB1IIl14YBLw6oLweWH4,5646
 cli/errors.py,sha256=sOjYasWbwqu2IcK4MvrG4ddpQ7idLGxiFYOxjhdsahM,1319
 cli/remotive.py,sha256=KKahzVZACa3MIBqt2lZDiSsDOTmoZIdNeKex8LJR8ZQ,1645
 cli/requirements.txt,sha256=Tjpv2HSAPemgKC-eJbwDw-gvAdklfJ18LixRcwzvQIU,78
@@ -31,10 +31,9 @@ cli/settings.py,sha256=r0txIWXNTH1veGu97J84PiYEDBsAphkXYTN64n_C-qw,792
 cli/tools/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 cli/tools/can/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 cli/tools/can/can.py,sha256=sl95utXl2gjXV8cN0AVzJut95oeWzKn7hgVTQn136V0,2407
-cli/tools/can/decoders.py,sha256=DTosl5BByUPdK-sPPtWTj4hHwhbpKB9qchdvM9Rzxjc,6203
 cli/tools/tools.py,sha256=LwQdWMcJ19pCyKUsVfSB2B3R6ui61NxxFWP0Nrnd5Jk,198
-remotivelabs_cli-0.0.9.dist-info/LICENSE,sha256=qDPP_yfuv1fF-u7EfexN-cN3M8aFgGVndGhGLovLKz0,608
-remotivelabs_cli-0.0.9.dist-info/METADATA,sha256=myDvapszQowm-ktaaq3UCIUiJVzy-3Ketao4a97Nlvo,1223
-remotivelabs_cli-0.0.9.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-remotivelabs_cli-0.0.9.dist-info/entry_points.txt,sha256=lvDhPgagLqW_KTnLPCwKSqfYlEp-1uYVosRiPjsVj10,45
-remotivelabs_cli-0.0.9.dist-info/RECORD,,
+remotivelabs_cli-0.0.11.dist-info/LICENSE,sha256=qDPP_yfuv1fF-u7EfexN-cN3M8aFgGVndGhGLovLKz0,608
+remotivelabs_cli-0.0.11.dist-info/METADATA,sha256=QJTlnudIpCSpyyv41IHMd7xvRJLZq9KrkQ2qLyQtx88,1224
+remotivelabs_cli-0.0.11.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+remotivelabs_cli-0.0.11.dist-info/entry_points.txt,sha256=lvDhPgagLqW_KTnLPCwKSqfYlEp-1uYVosRiPjsVj10,45
+remotivelabs_cli-0.0.11.dist-info/RECORD,,

cli/tools/can/decoders.py

@@ -1,162 +0,0 @@
-import os.path
-from typing import Union
-
-import can
-import cantools
-from can import Message as CanMessage
-from cantools.database import Database, Message
-from cantools.database.errors import DecodeError
-from cantools.database.namedsignalvalue import NamedSignalValue
-from cantools.typechecking import DecodeResultType
-
-
-class CanDecoder:
-    def __init__(self, signal_db_path: str, namespace: str = None):
-        self.signal_db: Union[Database, Database] = cantools.database.load_file(signal_db_path)
-        self.signal_db_path = signal_db_path
-        self.failed_arb_id = list()
-        self.successful_arb_id = list()
-        self.namespace = namespace
-
-    def decode_log_file_legacy(self, filename: str):
-        file1 = open(filename, "r")
-        Lines = file1.readlines()
-        return list(map(self.decode_log_line, Lines))
-
-    def decode_log_file(self, filename):
-        with can.LogReader(filename) as reader:
-            return list(map(self.__do_decode, reader))
-
-    def decode_log_line(self, line: str):
-        try:
-            time_ns_rawframe = line.split(" ")
-            ts = float(time_ns_rawframe[0][1:18])
-            ns = time_ns_rawframe[1]
-            rawframe = time_ns_rawframe[2]
-            arbid_and_data = rawframe.split("#")
-            arb_id = int(arbid_and_data[0], 16)
-
-            frame_infos = list(filter(lambda m: m.frame_id == arb_id, self.signal_db.messages))
-
-            if len(frame_infos) == 0:
-                return None
-
-            # message('PHEV_Battery_Data1_HS3', 0x3d4, False, 8, None)
-            frame_info: Message = frame_infos[0]
-
-            data = bytes.fromhex(arbid_and_data[1])
-            # print(frame)
-            # print(frame.name)
-        except Exception as e:
-            print(e)
-            return None
-
-        try:
-            # {'BattTracSoc_Pc_Dpltd': 4.5}
-            signal: DecodeResultType = self.signal_db.decode_message(arb_id, data)
-            # if frame_info.name == 'TransGearData_HS1':
-            #    for s in list(signal):
-            #        print(f"signal {s} - {signal[s].value} - {type(signal[s])}")
-
-            def signal_value(some_signal_value):
-                # NamedSignalValue contains name: int pair where "name" is the
-                # explanation or str version of the int from my understanding
-                # Sample from dbc file
-                #
-                # SignalName
-                # 0 AutonomousBrkPedalMove
-                # 1 NoAutonomousBrkPdlMovement
-                # 2 DriverApplyingBrakePedal
-                # 3 Unknown
-                if isinstance(some_signal_value, NamedSignalValue):
-                    return some_signal_value.value
-                else:
-                    return some_signal_value
-
-            all_signals = map(lambda m: {"type": type(signal[m]).__name__, "name": m, "value": signal_value(signal[m])}, list(signal))
-            numeric_signals_kv = list(filter(lambda m: type(m["value"]) is float or type(m["value"]) is int, all_signals))
-
-            self.successful_arb_id.append(arb_id)
-            return {
-                "name": frame_info.name,
-                "timestamp": ts,
-                "signal_db": os.path.basename(self.signal_db_path),
-                "namespace": ns,
-                "signals": list(numeric_signals_kv),
-            }
-
-        except KeyError as e:
-            print(e)
-            # print(f"Failed to parse msg for {arb_id} {str(e)}")
-            self.failed_arb_id.append(arb_id)
-            return
-
-        except Exception as e:
-            print(e)
-            self.failed_arb_id.append(arb_id)
-            return
-            # print(f"EX: Failed to parse msg for {arb_id}  + {str(ex)}")
-            # print(str(e))
-
-    def decode_asc_file(self, filename, **kwargs):
-        logfile = os.path.join(os.path.dirname(__file__), "data", filename)
-        print(logfile)
-
-        with can.ASCReader(filename, "hex", False, **kwargs) as reader:
-            return list(map(self.__do_decode, reader))
-
-    def asc2blf(self, asc_file, blf_file, **kwargs):
-        with open(asc_file, "r") as f_in:
-            log_in = can.io.ASCReader(f_in, "hex", False)
-
-            with open(blf_file, "wb") as f_out:
-                log_out = can.io.BLFWriter(f_out)
-                for msg in log_in:
-                    log_out.on_message_received(msg)
-                log_out.stop()
-
-    def log2asc(self, log_file, asc_file, **kwargs):
-        with can.LogReader(log_file) as log_in:
-            with open(asc_file, "w") as f_out:
-                log_out = can.io.ASCWriter(f_out)
-                for msg in log_in:
-                    log_out.on_message_received(msg)
-                log_out.stop()
-
-    def decode_blf_file(self, filename, **kwargs):
-        logfile = os.path.join(os.path.dirname(__file__), "data", filename)
-        print(logfile)
-        with can.BLFReader(filename, **kwargs) as reader:
-            return list(map(self.__do_decode, reader))
-
-    def __do_decode(self, mesg: CanMessage):
-        try:
-            signal: DecodeResultType = self.signal_db.decode_message(mesg.arbitration_id, mesg.data)
-            message = self.signal_db.get_message_by_frame_id(mesg.arbitration_id)
-            numeric_signals_kv = list(
-                filter(
-                    lambda m: type(m["value"]) is float or type(m["value"]) is int,
-                    map(lambda m: {"name": m, "value": signal[m]}, list(signal)),
-                )
-            )
-            self.successful_arb_id.append(mesg.arbitration_id)
-            return {
-                "name": message.name,
-                "timestamp": mesg.timestamp,
-                "signal_db": os.path.basename(self.signal_db_path),
-                "namespace": self.namespace,
-                "signals": list(numeric_signals_kv),
-            }
-        except KeyError:
-            # print(e)
-            self.failed_arb_id.append(mesg.arbitration_id)
-            return None
-
-        except DecodeError:
-            # print(e)
-            self.failed_arb_id.append(mesg.arbitration_id)
-            return None
-        except Exception:
-            # print(e)
-            self.failed_arb_id.append(mesg.arbitration_id)
-            return None