From c2c4d2391cb6480024ed1dd967718bba24488b2c Mon Sep 17 00:00:00 2001 From: Grayson Nocera Date: Thu, 27 Jun 2024 14:37:54 +0000 Subject: [PATCH 1/3] remove numpy from code --- j1939/j1939_22.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/j1939/j1939_22.py b/j1939/j1939_22.py index c55cf93..5fc587e 100644 --- a/j1939/j1939_22.py +++ b/j1939/j1939_22.py @@ -267,11 +267,7 @@ def send_pgn(self, data_page, pdu_format, pdu_specific, priority, src_address, d if priority == None: priority = 7 # get chunks from data - full_tp_size_packages = int(data_length/self.DataLength.TP) - arr = np.array(data) - list_of_arr = np.split(arr, [full_tp_size_packages*self.DataLength.TP]) - arr = np.reshape(list_of_arr[0], (-1,self.DataLength.TP)) - data_list = arr.tolist() + list_of_arr, data_list = self.get_chunks(data, data_length) if len(list_of_arr) > 1: data_list.append(list_of_arr[1].tolist()) @@ -319,6 +315,13 @@ def send_pgn(self, data_page, pdu_format, pdu_specific, priority, src_address, d return True + def get_chunks(self, data, data_length): + full_tp_size_packages = int(data_length / self.DataLength.TP) + index = full_tp_size_packages * self.DataLength.TP + list_of_arr = [data[:index], data[index:]] + data_list = [list_of_arr[0][i : (i + min(self.DataLength.TP, len(list_of_arr[0]) - i))] for i in range(0, len(list_of_arr[0]), self.DataLength.TP)] + return list_of_arr, data_list + def __send_multi_pg(self, frame_format, cpg_list, src_address, dst_address): # deadline reached priority = 7 From 0868f5897f1daeced52999b47b699b34ab631283 Mon Sep 17 00:00:00 2001 From: Grayson Nocera Date: Thu, 27 Jun 2024 14:42:36 +0000 Subject: [PATCH 2/3] remove reference to numpy in build system and import statements --- j1939/j1939_22.py | 1 - setup.py | 1 - 2 files changed, 2 deletions(-) diff --git a/j1939/j1939_22.py b/j1939/j1939_22.py index 5fc587e..832fbfb 100644 --- a/j1939/j1939_22.py +++ b/j1939/j1939_22.py @@ -2,7 +2,6 @@ from .message_id import MessageId, FrameFormat import logging import time -import numpy as np logger = logging.getLogger(__name__) diff --git a/setup.py b/setup.py index 8885ff7..0594b8c 100644 --- a/setup.py +++ b/setup.py @@ -27,7 +27,6 @@ ], install_requires=[ "python-can >= 3.3.4", - "numpy >= 1.17.0", "pytest >= 6.2.5", ], include_package_data=True, From 4949bef5843fc7f5d4a25245e648b8171baae9e7 Mon Sep 17 00:00:00 2001 From: Grayson Nocera Date: Thu, 27 Jun 2024 14:58:16 +0000 Subject: [PATCH 3/3] remove reference to to-list --- j1939/j1939_22.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/j1939/j1939_22.py b/j1939/j1939_22.py index 832fbfb..16f32d9 100644 --- a/j1939/j1939_22.py +++ b/j1939/j1939_22.py @@ -268,7 +268,7 @@ def send_pgn(self, data_page, pdu_format, pdu_specific, priority, src_address, d # get chunks from data list_of_arr, data_list = self.get_chunks(data, data_length) if len(list_of_arr) > 1: - data_list.append(list_of_arr[1].tolist()) + data_list.append(list_of_arr[1]) # if the PF is between 240 and 255, the message can only be broadcast if dest_address == ParameterGroupNumber.Address.GLOBAL: