Fix merge issues

js/core.js

@@ -1013,6 +1013,7 @@ window.show_faq_modal = show_faq_modal;
 window.show_info_tab = show_info_tab;
 window.calibrate_range = () => calibrate_range(
   controller,
+  { ll_data, rr_data },
   (success, message) => {
     if (success) {
       resetStickDiagrams();

js/modals/calib-range-modal.js

@@ -11,11 +11,9 @@ const SECONDS_UNTIL_UNLOCK = 15;
  * Handles stick range calibration
  */
 export class CalibRangeModal {
-  constructor(controllerInstance, { resetStickDiagrams, successAlert, ll_data, rr_data }, doneCallback = null) {
+  constructor(controllerInstance, { ll_data, rr_data }, doneCallback = null) {
     // Dependencies
     this.controller = controllerInstance;
-    this.resetStickDiagrams = resetStickDiagrams;
-    this.successAlert = successAlert;
     this.ll_data = ll_data;
     this.rr_data = rr_data;
 
@@ -51,7 +49,9 @@ export class CalibRangeModal {
       .toggleClass('btn-primary', false)
       .toggleClass('btn-outline-primary', true);
     bootstrap.Modal.getOrCreateInstance('#rangeModal').show();
-    this.resetStickDiagrams();
+
+    this.ll_data.fill(0);
+    this.rr_data.fill(0);
 
     this.updateProgress();  // reset progress bar
     this.startProgressMonitoring();
@@ -66,7 +66,6 @@ export class CalibRangeModal {
   async onClose() {
     this.stopProgressMonitoring();
     this.stopCountdown();
-    this.resetStickDiagrams();
 
     bootstrap.Modal.getOrCreateInstance('#rangeModal').hide();
 

js/modals/finetune-modal.js

@@ -1333,8 +1333,8 @@ async function finetune_quick_calibrate_range() {
   // Hide the finetune modal
   currentFinetuneInstance.setQuickCalibrating(true);
 
-  const { controller } = currentFinetuneInstance;
-  await calibrate_range(controller, (success, message) => {
+  const { controller, ll_data, rr_data } = currentFinetuneInstance;
+  await calibrate_range(controller, { ll_data, rr_data }, (success, message) => {
     currentFinetuneInstance.setQuickCalibrating(false);
   });
 }