Skip to content

Commit 6c0db5d

Browse files
authored
Merge pull request #88 from makerforgetech/feature/assistant
Feature/assistant
2 parents e159de7 + e8379b8 commit 6c0db5d

File tree

16 files changed

+144
-275
lines changed

16 files changed

+144
-275
lines changed

.gitignore

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,8 @@ app.log*
1313
battery*.csv
1414
timelapse/*
1515
.coverage
16-
modular-biped-venv
17-
data
1816

19-
# Viam demanded the modules get installed directly in the directory
17+
.venv/
2018
Adafruit_Blinka-8.28.0.dist-info/
2119
Adafruit_PlatformDetect-3.57.0.dist-info/
2220
Adafruit_PureIO-1.1.11.dist-info/
@@ -58,10 +56,13 @@ colorzero-2.0.dist-info/
5856
colorzero/
5957
colour-0.1.5.dist-info/
6058
colour.py
59+
config/tts.yml
60+
data/
6161
digitalio.py
6262
distutils-precedence.pth
6363
google/
6464
googleapis_common_protos-1.62.0.dist-info/
65+
googleapis_common_protos-1.63.0.dist-info/
6566
googletrans-3.1.0a0.dist-info/
6667
googletrans/
6768
gpiozero-2.0.dist-info/
@@ -72,8 +73,10 @@ grpclib/
7273
h11-0.9.0.dist-info/
7374
h11/
7475
h2-3.2.0.dist-info/
76+
h2-4.1.0.dist-info/
7577
h2/
7678
hpack-3.0.0.dist-info/
79+
hpack-4.0.0.dist-info/
7780
hpack/
7881
hstspreload-2023.1.1.dist-info/
7982
hstspreload/
@@ -82,6 +85,7 @@ httpcore/
8285
httpx-0.13.3.dist-info/
8386
httpx/
8487
hyperframe-5.2.0.dist-info/
88+
hyperframe-6.0.1.dist-info/
8589
hyperframe/
8690
idna-2.10.dist-info/
8791
idna/
@@ -92,7 +96,9 @@ keypad.py
9296
microcontroller/
9397
micropython-stubs/
9498
micropython.py
99+
modular-biped-venv/
95100
multidict-6.0.4.dist-info/
101+
multidict-6.0.5.dist-info/
96102
multidict/
97103
neopixel_write.py
98104
nltk-3.8.1.dist-info/
@@ -101,8 +107,11 @@ numpy-1.26.2.dist-info/
101107
numpy.libs/
102108
numpy/
103109
onewireio.py
110+
pillow-10.2.0.dist-info/
111+
pillow.libs/
104112
pkg_resources/
105113
protobuf-4.25.1.dist-info/
114+
protobuf-4.25.3.dist-info/
106115
pubsub/
107116
pulseio.py
108117
pwmio.py
@@ -133,12 +142,18 @@ sysv_ipc-1.1.0.dist-info/
133142
sysv_ipc.cpython-311-aarch64-linux-gnu.so
134143
tqdm-4.66.1.dist-info/
135144
tqdm/
145+
typing_extensions-4.10.0.dist-info/
136146
typing_extensions-4.9.0.dist-info/
137147
typing_extensions.py
138148
usb/
139149
usb_hid.py
140150
venv/
151+
viam-config-example.json
141152
viam/
142153
viam_sdk-0.12.0.dist-info/
154+
viam_sdk-0.15.0.dist-info/
143155
yaml/
144-
!modules/viam/
156+
myvenv/
157+
.circleci/
158+
.vscode
159+
myenv

arduino_sketch_old/.vscode/settings.json

Lines changed: 0 additions & 3 deletions
This file was deleted.

arduino_sketch_old/arduino_sketch.ino

Lines changed: 0 additions & 213 deletions
This file was deleted.

arduino_sketch_old/order.h

Lines changed: 0 additions & 20 deletions
This file was deleted.

arduino_sketch_old/parameters.h

Lines changed: 0 additions & 15 deletions
This file was deleted.

install.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,12 @@
2424
# OpenCV
2525
# sudo apt-get install libatlas-base-dev
2626

27+
# CREATE VIRTUAL ENVIRONMENT
28+
python3 -m venv myenv
29+
source myenv/bin/activate
30+
2731
# INSTALL ALL PYTHON DEPENDENCIES
28-
python3 -m pip install -r requirements.txt --break-system-packages
32+
python3 -m pip install -r requirements.txt
2933

3034
# Activate other scripts
3135
chmod 777 startup.sh

main.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
from modules.arduinoserial import ArduinoSerial
3737
from modules.neopx import NeoPx
3838
# from modules.tts import TTS
39+
# from modules.openaichat import OpenAiChat
3940
from modules.personality import Personality
4041
# from modules.battery import Battery
4142
from modules.braillespeak import Braillespeak
@@ -111,8 +112,9 @@ def main():
111112
# power = Power(Config.POWER_ENABLE_PIN)
112113

113114
neopx = NeoPx(Config.get('neopixel','count'))
114-
# tts = TTS(translator=translator)
115-
115+
# tts = TTS(service=Config.get('tts','service'), voice_id=Config.get('tts','voice_id'))
116+
#openaichat = OpenAiChat()
117+
116118
if Config.get('motion','pin') != '':
117119
motion = Sensor(Config.get('motion','pin'))
118120

@@ -163,7 +165,7 @@ def main():
163165
# sleep(1) # @todo is this needed?
164166
# @todo this is throwing errors: ALSA lib confmisc.c:1281:(snd_func_refer) Unable to find definition 'defaults.bluealsa.device'
165167

166-
#speech = SpeechInput()
168+
# speech = SpeechInput()
167169
# Output
168170
# if Config.get('buzzer', 'pin') != '':
169171
# speak = Braillespeak(Config.get('buzzer', 'pin'), duration=80/1000)
@@ -181,7 +183,7 @@ def main():
181183
ten_second_loop = time()
182184
minute_loop = time()
183185
loop = True
184-
# pub.sendMessage('speak', message='hi')
186+
# pub.sendMessage('speak', msg='hi')
185187
# pub.sendMessage('animate', action='celebrate')
186188

187189
try:

0 commit comments

Comments
 (0)