Merge pull request #67 from Universite-Gustave-Eiffel/pixljs_update

Change to less painful tones
Universite-Gustave-Eiffel · Sep 23, 2024 · 68387bd · 68387bd
2 parents 9a61b2b + 611ec91
commit 68387bd
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/services/pixljs_alert/pixljs_ble.js b/services/pixljs_alert/pixljs_ble.js
@@ -1,5 +1,5 @@
 // force timezone to UTC+0200
-const CODE_VERSION=5;
+const CODE_VERSION=6;
 E.setTimeZone(2);
 const BUZZING_TIME = 60000; // buzzer time ms
 const RESET_NO_ANSWER = 60000;
@@ -38,7 +38,7 @@ var formStack = [];
 var question_index = 0;
 var answer_index = 0;
 Bluetooth.setConsole(1);
-const tone_times = atob("ZHJkcmRyZHJkcmRyZHJkcmQqZCpkKmRyZHJkKmQqZCpkcmRyZHJkcmRyZHJkKmQqZCpkcmRyZCpkKmQqZHJkcmQqZCpkKmRyZHJkcmRyZHJkcmRyZHJkcmRyZCpkKmQqZHJkcmQqZCpkKmRyZHJkcmRyZHJkcmQqZCpkKmRyZHJkKmQqZCpkcmRyZCpkKmQqZHJkcg==");
+const tone_times = [300,200,300,4000];
 var current_note = 0;
 const bitmap_font = E.toString(atob('AAAAH0AGAAGAACI/iI/iIABkSX/SRMAGMyAgJmMADYkjUBAUAGAAB4QkCAECQh4AFAQFAAAgOAgAAGAAgEAgAAEAAMCAgIGAAD4gkkgj4AEEgn8AgEACEhkUkjEACIgkkkjYAAwKCQ/gQAHokkkkkYAD4kkkkiYAEEhEQkHAADYkkkkjYADIkkkkj4ABEABGAAgKCIABQKBQACIKAgACAgEUkDAAH8glkknkAA8aEQaA8AH8kkkkjYAD4gkEgiIAH8gkERBwAH8kkkkkEAH8kEgkEAAD4gkkkg8AH8EAgEH8AEE/kEAAYAgE/AA/ggKCIggA/gEAgEAgA/iAIAgICA/gA/kAYAwBH8AD4gkEgj4AH8kEgkDAAD4gkUhD0AH8kEwlDEADIkkkkiYAEAgH8gEAAH4AgEAn4AHAGAMGHAAHwBgwYAwBnwAGMKAgKGMAHAEA8EHAAEMikkomEAH+gUCAGAIAgCAMAECgX+ABAQEAQBAAACAQCAAAgCAAAAAA4IhEFB8AH8FBEIg4AA4IhEIhEAA4IhEFH8AA4KhUKg0ABA/lAAA4IpFFJ+AH8EBAIA8AF8AAEAQCvgA/gQFBEAH8AB8IBAHhAIA8AB8EBAIA8AA4IhEIg4AB/FBEIg4AA4IhEFB/AB8CAgIAAEhUKhUJAAIH8IgAPAEAgEPAAOAIAgIOAAPAEBAwBAEPAAIgoCAoIgAMIZAwYMAAJhUKhUMgAGD8gUCAH+AECgT8GAAEBAEAQEAAAAAAAAAAAXwAHBEfxEIgAEj8kkEQgARBwKBwRAAlCoPiolAA5wAaUplMpSwAAAAAAAAAAfEEulUqkEfAAEFQqFQeAACAoKgoIgAEAgHAAfEEulkikEfAAAAAAAAAAAYEgkDAAAkOgkAEQmFQSAQAEQqFQqCgAAAACAgAAAB/AgEAh4ADA8H+gH+AAgAAAAICAAAAEQiHwCAQADgiEQiDgABEFBUFAQAFQ6BWCQXAFQ6BUC4RAFQ6HWCQXAAMCSiAQEAAPmjEGgPAAPGjEmgPAAPWlEWgPAAPWlEWkPAA8aEQaA8AAPWlEWgPAD8kEgfkkkgAfEFg0ERAAP9JZJJIIAP5JZNJIIAP7JpLJIIA/kkkkkggAoL/IIAIL/oIAYN/YIAgn8ggA/kkgiIOAAP7AmCMgR/AA+oLBII+AA+ILBoI+AA+YNBYI+AA+YNBYM+AD4gkEgj4ACIKAgKCIAD4ikkoj4AB+gKBAJ+AB+AKBgJ+AB+QMBQJ+AH4AgEAn4ABwBCPhBwAH8RCIRBwAD8gEkagIAAckSiCg+AAcESiig+AAcUUiSg+AAcUUiSk+AA4ohElB8AAcUViSg+AA4IhEPhUKgkAA4IpGIhEAAclSqFQaAAcFSqlQaAAcVUqVQaAA4qhUqg0AF8AC+gCAnyAAB8gAcEUiUV8AA+SEgUEeAAckSiEQcAAcESikQcAAcUUiUQcAAcUUiUUcAA4ohEog4AAgVAgAA4JhUMg4AA8gSCAQ8AA8ASCgQ8AA8QUCQQ8AB4ggEgh4AAwBiDhgwAH+FBEIg4ABhjIGjBgAA=='));
 const police_heights = E.toString(atob("AwIEBgYGBgIEBAQEAgQCBgYGBgYGBgYGBgYCAgQEBAYGBgYGBgYGBgYEBQYGCAcGBgYGBgYGBggGBgYEBgQGBAYGBgYGBgQGBgIFBQIIBgYGBgUGBAYGCAYGBgUCBQYAAAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAgYGBgYCBgYIBgYEAAgGBQQGBgYGBgIGBgYGBgYGBgYGBgYGBgcGBgYGBgQEBAQGBwYGBgYGBgYGBgYGBgYGBgYGBgYGCAYGBgYGAgIEAgYGBgYGBgYEBgYGBgYGBgY="));
@@ -268,12 +268,12 @@ function playTones() {
   } else {
     digitalWrite(PIN_BUZZER, 1);
   }
-  current_note += 1;
   if (buzzerEnabled) {
-    setTimeout(playTones, tone_times.charCodeAt(current_note % tone_times.length));
+    setTimeout(playTones, tone_times[current_note % tone_times.length]);
   } else {
     digitalWrite(PIN_BUZZER, 0);
   }
+  current_note += 1;
 }
 
 function stopAlarm() {