Merge pull request #50 from robocup-logistics/common/markerless

Combined Production+Exploration and Markerless Option
robocup-logistics · Apr 18, 2022 · 941adc6 · 941adc6
2 parents f3da4df + 7491abb
commit 941adc6
Show file tree

Hide file tree

Showing 6 changed files with 180 additions and 113 deletions.
diff --git a/markers/Makefile b/markers/Makefile
@@ -1,5 +1,4 @@
-#MARKERS = 1 17 33 177 65 81 193 97 113 129 145 161 49 209
-MARKERS = 101 103 201 203 111 113 211 213 121 221 131 231 141 241
+MARKERS = 101 103 201 203 111 113 211 213 121 221 131 231 141 241 301
 
 all: numbered_markers.pdf markers.pdf
 

diff --git a/markers/figure_301.png b/markers/figure_301.png
diff --git a/markers/figure_302.png b/markers/figure_302.png
diff --git a/markers/marker.tex b/markers/marker.tex
@@ -38,6 +38,8 @@
   \ifthenelse{\equal{#1}{142}}{C-SS-I}{}%
   \ifthenelse{\equal{#1}{241}}{M-SS-O}{}%
   \ifthenelse{\equal{#1}{242}}{M-SS-I}{}%
+  \ifthenelse{\equal{#1}{301}}{UMPS-1}{}%
+  \ifthenelse{\equal{#1}{302}}{UMPS-2}{}%
   }%
 }
 \pagenumbering{gobble}% no page numbering

diff --git a/markers/numbered_markers.pdf b/markers/numbered_markers.pdf