Skip to content

Commit 073f0c7

Browse files
AndyLindsayAndyLindsay
committed
Update libraries to match dev and demo v1.4.45 branches
Includes commits that affect the Simple Libraries from 11/28/17 through 1/4/18 in: https://github.com/parallaxinc/Simple-Libraries/commits/Dev
1 parent 3640c2e commit 073f0c7

File tree

209 files changed

+24048
-1284
lines changed

Some content is hidden

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

209 files changed

+24048
-1284
lines changed

‎Learn/Examples/Robots/ActivityBot/Roaming with Whiskers.c

+7-7
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ int main() // main function
1717
while(1) // Main loop
1818
{
1919
// Go forward for 1/50th of a second.
20-
drive_speed(100, 100); // Go forward
20+
drive_speed(64, 64); // Go forward
2121

2222
// Check whisker states.
2323
int wL = input(7); // Left whisker -> wL variable
@@ -26,17 +26,17 @@ int main() // main function
2626
// If whisker(s) pressed, avoid obstacle.
2727
if(wR == 0) // Just right whisker
2828
{
29-
drive_speed(-100, -100); // Back up 0.5 seconds
29+
drive_speed(-64, -64); // Back up 1 second
30+
pause(1000);
31+
drive_speed(-64, 64); // Turn left 0.5 seconds
3032
pause(500);
31-
drive_speed(-100, 100); // Turn left 0.22 seconds
32-
pause(220);
3333
}
3434
else if(wL == 0) // Just left whisker
3535
{
36-
drive_speed(-100, -100); // Back up 0.5 seconds
36+
drive_speed(-64, -64); // Back up 1.0 second
37+
pause(1000);
38+
drive_speed(64, -64); // Turn right 0.5 seconds
3739
pause(500);
38-
drive_speed(100, -100); // Turn right 0.25 seconds
39-
pause(220);
4040
}
4141
}
4242
}

‎Learn/Library Cog and EEPROM Usage.html

+38
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,16 @@ <h3 style="font-family:verdana;">EEPROM Usage Conventions</h3>
3434

3535
<h3 style="font-family:verdana;">Library EEPROM Usage</h3>
3636

37+
<p>
38+
<blockquote>
39+
<a href="Simple%20Libraries/Robotics/ActivityBot360/libabcalibrate360/Documentation%20abcalibrate360%20Library.html" target="_blank">abcalibrate360.h</a> - 63418..65470
40+
<br>
41+
<blockquote>
42+
cal_activityBot writes to these addresses.
43+
</blockquote>
44+
</blockquote>
45+
</p>
46+
3747
<p>
3848
<blockquote>
3949
<a href="Simple%20Libraries/Robotics/ActivityBot/Documentation%20abcalibrate%20Library.html" target="_blank">abcalibrate.h</a> - 63418..65470
@@ -121,6 +131,16 @@ <h3 style="font-family:verdana;">Library Additional Core Usage</h3>
121131
</blockquote>
122132
</p>
123133

134+
<p>
135+
<blockquote>
136+
<a href="Simple%20Libraries/Motor/libservo360/Documentation%20servo360%20Library.html" target="_blank">servo360.h</a> +1
137+
<blockquote>
138+
Launches 1 core that controls up to 4 servos. Use servo360_connect to initialize
139+
each servo.
140+
</blockquote>
141+
</blockquote>
142+
</p>
143+
124144
<p>
125145
<blockquote>
126146
<a href="Simple%20Libraries/Motor/libservoAux/Documentation%20servoAux%20Library.html" target="_blank">servoAux.h</a> +1
@@ -130,6 +150,15 @@ <h3 style="font-family:verdana;">Library Additional Core Usage</h3>
130150
</blockquote>
131151
</p>
132152

153+
<p>
154+
<blockquote>
155+
<a href="Simple%20Libraries/Robotics/ActivityBot360/libabcalibrate360/Documentation%20abcalibrate360%20Library.html" target="_blank">abcalibrate360.h</a> +1 (self-terminating)
156+
<blockquote>
157+
A call to cal_activityBot launches 1 additional core that self-terminate when the function is done.
158+
</blockquote>
159+
</blockquote>
160+
</p>
161+
133162
<p>
134163
<blockquote>
135164
<a href="Simple%20Libraries/Robotics/ActivityBot/Documentation%20abcalibrate%20Library.html" target="_blank">abcalibrate.h</a> +2 (self-terminating)
@@ -139,6 +168,15 @@ <h3 style="font-family:verdana;">Library Additional Core Usage</h3>
139168
</blockquote>
140169
</p>
141170

171+
<p>
172+
<blockquote>
173+
<a href="Simple%20Libraries/Robotics/ActivityBot360/libabdrive360/Documentation%20abdrive360%20Library.html" target="_blank">abdrive360.h</a> +1 (including servo360.h)
174+
<blockquote>
175+
This library itself does not launch any cogs, but it controls and monitors Feedback 360 servos through servo360.h, which does use one additional cog..
176+
</blockquote>
177+
</blockquote>
178+
</p>
179+
142180
<p>
143181
<blockquote>
144182
<a href="Simple%20Libraries/Robotics/ActivityBot/Documentation%20abdrive%20Library.html" target="_blank">abdrive.h</a> +1

‎Learn/Simple Libraries Index.html

+19
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,12 @@ <h3 style="font-family:verdana;">Network</h3>
169169

170170
<h3 style="font-family:verdana;">Motor</h3>
171171

172+
<blockquote>
173+
<p>
174+
<a href="Simple%20Libraries/Motor/libservo360/Documentation%20servo360%20Library.html" target="_blank">servo360.h</a> - Parallax Feedback 360 High Speed Servo control, monitoring, and settings.
175+
</blockquote>
176+
</p>
177+
172178
<blockquote>
173179
<p>
174180
<a href="Simple%20Libraries/Motor/libservo/Documentation%20servo%20Library.html" target="_blank">servo.h</a> - Servo control library, up to 14 servos with 1 core.
@@ -245,6 +251,19 @@ <h3 style="font-family:verdana;">Remote</h3>
245251

246252
<h3 style="font-family:verdana;">Robotics</h3>
247253

254+
255+
<p>
256+
<blockquote>
257+
<a href="Simple%20Libraries/Robotics/ActivityBot360/libabdrive360/Documentation%20abdrive360%20Library.html" target="_blank">abdrive360.h</a> - Tools for ActivityBot 360 navigation with Feedback 360 servos.
258+
</blockquote>
259+
</p>
260+
261+
<p>
262+
<blockquote>
263+
<a href="Simple%20Libraries/Robotics/ActivityBot360/libabcalibrate360/Documentation%20abcalibrate360%20Library.html" target="_blank">abcalibrate360.h</a> - Self-calibration functions for the ActivityBot 360.
264+
</blockquote>
265+
</p>
266+
248267
<p>
249268
<blockquote>
250269
<a href="Simple%20Libraries/Robotics/ActivityBot/libabdrive/Documentation%20abdrive%20Library.html" target="_blank">abdrive.h</a> - Tools for ActivityBot navigation with encoders + servos.

0 commit comments

Comments
 (0)