Skip to content
Permalink
Browse files

Merge remote-tracking branch 'origin/development' into faults

  • Loading branch information
ema14006 committed Apr 15, 2019
2 parents 8a65f09 + b9cac43 commit 2fd9d3cf77f21bfdeec11bf86213ea6241945e63
Showing with 4 additions and 2 deletions.
  1. +3 −1 src/app/generator-object.ts
  2. +1 −1 src/app/services/generator.service.ts
@@ -11,7 +11,9 @@ export interface GeneratorState {
status: string;
status_code: number;
fault_count: number | null;
fault_codes: Array<string> | null;
fault_codes: Array<string>;
status_count: number;
status_codes: Array<string>;
ip: string;
}

@@ -35,7 +35,7 @@ export class GeneratorService {

getGeneratorState(gen_id: number, token: string): Promise<GeneratorState> {
return new Promise<GeneratorState>((resolve, reject) => {
this.http.get('http://sd5-backend.engr.uconn.edu/generator/' + gen_id + '/status', {
this.http.get('http://sd5-backend.engr.uconn.edu/generator/' + gen_id + '/state', {
headers: {
Authorization: 'Bearer ' + token
}

0 comments on commit 2fd9d3c

Please sign in to comment.
You can’t perform that action at this time.