Merge branch 'testing/trigger' into testing/security

src/components/analysis/replay/toolbox/ShowParameter.vue

@@ -46,58 +46,6 @@ export default {
           description: '800',
         },
       ],
-      neuliveSampleRateOptions: [
-        {
-          id: 0,
-          value: 1000,
-          description: '1k',
-        },
-        {
-          id: 1,
-          value: 2000,
-          description: '2k',
-        },
-        {
-          id: 2,
-          value: 4000,
-          description: '4k',
-        },
-        {
-          id: 3,
-          value: 5000,
-          description: '5k',
-        },
-        {
-          id: 4,
-          value: 8000,
-          description: '8k',
-        },
-        {
-          id: 5,
-          value: 10000,
-          description: '10k',
-        },
-        {
-          id: 6,
-          value: 20000,
-          description: '20k',
-        },
-        {
-          id: 7,
-          value: 40000,
-          description: '40k',
-        },
-        {
-          id: 8,
-          value: 80000,
-          description: '80k',
-        },
-        {
-          id: 9,
-          value: 100000,
-          description: '100k',
-        },
-      ],
       stimulateElectrodeOptions: [
         {
           label: 'Monopolar',
@@ -351,11 +299,7 @@ export default {
                 }
               } else if (key === 'SAMPLE_RATE') {
                 showKey = 'Sample Rate'
-                for (let i = 0; i < this.neuliveSampleRateOptions.length; i++) {
-                  if (this.neuliveSampleRateOptions[i].value === value) {
-                    showValue = this.neuliveSampleRateOptions[i].description
-                  }
-                }
+                showValue = value
               }
               this.content += '    ' + showKey + ': ' + showValue + '<br/>'
             }

src/components/file/file-table/FileTable.vue

@@ -701,7 +701,7 @@ export default {
         if (this.controllerList[0].sd_uploading === false) {
           const ret = await api.sdcard.getuuidList()
           if (ret.status === 200) {
-            this.SDuuidList = ret.data.data
+            this.SDuuidList = ret.data
           }
         }
       }

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

@@ -205,6 +205,16 @@ export default {
           value: 20000,
           description: '20k',
         },
+        {
+          id: 7,
+          value: 25000,
+          description: '25k',
+        },
+        {
+          id: 8,
+          value: 31250,
+          description: '31.25k',
+        },
       ],
       acceleratorSensitivitySelect: null,
       acceleratorSensitivityOptions: [
@@ -333,7 +343,7 @@ export default {
     },
     sampleRateSelectChange () {
       if (this.sampleRateSelect != null && this.sampleRateSelect.value !== ((taskInfo.getDeviceInfo(this.deviceID).parameterSet.SAMPLE_RATE))) {
-        const adcClock = 8e5 / this.sampleRateSelect.value
+        const adcClock = 1e6 / this.sampleRateSelect.value
         this.mqttPub(taskInfo.getTaskInfo().controllerID + '_user', JSON.stringify({
           header: 'device_parameter/0',
           device: taskInfo.getRawDeviceID(this.deviceID),

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

@@ -202,43 +202,43 @@ export default {
         },
         {
           id: 6,
+          value: 16000,
+          description: '16k',
+        },
+        {
+          id: 7,
           value: 20000,
           description: '20k',
         },
         {
-          id: 7,
-          value: 30000,
-          description: '30k',
+          id: 8,
+          value: 25000,
+          description: '25k',
         },
         {
-          id: 8,
+          id: 9,
+          value: 32000,
+          description: '32k',
+        },
+        {
+          id: 10,
           value: 40000,
           description: '40k',
         },
         {
-          id: 9,
+          id: 11,
           value: 50000,
           description: '50k',
         },
-        {
-          id: 10,
-          value: 60000,
-          description: '60k',
-        },
-        {
-          id: 11,
-          value: 70000,
-          description: '70k',
-        },
         {
           id: 12,
-          value: 80000,
-          description: '80k',
+          value: 64000,
+          description: '64k',
         },
         {
           id: 13,
-          value: 90000,
-          description: '90k',
+          value: 80000,
+          description: '80k',
         },
         {
           id: 14,

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

@@ -955,10 +955,10 @@ export default {
         return false
       }
 
-      if (usVal < 60) {
-        this.periodNumber = 60
-        this.periodNumberInput = String(60 / this.unitMultiply)
-        this.pageToast('Reset to 60 us')
+      if (usVal < 10) {
+        this.periodNumber = 10
+        this.periodNumberInput = String(10 / this.unitMultiply)
+        this.pageToast('Reset to 10 us')
       } else if (usVal > 1e6) { // freq: 1 to 20000Hz, so period < 1e6us (1e6/1e6=1)
         this.periodNumber = 1e6
         this.periodNumberInput = String(1e6 / this.unitMultiply)
@@ -1137,7 +1137,7 @@ export default {
       // val unit: us
       const val = (this.t1Range + this.t2Range + this.t3Range + this.t4Range) * 10 // UI us
 
-      if (val < 80) { // us
+      if (val < 10) { // us
         for (const tRange of [1, 2, 3, 4]) {
           this.updateTRangeErrorMsg({ stiIimeSelect: tRange, status: true, msg: 'Period < 0.08ms' })
         }

src/store/modules/download/actions/rawAct.js

@@ -92,7 +92,7 @@ const rawActs = {
       if (raw.sd_data !== null && raw.sd_data.length > 0) {
         const encodedData = raw.sd_data.split('"***"').slice(0, -1)
         const unzipDatas = encodedData.map(ctx => {
-          return ctx.split(' ')
+          return ctx.split(' ').filter(el => el !== '')
         })
 
         for (let i = 0; i <= unzipDatas.length - 1; i++) {