fix settings, feedrate, add axis inversion (UnchartedBull#1676)

pciavald · May 12, 2021 · de8250c · de8250c
1 parent de0f152
commit de8250c
Show file tree

Hide file tree

Showing 10 changed files with 134 additions and 15 deletions.
diff --git a/helper/config.schema.js b/helper/config.schema.js
@@ -117,6 +117,8 @@ const configSchema = {
         'printTimeGenius',
         'psuControl',
         'tpLinkSmartPlug',
+        'tasmota',
+        'tasmotaMqtt',
       ],
       properties: {
         displayLayerProgress: {
@@ -215,6 +217,44 @@ const configSchema = {
             },
           },
         },
+        tasmota: {
+          $id: '#/properties/plugins/properties/tasmota',
+          type: 'object',
+          required: ['enabled', 'ip', 'index'],
+          properties: {
+            enabled: {
+              $id: '#/properties/plugins/properties/tasmota/properties/enabled',
+              type: 'boolean',
+            },
+            ip: {
+              $id: '#/properties/plugins/properties/tasmota/properties/ip',
+              type: 'string',
+            },
+            index: {
+              $id: '#/properties/plugins/properties/tasmota/properties/index',
+              type: ['number', 'null'],
+            },
+          },
+        },
+        tasmotaMqtt: {
+          $id: '#/properties/plugins/properties/tasmotaMqtt',
+          type: 'object',
+          required: ['enabled', 'topic', 'relayNumber'],
+          properties: {
+            enabled: {
+              $id: '#/properties/plugins/properties/tasmotaMqtt/properties/enabled',
+              type: 'boolean',
+            },
+            topic: {
+              $id: '#/properties/plugins/properties/tasmotaMqtt/properties/topic',
+              type: 'string',
+            },
+            relayNumber: {
+              $id: '#/properties/plugins/properties/tasmotaMqtt/properties/relayNumber',
+              type: ['number', 'null'],
+            },
+          },
+        },
       },
     },
     octodash: {
@@ -223,6 +263,7 @@ const configSchema = {
       required: [
         'customActions',
         'fileSorting',
+        'invertAxisControl',
         'pollingInterval',
         'touchscreen',
         'turnScreenOffWhileSleeping',
@@ -284,6 +325,25 @@ const configSchema = {
             },
           },
         },
+        invertAxisControl: {
+          $id: '#/properties/octodash/properties/invertAxisControl',
+          type: 'object',
+          required: ['x', 'y', 'z'],
+          properties: {
+            x: {
+              $id: '#/properties/octodash/properties/invertAxisControl/properties/x',
+              type: 'boolean',
+            },
+            y: {
+              $id: '#/properties/octodash/properties/invertAxisControl/properties/y',
+              type: 'boolean',
+            },
+            z: {
+              $id: '#/properties/octodash/properties/invertAxisControl/properties/z',
+              type: 'boolean',
+            },
+          },
+        },
         pollingInterval: {
           $id: '#/properties/octodash/properties/pollingInterval',
           type: 'integer',

diff --git a/src/app/app.service.ts b/src/app/app.service.ts
@@ -45,6 +45,8 @@ export class AppService {
         (config.octodash.screenSleepCommand = 'xset dpms force standby'),
       ".octodash should have required property 'screenWakeupCommand'": config =>
         (config.octodash.screenWakeupCommand = 'xset s off && xset -dpms && xset s noblank'),
+      ".octodash should have required property 'invertAxisControl'": config =>
+        (config.octodash.invertAxisControl = { x: false, y: false, z: false }),
       ".printer should have required property 'disableExtruderGCode'": config =>
         (config.printer.disableExtruderGCode = 'M18 E'),
     };

diff --git a/src/app/config/config.default.ts b/src/app/config/config.default.ts
@@ -113,6 +113,11 @@ export const defaultConfig: Config = {
       attribute: 'name',
       order: 'asc',
     },
+    invertAxisControl: {
+      x: false,
+      y: false,
+      z: false,
+    },
     pollingInterval: 2000,
     touchscreen: true,
     turnScreenOffWhileSleeping: false,

diff --git a/src/app/config/config.model.ts b/src/app/config/config.model.ts
@@ -93,6 +93,7 @@ interface TasmotaMqttPlugin extends Plugin {
 interface OctoDash {
   customActions: CustomAction[];
   fileSorting: FileSorting;
+  invertAxisControl: InvertAxisControl;
   pollingInterval: number;
   touchscreen: boolean;
   turnScreenOffWhileSleeping: boolean;
@@ -126,3 +127,8 @@ interface Window {
   fullscreen: boolean;
   backgroundColor: string;
 }
+interface InvertAxisControl {
+  x: boolean;
+  y: boolean;
+  z: boolean;
+}
diff --git a/src/app/config/config.service.ts b/src/app/config/config.service.ts
@@ -300,4 +300,16 @@ export class ConfigService {
   public getShowExtruderControl(): boolean {
     return this.config.octodash.showExtruderControl;
   }
+
+  public isXAxisInverted(): boolean {
+    return this.config.octodash.invertAxisControl.x;
+  }
+
+  public isYAxisInverted(): boolean {
+    return this.config.octodash.invertAxisControl.y;
+  }
+
+  public isZAxisInverted(): boolean {
+    return this.config.octodash.invertAxisControl.z;
+  }
 }
diff --git a/src/app/print-control/print-control.component.html b/src/app/print-control/print-control.component.html
@@ -165,7 +165,7 @@
               -
             </div>
           </div>
-          <span class="print-control__adjust__name">Feedrate</span>
+          <span class="print-control__adjust__name">Speed</span>
         </td>
       </tr>
     </table>

diff --git a/src/app/services/printer/printer.octoprint.service.ts b/src/app/services/printer/printer.octoprint.service.ts
@@ -58,9 +58,9 @@ export class PrinterOctoprintService implements PrinterService {
   public jog(x: number, y: number, z: number): void {
     const jogPayload: JogCommand = {
       command: 'jog',
-      x,
-      y,
-      z,
+      x: this.configService.isXAxisInverted() ? x * -1 : x,
+      y: this.configService.isYAxisInverted() ? y * -1 : y,
+      z: this.configService.isZAxisInverted() ? z * -1 : z,
       speed: z !== 0 ? this.configService.getZSpeed() * 60 : this.configService.getXYSpeed() * 60,
     };
     this.http
@@ -106,9 +106,6 @@ export class PrinterOctoprintService implements PrinterService {
   }
 
   public setFeedrate(feedrate: number): void {
-    if (feedrate === 100) {
-      return;
-    }
     const feedrateCommand: FeedrateCommand = {
       command: 'feedrate',
       factor: feedrate,
@@ -120,9 +117,6 @@ export class PrinterOctoprintService implements PrinterService {
   }
 
   public setFlowrate(flowrate: number): void {
-    if (flowrate === 100) {
-      return;
-    }
     const flowrateCommand: FeedrateCommand = {
       command: 'flowrate',
       factor: flowrate,

diff --git a/src/app/settings/settings.component.html b/src/app/settings/settings.component.html
@@ -313,7 +313,10 @@
             class="settings__checkbox-container"
             [ngClass]="{
               'settings__checkbox-container-disabled': !(
-                config.plugins.psuControl.enabled || config.plugins.tpLinkSmartPlug.enabled || config.plugins.tasmota.enabled || config.plugins.tasmotaMqtt.enabled
+                config.plugins.psuControl.enabled ||
+                config.plugins.tpLinkSmartPlug.enabled ||
+                config.plugins.tasmota.enabled ||
+                config.plugins.tasmotaMqtt.enabled
               )
             }"
             (click)="config.octodash.turnOnPrinterWhenExitingSleep = !config.octodash.turnOnPrinterWhenExitingSleep"
@@ -323,7 +326,10 @@
                 class="settings__checkbox-checked"
                 [ngClass]="{
                   'settings__checkbox-checked-disabled': !(
-                    config.plugins.psuControl.enabled || config.plugins.tpLinkSmartPlug.enabled || config.plugins.tasmota.enabled || config.plugins.tasmotaMqtt.enabled
+                    config.plugins.psuControl.enabled ||
+                    config.plugins.tpLinkSmartPlug.enabled ||
+                    config.plugins.tasmota.enabled ||
+                    config.plugins.tasmotaMqtt.enabled
                   )
                 }"
                 *ngIf="config.octodash.turnOnPrinterWhenExitingSleep"
@@ -352,6 +358,35 @@
             <span class="settings__checkbox-descriptor" i18n="@@always-circular">Always use circular progress bar</span>
           </div>
           <br />
+          <span class="settings__heading-2">Invert Axis Control</span>
+          <div
+            class="settings__checkbox-container settings__checkbox-container__space-right"
+            (click)="config.octodash.invertAxisControl.x = !config.octodash.invertAxisControl.x"
+          >
+            <span class="settings__checkbox">
+              <span class="settings__checkbox-checked" *ngIf="config.octodash.invertAxisControl.x"></span>
+            </span>
+            <span class="settings__checkbox-descriptor">X</span>
+          </div>
+          <div
+            class="settings__checkbox-container settings__checkbox-container__space-right"
+            (click)="config.octodash.invertAxisControl.y = !config.octodash.invertAxisControl.y"
+          >
+            <span class="settings__checkbox">
+              <span class="settings__checkbox-checked" *ngIf="config.octodash.invertAxisControl.y"></span>
+            </span>
+            <span class="settings__checkbox-descriptor">Y</span>
+          </div>
+          <div
+            class="settings__checkbox-container"
+            (click)="config.octodash.invertAxisControl.z = !config.octodash.invertAxisControl.z"
+          >
+            <span class="settings__checkbox">
+              <span class="settings__checkbox-checked" *ngIf="config.octodash.invertAxisControl.z"></span>
+            </span>
+            <span class="settings__checkbox-descriptor">Z</span>
+          </div>
+
           <span class="settings__heading-2" i18n="@@octodash-files">Files</span>
           <table class="settings__files">
             <tr>
@@ -648,12 +683,12 @@
             required
             [disabled]="!config.plugins.tasmotaMqtt.enabled"
           />
-          <label for="tasmotaMqtt-relayN" class="settings__input-label">RelayN</label>
+          <label for="tasmotaMqtt-relayNumber" class="settings__input-label">Relay Number</label>
           <input
             type="number"
-            id="tasmotaMqtt-relayN"
+            id="tasmotaMqtt-relayNumber"
             class="settings__input"
-            name="tasmotaMqtt-relayN"
+            name="tasmotaMqtt-relayNumber"
             style="width: 44.94vw"
             [(ngModel)]="config.plugins.tasmotaMqtt.relayNumber"
             [disabled]="!config.plugins.tasmotaMqtt.enabled"

diff --git a/src/app/settings/settings.component.scss b/src/app/settings/settings.component.scss
@@ -148,6 +148,10 @@
       cursor: pointer;
       overflow: visible;
 
+      &__space-right {
+        margin-right: 14vw;
+      }
+
       &-disabled {
         opacity: 0.5;
       }

diff --git a/src/app/settings/settings.component.ts b/src/app/settings/settings.component.ts
@@ -53,6 +53,7 @@ export class SettingsComponent implements OnInit, OnDestroy {
         this.settingsCredits.nativeElement,
       ];
     }, 400);
+    console.log(this.config);
   }
 
   public ngOnDestroy(): void {