From 41ce6c5c0b36b908326e45d2c0c6f8eec2aca88f Mon Sep 17 00:00:00 2001 From: KGN Date: Fri, 17 Nov 2023 11:06:16 -0500 Subject: [PATCH] Appveyor to node 16 --- appveyor.yml | 18 +++++++++--------- .../controllers/Grblhal/GrblHalController.js | 6 +----- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 2b319d5e4..20a1ea47b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -12,27 +12,27 @@ environment: matrix: #- job_name: Windows build (x86) # appveyor_build_worker_image: Visual Studio 2019 - # nodejs_version: "14" + # nodejs_version: "16" # ARCH: x86 - job_name: Windows build (x64) appveyor_build_worker_image: Visual Studio 2019 - nodejs_version: "14" + nodejs_version: "16" ARCH: x64 - job_name: macOS build (x64) appveyor_build_worker_image: macos - nodejs_version: "14" + nodejs_version: "16" ARCH: x64 #- job_name: macOS build (arm64) # appveyor_build_worker_image: macos - # nodejs_version: "14" + # nodejs_version: "16" # ARCH: arm64 - job_name: Linux build (amd64) appveyor_build_worker_image: Ubuntu2004 - nodejs_version: "14" + nodejs_version: "16" ARCH: amd64 - job_name: Linux build (arm64) appveyor_build_worker_image: Ubuntu2004 - nodejs_version: "14" + nodejs_version: "16" ARCH: arm64 global: GH_TOKEN: @@ -303,7 +303,7 @@ for: prerelease: false on: appveyor_repo_tag: true # deploy on tag push only - nodejs_version: "14" + nodejs_version: "16" # macOS - @@ -425,7 +425,7 @@ for: prerelease: false on: appveyor_repo_tag: true # deploy on tag push only - nodejs_version: "14" + nodejs_version: "16" # Windows - @@ -545,4 +545,4 @@ for: prerelease: false on: appveyor_repo_tag: true # deploy on tag push only - nodejs_version: "14" + nodejs_version: "16" diff --git a/src/server/controllers/Grblhal/GrblHalController.js b/src/server/controllers/Grblhal/GrblHalController.js index 1670d55dc..5cf944e10 100644 --- a/src/server/controllers/Grblhal/GrblHalController.js +++ b/src/server/controllers/Grblhal/GrblHalController.js @@ -1003,15 +1003,11 @@ class GrblHalController { async initController() { // $13=0 (report in mm) // $13=1 (report in inches) - this.connection.writeImmediate(String.fromCharCode(0x87)); this.writeln('$$'); await delay(50); this.event.trigger(CONTROLLER_READY); - this.connection.writeImmediate('$ES\n'); await delay(100); - this.connection.writeImmediate('$ESH\n'); - this.connection.writeImmediate('$EG\n'); - this.connection.writeImmediate('$EA\n'); + this.connection.writeImmediate('$ES\n$ESH\n$EG\n$EA\n'); } populateContext(context = {}) {