Merge pull request #1 from UnchartedBull/harleyg-local

Introduce Boot Grace Time
harleyg321 · Apr 9, 2020 · c3c71d6 · c3c71d6
2 parents 8deee98 + c343a65
commit c3c71d6
Show file tree

Hide file tree

Showing 7 changed files with 101 additions and 16 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -81,7 +81,7 @@
     "electron-store": "^5.1.1",
     "lodash": "^4.17.15",
     "ngx-spinner": "^9.0.2",
-    "rxjs": "~6.5.4",
+    "rxjs": "~6.5.5",
     "tslib": "^1.11.1",
     "zone.js": "~0.10.3"
   },

diff --git a/src/app/job-status/job-status.component.html b/src/app/job-status/job-status.component.html
@@ -5,9 +5,9 @@
         <div class="job-info__progress-percentage">{{ job.progress }}<span style="font-size: 40%">%</span></div>
     </div>
     <span class="job-info__filename">{{ job.filename }}</span> <br />
-    <span class="job-info__filament">{{ job.filamentAmount }}g Filament</span> <br />
-    <span class="job-info__time"><span
-            class="job-info__time-left">{{ job.timeLeft.value }}</span>{{ job.timeLeft.unit }} left,
+    <span class="job-info__filament" *ngIf="job.filamentAmount !== null">{{ job.filamentAmount }}g Filament</span> <br />
+    <span class="job-info__time"><span *ngIf="job.timeLeft.value !== null"><span
+            class="job-info__time-left">{{ job.timeLeft.value }}</span>{{ job.timeLeft.unit }} left,</span>
         elapsed: {{ job.timePrinted.value }}{{ job.timePrinted.unit }}</span>
 </div>
 <div class="job-info__file-loaded" *ngIf="job && !isPrinting() && isFileLoaded()" (swipe)="cancelLoadedFile()">

diff --git a/src/app/job.service.ts b/src/app/job.service.ts
@@ -38,18 +38,18 @@ export class JobService {
                         async (data: OctoprintJobAPI): Promise<void> => {
                             let job: Job = null;
                             if (data.job && data.job.file.name) {
-                                this.printing = ['Printing', 'Pausing', 'Paused', 'Cancelling'].includes(data.state);
+                                this.printing = ['Printing', 'Pausing', 'Paused', 'Cancelling', 'Printing from SD'].includes(data.state);
                                 try {
                                     job = {
                                         status: data.state,
                                         filename: data.job.file.display.replace('.gcode', '').replace('.ufp', ''),
-                                        thumbnail: await this.fileService.getThumbnail(data.job.file.path),
+                                        thumbnail: (data.job.file.origin == 'sdcard') ? undefined : await this.fileService.getThumbnail(data.job.file.path),
                                         progress: Math.round((data.progress.filepos / data.job.file.size) * 100),
-                                        filamentAmount: this.service.convertFilamentLengthToAmount(
+                                        filamentAmount: (data.job.filament === null) ? null : this.service.convertFilamentLengthToAmount(
                                             this.getTotalAmountOfFilament(data.job.filament),
                                         ),
                                         timeLeft: {
-                                            value: this.service.convertSecondsToHours(data.progress.printTimeLeft),
+                                            value: (data.progress.printTimeLeft === null) ? null : this.service.convertSecondsToHours(data.progress.printTimeLeft),
                                             unit: 'h',
                                         },
                                         timePrinted: {

diff --git a/src/app/layer-progress/layer-progress.component.html b/src/app/layer-progress/layer-progress.component.html
@@ -1,3 +1,3 @@
-<span class="layer-indication" *ngIf="layerProgress">
+<span class="layer-indication" *ngIf="layerProgress && !(layerProgress.current === 0 && layerProgress.total === 0)">
     Layer <span class="layer-indication__current-layer">{{ layerProgress.current }}</span> of {{ layerProgress.total }}
 </span>
diff --git a/src/app/notification/notification.service.ts b/src/app/notification/notification.service.ts
@@ -9,10 +9,14 @@ export class NotificationService {
     private observable: Observable<Notification>;
     private observer: Observer<Notification>;
     private hideNotifications = false;
+    private bootGrace = true;
 
     public constructor() {
         this.observable = new Observable((observer: Observer<Notification>): void => {
             this.observer = observer;
+            setTimeout((): void => {
+                this.bootGrace = false;
+            }, 30000);
         }).pipe(shareReplay(1));
     }
 
@@ -27,7 +31,7 @@ export class NotificationService {
     }
 
     public setError(heading: string, text: string): void {
-        if (!this.hideNotifications) {
+        if ((!this.hideNotifications && !this.bootGrace) || (this.bootGrace && !text.endsWith('0 Unknown Error'))) {
             this.observer.next({ heading, text, type: 'error' });
         }
     }
@@ -45,6 +49,10 @@ export class NotificationService {
     public getObservable(): Observable<Notification> {
         return this.observable;
     }
+
+    public getBootGrace(): boolean {
+        return this.bootGrace;
+    }
 }
 
 export interface Notification {

diff --git a/src/app/printer.service.ts b/src/app/printer.service.ts
@@ -58,9 +58,19 @@ export class PrinterService {
                                         );
                                     }
                                 });
-                            } else if (error.status === 0) {
-                                this.router.navigate(['/standby']);
-                                this.notificationService.disableNotifications();
+                            } else if (error.status === 0 && this.notificationService.getBootGrace()) {
+                                const printerStatus: PrinterStatusAPI = {
+                                    status: `connecting ...`,
+                                    nozzle: {
+                                        current: 0,
+                                        set: 0,
+                                    },
+                                    heatbed: {
+                                        current: 0,
+                                        set: 0,
+                                    },
+                                };
+                                observer.next(printerStatus);
                             } else {
                                 const printerStatus: PrinterStatusAPI = {
                                     status: `error (${error.status})`,