Limit console logs for speed and add force trigger error message

Digilent · Nov 8, 2016 · a8640e9 · a8640e9
1 parent 0ca4255
commit a8640e9
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/src/components/chart/chart.component.ts b/src/components/chart/chart.component.ts
@@ -1190,7 +1190,6 @@ export class SilverNeedleChart {
     }
 
     openMathModal() {
-        console.log(this.currentBufferArray);
         if (this.currentBufferArray.length === 0) { return; }
         let modal = this.modalCtrl.create(MathModalPage, {
             chartComponent: this

diff --git a/src/components/trigger/trigger.component.ts b/src/components/trigger/trigger.component.ts
@@ -64,15 +64,21 @@ export class TriggerComponent {
     }
 
     forceTrigger() {
-        this.activeDevice.instruments.trigger.forceTrigger([1]).subscribe(
+        /*this.activeDevice.instruments.trigger.forceTrigger([1]).subscribe(
             (data) => {
                 console.log(data);
             },
             (err) => {
                 console.log(err);
             },
             () => { }
-        );
+        );*/
+        let toast = this.toastCtrl.create({
+            message: 'Force Trigger Not Yet Implemented',
+            showCloseButton: true,
+            position: 'bottom'
+        });
+        toast.present();
     }
 
     setupLevel() {

diff --git a/src/pages/test-chart-ctrls/test-chart-ctrls.ts b/src/pages/test-chart-ctrls/test-chart-ctrls.ts
@@ -220,12 +220,9 @@ export class TestChartCtrlsPage {
             ];
         }
         singleCommand['trigger']['single'] = [[1]];
-        if (this.triggerComponent.edgeDirection === 'off') {
+        /*if (this.triggerComponent.edgeDirection === 'off') {
             singleCommand['trigger']['forceTrigger'] = [[1]];
-            console.log(singleCommand);
-        }
-
-        console.log(singleCommand);
+        }*/
 
         this.activeDevice.multiCommand(singleCommand).subscribe(
             (data) => {
@@ -274,7 +271,6 @@ export class TestChartCtrlsPage {
         }
         this.activeDevice.instruments.osc.read(readArray).subscribe(
             (data) => {
-                console.log(data);
 
                 this.readAttemptCount = 0;
                 let numSeries = [];
@@ -308,7 +304,6 @@ export class TestChartCtrlsPage {
                         }
                     }
                 }
-                console.log(this.chart1.currentBufferArray);
                 this.triggerStatus = 'Idle';
             },
             (err) => {

diff --git a/src/services/settings/settings.service.ts b/src/services/settings/settings.service.ts
@@ -9,7 +9,7 @@ export class SettingsService {
     public storageService: StorageService;
     public defaultConsoleLog;
     public logArguments;
-    public logLength: number = 100;
+    public logLength: number = 50;
 
     constructor(_storageService: StorageService) {
         console.log('settings service constructor');