Merge pull request #66 from DIT112-V21/remove-unnecessary

Minor code refactoring

Author: TaofikArnouk

arduino/smartcar/smartcar.ino

@@ -17,10 +17,6 @@ BrushedMotor leftMotor(arduinoRuntime, smartcarlib::pins::v2::leftMotorPins);
 BrushedMotor rightMotor(arduinoRuntime, smartcarlib::pins::v2::rightMotorPins);
 DifferentialControl control(leftMotor, rightMotor);
 
-const int TRIGGER_PIN = 6; 
-const int ECHO_PIN = 7; 
-const unsigned int MAX_DISTANCE = 200;
-const int FRONT_PIN = 0;
 const auto oneSecond = 1000UL;
 const int GYROSCOPE_OFFSET = 37;
 const auto pulsesPerMeter = 400;
@@ -38,9 +34,6 @@ DirectionlessOdometer rightOdometer{
     pulsesPerMeter};
 
 GY50 gyro(arduinoRuntime, GYROSCOPE_OFFSET);
-SR04 frontUS(arduinoRuntime, TRIGGER_PIN, ECHO_PIN, MAX_DISTANCE);
-GP2Y0A21 frontIR(arduinoRuntime, FRONT_PIN); 
-
 
 SmartCar car(arduinoRuntime, control, gyro, leftOdometer, rightOdometer);
 
@@ -76,14 +69,13 @@ void loop() {
     if (currentTime - previousFrame >= 65) {
       previousFrame = currentTime;
       Camera.readFrame(frameBuffer.data());
-      mqtt.publish("/smartcar/sensors/camera", frameBuffer.data());
+      int bufferSize = (int) frameBuffer.size();
+      mqtt.publish("/smartcar/sensors/camera", frameBuffer.data(), bufferSize);
     }
 #endif
     static auto previousTransmission = 0;
     if (currentTime - previousTransmission >= oneSecond) {
       previousTransmission = currentTime;
-      mqtt.publish("/smartcar/sensors/ultra", String(frontUS.getDistance()));
-      mqtt.publish("/smartcar/sensors/infra", String(frontIR.getDistance()));
       gyro.update();
       mqtt.publish("/smartcar/sensors/gyro", String(car.getHeading()));
       mqtt.publish("/smartcar/sensors/distance", String(car.getDistance()));
@@ -93,4 +85,4 @@ void loop() {
 #ifdef __SMCE__
   delay(10);
 #endif
-}
+}

front_end/Credits.html

@@ -49,8 +49,8 @@ <h2 id="text-credits">Credits</h2>
   </div>
   </body>
 
-  <audio id="backgroundMusic" loop>
-    <source src="audio\music\elevatorbossnova.mp3" type="audio/mpeg">
+  <audio id="backgroundMusic" loop autoplay>
+    <source src="audio\music\SanAndreasTheme.mp3" type="audio/mpeg">
     Your browser does not support the music element.
   </audio>
 

front_end/audio/music/SanAndreasTheme.mp3

@@ -35,7 +35,7 @@
 
         <p class="status" id="charge">Charge: 100%</p>
         <br><br><br><br><br>
-        <canvas id="other-camera" width="640", height="480"></canvas>
+        <canvas id="other-camera" width="640" height="480"></canvas>
         <button id="ai-Button" type="button">Switch View</button>
       </div>
 

front_end/connect-to-car.html

@@ -30,9 +30,17 @@ <h1 id="app-name">Welcome to the virtual car app <br> Codename: Darkness
   </body>
 
   <script>
-    window.onload = sessionStorage.setItem("audioVolume", 0.25);
-    window.onload = sessionStorage.setItem("audioLength", 1);
-    window.onload = sessionStorage.setItem("musicOn", "unmuted");
+    // localStorage.setItem("firstAppInit", 1) // 0=false, 1=true
+    window.onload = function setInitialValues() {
+      sessionStorage.setItem("audioLength", 1);
+    if (localStorage.getItem("firstAppInit") == null) {
+      localStorage.setItem("audioVolume", 0.25);
+      localStorage.setItem("musicOn", "unmuted");
+      // App has been launced for the first time
+      localStorage.setItem("firstAppInit", 0);
+    }
+  }
+
   </script>
 
 </html>

front_end/index.html

@@ -3,19 +3,19 @@ var output = document.getElementById("demo");
 
 try {
   var slider = document.getElementById("volume");
-  slider.value = sessionStorage.getItem("audioVolume") * 100;
+  slider.value = localStorage.getItem("audioVolume") * 100;
   slider.oninput = function () {
     let percentageVolume = this.value / 100;
     tune.volume = percentageVolume;
-    sessionStorage.setItem("audioVolume", percentageVolume);
+    localStorage.setItem("audioVolume", percentageVolume);
   }
 } catch (e) { }
 
 function musicStart() {
-  tune.currentTime = sessionStorage.getItem("audioLengthSettings");
-  tune.volume = sessionStorage.getItem("audioVolume");
-  if (sessionStorage.getItem("musicOn") == "muted") {
-    tune.autoplay = 0
+  tune.currentTime = sessionStorage.getItem("audioLength");
+  tune.volume = localStorage.getItem("audioVolume");
+  if (localStorage.getItem("musicOn") == "muted") {
+    tune.autoplay = 0;
     try {
       let muteCheckbox = document.getElementById("music-toggle");
       muteCheckbox.checked = true;
@@ -24,17 +24,17 @@ function musicStart() {
 }
 
 window.onbeforeunload = function musicUpdate() {
-  sessionStorage.setItem("audioLengthSettings", tune.currentTime);
+  sessionStorage.setItem("audioLength", tune.currentTime);
 }
 
 function musicControl() {
   clickSound();
   let muteCheckbox = document.getElementById("music-toggle");
   if (muteCheckbox.checked) {
-    sessionStorage.setItem("musicOn", "muted");
+    localStorage.setItem("musicOn", "muted");
     tune.pause();
   } else {
-    sessionStorage.setItem("musicOn", "unmuted");
+    localStorage.setItem("musicOn", "unmuted");
     tune.play();
   }
 }

front_end/scripts/music.js

@@ -4,7 +4,7 @@ function styleStart() {
   dynamicClasses = document.querySelectorAll('[class^=dynamic]')
   dynamicClasses.forEach(element => {
     var relevantClass = element.className;
-    if (sessionStorage.getItem("styleSetting") == "darkmode") {
+    if (localStorage.getItem("styleSetting") == "darkmode") {
       relevantClass = element.className + "-dark";
       try {
         darkmodeCheckbox.checked = true;
@@ -24,10 +24,10 @@ function swapStyleSheet(sheet) {
 function styleControl() {
   clickSound();
   if (darkmodeCheckbox.checked) {
-    sessionStorage.setItem("styleSetting", "darkmode");
+    localStorage.setItem("styleSetting", "darkmode");
     styleStart();
   } else {
-    sessionStorage.setItem("styleSetting", "lightmode");
+    localStorage.setItem("styleSetting", "lightmode");
     styleStart();
   }
 }

front_end/scripts/styleToggling.js

@@ -0,0 +1 @@
+