fix: resolve merge conflicts in mqttClient.ts calibration function

Author: John Rogers (aider)

backend/src/mqttClient.ts

@@ -110,40 +110,35 @@ export const connectToDisplayBroker = (handler: MessageHandler, availTopic: stri
     });
 };
 
-<<<<<<< HEAD
-// Function to apply calibration offset to a message
-const applyCalibration = (message: string): string => {
-    // If no calibration string is set, return the original message
-    if (!calibrationString) {
-        return message;
+// Function to apply calibration offsets to the display text
+const applyCalibration = (text: string): string => {
+    const calibrationString = process.env.CALIBRATION_STRING;
+    
+    // If no calibration string is provided, return the original text
+    if (!calibrationString || calibrationString.trim() === '') {
+        return text;
     }
-
-    return message.split('').map((char, position) => {
-        // If character isn't in the flap sequence, return it unchanged
-        if (!FLAP_SEQUENCE.includes(char)) {
+    
+    // Parse the calibration string into an array of offsets
+    const offsets = calibrationString.split(',').map(offset => parseInt(offset.trim(), 10));
+    
+    // Apply the offsets to each character
+    return text.split('').map((char, index) => {
+        // If we don't have an offset for this position, don't change it
+        if (index >= offsets.length || isNaN(offsets[index])) {
             return char;
         }
 
-        // Get the calibration character for this position in the display
-        // If calibration string is shorter than message, wrap around
-        const calibrationChar = calibrationString[position % calibrationString.length];
-        
-        // If calibration character isn't in the flap sequence, return original
-        if (!FLAP_SEQUENCE.includes(calibrationChar)) {
-            return char;
+        // Find the character in the character set
+        const charIndex = SPLIT_FLAP_CHARSET.indexOf(char);
+        if (charIndex === -1) {
+            return char; // Character not in set, return unchanged
         }
 
-        // Find the positions in the flap sequence
-        const targetIndex = FLAP_SEQUENCE.indexOf(char);
-        const calibrationIndex = FLAP_SEQUENCE.indexOf(calibrationChar);
-        
-        // Calculate the offset:
-        // If the module shows 'A' when at home position (calibrationChar = 'A'),
-        // and we want to show 'C', we need to find what character is actually
-        // at position 'C' - 'A' steps in the sequence
-        const offset = (targetIndex - calibrationIndex + FLAP_SEQUENCE.length) % FLAP_SEQUENCE.length;
-        
-        return FLAP_SEQUENCE[offset];
+        // Apply the offset and wrap around the character set
+        const newIndex = (charIndex + offsets[index] + SPLIT_FLAP_CHARSET.length) % SPLIT_FLAP_CHARSET.length;
+        return SPLIT_FLAP_CHARSET[newIndex];
+>>>>>>> main
 =======
 // Function to apply calibration offsets to the display text
 const applyCalibration = (text: string): string => {
@@ -190,16 +185,11 @@ export const publishToDisplay = (message: string): boolean => {
 >>>>>>> main
     const calibratedMessage = applyCalibration(message);
 
-    client.publish(publishTopic, calibratedMessage, { qos: 0, retain: false }, (err) => {
-        if (err) {
-            console.error(`[MQTT Client] Failed to publish message to topic "${publishTopic}":`, err);
-        } else {
-<<<<<<< HEAD
-            if (calibrationString && calibratedMessage !== message) {
-                console.log(`[MQTT Client] Published "${message}" (calibrated to "${calibratedMessage}") to ${publishTopic}`);
-            } else {
-                console.log(`[MQTT Client] Published "${message}" to ${publishTopic}`);
-            }
+             console.log(`[MQTT Client] Published "${message}" to ${publishTopic}`);
+             if (message !== calibratedMessage) {
+                 console.log(`[MQTT Client] Calibrated message: "${calibratedMessage}"`);
+             }
+>>>>>>> main
 =======
              console.log(`[MQTT Client] Published "${message}" to ${publishTopic}`);
              if (message !== calibratedMessage) {