Skip to content

Commit b117b7f

Browse files
committed
Merge branch 'simulator-updates'
2 parents 190516f + 63c73c8 commit b117b7f

File tree

4 files changed

+11
-9
lines changed

4 files changed

+11
-9
lines changed

programming/sr/leds/index.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ title: LEDs
66
LEDs
77
====
88

9+
<div class="info">
10+
This documentation refers to a feature which is only available on the physical robot kits.
11+
</div>
12+
913
The KCH HAT provides diagnostic information about the state of your robot
1014
through a collection of preconfigured and user-controllable LEDs. It is part of
1115
the [Brain Board](/docs/kit/brain_board) assembly, however control of its LEDs

programming/sr/servos/index.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@ title: Servos
66
Servos
77
======
88

9-
<div class="info">
10-
This documentation refers to a feature which is only available on the physical robot kits.
11-
</div>
12-
139
The `servo_board` object is used to control a collection of Servo Boards.
1410

1511
When a single Servo Board is connected to your robot, you can control it

programming/sr/vision/index.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@ title: Vision
66
Vision
77
======
88

9-
<div class="info">
10-
This documentation refers to a feature which is only available on the physical robot kits.
11-
</div>
12-
139
The `sr.robot3` library contains support for detecting fiducial markers with the provided webcam.
1410
Markers are attached to various items in the Student Robotics arena.
1511
Each marker encodes a number in a machine-readable way, which means that robots can identify these objects.
@@ -168,6 +164,11 @@ A `ThreeDCoordinate` object contains an `x`, `y` and `z` attribute. The exact me
168164
[`Orientation`](#Orientation) {#Orientation}
169165
---------------
170166

167+
<div class="info">
168+
Orientation information is returned in different formats between the simulator and the physical robot kits.
169+
One (possibly both) of them may change to resolve this.
170+
</div>
171+
171172
An `Orientation` object describes the orientation of a marker.
172173

173174
![A visual representation of how the orientation axes work. Source: SourceBots]({{ site.baseurl }}/images/content/vision/yaw-pitch-roll.png)

simulator/programming/index.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ Your code should be developed in `robot.py`.
3232
There is a pre-built robot used in the simulator.
3333
To allow this simulated robot to move around and sense its environment a set of motors and sensors have been connected as detailed below.
3434

35-
The simulator’s API is very similar to the real SR API described in the [programming docs]({{ site.baseurl }}/programming/), with the exception of `R.time` and `R.sleep`.
35+
The simulator’s API is very similar to the real SR API described in the [programming docs]({{ site.baseurl }}/programming/).
36+
The main differences are the way that [time is handled](#simulated-time), some discrepancies in the vision API we hope to resolve soon and the simulated robot not having the Brain Board LEDs.
3637

3738
<div class="info">
3839
To more closely reflect reality, artificial noise has been added to simulated

0 commit comments

Comments
 (0)