diff --git a/html/config.html b/html/config.html index 3f3894b12279cbea689be0a53c6f16710424acf8..102ebd5e8728b15a9f74686f257fcb9ca7f50686 100644 --- a/html/config.html +++ b/html/config.html @@ -20,14 +20,14 @@ document.title="ADC GUI Config"; // //TODO: other way? -// var pwd="0"; -// var input=""; -// do -// { -// input = prompt("Enter password", ""); -// } -// while (input!=pwd); -// // + var msp="0"; + var input=""; + do + { + input = prompt("Enter password", ""); + } + while (input!=msp); + // var ip; ip = document.domain; diff --git a/html/jury.html b/html/jury.html index e07beb8fd86705791ce3ae10bdefe024f7c6eca0..cc9264b6dade203552be0010db0045fef2691c7f 100644 --- a/html/jury.html +++ b/html/jury.html @@ -27,14 +27,14 @@ document.title="ADC GUI Jury"; // //TODO: other way? -// var pwd="0"; -// var input=""; -// do -// { -// input = prompt("Enter password", ""); -// } -// while (input!=pwd); -// // + var msp="0"; + var input=""; + do + { + input = prompt("Enter password", ""); + } + while (input!=msp); + // var ip; ip = document.domain; @@ -103,25 +103,25 @@ var set_semaphore1_service_client = new ROSLIB.Service({ ros : ros, - name : '/jury/set_semaphore1', + name : '/jury/semaphore1/set_color', serviceType : 'iri_adc_msgs/set_semaphore' }); var set_semaphore2_service_client = new ROSLIB.Service({ ros : ros, - name : '/jury/set_semaphore2', + name : '/jury/semaphore2/set_color', serviceType : 'iri_adc_msgs/set_semaphore' }); var set_semaphore3_service_client = new ROSLIB.Service({ ros : ros, - name : '/jury/set_semaphore3', + name : '/jury/semaphore3/set_color', serviceType : 'iri_adc_msgs/set_semaphore' }); var set_semaphore4_service_client = new ROSLIB.Service({ ros : ros, - name : '/jury/set_semaphore4', + name : '/jury/semaphore4/set_color', serviceType : 'iri_adc_msgs/set_semaphore' }); @@ -131,21 +131,21 @@ var set_building1_service_client = new ROSLIB.Service({ ros : ros, - name : '/jury/hospital_light', + name : '/jury/set_hospital_light', serviceType : 'std_srvs/SetBool' }); var set_building2_service_client = new ROSLIB.Service({ ros : ros, - name : '/jury/seat_home_light', + name : '/jury/set_seat_home_light', serviceType : 'std_srvs/SetBool' }); var set_building3_service_client = new ROSLIB.Service({ ros : ros, - name : '/jury/school_light', + name : '/jury/set_school_light', serviceType : 'std_srvs/SetBool' }); @@ -926,11 +926,11 @@ <div class="row"> <div style="width: 40%"> <label style="width: 80px">Team</label> - <input type="number" id="team_input" min="0" max="4" step="1" style="width: 2em" value="1" onchange="update_team()"> + <input type="number" id="team_input" min="0" max="4" step="1" style="width: 3em" value="1" onchange="update_team()"> <span id="team_name">teamname1</span> <br> <label style="width: 80px">Challenge</label> - <input type="number" id="challenge_input" min="0" max="4" step="1" style="width: 2em" value="1" onchange="update_challenge()"> + <input type="number" id="challenge_input" min="0" max="4" step="1" style="width: 3em" value="1" onchange="update_challenge()"> <!-- <select id="challenge_input2" name="challenge_input2"> <option value="0">0</option> @@ -946,7 +946,7 @@ <div style="width: 60%"> SLOT TIME - <input type="number" id="slot_time_input" min="0" max="60" step="1" style="width: 2.5em" value="12" onchange="show_time()"> + <input type="number" id="slot_time_input" min="0" max="60" step="1" style="width: 3.5em" value="12" onchange="show_time()"> <button class="btn btn-success" id ="slot_time_button" style="width:25%; height: 50px" onclick = "this.blur();slot_time_start_stop()">START</button> <button class="btn btn-danger" id ="slot_time_reset_button" style="width:25%; height: 50px" onclick = "this.blur();slot_time_reset()">RESET</button> <!--<span id="slot_timer_output" style="width: 35%" >00:00</span>--> diff --git a/html/penalizations.html b/html/penalizations.html index 51554cb5d0f3aa0de3bc6788f0c12e5c1a356dbb..69fe3973cd0a423502f1126d0e2f6a26e1cecdf5 100644 --- a/html/penalizations.html +++ b/html/penalizations.html @@ -21,6 +21,17 @@ <script> document.title="ADC GUI Penalizations"; + //TODO: other way? + var msp="0"; + var input=""; + do + { + input = prompt("Enter password", ""); + } + while (input!=msp); + // + + var ip; ip = document.domain; //ip = window.location.hostname