Skip to content

Commit 1c0b81d

Browse files
committed
버전 0.1.3 업데이트
1. set_*_color 함수의 인자로 RGB 리스트 허용 - HamsterS, Pio, Turtle, CSD02, NeoPixel 2. AI 확장모듈 get_distance 함수에 잘못된 값 입력 시, _resolve_part 함수를 통해 에러 메시지 출력 - FaceDetection, DetailedFaceDetection, BodyDetection
1 parent 73a90a7 commit 1c0b81d

9 files changed

Lines changed: 64 additions & 24 deletions

File tree

‎pyproject.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,5 +49,5 @@ Documentation = "https://github.com/RobomationLAB/Robomation_Python/wiki"
4949
"robomation" = ["py.typed"]
5050

5151
[tool.setuptools_scm]
52-
fallback_version = "0.1.2"
52+
fallback_version = "0.1.3"
5353
local_scheme = "no-local-version"

‎robomation/ai/body_detection.py‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,9 @@ def _read_part(self, method, part, pos):
164164
return self.read(dev_id) if dev_id is not None else 0
165165

166166
@staticmethod
167-
def _resolve_part(name):
167+
def _resolve_part(name, param='unit'):
168+
if name not in BodyDetection._PARTS:
169+
return _err(BodyDetection, 'get_distance', param, name, tuple(BodyDetection._PARTS))
168170
return BodyDetection._PARTS.get(name)
169171

170172
# ── Public API ───────────────────────────────────────────────────────────
@@ -270,8 +272,8 @@ def right_foot(self, pos: _Pos) -> int:
270272
def get_distance(self, unit1: _PartName, unit2: _PartName, type: _DistType = None) -> float:
271273
if type is not None and type not in BodyDetection._VALID_DISTANCE_TYPE:
272274
return _err(BodyDetection, 'get_distance', 'type', type, BodyDetection._VALID_DISTANCE_TYPE)
273-
p1 = BodyDetection._resolve_part(unit1)
274-
p2 = BodyDetection._resolve_part(unit2)
275+
p1 = BodyDetection._resolve_part(unit1, 'unit1')
276+
p2 = BodyDetection._resolve_part(unit2, 'unit2')
275277
dx = self._read_seg(p2, 'x') - self._read_seg(p1, 'x')
276278
dy = self._read_seg(p2, 'y') - self._read_seg(p1, 'y')
277279
if type is None:

‎robomation/ai/detailed_face_detection.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020
import math
2121
import time
2222

23-
import cv2
24-
2523
from robomation.core.error import _err
2624
from robomation.core.runner import Runner
2725
from robomation.core.model import Robot
@@ -177,7 +175,9 @@ def _read_part(self, method, part, pos, allowed):
177175
return self.read(DetailedFaceDetection._COORD_DEVICE[DetailedFaceDetection._PARTS[part] + '.' + pos])
178176

179177
@staticmethod
180-
def _resolve_part(name):
178+
def _resolve_part(name, param='unit'):
179+
if name not in DetailedFaceDetection._PARTS:
180+
return _err(DetailedFaceDetection, 'get_distance', param, name, tuple(DetailedFaceDetection._PARTS))
181181
return DetailedFaceDetection._PARTS.get(name)
182182

183183
# ── Public API ───────────────────────────────────────────────────────────
@@ -251,8 +251,8 @@ def right_pupil(self, pos: _Pos) -> int:
251251
def get_distance(self, unit1: _PartName, unit2: _PartName, type: _DistType = None) -> float:
252252
if type is not None and type not in DetailedFaceDetection._VALID_DISTANCE_TYPE:
253253
return _err(DetailedFaceDetection, 'get_distance', 'type', type, DetailedFaceDetection._VALID_DISTANCE_TYPE)
254-
p1 = DetailedFaceDetection._resolve_part(unit1)
255-
p2 = DetailedFaceDetection._resolve_part(unit2)
254+
p1 = DetailedFaceDetection._resolve_part(unit1, 'unit1')
255+
p2 = DetailedFaceDetection._resolve_part(unit2, 'unit2')
256256
dx = self.read(DetailedFaceDetection._COORD_DEVICE[p2 + '.x']) - self.read(DetailedFaceDetection._COORD_DEVICE[p1 + '.x'])
257257
dy = self.read(DetailedFaceDetection._COORD_DEVICE[p2 + '.y']) - self.read(DetailedFaceDetection._COORD_DEVICE[p1 + '.y'])
258258
if type is None:

