Skip to content

Commit 2e65aad

Browse files
committed
Arrange unused codes
1 parent 8620164 commit 2e65aad

File tree

9 files changed

+70
-589
lines changed

9 files changed

+70
-589
lines changed

neopia/keyboard.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Part of the ROBOID project - https://roboticsware.uz
1+
# Part of the RoboticsWare project - https://roboticsware.uz
22
# Copyright (C) 2022 RoboticsWare ([email protected])
33
#
44
# This library is free software; you can redistribute it and/or

neopia/linker.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Part of the ROBOID project - https://roboticsware.uz
1+
# Part of the RoboticsWare project - https://roboticsware.uz
22
# Copyright (C) 2022 RoboticsWare ([email protected])
33
#
44
# This library is free software; you can redistribute it and/or
@@ -28,13 +28,13 @@
2828

2929
class Link(object):
3030
def __init__(self, tag, neobot):
31-
self._roboid = None
31+
self._neobot = None
3232
self._tag = tag
33-
self._roboid = neobot
33+
self._neobot = neobot
3434
self._connection_state = -1
3535

3636
def get_motoring(self):
37-
return self._roboid.get_motoring()
37+
return self._neobot.get_motoring()
3838

3939
def handle_sensory(self, received):
4040
connection_state = received['connectionState']
@@ -48,11 +48,11 @@ def handle_sensory(self, received):
4848
Linker.print_error(self._tag, 'Connection lost')
4949
elif connection_state == State.DISCONNECTED:
5050
Linker.print_error(self._tag, 'Disconnected')
51-
if self._roboid is not None:
52-
self._roboid.decode_sensory(received)
51+
if self._neobot is not None:
52+
self._neobot.decode_sensory(received)
5353

5454
def handle_motoring(self):
55-
self._roboid.encode_motoring()
55+
self._neobot.encode_motoring()
5656

5757

5858
class Linker(object):
@@ -91,7 +91,7 @@ def _get_or_create_link(group, module, index, tag, neobot):
9191
return link
9292

9393
@staticmethod
94-
def register_roboid(group, module, index, tag, neobot):
94+
def register_neobot(group, module, index, tag, neobot):
9595
Linker._get_or_create_link(group, module, index, tag, neobot)
9696

9797
@staticmethod

neopia/mode.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Part of the ROBOID project - https://roboticsware.uz
1+
# Part of the RoboticsWare project - https://roboticsware.uz
22
# Copyright (C) 2022 RoboticsWare ([email protected])
33
#
44
# This library is free software; you can redistribute it and/or

neopia/model.py

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Part of the ROBOID project - https://roboticsware.uz
1+
# Part of the RoboticsWare project - https://roboticsware.uz
22
# Copyright (C) 2022 RoboticsWare ([email protected])
33
#
44
# This library is free software; you can redistribute it and/or
@@ -268,26 +268,26 @@ def _add_device(self, id, name, device_type, data_type, data_size, min_value, ma
268268
self._motoring_devices.append(dev)
269269
return dev
270270

271-
def _add_roboid(self, neobot):
271+
def _add_neobot(self, neobot):
272272
if isinstance(neobot, Neobot):
273273
self._neobots.append(neobot)
274274

275275
def get_id(self):
276276
return self._id
277277

278-
def find_roboid_by_name(self, name):
278+
def find_neobot_by_name(self, name):
279279
name = str(name).lower()
280280
dot = name.find(".")
281281
if dot < 0:
282282
for neobot in self._neobots:
283283
if name == neobot.get_name().lower():
284284
return neobot
285285
else:
286-
roboid_name = name[:dot]
286+
neobot_name = name[:dot]
287287
sub_name = name[dot+1:]
288288
for neobot in self._neobots:
289-
if roboid_name == neobot.get_name().lower():
290-
return neobot.find_roboid_by_name(sub_name)
289+
if neobot_name == neobot.get_name().lower():
290+
return neobot.find_neobot_by_name(sub_name)
291291
return None
292292

293293
def find_device_by_name(self, name):
@@ -298,10 +298,10 @@ def find_device_by_name(self, name):
298298
if name == device.get_name().lower():
299299
return device
300300
else:
301-
roboid_name = name[:dot]
301+
neobot_name = name[:dot]
302302
sub_name = name[dot+1:]
303303
for neobot in self._neobots:
304-
if roboid_name == neobot.get_name().lower():
304+
if neobot_name == neobot.get_name().lower():
305305
return neobot.find_device_by_name(sub_name)
306306
return None
307307

@@ -430,33 +430,33 @@ def reset(self):
430430
for neobot in self._neobots:
431431
neobot._reset()
432432

433-
def _add_roboid(self, neobot):
433+
def _add_neobot(self, neobot):
434434
if isinstance(neobot, Neobot):
435435
self._neobots.append(neobot)
436436

437-
def find_roboid_by_name(self, name):
437+
def find_neobot_by_name(self, name):
438438
name = str(name).lower()
439439
dot = name.find(".")
440440
if dot < 0:
441441
for neobot in self._neobots:
442442
if name == neobot.get_name().lower():
443443
return neobot
444444
else:
445-
roboid_name = name[:dot]
445+
neobot_name = name[:dot]
446446
sub_name = name[dot+1:]
447447
for neobot in self._neobots:
448-
if roboid_name == neobot.get_name().lower():
449-
return neobot.find_roboid_by_name(sub_name)
448+
if neobot_name == neobot.get_name().lower():
449+
return neobot.find_neobot_by_name(sub_name)
450450
return None
451451

452452
def find_device_by_name(self, name):
453453
name = str(name).lower()
454454
dot = name.find(".")
455455
if dot >= 0:
456-
roboid_name = name[:dot]
456+
neobot_name = name[:dot]
457457
sub_name = name[dot+1:]
458458
for neobot in self._neobots:
459-
if roboid_name == neobot.get_name().lower():
459+
if neobot_name == neobot.get_name().lower():
460460
return neobot.find_device_by_name(sub_name)
461461
return None
462462

0 commit comments

Comments
 (0)