From cfa45aa09bfcc83ff4e114fe703e6e19038c39ac Mon Sep 17 00:00:00 2001
From: Sylvain Mariel <sylvain.mariel@otmax.fr>
Date: Sat, 11 Jan 2020 17:52:29 +0100
Subject: [PATCH] Input Voltage Limit (#72)

---
 html/itemEditor.html    | 52 ++++++++++++++++++++++++++---------------
 js/class.Item.Source.js | 20 ++++++++++++----
 main.js                 |  9 +++++--
 3 files changed, 56 insertions(+), 25 deletions(-)

diff --git a/html/itemEditor.html b/html/itemEditor.html
index ea4e253..1b948ef 100644
--- a/html/itemEditor.html
+++ b/html/itemEditor.html
@@ -106,14 +106,6 @@ <h3>Characteristics</h3>
           <div class="col-xs-4 mintypmax"><label for="input_vout_max">V<sub>OUT MAX</sub></label><input id="input_vout_max" type="text" data-itemdata="vout_max" class="form-control input_vout input_num item-control" placeholder="max (V)" data-toggle="tooltip" data-placement="bottom" title="Maximum output voltage (V)" /></div>
         </div>
 
-        <!-- OUTOUT CURRENT LIMIT -->
-        <div class="form-group row">
-          <div class="col-xs-12">
-            <label for="source_ilimit">Output current limit (absolute value)</label>
-            <input id="source_ilimit" type="text" data-itemdata="iout_limit" class="form-control input_num" placeholder="xx A (0 = no limit)" data-toggle="tooltip" data-placement="bottom" title="Output current limit (0 = no limit)"/>
-          </div>
-        </div>
-
         <!-- DC/DC EFFICIENCY -->
         <div class="form-group source_dcdc">
           <label>Efficiency</label>
@@ -131,17 +123,6 @@ <h3>Characteristics</h3>
           <div class="col-xs-4 mintypmax"><label>I<sub>Q TYP</sub></label><input id="input_iq_typ" type="text" data-itemdata="iq_typ" class="form-control input_iq input_num item-control" placeholder="typ (V)" data-toggle="tooltip" data-placement="bottom" title="Typical quiescent current (A)" /></div>
           <div class="col-xs-4 mintypmax"><label>I<sub>Q MAX</sub></label><input id="input_iq_max" type="text" data-itemdata="iq_max" class="form-control input_iq input_num item-control" placeholder="max (V)" data-toggle="tooltip" data-placement="bottom" title="Maximum quiescent current (A)" /></div>
         </div>
-
-        <!-- LDO DROPOUT -->
-        <div class="form-group source_ldo">
-          <label>Dropout voltage</label>
-          <div class="row">
-            <div class="col-xs-5 dropout"><input id="input_drop_i" type="text" class="form-control input_num" placeholder="xx A" data-toggle="tooltip" data-placement="bottom" title="Output current (A)" /></div>
-            <div class="col-xs-5 dropout"><input id="input_drop_v" type="text" class="form-control input_num" placeholder="xx V" data-toggle="tooltip" data-placement="bottom" title="Dropout voltage (V)" /></div>
-            <div class="col-xs-2 dropout"><a id="add_drop" class="btn btn-default"><span class="fa fa-plus"></span></a></div>
-          </div>
-          <canvas id="dropChart" width="200" height="108"></canvas>
-        </div>
       </div>
 
       <!-- _____________________ -->
@@ -172,6 +153,39 @@ <h3>Feadback</h3>
           <div class="col-xs-4 mintypmax"><label>V<sub>REF MAX</sub></label><input id="source_vref_max" type="text" data-itemdata="vref_max" class="form-control input_num source_adj item-control" placeholder="typ (V)" data-toggle="tooltip" data-placement="bottom" title="Maximul regulator Vref (V)" /></div>
         </div>
       </div>
+
+
+      <!-- LIMITS -->
+      <div class="container">
+        <h3>Limits</h3>
+
+        <!-- INPUT VOLTAGE LIMIT -->
+        <div class="form-group row">
+          <div class="col-xs-12">
+            <label for="source_vinlim">V<sub>IN</sub> limit</label>
+            <input id="source_vinlim" type="text" data-itemdata="vin_limit" class="form-control input_num" placeholder="xx V (0 = no limit)" data-toggle="tooltip" data-placement="bottom" title="Maximum recommended input voltage (0 = no limit)"/>
+          </div>
+        </div>
+
+        <!-- OUTPUT CURRENT LIMIT -->
+        <div class="form-group row">
+          <div class="col-xs-12">
+            <label for="source_ilimit">I<sub>OUT</sub> limit</label>
+            <input id="source_ilimit" type="text" data-itemdata="iout_limit" class="form-control input_num" placeholder="xx A (0 = no limit)" data-toggle="tooltip" data-placement="bottom" title="Maximum recommended output current (0 = no limit)"/>
+          </div>
+        </div>
+
+        <!-- LDO DROPOUT -->
+        <div class="form-group source_ldo">
+          <label>Dropout voltage</label>
+          <div class="row">
+            <div class="col-xs-5 dropout"><input id="input_drop_i" type="text" class="form-control input_num" placeholder="xx A" data-toggle="tooltip" data-placement="bottom" title="Output current (A)" /></div>
+            <div class="col-xs-5 dropout"><input id="input_drop_v" type="text" class="form-control input_num" placeholder="xx V" data-toggle="tooltip" data-placement="bottom" title="Dropout voltage (V)" /></div>
+            <div class="col-xs-2 dropout"><a id="add_drop" class="btn btn-default"><span class="fa fa-plus"></span></a></div>
+          </div>
+          <canvas id="dropChart" width="200" height="108"></canvas>
+        </div>
+      </div>
     </form>
 
 
diff --git a/js/class.Item.Source.js b/js/class.Item.Source.js
index 64be573..76ddd30 100644
--- a/js/class.Item.Source.js
+++ b/js/class.Item.Source.js
@@ -36,6 +36,7 @@ class Source extends Item {
       vout_min    : '1.78',
       vout_typ    : '1.8',
       vout_max    : '1.82',
+      vin_limit   : '0', // v1.8.0, 0=no limit
       iout_limit  : '0', // v1.8.0, 0=no limit
       r1          : '150000',
       r2          : '120000',
@@ -475,13 +476,24 @@ class Source extends Item {
       }
     }
 
+    // Check if Vin < vin_limit
+    let vin_limit = parseFloat(this.characs.vin_limit);
+    if(vin_limit !== 0) {
+      for(let valType of ['typ', 'max']) {
+        let vin = this.getInputVoltage(valType);
+        if((vin > 0 && vin > vin_limit) || (vin < 0 && vin < vin_limit)) {
+          alerts.push(`V<sub>IN ${valType.toUpperCase()}</sub> (${vin}V) exceeds the input voltage limit (${vin_limit}V).`);
+        }
+      }
+    }
+
     // Check if Iout < iout_limit
-    let ilimit = parseFloat(this.characs.iout_limit);
-    if(ilimit !== 0) {
+    let iout_limit = parseFloat(this.characs.iout_limit);
+    if(iout_limit !== 0) {
       for(let valType of ['typ', 'max']) {
         let iout = this.getOutputCurrent(valType);
-        if(Math.abs(iout) > Math.abs(ilimit)) {
-          alerts.push(`I<sub>OUT ${valType.toUpperCase()}</sub> is higher than the output current limit (|${iout}| > |${ilimit}|).`);
+        if((iout > 0 && iout > iout_limit) || (iout < 0 && iout < iout_limit)) {
+          alerts.push(`I<sub>OUT ${valType.toUpperCase()}</sub> (${iout}A) exceeds the output current limit (${iout_limit}A).`);
         }
       }
     }
diff --git a/main.js b/main.js
index c413272..14ebf75 100644
--- a/main.js
+++ b/main.js
@@ -10,6 +10,7 @@ const app = electron.app;
 const BrowserWindow = electron.BrowserWindow;
 // Electron module to send/receive message with all renderers
 const ipcMain = electron.ipcMain;
+
 // Node.js module to access File System
 const fs = require('fs');
 // Node.js module to work with  paths
@@ -270,10 +271,14 @@ ipcMain.on('Item-editReq', (evt, itemStr, itemType) => {
   // save the event to respond to this msg later
   renderers.itemEditor.reqEvent = evt;
 
+  // Electron module to get screen informations
+  const screen = electron.screen;
+  const maxWidth = screen.getPrimaryDisplay().workAreaSize.width;
+
   // Create the itemEditor window
   renderers.itemEditor.browserWindow = new BrowserWindow({
-    width           : ('source' == itemType) ? 1000 : 650,
-    height          : ('source' == itemType) ? 720 : 485,
+    width           : ('source' == itemType) ? (1300>maxWidth)?maxWidth:1300 : 650,
+    height          : ('source' == itemType) ? 540 : 485,
     parent          : renderers.PTree.browserWindow,
     modal           : true,
     resizable       : false,