‎robomation/ai/face_detection.py‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,9 @@ def _read_part(self, method, part, pos, allowed):
154154
return self.read(FaceDetection._COORD_DEVICE[FaceDetection._PARTS[part] + '.' + pos])
155155

156156
@staticmethod
157-
def _resolve_part(name):
157+
def _resolve_part(name, param='unit'):
158+
if name not in FaceDetection._PARTS:
159+
return _err(FaceDetection, 'get_distance', param, name, tuple(FaceDetection._PARTS))
158160
return FaceDetection._PARTS.get(name)
159161

160162
# ── Public API ───────────────────────────────────────────────────────────
@@ -214,8 +216,8 @@ def mouth(self, pos: _Pos) -> int:
214216
def get_distance(self, unit1: _PartName, unit2: _PartName, type: _DistType = None) -> float:
215217
if type is not None and type not in FaceDetection._VALID_DISTANCE_TYPE:
216218
return _err(FaceDetection, 'get_distance', 'type', type, FaceDetection._VALID_DISTANCE_TYPE)
217-
p1 = FaceDetection._resolve_part(unit1)
218-
p2 = FaceDetection._resolve_part(unit2)
219+
p1 = FaceDetection._resolve_part(unit1, 'unit1')
220+
p2 = FaceDetection._resolve_part(unit2, 'unit2')
219221
dx = self.read(FaceDetection._COORD_DEVICE[p2 + '.x']) - self.read(FaceDetection._COORD_DEVICE[p1 + '.x'])
220222
dy = self.read(FaceDetection._COORD_DEVICE[p2 + '.y']) - self.read(FaceDetection._COORD_DEVICE[p1 + '.y'])
221223
if type is None:

‎robomation/cheesestick_ext/csd02.py‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,16 @@ def _set_rgb(self, r, g, b):
6666
self._parent.write(self._parent.LB_OUTPUT_PWM, self._parent._analog_to_pwm(g))
6767
self._parent.write(self._parent.LC_OUTPUT_PWM, self._parent._analog_to_pwm(b))
6868

69-
def set_color(self, r: Union[_CSD02Color, int, float], g: Union[int, None] = None, b: Union[int, None] = None):
70-
if isinstance(r, str):
69+
def set_color(self, r: Union[_CSD02Color, int, float, list, tuple], g: Union[int, None] = None, b: Union[int, None] = None):
70+
# 색을 list 또는 tuple 로 넘긴 경우, r g b 로 펼친다. (r의 길이가 3이 아니거나 g/b 가 함께 오면 오류)
71+
if isinstance(r, (list, tuple)):
72+
if len(r) != 3:
73+
return _err(CSD02, 'set_color', 'r', r, 'list | tuple, length: 3')
74+
elif g is not None or b is not None:
75+
return _err(CSD02, 'set_color', 'r, g, b', (r, g, b), 'g and b should be None')
76+
rgb = r
77+
elif isinstance(r, str):
78+
7179
if r not in CSD02._VALID_COLORS:
7280
return _err(CSD02, 'set_color', 'color', r, tuple(CSD02._VALID_COLORS))
7381
rgb = CSD02._VALID_COLORS[r]

‎robomation/cheesestick_ext/neopixel.py‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,15 @@ def _set_rgb(self, r, g, b):
9292
self._parent.write(self._parent.NEO_BLUE, b)
9393
time.sleep(0.1)
9494

