Formatting

ioBroker · Aug 28, 2024 · c4530ea · c4530ea
1 parent 287c0e4
commit c4530ea
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 16 deletions.
diff --git a/lib/master.js b/lib/master.js
@@ -211,7 +211,7 @@ function Master(options, adapter) {
                     showDebug && adapter.log.debug(`[DevID_${regs.deviceId}/${regType}] Poll address ${regBlock.start} DONE`);
                     if (response.payload && response.payload.length) {
 
-                        // first process all the scalefactor values inside the block
+                        // first process all the scale factor values inside the block
                         for (let n = regBlock.startIndex; n < regBlock.endIndex; n++) {
                             if (regs.config[n].isScale) {
                                 const prefixAddr = `DevID_${device.coils.deviceId}/${regType}/${regs.config[n]._address}`;
@@ -235,11 +235,10 @@ function Master(options, adapter) {
                                         } catch (e) {
                                             adapter.log.warn(`[${prefixAddr}] Calculation: eval(${regs.config[n].formula}) not possible: ${e}`);
                                         }
-                                    } else { // no formula used, so just scale with factor and offset
-                                        if (typeof val === 'number') {
-                                            val = val * regs.config[n].factor + regs.config[n].offset;
-                                            val = Math.round(val * options.config.round) / options.config.round;
-                                        }
+                                    } else if (typeof val === 'number') {
+                                        // no formula used, so just scale with factor and offset
+                                        val = val * regs.config[n].factor + regs.config[n].offset;
+                                        val = Math.round(val * options.config.round) / options.config.round;
                                     }
                                     // store the finally calculated value as scaleFactor
                                     scaleFactors[regs.deviceId][regs.config[n]._address] = val;
@@ -302,18 +301,16 @@ function Master(options, adapter) {
                                     } catch (e) {
                                         adapter.log.warn(`[DevID_${device.coils.deviceId}/${regType}/${regs.config[n]._address}] Calculation: eval(${regs.config[n].formula}) not possible: ${e}`);
                                     }
-                                } else {
-                                    if (typeof val === 'number') {
-                                        val = val * regs.config[n].factor + regs.config[n].offset;
-                                        val = Math.round(val * options.config.round) / options.config.round;
-                                    }
+                                } else if (typeof val === 'number') {
+                                    val = val * regs.config[n].factor + regs.config[n].offset;
+                                    val = Math.round(val * options.config.round) / options.config.round;
                                 }
 
                                 if (val !== null &&
                                     (options.config.alwaysUpdate || ackObjects[id] === undefined || ackObjects[id].val !== val)) {
                                     ackObjects[id] = { val };
                                     adapter.setState(id, val, true, err =>
-                                        // analyse if the state could be set (because of permissions)
+                                        // analyze if the state could be set (because of permissions)
                                         err && adapter.log.error(`Can not set state ${id}: ${err}`));
                                 }
                             } catch (err) {

diff --git a/main.js b/main.js
@@ -747,18 +747,18 @@ function iterateAddresses(isBools, deviceId, result, regName, regType, localOpti
         if (config.length) {
             result.length = result.addressHigh - result.addressLow;
             if (isBools && !localOptions.doNotRoundAddressToWord) {
-                let oldstart = result.addressLow;
+                const oldStart = result.addressLow;
                 result.addressLow = (result.addressLow >> 4) << 4;
-                result.length += (oldstart - result.addressLow);
+                result.length += oldStart - result.addressLow;
 
                 if (result.length % 16) {
                     result.length = ((result.length >> 4) + 1) << 4;
                 }
                 if (result.blocks) {
                     for (let b = 0; b < result.blocks.length; b++) {
-                        let oldstart = result.blocks[b].start;
+                        const _oldStart = result.blocks[b].start;
                         result.blocks[b].start = (result.blocks[b].start >> 4) << 4;
-                        result.blocks[b].count += (oldstart - result.blocks[b].count);
+                        result.blocks[b].count += _oldStart - result.blocks[b].count;
 
                         if (result.blocks[b].count % 16) {
                             result.blocks[b].count = ((result.blocks[b].count >> 4) + 1) << 4;