From 23b67e490dc0192882a4c8af6d3e4d96afff606a Mon Sep 17 00:00:00 2001 From: Marvin Martinson Date: Fri, 2 Nov 2018 12:50:15 +0200 Subject: [PATCH] Changes for new robot --- assets/js/blockly.js | 3 ++- assets/js/main.js | 2 ++ assets/js/sumorobot.js | 1 + index.html | 17 +++++++++-------- 4 files changed, 14 insertions(+), 9 deletions(-) diff --git a/assets/js/blockly.js b/assets/js/blockly.js index 2a14b72..3f8eb50 100755 --- a/assets/js/blockly.js +++ b/assets/js/blockly.js @@ -120,7 +120,8 @@ window.addEventListener('load', function() { init: function() { var OPERATORS = [ ['line left', 'LEFT'], - ['line right', 'RIGHT'] + ['line right', 'RIGHT'], + ['line middle', 'MIDDLE'] ]; this.setColour('#E6BF00'); var dropdown = new Blockly.FieldDropdown(OPERATORS); diff --git a/assets/js/main.js b/assets/js/main.js index a0a9da7..0cb8f08 100755 --- a/assets/js/main.js +++ b/assets/js/main.js @@ -137,6 +137,8 @@ window.addEventListener('load', function() { foundTrue = (sumorobot.sensors['line_left'] > 2000); } else if (/RIGHT/.test(code)) { foundTrue = (sumorobot.sensors['line_right'] > 2000); + } else if (/MIDDLE/.test(code)) { + foundTrue = (sumorobot.sensors['line_middle'] > 2000); } else { foundTrue = true; } diff --git a/assets/js/sumorobot.js b/assets/js/sumorobot.js index 7c9a9fb..e722d4a 100755 --- a/assets/js/sumorobot.js +++ b/assets/js/sumorobot.js @@ -16,6 +16,7 @@ var Sumorobot = function(wsUri, robotId) { this.sensors = { 'opponent': 99, 'line_left': 0, + 'line_middle': 0, 'line_right': 0, 'battery_voltage': 0 }; diff --git a/index.html b/index.html index 28be1c0..0f52958 100755 --- a/index.html +++ b/index.html @@ -33,15 +33,16 @@
- -
-
- SumoID +
+
+
+ SumoID +
+ +
+
+ GO!
- -
-
- GO!