Skip to content

Commit 2033c1b

Browse files
author
Angel Campos
committed
Merge branch 'feature/observer-updates' into 'develop'
Autogen updates related to new DID 0x10 enum addition. See merge request sdk/v4/convenience/raspberry-pi!75
2 parents 80fb8c3 + 7350aff commit 2033c1b

File tree

5 files changed

+24
-8
lines changed

5 files changed

+24
-8
lines changed

getting_started/asyncio/api_and_shell/generate_api_error.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
from sphero_sdk import SpheroRvrAsync
77
from sphero_sdk import SerialAsyncDal
88
from sphero_sdk import SpheroRvrTargets
9-
from sphero_sdk import ErrorCode
9+
from sphero_sdk import ApiResponseCodesEnum
1010

1111

1212
loop = asyncio.get_event_loop()
@@ -48,7 +48,7 @@ async def main():
4848
rvr.request_error_responses_only = True
4949

5050
await rvr.generate_api_error(
51-
error=ErrorCode.target_unavailable, # Specify code 0x01 - 0x0A to receive that specific error response from RVR.
51+
error=ApiResponseCodesEnum.target_unavailable, # Specify code 0x01 - 0x0A to receive that specific error response from RVR.
5252
target=SpheroRvrTargets.secondary.value,
5353
timeout=3
5454
)

getting_started/observer/api_and_shell/generate_api_error.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
from sphero_sdk import SpheroRvrObserver
77
from sphero_sdk import SpheroRvrTargets
8-
from sphero_sdk import ErrorCode
8+
from sphero_sdk import ApiResponseCodesEnum
99
from sphero_sdk.common.log_level import LogLevel
1010

1111
rvr = SpheroRvrObserver(log_level=LogLevel.Debug_Verbose)
@@ -41,7 +41,7 @@ def main():
4141
rvr.request_error_responses_only = True
4242

4343
rvr.generate_api_error(
44-
error=ErrorCode.bad_cid, # Specify code 0x01 - 0x0A to receive that specific error response from RVR.
44+
error=ApiResponseCodesEnum.bad_cid, # Specify code 0x01 - 0x0A to receive that specific error response from RVR.
4545
target=SpheroRvrTargets.secondary.value,
4646
timeout=3
4747
)

sphero_sdk/__init__.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@
99
from sphero_sdk.common.enums.sphero_rvr_enums import SpheroRvrLedBitmasks
1010
from sphero_sdk.common.rvr_streaming_services import RvrStreamingServices
1111

12-
from sphero_sdk.common.protocol.api_sphero_protocol import ErrorCode
13-
12+
from sphero_sdk.common.enums.api_and_shell_enums import ApiResponseCodesEnum
1413
from sphero_sdk.common.enums.drive_enums import RawMotorModesEnum
1514
from sphero_sdk.common.enums.drive_enums import MotorIndexesEnum as DriveMotorIndexesEnum
1615
from sphero_sdk.common.enums.drive_enums import DriveFlagsBitmask

sphero_sdk/common/enums/api_and_shell_enums.py

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,28 @@
33
# Source File: 0x10-api_and_shell.json
44
# Device ID: 0x10
55
# Device Name: api_and_shell
6-
# Timestamp: 07/09/2020 @ 20:14:20.824413 (UTC)
6+
# Timestamp: 08/17/2020 @ 16:45:12.614922 (UTC)
77

88
from enum import IntEnum
99

1010

11+
__all__ = ['ApiResponseCodesEnum']
12+
13+
1114
class CommandsEnum(IntEnum):
1215
echo = 0x00
1316
generate_api_error = 0x09
17+
18+
19+
class ApiResponseCodesEnum(IntEnum):
20+
api_success = 0
21+
bad_did = 1
22+
bad_cid = 2
23+
not_yet_implemented = 3
24+
restricted = 4
25+
bad_data_length = 5
26+
failed = 6
27+
bad_data_value = 7
28+
busy = 8
29+
bad_tid = 9
30+
target_unavailable = 10

sphero_sdk/observer/events/event_dispatcher.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import logging
2-
from sphero_sdk import ErrorCode
2+
from sphero_sdk.common.protocol import ErrorCode
33
from sphero_sdk.observer.observer_base import Observer
44

55
logger = logging.getLogger(__name__)

0 commit comments

Comments
 (0)