Skip to content

Commit a31fe01

Browse files
Fantomas42Fantomas42
committed
Rename types.py to annotations.py
1 parent 7fae78a commit a31fe01

41 files changed

Lines changed: 144 additions & 138 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎term_timer/aggregator.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,18 @@
99

1010
from cubing_algs.cases import get_case
1111

12+
from term_timer.annotations import CaseStats
13+
from term_timer.annotations import CaseStatsAccumulator
14+
from term_timer.annotations import MethodAnalysis
15+
from term_timer.annotations import SolveAnalysis
16+
from term_timer.annotations import StepAnalysis
1217
from term_timer.methods import get_method_analyser
1318
from term_timer.solve import Solve
1419
from term_timer.stats import StatisticsTools
15-
from term_timer.types import CaseStats
16-
from term_timer.types import CaseStatsAccumulator
17-
from term_timer.types import MethodAnalysis
18-
from term_timer.types import SolveAnalysis
19-
from term_timer.types import StepAnalysis
2020

2121
if TYPE_CHECKING:
22+
from term_timer.methods.annotations import StepSummary
2223
from term_timer.methods.base import Analyser
23-
from term_timer.methods.types import StepSummary
2424

2525
logger = logging.getLogger(__name__)
2626

term_timer/types.py renamed to term_timer/annotations.py

File renamed without changes.

term_timer/bluetooth/types.py renamed to term_timer/bluetooth/annotations.py

File renamed without changes.

‎term_timer/bluetooth/drivers/base.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
from bleak import BleakClient
77
from bleak.backends.characteristic import BleakGATTCharacteristic
88

9+
from term_timer.bluetooth.annotations import EventDict
910
from term_timer.bluetooth.encrypter import GanGen2CubeEncrypter
10-
from term_timer.bluetooth.types import EventDict
1111

1212

1313
class Driver:

‎term_timer/bluetooth/drivers/gan_gen2.py‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,13 @@
1515
from bleak.backends.characteristic import BleakGATTCharacteristic
1616
from cubing_algs.facelets import cubies_to_facelets
1717

18+
from term_timer.bluetooth.annotations import BatteryEventDict
19+
from term_timer.bluetooth.annotations import DisconnectEventDict
20+
from term_timer.bluetooth.annotations import EventDict
21+
from term_timer.bluetooth.annotations import FaceletsEventDict
22+
from term_timer.bluetooth.annotations import GyroEventDict
23+
from term_timer.bluetooth.annotations import HardwareEventDict
24+
from term_timer.bluetooth.annotations import MoveEventDict
1825
from term_timer.bluetooth.constants import GAN_ENCRYPTION_KEY
1926
from term_timer.bluetooth.constants import GAN_GEN2_COMMAND_CHARACTERISTIC
2027
from term_timer.bluetooth.constants import GAN_GEN2_SERVICE
@@ -24,13 +31,6 @@
2431
from term_timer.bluetooth.encrypter import GanGen2CubeEncrypter
2532
from term_timer.bluetooth.message import GanProtocolMessage
2633
from term_timer.bluetooth.salt import get_salt
27-
from term_timer.bluetooth.types import BatteryEventDict
28-
from term_timer.bluetooth.types import DisconnectEventDict
29-
from term_timer.bluetooth.types import EventDict
30-
from term_timer.bluetooth.types import FaceletsEventDict
31-
from term_timer.bluetooth.types import GyroEventDict
32-
from term_timer.bluetooth.types import HardwareEventDict
33-
from term_timer.bluetooth.types import MoveEventDict
3434

3535
logger = logging.getLogger(__name__)
3636

‎term_timer/bluetooth/drivers/gan_gen3.py‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,19 @@
1515
from bleak.backends.characteristic import BleakGATTCharacteristic
1616
from cubing_algs.facelets import cubies_to_facelets
1717

18+
from term_timer.bluetooth.annotations import BatteryEventDict
19+
from term_timer.bluetooth.annotations import DisconnectEventDict
20+
from term_timer.bluetooth.annotations import EventDict
21+
from term_timer.bluetooth.annotations import FaceletsEventDict
22+
from term_timer.bluetooth.annotations import HardwareEventDict
23+
from term_timer.bluetooth.annotations import MoveEventDict
24+
from term_timer.bluetooth.annotations import ResetEventDict
1825
from term_timer.bluetooth.constants import DEBOUNCE
1926
from term_timer.bluetooth.constants import GAN_GEN3_COMMAND_CHARACTERISTIC
2027
from term_timer.bluetooth.constants import GAN_GEN3_SERVICE
2128
from term_timer.bluetooth.constants import GAN_GEN3_STATE_CHARACTERISTIC
2229
from term_timer.bluetooth.drivers.gan_gen2 import GanGen2Driver
2330
from term_timer.bluetooth.message import GanProtocolMessage
24-
from term_timer.bluetooth.types import BatteryEventDict
25-
from term_timer.bluetooth.types import DisconnectEventDict
26-
from term_timer.bluetooth.types import EventDict
27-
from term_timer.bluetooth.types import FaceletsEventDict
28-
from term_timer.bluetooth.types import HardwareEventDict
29-
from term_timer.bluetooth.types import MoveEventDict
30-
from term_timer.bluetooth.types import ResetEventDict
3131

3232
logger = logging.getLogger(__name__)
3333

‎term_timer/bluetooth/drivers/gan_gen4.py‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,23 +14,25 @@
1414
from bleak.backends.characteristic import BleakGATTCharacteristic
1515
from cubing_algs.facelets import cubies_to_facelets
1616

