adjusted for merge with changes to generatorobject

SeniorDesignGroup5 · Apr 12, 2019 · b52798c · b52798c
1 parent 8d08ed2
commit b52798c
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/src/app/statistics/statistics.component.ts b/src/app/statistics/statistics.component.ts
@@ -176,9 +176,9 @@ export class StatisticsComponent implements OnInit {
 
       });
 
-      this.generator = await this.data2.getGeneratorStatus(gen_id,jsonToken);
+      this.generator = await this.data2.getGeneratorState(gen_id,jsonToken);
 
-      if (this.generator.fault_count != 0)
+      if (this.generator.fault_count == 0)
       {
       	console.log("hi");
       }
@@ -188,9 +188,7 @@ export class StatisticsComponent implements OnInit {
       		{
       			this.statusChange(this.testArray[i]);
 
-      		}
+      		}      		
-      		console.log(this.isOvercrank);
-      		console.log(this.isOvercrank);
       }