Cleaned up units code

Author: mikecentola

src/gcodeUnits.ts

@@ -8,16 +8,19 @@ import { ConfigurationChangeEvent, Disposable, TextDocumentChangeEvent, TextEdit
 import { Control } from './control';
 import { UtilCommands } from './util/commands/common';
 import { configuration } from './util/configuration/config';
+import { defaults } from './util/configuration/defaults';
 import { Logger } from './util/logger';
 import { StatusBar, StatusBarControl } from './util/statusBar';
 
 export const enum GCodeUnits {
     Inch = 'Inch',
     MM = 'Metric',
     Auto = 'Auto',
-    Default = 'Defautlt (Inch)',
+    Default = 'Default (Inch)',
 }
 
+const cfgUnits = 'general.units';
+
 export class GCodeUnitsController implements Disposable {
     private readonly _disposable: Disposable | undefined;
     private _editor: TextEditor | undefined;
@@ -29,7 +32,7 @@ export class GCodeUnitsController implements Disposable {
     constructor() {
         this._statusbar = Control.statusBarController;
 
-        this._auto = (this._units = <GCodeUnits>configuration.getParam('general.units')) === GCodeUnits.Auto;
+        this._auto = (this._units = configuration.getParam(cfgUnits) ?? defaults.general.units) === GCodeUnits.Auto;
 
         this._statusbar.updateStatusBar(
             this._units,
@@ -49,8 +52,8 @@ export class GCodeUnitsController implements Disposable {
     }
 
     private onConfigurationChanged(e: ConfigurationChangeEvent) {
-        if (configuration.changed(e, 'general.units')) {
-            if ((this._units = <GCodeUnits>configuration.getParam('general.units')) !== 'Auto') {
+        if (configuration.changed(e, cfgUnits)) {
+            if ((this._units = configuration.getParam(cfgUnits) ?? defaults.general.units) !== GCodeUnits.Auto) {
                 Logger.log(`Units: ${this._units}`);
                 this._auto = false;
                 this._statusbar.updateStatusBar(

src/util/configuration/defaults.ts

@@ -6,6 +6,7 @@
 'use strict';
 
 import { StatusBarAlignment } from 'vscode';
+import { GCodeUnits } from '../../gcodeUnits';
 import { LineNumberFrequency } from '../lineNumberer';
 import { TraceLevel } from '../logger';
 
@@ -22,7 +23,7 @@ interface GCodeConfiguration {
             alignment: StatusBarAlignment;
         };
 
-        units: 'Auto' | 'Inch' | 'Metric';
+        units: GCodeUnits;
 
         outputLevel: TraceLevel;
     };
@@ -61,7 +62,7 @@ export const defaults: GCodeConfiguration = {
             enabled: true,
             alignment: StatusBarAlignment.Left,
         },
-        units: 'Auto',
+        units: GCodeUnits.Auto,
         outputLevel: TraceLevel.Verbose,
     },
     lineNumberer: {