Skip to content
This repository was archived by the owner on Apr 29, 2024. It is now read-only.

Commit f0742b7

Browse files
committed
Fixed formatting after page size change
1 parent 157f3cd commit f0742b7

File tree

12 files changed

+32
-25
lines changed

12 files changed

+32
-25
lines changed

entries/brainstorm-auton-movement/entry.typ

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,8 @@
5959
down as it approaches the target. Its output is calculated by adding together
6060
it's 3 terms, P, I, and D.
6161

62+
#v(500pt)
63+
6264
#nb_pro_con(pros: [
6365
- Smooth, precise movement
6466
], cons: [

entries/brainstorm-launcher.typ

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
- Take up a lot of horizontal space
2222
])
2323

24-
], image("/assets/launchers/puncher.svg"), [
24+
], image("/assets/launchers/puncher.svg", width: 90%), [
2525
#nb_heading([Catapult], level: 2)
2626

2727
#nb_pro_con(pros: [
@@ -31,15 +31,15 @@
3131
], cons: [
3232
- Takes up a lot of space
3333
])
34-
], image("/assets/launchers/catapult.svg"), [
34+
], image("/assets/launchers/catapult.svg", width: 90%), [
3535
#nb_heading([Flywheel], level: 2)
3636
#nb_pro_con(pros: [
3737
- Very accurate speed control
3838
], cons: [
3939
- Easily burn out if not given enough power
4040
- Difficult to correctly tune
4141
])
42-
], image("/assets/launchers/flywheel.svg"))
42+
], image("/assets/launchers/flywheel.svg", width: 90%))
4343

4444
]
4545

entries/build-catapult-upgrade/entry.typ

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@
4949

5050
],
5151
[
52-
#figure(image("./iso.jpg"), caption: "Lengthened arm")
53-
#figure(image("./sensor.jpg"), caption: "New sensor")
54-
#figure(image("./ratchet.jpg"), caption: "Ratchet, with temporary 3D printed gear")
52+
#figure(image("./iso.jpg", width: 75%), caption: "Lengthened arm")
53+
#figure(image("./sensor.jpg", width: 75%), caption: "New sensor")
54+
#figure(image("./ratchet.jpg", width: 75%), caption: "Ratchet, with temporary 3D printed gear")
5555
],
5656
)
5757

entries/build-test-launcher/entry.typ

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,11 +149,11 @@
149149

150150
#nb_heading([General Testing], level: 2)
151151

152-
#image("./general-testing-cycle.svg", width: 60%)
152+
#image("./general-testing-cycle.svg", width: 55%)
153153

154154
#nb_heading([Trajectory Testing], level: 2)
155155

156-
#image("./trajectory-testing.svg", width: 55%)
156+
#image("./trajectory-testing.svg", width: 50%)
157157

158158
#nb_heading([Results], level: 1)
159159

entries/decide-auton-movement/entry.typ

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,10 +180,17 @@
180180
$ y_"carrot" = y_"target" - h cos(theta_"target") * d_"lead" $
181181
]
182182

183+
#v(100pt)
184+
183185
As the robot gets closer to the carrot point, the carrot point gets closer to
184186
the target point, moving the robot along the projected path. Eventually the
185187
points will overlap, and the movement will be complete.
186188

187-
#image("./boomerang-controller.svg")
189+
#figure(
190+
image("./boomerang-controller.svg"),
191+
caption: "Projected boomerang path"
192+
)
193+
194+
Overall this has a lot of advantages over a simple move to point. It means that the system only has to settle once, and it also means that the system knows what angle it should end at, giving it more certainty at the end of movements.
188195

189196
]

entries/decide-launcher/entry.typ

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@
3333
#grid(
3434
columns: (1fr, 1fr),
3535
gutter: 20pt,
36-
figure(caption: "Front View", image("./front.png")),
37-
figure(caption: "Top View", image("./top.png")),
38-
figure(caption: "Side View", image("./side.png")),
39-
figure(caption: "Isometric View", image("./iso.png")),
36+
figure(caption: "Front View", image("./front.png",width: 90%)),
37+
figure(caption: "Top View", image("./top.png", width: 90%)),
38+
figure(caption: "Side View", image("./side.png", width: 90%)),
39+
figure(caption: "Isometric View", image("./iso.png", width: 90%)),
4040
)
4141

4242
#image("./1.png")

entries/decide-scoring/entry.typ

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,8 @@
6464

6565
#nb_heading([Final Design])
6666

67+
Our final design used a top mounted piston and a piece of C-channel as the wing base. This strikes the right balance between structural integrity and lightness, and also doesn't expose the piston to other robots.
68+
6769
#grid(
6870
columns: (1fr, 1fr),
6971
gutter: 20pt,

entries/notebook-toc.typ

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@
108108
)
109109
}
110110
```
111-
111+
#v(100pt)
112112
This means that all the notebooker has to do to add a new entry is this: ```typ
113113
#nb_create_entry(
114114
title: "Interesting Title",

entries/program-tracking.typ

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"https://lemlib.github.io/LemLib/md_docs_tutorials_1_getting_started.html",
1313
),
1414
) and downloaded the zip file for the 0.4.7 release. Then we ran the following
15-
commands to apply the template: ```shell-unix-generic
15+
commands to apply the template: ```sh
1616
pros c fetch LemLib@0.4.7.zip
1717
pros c apply LemLib@0.4.7
1818
```

template/colors.typ

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,19 @@
11
#let red = rgb("#e03131")
22
#let pink = rgb("#f06595")
3-
#let purple = rgb("#9c36b5")
3+
#let purple = rgb("#cc5de8")
44
#let violet = rgb("#6741d9")
55
#let indigo = rgb("3b5bdb")
66
#let blue = rgb("#1971c2")
7-
#let light_blue = rgb("#a5d8ff")
87
#let cyan = rgb("#0c8599")
98
#let teal = rgb("#099268")
10-
#let green = rgb("#2f9e44")
11-
#let light_green = rgb("#8ce99a")
9+
#let green = rgb("#51cf66")
1210
#let lime = rgb("#66a80f")
13-
#let yellow =rgb("#fcc419")
14-
#let orange = rgb("#e8590c")
11+
#let yellow =rgb("#ffd43b")
12+
#let orange = rgb("#ff922b")
1513
#let gray = rgb("#343a40")
1614
#let white = rgb("#ffffff")
1715
#let black = rgb("#000000")
1816

19-
#let primary = green
20-
#let secondary = light_green
21-
#let background = white
2217
#let surface_0 = rgb("#f1f3f5")
2318
#let surface_1 = rgb("#e9ecef")
2419
#let surface_2 = rgb("#dee2e6")

template/template.typ

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
) = {
1616
// Styling rules
1717
set text(font: "Calibri", size: 11pt)
18+
set page("us-letter")
1819

1920
set heading()
2021
set footnote.entry(separator: none)

template/widgets.typ

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@
190190
} else if type == "warning" {
191191
title = "Warning"
192192
icon = "./icons/warning.svg"
193-
color = yellow
193+
color = red
194194
} else if type == "example" {
195195
title = "Example"
196196
icon = "./icons/web.svg"

0 commit comments

Comments
 (0)