[update] fix VOLT_VSCAN scale

src/components/project/task/config/parameter/EliteParameterRecordingElitezm15.vue

@@ -505,7 +505,7 @@ export default {
         // },
         // {
         //   id: 11,
-        //   description: 'Cali ADC - test',
+        //   description: 'Cali Mode - test',
         // },
         // {
         //   id: 12,
@@ -576,6 +576,10 @@ export default {
           value: 1,
           label: 'Vin',
         },
+        {
+          value: 2,
+          label: 'Vout'
+        },
       ],
       startVoltNumber: null,
       stopVoltNumber: null,

src/components/task/content/chart/CanvasChartTable.js

@@ -57,7 +57,7 @@ const chartTable = {
           mA: 1e6,
           A: 1e9,
         },
-        defaultUnit: (Mode) => { return (Mode === 10) ? 'nA' : 'mA' },
+        defaultUnit: (Mode) => { return (Mode === 10 || Mode === 11) ? 'nA' : 'mA' },
         downloadUnit: 'mA',
       },
       // Q = ∫ I dt
@@ -152,7 +152,7 @@ const chartTable = {
           mA: 1e6,
           A: 1e9,
         },
-        defaultUnit: (Mode) => { return (Mode === 10) ? 'nA' : 'mA' },
+        defaultUnit: (Mode) => { return (Mode === 10 || Mode === 11) ? 'nA' : 'mA' },
         downloadUnit: 'mA',
       },
       // Gm = dI/dV

src/components/task/content/parameter/DeviceParameterRecording.vue

@@ -81,6 +81,7 @@
               :parameterName="name"
               :inputValue="parameter[name]"
               :disable="name === 'CTRL_HIGH_Z_15' && device && device.status === 0"
+              :syncParameter="parameterTable[name].syncParameter"
               v-bind="parameterTable[name]"
               @parameterChange="parameterChange"
               @getParameter="getParameter"

src/components/task/content/parameter/itemNew/InputButtonToggle.vue

@@ -75,6 +75,10 @@ export default {
       type: Boolean,
       default: false,
     },
+    syncParameter: {
+      type: Object,
+      default: () => {},
+    },
   },
   created () {
   },