95-
# 색 인자가 이름 문자열이면 RGB로 변환, 숫자면 그대로 검증해 반환.
95+
# 색 인자가 이름 문자열이거나 list/tuple 이면 RGB로 변환, 숫자면 그대로 검증해 반환.
9696
def _resolve_color(self, method, r, g, b):
97+
# 색을 list 또는 tuple 로 넘긴 경우 그대로 rgb 로. (r의 길이가 3이 아니거나 g/b 가 함께 오면 오류)
98+
if isinstance(r, (list, tuple)):
99+
if len(r) != 3:
100+
return _err(NeoPixel, method, 'r', r, 'list | tuple, length: 3')
101+
elif g is not None or b is not None:
102+
return _err(NeoPixel, method, 'r, g, b', (r, g, b), 'g and b should be None')
103+
return list(r)
97104
if isinstance(r, str):
98105
if r not in NeoPixel._VALID_COLORS:
99106
_err(NeoPixel, method, 'color', r, tuple(NeoPixel._VALID_COLORS))
@@ -139,7 +146,7 @@ def _change_increment_color_impl(self, from_idx, to_idx, increment, r, g, b):
139146
self._parent.read(self._parent.NEO_BLUE) + b
140147
)
141148

142-
def set_one_color(self, idx: int, r: Union[_NeoPixelColor, int, float], g: int | None = None, b: int | None = None):
149+
def set_one_color(self, idx: int, r: Union[_NeoPixelColor, int, float, list, tuple], g: int | None = None, b: int | None = None):
143150
rgb = self._resolve_color('set_one_color', r, g, b)
144151
Runner.dispatch(lambda: self._fill_color_impl(idx, idx, rgb), True)
145152

