diff --git a/project/pages/tests.py b/project/pages/tests.py index 38d02fd..ecf1f0d 100644 --- a/project/pages/tests.py +++ b/project/pages/tests.py @@ -65,3 +65,7 @@ class RoboticsTestCase(TestCase): def test_2015_robot_accessable(self): response = self.client.get(reverse('robotics:2015-robot')) self.assertEqual(response.status_code, 200) + + def test_2015_code_accessable(self): + response = self.client.get(reverse('robotics:2015-code')) + self.assertEqual(response.status_code, 200) diff --git a/project/pages/urls/robotics.py b/project/pages/urls/robotics.py index 2eed5b5..a36fc15 100644 --- a/project/pages/urls/robotics.py +++ b/project/pages/urls/robotics.py @@ -6,5 +6,6 @@ urlpatterns = [ url(r'^$', robotics.IndexView.as_view(), name="index"), url(r'^2014/$', robotics.Index2014View.as_view(), name="2014-index"), url(r'^2015/robot/$', robotics.Robot2015View.as_view(), name="2015-robot"), + url(r'^2015/code/$', robotics.Code2015View.as_view(), name="2015-code"), url(r'^2015/$', robotics.Index2015View.as_view(), name="2015-index") ] diff --git a/project/pages/views/robotics.py b/project/pages/views/robotics.py index aa2b274..99fcfaa 100644 --- a/project/pages/views/robotics.py +++ b/project/pages/views/robotics.py @@ -1,4 +1,4 @@ -from project.common.views import CustomTemplate +from project.common.views import CustomTemplate, MarkdownView class IndexView(CustomTemplate): @@ -14,6 +14,10 @@ class Robot2015View(CustomTemplate): template_name = 'robotics/2015-robot.html' +class Code2015View(MarkdownView): + markdown = 'robotics/2015-code.md' + + # 2014 class Index2014View(CustomTemplate): template_name = 'robotics/2014-index.html' diff --git a/static/src/js/components/navbar/navbar.js b/static/src/js/components/navbar/navbar.js index fc6a886..ba50051 100644 --- a/static/src/js/components/navbar/navbar.js +++ b/static/src/js/components/navbar/navbar.js @@ -19,14 +19,17 @@ export default class NavBar extends React.Component { diff --git a/static/src/less/style.less b/static/src/less/style.less index 343bf13..6702993 100644 --- a/static/src/less/style.less +++ b/static/src/less/style.less @@ -38,10 +38,19 @@ a.no-color-change { color: inherit; } } +img { + max-width: 100%; +} + /* @end Global */ /* @group Functional */ +.center-align { + margin-left: auto; + margin-right: auto; +} + .center-text { text-align: center; } diff --git a/templates/robotics/2014-index.html b/templates/robotics/2014-index.html index 944fd4c..f8301ac 100644 --- a/templates/robotics/2014-index.html +++ b/templates/robotics/2014-index.html @@ -6,10 +6,30 @@
- +
-

+

Welcome to the homepage of Collyer's Student Robotics 2014 team. Originally, this page was a part of the competition, but due to 3 different site rewrites, the original content and formatting has been lost.

+
+
+
+ + +
+
+
+

The Competition

+

The game for this year was called Slots. Teams compeated to get as many of their tokens into a scoring zone in 3 minutes. Teams would also get extra points if they could get the token into a zones 'slot', an area the size of a token, raised by around 3 cm.

+

To see a copy of the rules from the competition, Click Here!

+
+
+
+ Quick Links + The Code + Gallery + Blog + Competition Information +
diff --git a/templates/robotics/2015-code.md b/templates/robotics/2015-code.md new file mode 100644 index 0000000..a7c3867 --- /dev/null +++ b/templates/robotics/2015-code.md @@ -0,0 +1,21 @@ +# The Code | SR2015 + +The code used for this competition was by far the most complicated and advanced code that had ever been written by a Collyer's team. + +The main change between any other year was using an entirely co-ordinate based movement system. Any input taken in from the camera was converted to co-ordinates in terms of the arena, so we could plot our movement more accurately and allow for any immovable objects such as the internal walls. + +The addition of this coordinate system allowed us to create the killer feature of this year, the position correction code. This code allowed us to automatically correct our position after we scanned for a marker, meaning we could allow for any imperfections in the build. + +There were a lot of really great features in this years code, that made our robot function much faster: + +- Position correction +- co-ordinate based movement +- Arc movement +- Distance based movement +- _move 'til touch_ +- Camera rotation + +### So, where is this code? +Unfortunately, due to the number of features, we have decided to keep the source private, so that only other Collyer's teams may access it. A lot of blood, sweat and tears (not literally) went into writing this code, and it would be a shame if that were to be used to help any of our opponents. + +You can however see the code from our other years on our [GitHub organisation](https://github.com/SR-CLY). diff --git a/templates/robotics/2015-index.html b/templates/robotics/2015-index.html index 99945a8..06924a3 100644 --- a/templates/robotics/2015-index.html +++ b/templates/robotics/2015-index.html @@ -6,11 +6,10 @@
- +

