diff --git a/utapi/adra/adra_api_base.py b/utapi/adra/adra_api_base.py index a59ed92..84fbcf1 100755 --- a/utapi/adra/adra_api_base.py +++ b/utapi/adra/adra_api_base.py @@ -6,7 +6,7 @@ # # Author: Jimy Zhang # ============================================================================= -from base.servo_api_base import _ServoApiBase +from utapi.base.servo_api_base import _ServoApiBase class AdraApiBase(_ServoApiBase): diff --git a/utapi/adra/adra_api_serial.py b/utapi/adra/adra_api_serial.py index 1327215..a7574bd 100755 --- a/utapi/adra/adra_api_serial.py +++ b/utapi/adra/adra_api_serial.py @@ -6,11 +6,11 @@ # # Author: Jimy Zhang # ============================================================================= -from common.utrc import UtrcType, UtrcClient, UtrcDecode -from common.utcc import UtccType, UtccClient, UtccDecode -from common.socket_serial import SocketSerial +from utapi.common.utrc import UtrcType, UtrcClient, UtrcDecode +from utapi.common.utcc import UtccType, UtccClient, UtccDecode +from utapi.common.socket_serial import SocketSerial -from adra.adra_api_base import AdraApiBase +from utapi.adra.adra_api_base import AdraApiBase class AdraApiSerial(AdraApiBase): diff --git a/utapi/adra/adra_api_tcp.py b/utapi/adra/adra_api_tcp.py index b2959a2..7638aaf 100755 --- a/utapi/adra/adra_api_tcp.py +++ b/utapi/adra/adra_api_tcp.py @@ -6,10 +6,10 @@ # # Author: Jimy Zhang # ============================================================================= -from common.utrc import UtrcType, UtrcClient, UtrcDecode -from common.utcc import UtccType, UtccClient, UtccDecode -from common.socket_tcp import SocketTcp -from adra.adra_api_base import AdraApiBase +from utapi.common.utrc import UtrcType, UtrcClient, UtrcDecode +from utapi.common.utcc import UtccType, UtccClient, UtccDecode +from utapi.common.socket_tcp import SocketTcp +from utapi.adra.adra_api_base import AdraApiBase import time import socket diff --git a/utapi/adra/adra_api_udp.py b/utapi/adra/adra_api_udp.py index fc058a4..4b12116 100755 --- a/utapi/adra/adra_api_udp.py +++ b/utapi/adra/adra_api_udp.py @@ -6,10 +6,10 @@ # # Author: Jimy Zhang # ============================================================================= -from common.utrc import UtrcType, UtrcClient -from common.utcc import UtccType, UtccClient -from common.socket_udp import SocketUDP -from adra.adra_api_base import AdraApiBase +from utapi.common.utrc import UtrcType, UtrcClient +from utapi.common.utcc import UtccType, UtccClient +from utapi.common.socket_udp import SocketUDP +from utapi.adra.adra_api_base import AdraApiBase import time import socket diff --git a/utapi/base/arm_api_base.py b/utapi/base/arm_api_base.py index 5a9443b..f41ee98 100755 --- a/utapi/base/arm_api_base.py +++ b/utapi/base/arm_api_base.py @@ -6,10 +6,10 @@ # # Author: Jimy Zhang # ============================================================================= -from common import hex_data -from base.arm_reg import ARM_REG, RS485_LINE -from base.gpio_reg import GPIO_REG -from common.utrc import UtrcClient, UtrcType, UTRC_RW, UTRC_RX_ERROR +from utapi.common import hex_data +from utapi.base.arm_reg import ARM_REG, RS485_LINE +from utapi.base.gpio_reg import GPIO_REG +from utapi.common.utrc import UtrcClient, UtrcType, UTRC_RW, UTRC_RX_ERROR import logging import threading diff --git a/utapi/base/arm_report_config.py b/utapi/base/arm_report_config.py index fab9440..0fc3998 100755 --- a/utapi/base/arm_report_config.py +++ b/utapi/base/arm_report_config.py @@ -8,8 +8,8 @@ # ============================================================================= import struct import threading -from common import print_msg -from common.socket_tcp import SocketTcp +from utapi.common import print_msg +from utapi.common.socket_tcp import SocketTcp class ArmReportConfig(threading.Thread): diff --git a/utapi/base/arm_report_status.py b/utapi/base/arm_report_status.py index 25f5ad8..cea38e4 100755 --- a/utapi/base/arm_report_status.py +++ b/utapi/base/arm_report_status.py @@ -8,8 +8,8 @@ # ============================================================================= import struct import threading -from common import print_msg -from common.socket_tcp import SocketTcp +from utapi.common import print_msg +from utapi.common.socket_tcp import SocketTcp import logging diff --git a/utapi/base/servo_api_base.py b/utapi/base/servo_api_base.py index b3a4f65..0f6581e 100755 --- a/utapi/base/servo_api_base.py +++ b/utapi/base/servo_api_base.py @@ -6,9 +6,9 @@ # # Author: Jimy Zhang # ============================================================================= -from common.utrc import UTRC_RW, UTRC_RX_ERROR -from common import hex_data -from base.servo_reg import SERVO_REG +from utapi.common.utrc import UTRC_RW, UTRC_RX_ERROR +from utapi.common import hex_data +from utapi.base.servo_reg import SERVO_REG import threading @@ -545,4 +545,3 @@ def _get_cpostau_current(self, sid, eid): self.mutex.release() return ret, broadcast_num, pos, tau - diff --git a/utapi/common/utcc.py b/utapi/common/utcc.py index 050c0fd..ca002e9 100755 --- a/utapi/common/utcc.py +++ b/utapi/common/utcc.py @@ -6,9 +6,9 @@ # # Author: Jimy Zhang # ============================================================================= -from common import print_msg -from common import hex_data -from common import crc16 +from utapi.common import print_msg +from utapi.common import hex_data +from utapi.common import crc16 class UTCC_RX_ERROR(): diff --git a/utapi/common/utrc.py b/utapi/common/utrc.py index 2625c4e..ea4b76f 100755 --- a/utapi/common/utrc.py +++ b/utapi/common/utrc.py @@ -6,9 +6,9 @@ # # Author: Jimy Zhang # ============================================================================= -from common import print_msg -from common import crc16 -from common import hex_data +from utapi.common import print_msg +from utapi.common import crc16 +from utapi.common import hex_data class UTRC_RX_ERROR: diff --git a/utapi/datalink/datalink_api_can.py b/utapi/datalink/datalink_api_can.py index a2dea7d..0afdf53 100755 --- a/utapi/datalink/datalink_api_can.py +++ b/utapi/datalink/datalink_api_can.py @@ -8,12 +8,12 @@ # ============================================================================= import time import socket -from common import hex_data -from common.utcc import UtccClient, UtccType, UtccDecode -from common.socket_udp import SocketUDP -from common.socket_tcp import SocketTcp -from common.socket_serial import SocketSerial -from common import crc16 +from utapi.common import hex_data +from utapi.common.utcc import UtccClient, UtccType, UtccDecode +from utapi.common.socket_udp import SocketUDP +from utapi.common.socket_tcp import SocketTcp +from utapi.common.socket_serial import SocketSerial +from utapi.common import crc16 class DataLinkApiCan(): diff --git a/utapi/datalink/datalink_api_rs485.py b/utapi/datalink/datalink_api_rs485.py index a67c41d..56a5858 100755 --- a/utapi/datalink/datalink_api_rs485.py +++ b/utapi/datalink/datalink_api_rs485.py @@ -8,10 +8,10 @@ # ============================================================================= import time import socket -from common.utrc import UtrcClient, UtrcType -from common.socket_udp import SocketUDP -from common.socket_tcp import SocketTcp -from common.socket_serial import SocketSerial +from utapi.common.utrc import UtrcClient, UtrcType +from utapi.common.socket_udp import SocketUDP +from utapi.common.socket_tcp import SocketTcp +from utapi.common.socket_serial import SocketSerial class DataLinkApiRs485(): diff --git a/utapi/flxie/flxie2_api_base.py b/utapi/flxie/flxie2_api_base.py index fc5ba90..54d88b4 100755 --- a/utapi/flxie/flxie2_api_base.py +++ b/utapi/flxie/flxie2_api_base.py @@ -6,9 +6,9 @@ # # Author: Jimy Zhang # ============================================================================= -from base.servo_api_base import _ServoApiBase -from common.utrc import UTRC_RW -from common import hex_data +from utapi.base.servo_api_base import _ServoApiBase +from utapi.common.utrc import UTRC_RW +from utapi.common import hex_data class FLXIE_REG: diff --git a/utapi/flxie/flxie2_api_serial.py b/utapi/flxie/flxie2_api_serial.py index 775bc55..c1afc7d 100755 --- a/utapi/flxie/flxie2_api_serial.py +++ b/utapi/flxie/flxie2_api_serial.py @@ -6,10 +6,10 @@ # # Author: Jimy Zhang # ============================================================================= -from common.utrc import UtrcType, UtrcClient, UtrcDecode -from common.utcc import UtccType, UtccClient -from common.socket_serial import SocketSerial -from flxie.flxie2_api_base import FlxiE2ApiBase +from utapi.common.utrc import UtrcType, UtrcClient, UtrcDecode +from utapi.common.utcc import UtccType, UtccClient +from utapi.common.socket_serial import SocketSerial +from utapi.flxie.flxie2_api_base import FlxiE2ApiBase class FlxiE2ApiSerial(FlxiE2ApiBase): diff --git a/utapi/flxiv/flxivl_api_base.py b/utapi/flxiv/flxivl_api_base.py index 77d5c13..681b208 100755 --- a/utapi/flxiv/flxivl_api_base.py +++ b/utapi/flxiv/flxivl_api_base.py @@ -6,9 +6,9 @@ # # Author: Jimy Zhang # ============================================================================= -from base.servo_api_base import _ServoApiBase -from common.utrc import UTRC_RW -from common import hex_data +from utapi.base.servo_api_base import _ServoApiBase +from utapi.common.utrc import UTRC_RW +from utapi.common import hex_data class FLXIV_REG: diff --git a/utapi/flxiv/flxivl_api_serial.py b/utapi/flxiv/flxivl_api_serial.py index e73033d..a36d2e6 100755 --- a/utapi/flxiv/flxivl_api_serial.py +++ b/utapi/flxiv/flxivl_api_serial.py @@ -6,10 +6,10 @@ # # Author: Jimy Zhang # ============================================================================= -from common.utrc import UtrcType, UtrcClient, UtrcDecode -from common.utcc import UtccType, UtccClient -from common.socket_serial import SocketSerial -from flxiv.flxivl_api_base import FlxiVlApiBase +from utapi.common.utrc import UtrcType, UtrcClient, UtrcDecode +from utapi.common.utcc import UtccType, UtccClient +from utapi.common.socket_serial import SocketSerial +from utapi.flxiv.flxivl_api_base import FlxiVlApiBase class FlxiVlApiSerial(FlxiVlApiBase): diff --git a/utapi/utra/utra_api_tcp.py b/utapi/utra/utra_api_tcp.py index 15d7e56..05fb1a2 100755 --- a/utapi/utra/utra_api_tcp.py +++ b/utapi/utra/utra_api_tcp.py @@ -7,8 +7,8 @@ # Author: Jimy Zhang # ============================================================================= -from base.arm_api_base import _ArmApiBase -from common.socket_tcp import SocketTcp +from utapi.base.arm_api_base import _ArmApiBase +from utapi.common.socket_tcp import SocketTcp import logging diff --git a/utapi/utra/utra_flxie_api.py b/utapi/utra/utra_flxie_api.py index 1a30474..561490f 100755 --- a/utapi/utra/utra_flxie_api.py +++ b/utapi/utra/utra_flxie_api.py @@ -6,9 +6,9 @@ # # Author: Jimy Zhang # ============================================================================= -from base.arm_reg import RS485_LINE -from base.servo_reg import SERVO_REG as REG -from common import hex_data +from utapi.base.arm_reg import RS485_LINE +from utapi.base.servo_reg import SERVO_REG as REG +from utapi.common import hex_data class FLXIE_REG: diff --git a/utapi/utra/utra_flxiv_api.py b/utapi/utra/utra_flxiv_api.py index 9be7515..248a58f 100755 --- a/utapi/utra/utra_flxiv_api.py +++ b/utapi/utra/utra_flxiv_api.py @@ -6,9 +6,9 @@ # # Author: Jimy Zhang # ============================================================================= -from base.arm_reg import RS485_LINE -from base.servo_reg import SERVO_REG as REG -from common import hex_data +from utapi.base.arm_reg import RS485_LINE +from utapi.base.servo_reg import SERVO_REG as REG +from utapi.common import hex_data class FLXIV_REG: diff --git a/utapi/utra/utra_report_config.py b/utapi/utra/utra_report_config.py index fe4c736..a4f9687 100755 --- a/utapi/utra/utra_report_config.py +++ b/utapi/utra/utra_report_config.py @@ -6,7 +6,7 @@ # # Author: Jimy Zhang # ============================================================================= -from base.arm_report_config import ArmReportConfig +from utapi.base.arm_report_config import ArmReportConfig class UtraReportConfig10Hz(ArmReportConfig): diff --git a/utapi/utra/utra_report_status.py b/utapi/utra/utra_report_status.py index 36efacb..dcdb451 100755 --- a/utapi/utra/utra_report_status.py +++ b/utapi/utra/utra_report_status.py @@ -6,7 +6,7 @@ # # Author: Jimy Zhang # ============================================================================= -from base.arm_report_status import ArmReportStatus +from utapi.base.arm_report_status import ArmReportStatus class UtraReportStatus10Hz(ArmReportStatus):