From edcc18b43f396f190ad03b429f036196b8dcc19e Mon Sep 17 00:00:00 2001 From: Timo Novak Date: Thu, 30 Mar 2023 16:09:36 +0200 Subject: [PATCH] removed numpy import and changed numpy-code for python-code without numpy --- j1939/j1939_22.py | 17 +++++++++-------- setup.py | 1 - 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/j1939/j1939_22.py b/j1939/j1939_22.py index c7a5790..042c6bc 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__) @@ -267,13 +266,15 @@ 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() - if len(list_of_arr) > 1: - data_list.append(list_of_arr[1].tolist()) + full_tp_size_packages = int(data_length / self.DataLength.TP) + data_list = [] + for i in range(full_tp_size_packages): + start_index = i * self.DataLength.TP + end_index = (i + 1) * self.DataLength.TP + sublist = data[start_index:end_index] + data_list.append(sublist) + if data_length % self.DataLength.TP != 0: + data_list.append(data[full_tp_size_packages*self.DataLength.TP:]) # if the PF is between 240 and 255, the message can only be broadcast if dest_address == ParameterGroupNumber.Address.GLOBAL: diff --git a/setup.py b/setup.py index ffb9ff7..6d91def 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,