Welcome to the homepage of Collyer's Student Robotics Team 2015 (The 'A' Team) - Creators of 'A.L.I.C.E'! Here you can see everything that goes on throughout the competition.

-

This website is here to bridge the gap between the team and the outside world, and also to document everything that we do so that parents and Blue Shirts can see what we have been getting up to! Not only is the website for this, but it's also in the competition too! There is a prize (Awarded at the competition itself), for the best online presence. Hopefully no one else that has entered has their own domain name with dedicated section for the competition!

@@ -20,17 +19,17 @@

The Competition

As was announced at kickstart, the game for this year is a take on the classic gamemode Capture the Flag. 4 teams compete over 5 flags to move as many of them as they can into their scoring zones. The person with the most flags in their scoring zone wins.

-

The flags are 25cm cubes of wood on caster wheels weighing roughly 2kg. The rules prevent us from lifting them, so the idea is to drag them around!

-

To see a copy of the rules from the competition, Click Here!

+

The 'flags' are 25cm cubes of wood on caster wheels weighing roughly 2kg. The rules prevent us from lifting them, so the idea is to drag them around!

+

To see a copy of the rules from the competition, Click Here!

Quick Links The Robot - A.L.I.C.E - The Code - Gallery - Blog - Competition Information + The Code + Gallery + Blog + Competition Information
diff --git a/templates/robotics/2015-robot.html b/templates/robotics/2015-robot.html index 8f75a90..8b82a0f 100644 --- a/templates/robotics/2015-robot.html +++ b/templates/robotics/2015-robot.html @@ -20,7 +20,7 @@ The entire chassis was made from sheets of plywood, which we laser cut in college, allowing us to be very precise in the design of the robot to make sure that all the pieces would fit together properly, making the chassis less likely to break.

- The initial design was concieved by Ben, at kickstart, and was then refined over the coming weeks by me and the rest of the building team. This was made much easier from the use of the 3d model (See Right), that ben made, which helped us visualize any changes that were to be made, as well as work out strategy by seeing the measurements we had to work with. + The initial design was concieved by Ben, at kickstart, and was then refined over the coming weeks by me and the rest of the building team. This was made much easier from the use of the 3d model, that ben made, which helped us visualize any changes that were to be made, as well as work out strategy by seeing the measurements we had to work with.

Once the build was completed, it was to a much higher design and quality than I could have ever imagined! It allowed us to forget about any shortcomings when it came to chassis, not having to compensate for weight distribution, or worry about the grip on the wheels. @@ -39,4 +39,7 @@

One idea was also suggested that we name the robot after the first sponsor we got, but as we didnt get one until after the team split, the other team took that name instead. In the end we decided to go with one that Sam initially suggested, so 'ALICE' officially stands for:

'Autonomous Logistics and Inevitable Collision Engine'

+
+ +
{% endblock %} diff --git a/templates/robotics/index.html b/templates/robotics/index.html index db07bce..ef6301a 100644 --- a/templates/robotics/index.html +++ b/templates/robotics/index.html @@ -14,16 +14,19 @@
-

Being at college for 2 years, meant I was able to enter 2 years of competitions, SR14, and SR15. We were encouraged to gain an online presence for our team, so I created a website for both years. Unfortunately due to account inactivity, and me changing my website 3 times since, The original pages have been lost, however all the content still remains. Below you can find all the content, media and information about both competitions, as well as the source code for Lucy, the 2014 entry.

+

My Entries

+

Being at college for 2 years, meant I was able to enter 2 years of competitions, SR14, and SR15. We were encouraged to gain an online presence for our team, so I created a website for both years. Unfortunately due to account inactivity, and me changing my website 3 times since, The original pages have been lost, however all the content still remains.

+ Lucy

Student Robotics 2014

-

Robot Name: Lucy

+

Robot Name: Lucy +
(No, it doesn't stand for anything)

More Info

@@ -31,9 +34,11 @@
+ A.L.I.C.E

Student Robotics 2015

-

Robot Name : A.L.I.C.E (Autonomous Logistics and Inevitable Collision Engine)

+

Robot Name : A.L.I.C.E +
(Autonomous Logistics and Inevitable Collision Engine)

More Info