@@ -162,7 +169,7 @@ def set_range_pattern(self, from_idx: int, to_idx: int, pattern: _NeoPixelPatter
162169
return _err(NeoPixel, 'set_range_pattern', 'pattern', pattern, NeoPixel._VALID_PATTERNS)
163170
Runner.dispatch(lambda: self._set_range_pattern_impl(from_idx, to_idx, pattern), True)
164171

165-
def set_range_color(self, from_idx: int, to_idx: int, r: Union[_NeoPixelColor, int, float], g: int | None = None, b: int | None = None):
172+
def set_range_color(self, from_idx: int, to_idx: int, r: Union[_NeoPixelColor, int, float, list, tuple], g: int | None = None, b: int | None = None):
166173
rgb = self._resolve_color('set_range_color', r, g, b)
167174
Runner.dispatch(lambda: self._fill_color_impl(from_idx, to_idx, rgb), True)
168175

@@ -173,7 +180,7 @@ def turn_off_range(self, from_idx: int, to_idx: int):
173180
Runner.dispatch(lambda: self._fill_color_impl(from_idx, to_idx, [0, 0, 0]), True)
174181

175182
# ── Range increment ──────────────────────────────────────────────────────
176-
def set_range_increment_color(self, from_idx: int, to_idx: int, increment: int, r: Union[_NeoPixelColor, int, float], g: int | None = None, b: int | None = None):
183+
def set_range_increment_color(self, from_idx: int, to_idx: int, increment: int, r: Union[_NeoPixelColor, int, float, list, tuple], g: int | None = None, b: int | None = None):
177184
rgb = self._resolve_color('set_range_increment_color', r, g, b)
178185
Runner.dispatch(lambda: self._fill_increment_color_impl(from_idx, to_idx, increment, rgb), True)
179186

‎robomation/roboids/hamster_s.py‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -634,10 +634,17 @@ def stop_trace(self):
634634

635635
# ── LED ───────────────────────────────────────────────────────────────────
636636

637-
def set_led_color(self, unit: _LedUnit, r: Union[_Color, int, float], g: Union[int, None] = None, b: Union[int, None] = None):
637+
def set_led_color(self, unit: _LedUnit, r: Union[_Color, int, float, list, tuple], g: Union[int, None] = None, b: Union[int, None] = None):
638638
if unit not in HamsterS._VALID_LED_UNITS:
639639
return _err(HamsterS, 'set_led_color', 'unit', unit, HamsterS._VALID_LED_UNITS)
640-
if isinstance(r, str):
640+
# 색을 list 또는 tuple 로 넘긴 경우, r g b 로 펼친다. (r의 길이가 3이 아니거나 g/b 가 함께 오면 오류)
641+
if isinstance(r, (list, tuple)):
642+
if len(r) != 3:
643+
return _err(HamsterS, 'set_led_color', 'r', r, 'list | tuple, length: 3')
644+
elif g is not None or b is not None:
645+
return _err(HamsterS, 'set_led_color', 'r, g, b', (r, g, b), 'g and b should be None')
646+
rgb = r
647+
elif isinstance(r, str):
641648
if r not in HamsterS._VALID_COLORS:
642649
return _err(HamsterS, 'set_led_color', 'color', r, tuple(HamsterS._VALID_COLORS))
643650
rgb = HamsterS._VALID_COLORS[r]

‎robomation/roboids/pio.py‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -431,10 +431,17 @@ def neck_moving(self) -> bool:
431431
return self.read(Pio.NECK_MOVING)
432432

433433
# ── Eye LED ───────────────────────────────────────────────────────────────
434-
def set_eye_color(self, unit: _EyeUnit, r: Union[_EyeColor, int, float], g: Union[int, None] = None, b: Union[int, None] = None):
434+
def set_eye_color(self, unit: _EyeUnit, r: Union[_EyeColor, int, float, list, tuple], g: Union[int, None] = None, b: Union[int, None] = None):
435435
if unit not in Pio._VALID_EYE_UNITS:
436436
return _err(Pio, 'set_eye_color', 'unit', unit, Pio._VALID_EYE_UNITS)
437-
if isinstance(r, str):
437+
# 색을 list 또는 tuple 로 넘긴 경우, r g b 로 펼친다. (r의 길이가 3이 아니거나 g/b 가 함께 오면 오류)
438+
if isinstance(r, (list, tuple)):
439+
if len(r) != 3:
440+
return _err(Pio, 'set_eye_color', 'r', r, 'list | tuple, length: 3')
441+
elif g is not None or b is not None:
442+
return _err(Pio, 'set_eye_color', 'r, g, b', (r, g, b), 'g and b should be None')
443+
rgb = r
444+
elif isinstance(r, str):
438445
if r not in Pio._VALID_COLORS:
439446
return _err(Pio, 'set_eye_color', 'color', r, tuple(Pio._VALID_COLORS))
440447
rgb = Pio._VALID_COLORS[r]

‎robomation/roboids/turtle.py‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -513,8 +513,15 @@ def stop_trace(self):
513513
self.write(Turtle.LINE_TRACER_MODE, 0)
514514

515515
# ── LED ─────────────────────────────────────────────────────────────────
516-
def set_led_color(self, r: Union[_LEDColor, int, float], g: Union[int, None] = None, b: Union[int, None] = None):
517-
if isinstance(r, str):
516+
def set_led_color(self, r: Union[_LEDColor, int, float, list, tuple], g: Union[int, None] = None, b: Union[int, None] = None):
517+
# 색을 list 또는 tuple 로 넘긴 경우, r g b 로 펼친다. (r의 길이가 3이 아니거나 g/b 가 함께 오면 오류)
518+
if isinstance(r, (list, tuple)):
519+
if len(r) != 3:
520+
return _err(Turtle, 'set_led_color', 'r', r, 'list | tuple, length: 3')
521+
elif g is not None or b is not None:
522+
return _err(Turtle, 'set_led_color', 'r, g, b', (r, g, b), 'g and b should be None')
523+
rgb = r
524+
elif isinstance(r, str):
518525
if r not in Turtle._VALID_COLORS:
519526
return _err(Turtle, 'set_led_color', 'color', r, tuple(Turtle._VALID_COLORS))
520527
rgb = Turtle._VALID_COLORS[r]

0 commit comments

Comments
 (0)