Skip to content

Commit bda1efe

Browse files
authored
Merge pull request #94 from makerforgetech/develop
Release 'Buddy' to main branch
2 parents f21b4b3 + b3c5344 commit bda1efe

File tree

199 files changed

+4489
-5029
lines changed

Some content is hidden

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

199 files changed

+4489
-5029
lines changed

.gitignore

Lines changed: 19 additions & 5 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,12 @@ colorzero-2.0.dist-info/
5856
colorzero/
5957
colour-0.1.5.dist-info/
6058
colour.py
59+
data/
6160
digitalio.py
6261
distutils-precedence.pth
6362
google/
6463
googleapis_common_protos-1.62.0.dist-info/
64+
googleapis_common_protos-1.63.0.dist-info/
6565
googletrans-3.1.0a0.dist-info/
6666
googletrans/
6767
gpiozero-2.0.dist-info/
@@ -72,8 +72,10 @@ grpclib/
7272
h11-0.9.0.dist-info/
7373
h11/
7474
h2-3.2.0.dist-info/
75+
h2-4.1.0.dist-info/
7576
h2/
7677
hpack-3.0.0.dist-info/
78+
hpack-4.0.0.dist-info/
7779
hpack/
7880
hstspreload-2023.1.1.dist-info/
7981
hstspreload/
@@ -82,6 +84,7 @@ httpcore/
8284
httpx-0.13.3.dist-info/
8385
httpx/
8486
hyperframe-5.2.0.dist-info/
87+
hyperframe-6.0.1.dist-info/
8588
hyperframe/
8689
idna-2.10.dist-info/
8790
idna/
@@ -92,7 +95,9 @@ keypad.py
9295
microcontroller/
9396
micropython-stubs/
9497
micropython.py
98+
modular-biped-venv/
9599
multidict-6.0.4.dist-info/
100+
multidict-6.0.5.dist-info/
96101
multidict/
97102
neopixel_write.py
98103
nltk-3.8.1.dist-info/
@@ -101,8 +106,11 @@ numpy-1.26.2.dist-info/
101106
numpy.libs/
102107
numpy/
103108
onewireio.py
109+
pillow-10.2.0.dist-info/
110+
pillow.libs/
104111
pkg_resources/
105112
protobuf-4.25.1.dist-info/
113+
protobuf-4.25.3.dist-info/
106114
pubsub/
107115
pulseio.py
108116
pwmio.py
@@ -133,12 +141,18 @@ sysv_ipc-1.1.0.dist-info/
133141
sysv_ipc.cpython-311-aarch64-linux-gnu.so
134142
tqdm-4.66.1.dist-info/
135143
tqdm/
144+
typing_extensions-4.10.0.dist-info/
136145
typing_extensions-4.9.0.dist-info/
137146
typing_extensions.py
138147
usb/
139148
usb_hid.py
140149
venv/
141-
viam/
150+
viam-config-example.json
151+
/viam/
142152
viam_sdk-0.12.0.dist-info/
153+
viam_sdk-0.15.0.dist-info/
143154
yaml/
144-
!modules/viam/
155+
myvenv/
156+
.circleci/
157+
.vscode
158+
myenv

.vscode/c_cpp_properties.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,11 @@
2020
"/home/dan/.arduino15/packages/arduino/hardware/avr/1.8.6/variants/eightanaloginputs",
2121
"/home/dan/Arduino/libraries/ServoEasing/src",
2222
"/home/dan/Arduino/libraries/Servo/src",
23+
"/home/dan/Arduino/libraries/Adafruit_MPU6050",
24+
"/home/dan/Arduino/libraries/Adafruit_BusIO",
25+
"/home/dan/.arduino15/packages/arduino/hardware/avr/1.8.6/libraries/Wire/src",
26+
"/home/dan/.arduino15/packages/arduino/hardware/avr/1.8.6/libraries/SPI/src",
27+
"/home/dan/Arduino/libraries/Adafruit_Unified_Sensor",
2328
"/home/dan/.arduino15/packages/arduino/tools/avr-gcc/7.3.0-atmel3.6.1-arduino7/lib/gcc/avr/7.3.0/include",
2429
"/home/dan/.arduino15/packages/arduino/tools/avr-gcc/7.3.0-atmel3.6.1-arduino7/lib/gcc/avr/7.3.0/include-fixed",
2530
"/home/dan/.arduino15/packages/arduino/tools/avr-gcc/7.3.0-atmel3.6.1-arduino7/avr/include"

arduino_sketch/Config.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,10 @@ int PosLookDown[SERVO_COUNT] = {NOVAL, NOVAL, NOVAL, NOVAL, NOVAL, NOVAL, 120, 9
8080
// Array of poses except PosRest and PosSleep (which are used for initialization and reset of position)
8181
int *Poses[] = {PosStand, PosLookLeft, PosLookRight, PosLookUp, PosLookDown, PosLookRandom};
8282

83-
int backpackPin = 12;
83+
int backpackPin = PIN_A1;
8484
bool backpack = false;
8585

86-
int restrainPin = PIN_A1;
86+
int restrainPin = 12;
8787
bool restrainingBolt = false;
8888

8989
void blinkLED()

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.

0 commit comments

Comments
 (0)