Hardened expressions so they emit an error in the log when an exception occurs. Added reverse bias for ADC processing on ADS1x15

Author: rstrouse

boards/Controller.ts

@@ -924,8 +924,14 @@ export class Feed {
     constructor(feed: DeviceFeed) {
         this.server = connBroker.findServer(feed.connectionId);
         this.feed = feed;
-        if (typeof feed.payloadExpression !== 'undefined' && feed.payloadExpression.length > 0)
-            this.translatePayload = new Function('feed', 'value', feed.payloadExpression);
+        if (typeof feed.payloadExpression !== 'undefined' && feed.payloadExpression.length > 0) {
+            try {
+                this.translatePayload = new Function('feed', 'value', feed.payloadExpression);
+            } catch (err) {
+                logger.error(`Script error processing payload expression ${err.message}:\n`);
+                console.log(feed.payloadExpression);
+            }
+        }
     }
     public async send(dev: any) {
         try {

gpio/Gpio-Controller.ts

@@ -33,9 +33,9 @@ export class GpioController {
             return this;
         } catch (err) { logger.error(`Error stopping GPIO controller :${err.message}`); }
     }
-    public reset() {
-        this.stopAsync();
-        this.init();
+    public async reset() {
+        await this.stopAsync();
+        await this.init();
     }
     private translateState(direction: string, state: string) {
         switch (state) {

i2c-bus/ads1x15.ts

@@ -314,7 +314,7 @@ export class ads1x15 extends i2cDeviceBase {
                     // 65355 = max
                     // 4.096 = pga
                     // 21,265 / 32,767 * 4.096
-                    let voltage = this.getVoltageFromValue(value, channels[i].pga);
+                    let voltage = this.getVoltageFromValue(value, channels[i].pga, channels[i].reverseBias);
                     let valElem = this.device.values.channels.find(elem => { return elem.id === channels[i].id });
                     if (typeof valElem !== 'undefined') {
                         valElem.value = value;
@@ -367,12 +367,13 @@ export class ads1x15 extends i2cDeviceBase {
         //    return value;
         //}
     }
-    private getVoltageFromValue(value, pga) {
+    private getVoltageFromValue(value, pga, reverseBias) {
         let max = ads1x15.thresholdValues[this.device.options.adcType];
         // positive values must be 1 less than max range value (e.g. full scale of 12 bit ADC => 2^(12-1)-1 => -2048 to 2047)
         max = value > 0 ? max - 1 : max;
         logger.silly(`${this.options.name} Convert Voltage ${value} / ${max} * ${pga} = ${value / max * pga}`);
-        return value / max * pga; // value / mx = % of scale, scale * pga = Volts
+        let volts = value / max * pga; // value / mx = % of scale, scale * pga = Volts
+        return reverseBias ? pga - volts : volts;
     }
 
     public async setOptions(opts): Promise<any> {

pages/widgets.js

@@ -4099,6 +4099,7 @@ $.ui.position.fieldTip = {
                 inputAttrs: { style: { width: "5rem" } }
             })
             line = $('<div></div>').appendTo(dlg);
+            $('<div></div>').appendTo(dlg).checkbox({ labelText: 'Reverse Bias', binding: 'reverseBias' });
             dataBinder.bind(dlg, channel);
             dlg.css({ overflow: 'visible' });
         },