Skip to content

Optimize the path of import #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dlerner97 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Optimize the path of import #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion utapi/adra/adra_api_base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#
# Author: Jimy Zhang <jimy.zhang@umbratek.com> <jimy92@163.com>
# =============================================================================
from base.servo_api_base import _ServoApiBase
from utapi.base.servo_api_base import _ServoApiBase


class AdraApiBase(_ServoApiBase):
Expand Down
8 changes: 4 additions & 4 deletions utapi/adra/adra_api_serial.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
#
# Author: Jimy Zhang <jimy.zhang@umbratek.com> <jimy92@163.com>
# =============================================================================
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):
Expand Down
8 changes: 4 additions & 4 deletions utapi/adra/adra_api_tcp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
#
# Author: Jimy Zhang <jimy.zhang@umbratek.com> <jimy92@163.com>
# =============================================================================
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

Expand Down
8 changes: 4 additions & 4 deletions utapi/adra/adra_api_udp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
#
# Author: Jimy Zhang <jimy.zhang@umbratek.com> <jimy92@163.com>
# =============================================================================
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

Expand Down
8 changes: 4 additions & 4 deletions utapi/base/arm_api_base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
#
# Author: Jimy Zhang <jimy.zhang@umbratek.com> <jimy92@163.com>
# =============================================================================
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

Expand Down
4 changes: 2 additions & 2 deletions utapi/base/arm_report_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
4 changes: 2 additions & 2 deletions utapi/base/arm_report_status.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down
7 changes: 3 additions & 4 deletions utapi/base/servo_api_base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
#
# Author: Jimy Zhang <jimy.zhang@umbratek.com> <jimy92@163.com>
# =============================================================================
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


Expand Down Expand Up @@ -545,4 +545,3 @@ def _get_cpostau_current(self, sid, eid):
self.mutex.release()

return ret, broadcast_num, pos, tau

6 changes: 3 additions & 3 deletions utapi/common/utcc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
#
# Author: Jimy Zhang <jimy.zhang@umbratek.com> <jimy92@163.com>
# =============================================================================
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():
Expand Down
6 changes: 3 additions & 3 deletions utapi/common/utrc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
#
# Author: Jimy Zhang <jimy.zhang@umbratek.com> <jimy92@163.com>
# =============================================================================
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:
Expand Down
12 changes: 6 additions & 6 deletions utapi/datalink/datalink_api_can.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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():
Expand Down
8 changes: 4 additions & 4 deletions utapi/datalink/datalink_api_rs485.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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():
Expand Down
6 changes: 3 additions & 3 deletions utapi/flxie/flxie2_api_base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
#
# Author: Jimy Zhang <jimy.zhang@umbratek.com> <jimy92@163.com>
# =============================================================================
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:
Expand Down
8 changes: 4 additions & 4 deletions utapi/flxie/flxie2_api_serial.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
#
# Author: Jimy Zhang <jimy.zhang@umbratek.com> <jimy92@163.com>
# =============================================================================
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):
Expand Down
6 changes: 3 additions & 3 deletions utapi/flxiv/flxivl_api_base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
#
# Author: Jimy Zhang <jimy.zhang@umbratek.com> <jimy92@163.com>
# =============================================================================
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:
Expand Down
8 changes: 4 additions & 4 deletions utapi/flxiv/flxivl_api_serial.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
#
# Author: Jimy Zhang <jimy.zhang@umbratek.com> <jimy92@163.com>
# =============================================================================
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):
Expand Down
4 changes: 2 additions & 2 deletions utapi/utra/utra_api_tcp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
# Author: Jimy Zhang <jimy.zhang@umbratek.com> <jimy92@163.com>
# =============================================================================

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


Expand Down
6 changes: 3 additions & 3 deletions utapi/utra/utra_flxie_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
#
# Author: Jimy Zhang <jimy.zhang@umbratek.com> <jimy92@163.com>
# =============================================================================
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:
Expand Down
6 changes: 3 additions & 3 deletions utapi/utra/utra_flxiv_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
#
# Author: Jimy Zhang <jimy.zhang@umbratek.com> <jimy92@163.com>
# =============================================================================
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:
Expand Down
2 changes: 1 addition & 1 deletion utapi/utra/utra_report_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#
# Author: Jimy Zhang <jimy.zhang@umbratek.com> <jimy92@163.com>
# =============================================================================
from base.arm_report_config import ArmReportConfig
from utapi.base.arm_report_config import ArmReportConfig


class UtraReportConfig10Hz(ArmReportConfig):
Expand Down
2 changes: 1 addition & 1 deletion utapi/utra/utra_report_status.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#
# Author: Jimy Zhang <jimy.zhang@umbratek.com> <jimy92@163.com>
# =============================================================================
from base.arm_report_status import ArmReportStatus
from utapi.base.arm_report_status import ArmReportStatus


class UtraReportStatus10Hz(ArmReportStatus):
Expand Down