17+
from term_timer.bluetooth.annotations import BatteryEventDict
18+
from term_timer.bluetooth.annotations import DisconnectEventDict
19+
from term_timer.bluetooth.annotations import EventDict
20+
from term_timer.bluetooth.annotations import FaceletsEventDict
21+
from term_timer.bluetooth.annotations import GyroEventDict
22+
from term_timer.bluetooth.annotations import HardwareEventNameOnlyDict
23+
from term_timer.bluetooth.annotations import HardwareEventPartialDict
24+
from term_timer.bluetooth.annotations import (
25+
HardwareEventSoftwareVersionOnlyDict,
26+
)
27+
from term_timer.bluetooth.annotations import HardwareEventVersionOnlyDict
28+
from term_timer.bluetooth.annotations import MoveEventDict
29+
from term_timer.bluetooth.annotations import ResetEventDict
1730
from term_timer.bluetooth.constants import DEBOUNCE
1831
from term_timer.bluetooth.constants import GAN_GEN4_COMMAND_CHARACTERISTIC
1932
from term_timer.bluetooth.constants import GAN_GEN4_SERVICE
2033
from term_timer.bluetooth.constants import GAN_GEN4_STATE_CHARACTERISTIC
2134
from term_timer.bluetooth.drivers.gan_gen3 import GanGen3Driver
2235
from term_timer.bluetooth.message import GanProtocolMessage
23-
from term_timer.bluetooth.types import BatteryEventDict
24-
from term_timer.bluetooth.types import DisconnectEventDict
25-
from term_timer.bluetooth.types import EventDict
26-
from term_timer.bluetooth.types import FaceletsEventDict
27-
from term_timer.bluetooth.types import GyroEventDict
28-
from term_timer.bluetooth.types import HardwareEventNameOnlyDict
29-
from term_timer.bluetooth.types import HardwareEventPartialDict
30-
from term_timer.bluetooth.types import HardwareEventSoftwareVersionOnlyDict
31-
from term_timer.bluetooth.types import HardwareEventVersionOnlyDict
32-
from term_timer.bluetooth.types import MoveEventDict
33-
from term_timer.bluetooth.types import ResetEventDict
3436

3537
logger = logging.getLogger(__name__)
3638

‎term_timer/bluetooth/drivers/moyu.py‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,13 @@
1313
from bleak import BleakClient
1414
from bleak.backends.characteristic import BleakGATTCharacteristic
1515

16+
from term_timer.bluetooth.annotations import BatteryEventDict
17+
from term_timer.bluetooth.annotations import EventDict
18+
from term_timer.bluetooth.annotations import FaceletsEventDictNoState
19+
from term_timer.bluetooth.annotations import GyroConfigEventDict
20+
from term_timer.bluetooth.annotations import GyroEventDictNoVelocity
21+
from term_timer.bluetooth.annotations import HardwareEventMoyuDict
22+
from term_timer.bluetooth.annotations import MoveEventDict
1623
from term_timer.bluetooth.constants import MOYU_WEILONG_COMMAND_CHARACTERISTIC
1724
from term_timer.bluetooth.constants import MOYU_WEILONG_ENCRYPTION_KEY
1825
from term_timer.bluetooth.constants import MOYU_WEILONG_SERVICE
@@ -21,13 +28,6 @@
2128
from term_timer.bluetooth.encrypter import GanGen2CubeEncrypter
2229
from term_timer.bluetooth.message import GanProtocolMessage
2330
from term_timer.bluetooth.salt import get_salt
24-
from term_timer.bluetooth.types import BatteryEventDict
25-
from term_timer.bluetooth.types import EventDict
26-
from term_timer.bluetooth.types import FaceletsEventDictNoState
27-
from term_timer.bluetooth.types import GyroConfigEventDict
28-
from term_timer.bluetooth.types import GyroEventDictNoVelocity
29-
from term_timer.bluetooth.types import HardwareEventMoyuDict
30-
from term_timer.bluetooth.types import MoveEventDict
3131

3232
logger = logging.getLogger(__name__)
3333

‎term_timer/bluetooth/gyroscope.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
from dataclasses import dataclass
66
from typing import Final
77

8-
from term_timer.bluetooth.types import QuaternionDict
9-
from term_timer.bluetooth.types import RotationResult
8+
from term_timer.bluetooth.annotations import QuaternionDict
9+
from term_timer.bluetooth.annotations import RotationResult
1010
from term_timer.config import ROTATION_THRESHOLD
1111

1212
logger = logging.getLogger(__name__)

‎term_timer/bluetooth/interface.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@
1111
from bleak.backends.device import BLEDevice
1212
from bleak.exc import BleakError
1313

14+
from term_timer.bluetooth.annotations import EventDict
1415
from term_timer.bluetooth.constants import PREFIX
1516
from term_timer.bluetooth.drivers.base import Driver
1617
from term_timer.bluetooth.drivers.gan_gen2 import GanGen2Driver
1718
from term_timer.bluetooth.drivers.gan_gen3 import GanGen3Driver
1819
from term_timer.bluetooth.drivers.gan_gen4 import GanGen4Driver
1920
from term_timer.bluetooth.drivers.moyu import MoyuWeilong10Driver
20-
from term_timer.bluetooth.types import EventDict
2121
from term_timer.config import DEBUG
2222
from term_timer.exceptions import CubeNotFoundError
2323

0 commit comments

Comments
 (0)