Skip to content

Commit 53fdb4a

Browse files
committed
Añade ajustes al main_module
1 parent ac209be commit 53fdb4a

File tree

2 files changed

+18
-11
lines changed

2 files changed

+18
-11
lines changed

source_code/main_module/src/stopwatch.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ void stopwatch_lap() {
3535
if (lap_ms < 1000) {
3636
return;
3737
}
38+
web_lap();
3839
lap_number++;
3940
update_last_laps = true;
4041
start_ms = millis();
@@ -51,7 +52,6 @@ void stopwatch_lap() {
5152
last_laps_number[0] = lap_number;
5253
last_lap_ms = lap_ms;
5354
}
54-
web_lap();
5555
}
5656

5757
void stopwatch_reset() {

source_code/main_module/src/web.cpp

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ const char index_html[] PROGMEM = R"rawliteral(
8686
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js" integrity="sha384-YvpcrYf0tY3lHB60NNkmXc5s9fDVZLESaAA55NDzOxhy9GkcIdslK1eN7N6jIeHz" crossorigin="anonymous"></script>
8787
<script>
8888
89-
let timer;
89+
let timer = undefined;
9090
let startTime = 0;
9191
9292
let lapCounter = 0;
@@ -215,22 +215,28 @@ const char index_html[] PROGMEM = R"rawliteral(
215215
}
216216
217217
var start = function () {
218-
reset();
218+
console.log('start');
219+
stop();
219220
startTime = Date.now();
220221
timer = setInterval(__handleTimer, 8);
221-
__clearLapRows();
222+
// __clearLapRows();
222223
// setTimeout(stop, 5000);
223224
}
224225
225226
var stop = function () {
226-
clearInterval(timer);
227+
console.log('stop');
228+
if(timer != undefined){
229+
clearInterval(timer);
230+
timer = undefined;
231+
}
227232
startTime = 0;
228233
lastLapTime = 0;
229234
bestLapTime = 0;
230235
document.getElementById('currentTimer').innerText = '00:00.000';
231236
}
232237
233238
var lap = function () {
239+
console.log('lap');
234240
if (startTime == 0) {
235241
start();
236242
return;
@@ -244,6 +250,7 @@ const char index_html[] PROGMEM = R"rawliteral(
244250
}
245251
246252
var reset = function () {
253+
console.log('reset');
247254
stop();
248255
__clearLapRows();
249256
lapCounter = 0;
@@ -328,17 +335,17 @@ bool web_setup() {
328335
}
329336

330337
void web_start() {
331-
// if (millis() > last_event_ms + 1000) {
332-
events.send("start", "start", millis());
333-
last_event_ms = millis();
334-
// }
338+
if (millis() > last_event_ms + 1000) {
339+
events.send("start", "start", millis());
340+
last_event_ms = millis();
341+
}
335342
}
336343

337344
void web_stop() {
338-
if (millis() > last_event_ms + 1000) {
345+
// if (millis() > last_event_ms + 1000) {
339346
events.send("stop", "stop", millis());
340347
last_event_ms = millis();
341-
}
348+
// }
342349
}
343350

344351
void web_lap() {

0 commit comments

Comments
 (0)