Display layer progress api (#22)

* Layers now working * Fan Speed now working * AppComponent config needs to be public
UnchartedBull · Jul 12, 2019 · 393a482 · 393a482
1 parent 737f5d1
commit 393a482
Show file tree

Hide file tree

Showing 10 changed files with 127 additions and 51 deletions.
diff --git a/src/app/app.component.html b/src/app/app.component.html
@@ -1,4 +1,4 @@
-<div *ngIf="_configService.config" class="container">
+<div *ngIf="configService.config" class="container">
   <app-job-status></app-job-status>
   <app-printer-status></app-printer-status>
   <app-layer-progress></app-layer-progress>

diff --git a/src/app/app.component.ts b/src/app/app.component.ts
@@ -11,7 +11,7 @@ import { map } from 'rxjs/operators'
 })
 
 export class AppComponent {
-  constructor(private _configService: ConfigService) {
+  constructor(public configService: ConfigService) {
   }
 }
 
diff --git a/src/app/bottom-bar/bottom-bar.component.ts b/src/app/bottom-bar/bottom-bar.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 import { ConfigService } from '../config/config.service';
-import { PrinterStatusService, PrinterStatus } from '../printer-status.service';
+import { PrinterStatusService, PrinterStatusAPI } from '../printer-status.service';
 
 @Component({
   selector: 'app-bottom-bar',
@@ -14,7 +14,7 @@ export class BottomBarComponent implements OnInit {
 
 
   constructor(private _printerStatusService: PrinterStatusService, private _configService: ConfigService) {
-    this._printerStatusService.getPrinterStatusObservable().subscribe((printerStatus: PrinterStatus) => this.printer.status = printerStatus.status)
+    this._printerStatusService.getObservable().subscribe((printerStatus: PrinterStatusAPI) => this.printer.status = printerStatus.status)
   }
 
   ngOnInit() {

diff --git a/src/app/display-layer-progress.service.spec.ts b/src/app/display-layer-progress.service.spec.ts
@@ -0,0 +1,12 @@
+import { TestBed } from '@angular/core/testing';
+
+import { DisplayLayerProgressService } from './display-layer-progress.service';
+
+describe('DisplayLayerProgressService', () => {
+  beforeEach(() => TestBed.configureTestingModule({}));
+
+  it('should be created', () => {
+    const service: DisplayLayerProgressService = TestBed.get(DisplayLayerProgressService);
+    expect(service).toBeTruthy();
+  });
+});
diff --git a/src/app/display-layer-progress.service.ts b/src/app/display-layer-progress.service.ts
@@ -0,0 +1,49 @@
+import { Injectable } from '@angular/core';
+import { Observable, Observer, timer } from 'rxjs';
+import { HttpHeaders, HttpErrorResponse, HttpClient } from '@angular/common/http';
+import { ConfigService } from './config/config.service';
+import { share } from 'rxjs/operators';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class DisplayLayerProgressService {
+
+  observable: Observable<Object>
+
+  constructor(private _configService: ConfigService, private _http: HttpClient) {
+    this.observable = Observable.create((observer: Observer<any>) => {
+      timer(750, this._configService.config.octoprint.apiInterval).subscribe(_ => {
+        if (this._configService.config) {
+          const httpHeaders = {
+            headers: new HttpHeaders({
+              'x-api-key': this._configService.config.octoprint.accessToken
+            })
+          }
+          this._http.get(this._configService.config.octoprint.url + "plugin/DisplayLayerProgress", httpHeaders).subscribe(
+            (data: JSON) => {
+              observer.next({
+                current: data["layer"]["current"] === "-" ? 0 : data["layer"]["current"],
+                total: data["layer"]["total"] === "-" ? 0 : data["layer"]["total"],
+                fanSpeed: data["fanSpeed"] === "-" ? 0 : data["fanSpeed"]
+              })
+            }, (error: HttpErrorResponse) => {
+              console.error("Can't retrieve layerProgress! " + error.message)
+            })
+        }
+      })
+    }).pipe(share())
+  }
+
+
+  public getObservable(): Observable<Object> {
+    return this.observable
+  }
+
+}
+
+export interface DisplayLayerProgressAPI {
+  current: number;
+  total: number;
+  fanSpeed: number;
+}
diff --git a/src/app/job-status.service.ts b/src/app/job-status.service.ts
@@ -2,17 +2,17 @@ import { Injectable } from '@angular/core';
 import { Observable, Observer, timer } from 'rxjs';
 import { ConfigService } from './config/config.service';
 import { HttpHeaders, HttpClient, HttpErrorResponse } from '@angular/common/http';
+import { share } from 'rxjs/operators';
 
 @Injectable({
   providedIn: 'root'
 })
 export class JobStatusService {
 
-  jobInformation: Observable<Object>
-  layerProgress: Observable<Object>
+  observable: Observable<Object>
 
   constructor(private _configService: ConfigService, private _http: HttpClient) {
-    this.jobInformation = Observable.create((observer: Observer<any>) => {
+    this.observable = Observable.create((observer: Observer<any>) => {
       timer(1000, this._configService.config.octoprint.apiInterval).subscribe(_ => {
         if (this._configService.config) {
           const httpHeaders = {
@@ -39,29 +39,16 @@ export class JobStatusService {
                 }
               }
               observer.next(job);
-            }, ((error: HttpErrorResponse) => {
-              observer.next(null);
-            }))
+            }, (error: HttpErrorResponse) => {
+              console.log("Can't retrieve jobs! " + error.message)
+            })
         }
       })
-    })
-
-    this.layerProgress = Observable.create((observer: Observer<any>) => {
-      // TODO
-      let layerProgress = {
-        current: 0,
-        total: 0
-      }
-      observer.next(layerProgress)
-    })
-  }
-
-  public getJobInformationObservable(): Observable<Object> {
-    return this.jobInformation
+    }).pipe(share())
   }
 
-  public getLayerProgressObservable(): Observable<Object> {
-    return this.layerProgress
+  public getObservable(): Observable<Object> {
+    return this.observable
   }
 
   private timeConvert(input: number): string {
@@ -89,8 +76,3 @@ export interface Job {
   timeLeft: Duration;
   timePrinted: Duration;
 }
-
-export interface LayerProgress {
-  current: number;
-  total: number;
-}
diff --git a/src/app/job-status/job-status.component.ts b/src/app/job-status/job-status.component.ts
@@ -13,6 +13,6 @@ export class JobStatusComponent implements OnInit {
   constructor(private _jobStatusService: JobStatusService) { }
 
   ngOnInit() {
-    this._jobStatusService.getJobInformationObservable().subscribe((job: Job) => this.job = job);
+    this._jobStatusService.getObservable().subscribe((job: Job) => this.job = job);
   }
 }
diff --git a/src/app/layer-progress/layer-progress.component.ts b/src/app/layer-progress/layer-progress.component.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { LayerProgress, JobStatusService } from '../job-status.service';
+import { DisplayLayerProgressService, DisplayLayerProgressAPI } from '../display-layer-progress.service';
 
 @Component({
   selector: 'app-layer-progress',
@@ -10,11 +10,23 @@ export class LayerProgressComponent implements OnInit {
 
   layerProgress: LayerProgress
 
-  constructor(private _jobStatusService: JobStatusService) {
-    this._jobStatusService.getLayerProgressObservable().subscribe((layerProgress: LayerProgress) => this.layerProgress = layerProgress);
+  constructor(private _displayLayerProgressService: DisplayLayerProgressService) {
+    this.layerProgress = {
+      current: 0,
+      total: 0
+    }
+    this._displayLayerProgressService.getObservable().subscribe((layerProgress: DisplayLayerProgressAPI) => {
+      this.layerProgress.current = layerProgress.current;
+      this.layerProgress.total = layerProgress.total;
+    });
   }
 
   ngOnInit() {
   }
 
 }
+
+export interface LayerProgress {
+  current: number;
+  total: number;
+}
diff --git a/src/app/printer-status.service.ts b/src/app/printer-status.service.ts
@@ -22,7 +22,7 @@ export class PrinterStatusService {
           }
           this._http.get(this._configService.config.octoprint.url + "printer", httpHeaders).subscribe(
             (data: JSON) => {
-              const printerStatus: PrinterStatus = {
+              const printerStatus: PrinterStatusAPI = {
                 status: data["state"]["text"].toLowerCase(),
                 nozzle: {
                   current: Math.round(data["temperature"]["tool0"]["actual"]),
@@ -31,12 +31,11 @@ export class PrinterStatusService {
                 heatbed: {
                   current: Math.round(data["temperature"]["bed"]["actual"]),
                   set: Math.round(data["temperature"]["bed"]["target"])
-                },
-                fan: 100
+                }
               }
               observer.next(printerStatus)
             }, (error: HttpErrorResponse) => {
-              const printerStatus: PrinterStatus = {
+              const printerStatus: PrinterStatusAPI = {
                 status: `error (${error.status})`,
                 nozzle: {
                   current: 0,
@@ -45,8 +44,7 @@ export class PrinterStatusService {
                 heatbed: {
                   current: 0,
                   set: 0
-                },
-                fan: 0
+                }
               }
               observer.next(printerStatus)
             })
@@ -55,20 +53,18 @@ export class PrinterStatusService {
     }).pipe(share())
   }
 
-  getPrinterStatusObservable(): Observable<Object> {
+  getObservable(): Observable<Object> {
     return this.observable
   }
 }
 
-
-export interface PrinterStatus {
-  status: string,
+export interface PrinterStatusAPI {
+  status: string;
   nozzle: PrinterValue;
   heatbed: PrinterValue;
-  fan: number;
 }
 
-interface PrinterValue {
+export interface PrinterValue {
   current: number;
   set: number;
 }
diff --git a/src/app/printer-status/printer-status.component.ts b/src/app/printer-status/printer-status.component.ts
@@ -1,5 +1,6 @@
 import { Component, OnInit } from '@angular/core';
-import { PrinterStatusService, PrinterStatus } from '../printer-status.service';
+import { PrinterStatusService, PrinterStatusAPI, PrinterValue } from '../printer-status.service';
+import { DisplayLayerProgressService, DisplayLayerProgressAPI } from '../display-layer-progress.service';
 
 @Component({
   selector: 'app-printer-status',
@@ -8,12 +9,36 @@ import { PrinterStatusService, PrinterStatus } from '../printer-status.service';
 })
 export class PrinterStatusComponent implements OnInit {
 
-  printerStatus: PrinterStatus;
+  printerStatus: PrinterStatus
 
-  constructor(private _printerStatusService: PrinterStatusService) {
-    this._printerStatusService.getPrinterStatusObservable().subscribe((printerStatus: PrinterStatus) => this.printerStatus = printerStatus)
+  constructor(private _printerStatusService: PrinterStatusService, private _displayLayerProgressService: DisplayLayerProgressService) {
+    this.printerStatus = {
+      nozzle: {
+        current: 0,
+        set: 0
+      },
+      heatbed: {
+        current: 0,
+        set: 0
+      },
+      fan: 0
+    };
+    this._printerStatusService.getObservable().subscribe((printerStatus: PrinterStatusAPI) => {
+      this.printerStatus.nozzle = printerStatus.nozzle;
+      this.printerStatus.heatbed = printerStatus.heatbed;
+    })
+
+    this._displayLayerProgressService.getObservable().subscribe((layerProgress: DisplayLayerProgressAPI) => {
+      this.printerStatus.fan = layerProgress.fanSpeed
+    })
   }
 
   ngOnInit() { }
 
+}
+
+export interface PrinterStatus {
+  nozzle: PrinterValue;
+  heatbed: PrinterValue;
+  fan: number;
 }