@@ -87,6 +91,13 @@ export default {
   methods: {
     buttonSelectChange (value) {
       this.$emit('parameterChange', this.parameterName, value)
+      this.syncParameter && Object.keys(this.syncParameter).forEach(element => {
+        if (String(element) === String(value)) {
+          this.syncParameter[value].forEach(element => {
+            this.$emit('parameterChange', element[0], element[1])
+          })
+        }
+      })
     },
   },
   async mounted () {

src/data/config-table/EliteEDC/CaliADC.js

@@ -1,7 +1,8 @@
 export default {
-  name: 'Cali ADC - test',
+  name: 'Cali Mode - test',
-  parameter: ['DAC_VOLT', 'ADC_LEVEL_I_15', 'ADC_LEVEL_V_IN_15', 'ADC_DAC_CHANNEL_15'], // 這個mode用到的參數
+  parameter: ['ADC_DAC_CHANNEL_15', 'ADC_LEVEL_I_15', 'ADC_LEVEL_V_IN_15', 'DAC_LEVEL_V_OUT_15', 'DAC_VOLT_BUTTON'], // 這個mode用到的參數
-  showParameter: ['DAC_VOLT', 'ADC_LEVEL_I_15', 'ADC_LEVEL_V_IN_15', 'ADC_DAC_CHANNEL_15'], // 有要秀給user看的參數
+  showParameter: ['ADC_DAC_CHANNEL_15', 'ADC_LEVEL_I_15', 'ADC_LEVEL_V_IN_15', 'DAC_LEVEL_V_OUT_15', 'DAC_VOLT_BUTTON'], // 有要秀給user看的參數
+  headerParameter: () => ['ADC_DAC_CHANNEL_15', 'ADC_LEVEL_I_15', 'ADC_LEVEL_V_IN_15', 'DAC_LEVEL_V_OUT_15', 'DAC_VOLT_BUTTON'], // export header的參數
   valScales: {
     linear: {
       func: (val) => {
@@ -52,7 +53,7 @@ export default {
   charts: {
     default: [
       {
-        name: 'Cali ADC - test',
+        name: 'Cali Mode - test',
         description: '',
         subplot: [
           {

src/data/config-table/EliteEDC/index.js

@@ -162,17 +162,24 @@ const EliteZM15 = {
     options: [
       { value: 0, label: 'Iin' },
       { value: 1, label: 'Vin' },
+      { value: 2, label: 'Vout' },
     ],
-    range: ['Iin', 'Vin'],
+    range: ['Iin', 'Vin', 'Vout'],
     defaultValue: 0,
     outputRawData: (val) => {
-      const caliChannelArr = ['Iin', 'Vin']
+      const caliChannelArr = ['Iin', 'Vin', 'Vout']
       return caliChannelArr.indexOf(val.toString())
     },
     outputReadabilityData: (idx) => {
-      const caliChannelArr = ['Iin', 'Vin']
+      const caliChannelArr = ['Iin', 'Vin', 'Vout']
       return caliChannelArr[parseInt(idx)]
     },
+
+    syncParameter: {
+      0: [['ADC_LEVEL_V_IN_15', 3], ['ADC_LEVEL_I_15', 0], ['DAC_LEVEL_V_OUT_15', 2]],
+      1: [['ADC_LEVEL_V_IN_15', 0], ['ADC_LEVEL_I_15', 0], ['DAC_LEVEL_V_OUT_15', 2]],
+      2: [['ADC_LEVEL_V_IN_15', 3], ['ADC_LEVEL_I_15', 4], ['DAC_LEVEL_V_OUT_15', 0]],
+    },
   },
   VOLT_ORIGIN: {
     type: 'number',
@@ -255,6 +262,26 @@ const EliteZM15 = {
     },
     downloadUnit: 's',
   },
+  DAC_LEVEL_V_OUT_15: {
+    type: 'array',
+    showName: 'DAC range',
+    componentType: 'input-button-toggle',
+    options: [
+      { value: 0, label: '0' },
+      { value: 1, label: '1' },
+      { value: 2, label: 'Auto' },
+    ],
+    range: ['0', '1', 'Auto'],
+    defaultValue: 2,
+    outputRawData: (val) => {
+      const caliChannelArr = ['0', '1', 'Auto']
+      return caliChannelArr.indexOf(val.toString())
+    },
+    outputReadabilityData: (idx) => {
+      const caliChannelArr = ['0', '1', 'Auto']
+      return caliChannelArr[parseInt(idx)]
+    },
+  },
   DAC_VOLT: {
     type: 'number',
     showName: 'Volt out',
@@ -274,6 +301,46 @@ const EliteZM15 = {
       return parseInt((parseFloat(val) - 25000) / 5) / scale
     },
   },
+  DAC_VOLT_SCROLL: {
+    type: 'number',
+    showName: 'DAC code',
+    componentType: 'input-range',
+    range: Object.freeze({ min: 0, max: 60000 }),
+    defaultValue: 25000,
+    defaultUnit: '',
+    downloadUnit: 'mV',
+    unit: {
+      mV: 1,
+      V: 1e3,
+    },
+    outputRawData: (val, scale = 1) => {
+      return parseInt(parseFloat(val))
+    },
+    outputReadabilityData: (val, scale = 0) => {
+      return parseInt(parseFloat(val))
+    },
+  },
+  DAC_VOLT_BUTTON: {
+    type: 'array',
+    showName: 'DAC code',
+    componentType: 'input-button-toggle',
+    options: [
+      { value: 0, label: '10000' },
+      { value: 1, label: '25000' },
+      { value: 2, label: '50000' },
+      { value: 3, label: '60000' },
+    ],
+    range: ['10000', '25000', '50000', '60000'],
+    defaultValue: 1,
+    outputRawData: (val) => {
+      const caliChannelArr = ['10000', '25000', '50000', '60000']
+      return caliChannelArr.indexOf(val.toString())
+    },
+    outputReadabilityData: (idx) => {
+      const caliChannelArr = ['10000', '25000', '50000', '60000']
+      return caliChannelArr[parseInt(idx)]
+    },
+  },
   SAMPLE_RATE: {
     type: 'number',
     componentType: 'input-range',
@@ -981,7 +1048,7 @@ const EliteZM15 = {
     },
     {
       id: 11,
-      description: 'Cali ADC - test',
+      description: 'Cali Mode - test',
       img_src: 'CADC-Wire',
     },
   ],

src/data/config-table/EliteEIS/index.js

@@ -8,20 +8,19 @@ const EliteEIS = {
     type: 'number',
     showName: 'Volt (v.s. ref)',
     componentType: 'input-range',
-    range: Object.freeze({ min: 0, max: 50000 }),
+    range: Object.freeze({ min: 2500, max: 50000 }),
-    defaultValue: 25000,
+    outputRawData: (val, scale = 1) => {
+      return parseInt(parseFloat(val) * scale * 12.5 + 25000)
+    },
+    outputReadabilityData: (val, scale = 1) => {
+      return parseInt((parseFloat(val) - 25000) / 12.5) / scale
+    },
     defaultUnit: 'V',
     downloadUnit: 'mV',
     unit: {
       mV: 1,
       V: 1e3,
     },
-    outputRawData: (val, scale = 1) => {
-      return parseInt(parseFloat(val) * scale * 5 + 25000)
-    },
-    outputReadabilityData: (val, scale = 1) => {
-      return parseInt((parseFloat(val) - 25000) / 5) / scale
-    },
   },
   ADC_VALUE_I: {
     type: 'none',

src/factories/project/deviceLibraryFactory.js

@@ -61,7 +61,7 @@ function newAction () {
         },
         {
           id: 11,
-          description: 'Cali ADC - test',
+          description: 'Cali Mode - test',
           select: false,
         },
         {

src/factories/project/eliteZM15ParmameterFactory.js

@@ -54,7 +54,7 @@ function newEliteZm15Parameter () {
         // },
         // {
         //   id: 11,
-        //   description: 'Cali ADC - test',
+        //   description: 'Cali Mode - test',
         // },
         // {
         //   id: 12,