Merge pull request #795 from bdring/Devt

bdring · web-flow · commit c0c539728299 · 2023-01-29T12:30:03.000-06:00
Devt
diff --git a/FluidNC/data/index.html.gz b/FluidNC/data/index.html.gz
diff --git a/FluidNC/src/GCode.cpp b/FluidNC/src/GCode.cpp
@@ -480,7 +480,7 @@ Error gc_execute_line(char* line) {
                 break;
             case 'M':
                 // Determine 'M' command and its modal group
-                if (mantissa > 0) {
+                if (mantissa > 0 && !(int_value == 7 || int_value == 8)) {
                     FAIL(Error::GcodeCommandValueNotInteger);  // [No Mxx.x commands]
                 }
                 switch (int_value) {
@@ -533,11 +533,17 @@ Error gc_execute_line(char* line) {
                     case 9:
                         switch (int_value) {
                             case 7:
+                                if (mantissa && mantissa != 10) {
+                                    FAIL(Error::GcodeUnsupportedCommand);  // M7 and M7.1 are supported
+                                }
                                 if (config->_coolant->hasMist()) {
                                     gc_block.coolant = GCodeCoolant::M7;
                                 }
                                 break;
                             case 8:
+                                if (mantissa && mantissa != 10) {
+                                    FAIL(Error::GcodeUnsupportedCommand);  // M8 and M8.1 are supported
+                                }
                                 if (config->_coolant->hasFlood()) {
                                     gc_block.coolant = GCodeCoolant::M8;
                                 }
@@ -1449,10 +1455,10 @@ Error gc_execute_line(char* line) {
             case GCodeCoolant::None:
                 break;
             case GCodeCoolant::M7:
-                gc_state.modal.coolant.Mist = 1;
+                gc_state.modal.coolant.Mist = mantissa == 10 ? 0 : 1;
                 break;
             case GCodeCoolant::M8:
-                gc_state.modal.coolant.Flood = 1;
+                gc_state.modal.coolant.Flood = mantissa == 10 ? 0 : 1;
                 break;
             case GCodeCoolant::M9:
                 gc_state.modal.coolant = {};
diff --git a/FluidNC/src/Kinematics/WallPlotter.cpp b/FluidNC/src/Kinematics/WallPlotter.cpp
@@ -42,6 +42,11 @@ namespace Kinematics {
         }
     }
 
+    bool WallPlotter::canHome(AxisMask axisMask) {
+        log_error("This kinematic system cannot home");
+        return false;
+    }
+
     void WallPlotter::transform_cartesian_to_motors(float* cartesian, float* motors) {
         log_error("WallPlotter::transform_cartesian_to_motors is broken");
     }
diff --git a/FluidNC/src/Kinematics/WallPlotter.h b/FluidNC/src/Kinematics/WallPlotter.h
@@ -24,6 +24,7 @@ namespace Kinematics {
         // Kinematic Interface
 
         void init() override;
+        bool canHome(AxisMask axisMask) override;
         void init_position() override;
         bool cartesian_to_motors(float* target, plan_line_data_t* pl_data, float* position) override;
         void motors_to_cartesian(float* cartesian, float* motors, int n_axis) override;
diff --git a/FluidNC/src/Machine/Axis.cpp b/FluidNC/src/Machine/Axis.cpp
@@ -32,6 +32,9 @@ namespace Machine {
             _homing         = new Homing();
             _homing->_cycle = 0;
         }
+        if (_motors[0] == nullptr) {
+            _motors[0] = new Machine::Motor(_axis, 0);
+        }
     }
 
     void Axis::init() {
diff --git a/FluidNC/src/Machine/Homing.cpp b/FluidNC/src/Machine/Homing.cpp
@@ -420,8 +420,7 @@ namespace Machine {
     // cycle.  The protocol loop will then respond to events and advance
     // the homing state machine through its phases.
     void Homing::run_cycles(AxisMask axisMask) {
-        if (!config->_kinematics->canHome(axisMask)) {
-            log_error("This kinematic system cannot do homing");
+        if (!config->_kinematics->canHome(axisMask)) {            
             sys.state = State::Alarm;
             return;
         }
diff --git a/FluidNC/src/Machine/SPIBus.cpp b/FluidNC/src/Machine/SPIBus.cpp
@@ -29,7 +29,7 @@ namespace Machine {
             misoPin = _miso.getNative(Pin::Capabilities::Input | Pin::Capabilities::Native);
         } else {
             if (sd_fallback_cs->get() == -1) {
-                log_info("SPI not defined");
+                log_debug("SPI not defined");
                 return;
             }
             log_info("Using default SPI pins");
@@ -42,7 +42,9 @@ namespace Machine {
         _defined = true;
     }
 
-    void SPIBus::deinit() { spi_deinit_bus(); }
+    void SPIBus::deinit() {
+        spi_deinit_bus();
+    }
 
     void SPIBus::group(Configuration::HandlerBase& handler) {
         handler.item("miso_pin", _miso);
@@ -63,5 +65,7 @@ namespace Machine {
         // }
     }
 
-    bool SPIBus::defined() { return _defined; }
+    bool SPIBus::defined() {
+        return _defined;
+    }
 }
diff --git a/FluidNC/src/Report.cpp b/FluidNC/src/Report.cpp
@@ -365,7 +365,7 @@ void report_gcode_modes(Channel& channel) {
         msg << " M56";
     }
 
-    msg << " T" + gc_state.tool;
+    msg << " T" << gc_state.tool;
     int digits = config->_reportInches ? 1 : 0;
     msg << " F" << std::fixed << std::setprecision(digits) << gc_state.feed_rate;
     msg << " S" << uint32_t(gc_state.spindle_speed);
diff --git a/FluidNC/src/SDCard.cpp b/FluidNC/src/SDCard.cpp
@@ -32,8 +32,7 @@ void SDCard::init() {
         csPin = static_cast<pinnum_t>(csFallback);
         log_info("Using fallback CS pin " << int(csPin));
     } else {
-        log_info("No SD Card CS Pin");
-        log_info("See http://wiki.fluidnc.com/en/config/sd_card#sdfallbackcs-access-sd-without-a-config-file");
+        log_debug("See http://wiki.fluidnc.com/en/config/sd_card#sdfallbackcs-access-sd-without-a-config-file");
         return;
     }
 
diff --git a/FluidNC/src/SettingsDefinitions.cpp b/FluidNC/src/SettingsDefinitions.cpp
@@ -48,6 +48,8 @@ void make_settings() {
     make_coordinate(CoordIndex::G59, "G59");
     make_coordinate(CoordIndex::G28, "G28");
     make_coordinate(CoordIndex::G30, "G30");
+    make_coordinate(CoordIndex::G92, "G92");
+    make_coordinate(CoordIndex::TLO, "TLO");
 
     message_level = new EnumSetting("Which Messages", EXTENDED, WG, NULL, "Message/Level", MsgLevelInfo, &messageLevels, NULL);
 
diff --git a/FluidNC/src/WebUI/WifiConfig.cpp b/FluidNC/src/WebUI/WifiConfig.cpp
@@ -42,6 +42,103 @@ namespace WebUI {
         { "AP", WiFiAP },
         { "STA>AP", WiFiFallback },
     };
+
+    enum WiFiContry {
+        WiFiCountry01 = 0, // country "01" is the safest set of settings which complies with all regulatory domains
+        WiFiCountryAT,
+        WiFiCountryAU,
+        WiFiCountryBE,
+        WiFiCountryBG,
+        WiFiCountryBR,
+        WiFiCountryCA,
+        WiFiCountryCH,
+        WiFiCountryCN,
+        WiFiCountryCY,
+        WiFiCountryCZ,
+        WiFiCountryDE,
+        WiFiCountryDK,
+        WiFiCountryEE,
+        WiFiCountryES,
+        WiFiCountryFI,
+        WiFiCountryFR,
+        WiFiCountryGB,
+        WiFiCountryGR,
+        WiFiCountryHK,
+        WiFiCountryHR,
+        WiFiCountryHU,
+        WiFiCountryIE,
+        WiFiCountryIN,
+        WiFiCountryIS,
+        WiFiCountryIT,
+        WiFiCountryJP,
+        WiFiCountryKR,
+        WiFiCountryLI,
+        WiFiCountryLT,
+        WiFiCountryLU,
+        WiFiCountryLV,
+        WiFiCountryMT,
+        WiFiCountryMX,
+        WiFiCountryNL,
+        WiFiCountryNO,
+        WiFiCountryNZ,
+        WiFiCountryPL,
+        WiFiCountryPT,
+        WiFiCountryRO,
+        WiFiCountrySE,
+        WiFiCountrySI,
+        WiFiCountrySK,
+        WiFiCountryTW,
+        WiFiCountryUS,
+    };
+
+    enum_opt_t wifiContryOptions = {
+        { "01", WiFiCountry01 },
+        { "AT", WiFiCountryAT },
+        { "AU", WiFiCountryAU },
+        { "BE", WiFiCountryBE },
+        { "BG", WiFiCountryBG },
+        { "BR", WiFiCountryBR },
+        { "CA", WiFiCountryCA },
+        { "CH", WiFiCountryCH },
+        { "CN", WiFiCountryCN },
+        { "CY", WiFiCountryCY },
+        { "CZ", WiFiCountryCZ },
+        { "DE", WiFiCountryDE },
+        { "DK", WiFiCountryDK },
+        { "EE", WiFiCountryEE },
+        { "ES", WiFiCountryES },
+        { "FI", WiFiCountryFI },
+        { "FR", WiFiCountryFR },
+        { "GB", WiFiCountryGB },
+        { "GR", WiFiCountryGR },
+        { "HK", WiFiCountryHK },
+        { "HR", WiFiCountryHR },
+        { "HU", WiFiCountryHU },
+        { "IE", WiFiCountryIE },
+        { "IN", WiFiCountryIN },
+        { "IS", WiFiCountryIS },
+        { "IT", WiFiCountryIT },
+        { "JP", WiFiCountryJP },
+        { "KR", WiFiCountryKR },
+        { "LI", WiFiCountryLI },
+        { "LT", WiFiCountryLT },
+        { "LU", WiFiCountryLU },
+        { "LV", WiFiCountryLV },
+        { "MT", WiFiCountryMT },
+        { "MX", WiFiCountryMX },
+        { "NL", WiFiCountryNL },
+        { "NO", WiFiCountryNO },
+        { "NZ", WiFiCountryNZ },
+        { "PL", WiFiCountryPL },
+        { "PT", WiFiCountryPT },
+        { "RO", WiFiCountryRO },
+        { "SE", WiFiCountrySE },
+        { "SI", WiFiCountrySI },
+        { "SK", WiFiCountrySK },
+        { "TW", WiFiCountryTW },
+        { "US", WiFiCountryUS },
+    };
+
     EnumSetting* wifi_mode;
 
     StringSetting* wifi_sta_ssid;
@@ -56,6 +153,7 @@ namespace WebUI {
 
     StringSetting* wifi_ap_ssid;
     StringSetting* wifi_ap_password;
+    EnumSetting*   wifi_ap_country;
 
     IPaddrSetting* wifi_ap_ip;
 
@@ -170,9 +268,12 @@ namespace WebUI {
                 print_mac(out, "Current WiFi Mode: AP", WiFi.softAPmacAddress());
 
                 wifi_config_t conf;
+                wifi_country_t country;
                 esp_wifi_get_config(WIFI_IF_AP, &conf);
+                esp_wifi_get_country(&country);
                 log_to(out, "SSID: ", (const char*)conf.ap.ssid);
                 log_to(out, "Visible: ", (conf.ap.ssid_hidden == 0 ? "Yes" : "No"));
+                log_to(out, "Radio country set: ", country.cc << " (channels " << country.schan << "-" << (country.schan+country.nchan-1) << ", max power " << country.max_tx_power << "dBm)");
 
                 const char* mode;
                 switch (conf.ap.authmode) {
@@ -271,6 +372,8 @@ namespace WebUI {
                                              (bool (*)(char*))WiFiConfig::isPasswordValid);
         wifi_ap_ssid     = new StringSetting(
             "AP SSID", WEBSET, WA, "ESP105", "AP/SSID", DEFAULT_AP_SSID, MIN_SSID_LENGTH, MAX_SSID_LENGTH, (bool (*)(char*))WiFiConfig::isSSIDValid);
+        wifi_ap_country  = new EnumSetting(
+            "AP regulatory domain", WEBSET, WA, NULL, "AP/Country", WiFiCountry01, &wifiContryOptions, NULL);
         wifi_sta_netmask = new IPaddrSetting("Station Static Mask", WEBSET, WA, NULL, "Sta/Netmask", DEFAULT_STA_MK, NULL);
         wifi_sta_gateway = new IPaddrSetting("Station Static Gateway", WEBSET, WA, NULL, "Sta/Gateway", DEFAULT_STA_GW, NULL);
         wifi_sta_ip      = new IPaddrSetting("Station Static IP", WEBSET, WA, NULL, "Sta/IP", DEFAULT_STA_IP, NULL);
@@ -598,6 +701,11 @@ namespace WebUI {
         WiFi.enableSTA(false);
         WiFi.mode(WIFI_AP);
 
+        const char *country = wifi_ap_country->getStringValue();
+        if (ESP_OK != esp_wifi_set_country_code(country, true)) {
+            log_error("failed to set Wifi regulatory domain to " << country);
+        }
+
         //auto comms = config->_comms;  // _comms is automatically created in afterParse
         //auto ap    = comms->_apConfig;
         // ap might be nullpt if there is an explicit comms: with no wifi_ap:
diff --git a/example_configs/BlackBox_X32_XYYZ-DOOR.yaml b/example_configs/BlackBox_X32_XYYZ-DOOR.yaml

Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,11 @@ namespace Kinematics {`
`42`	`42`	`}`
`43`	`43`	`}`
`44`	`44`
	`45`	`+ bool WallPlotter::canHome(AxisMask axisMask) {`
	`46`	`+ log_error("This kinematic system cannot home");`
	`47`	`+ return false;`
	`48`	`+ }`
	`49`	`+`
`45`	`50`	`void WallPlotter::transform_cartesian_to_motors(float* cartesian, float* motors) {`
`46`	`51`	`log_error("WallPlotter::transform_cartesian_to_motors is broken");`
`47`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,9 @@ namespace Machine {`
`32`	`32`	`_homing = new Homing();`
`33`	`33`	`_homing->_cycle = 0;`
`34`	`34`	`}`
	`35`	`+ if (_motors[0] == nullptr) {`
	`36`	`+ _motors[0] = new Machine::Motor(_axis, 0);`
	`37`	`+ }`
`35`	`38`	`}`
`36`	`39`
`37`	`40`	`void Axis::init() {`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ namespace Machine {`
`29`	`29`	`misoPin = _miso.getNative(Pin::Capabilities::Input \| Pin::Capabilities::Native);`
`30`	`30`	`} else {`
`31`	`31`	`if (sd_fallback_cs->get() == -1) {`
`32`		`- log_info("SPI not defined");`
	`32`	`+ log_debug("SPI not defined");`
`33`	`33`	`return;`
`34`	`34`	`}`
`35`	`35`	`log_info("Using default SPI pins");`
`@@ -42,7 +42,9 @@ namespace Machine {`
`42`	`42`	`_defined = true;`
`43`	`43`	`}`
`44`	`44`
`45`		`- void SPIBus::deinit() { spi_deinit_bus(); }`
	`45`	`+ void SPIBus::deinit() {`
	`46`	`+ spi_deinit_bus();`
	`47`	`+ }`
`46`	`48`
`47`	`49`	`void SPIBus::group(Configuration::HandlerBase& handler) {`
`48`	`50`	`handler.item("miso_pin", _miso);`
`@@ -63,5 +65,7 @@ namespace Machine {`
`63`	`65`	`// }`
`64`	`66`	`}`
`65`	`67`
`66`		`- bool SPIBus::defined() { return _defined; }`
	`68`	`+ bool SPIBus::defined() {`
	`69`	`+ return _defined;`
	`70`	`+ }`
`67`	`71`	`}`
Original file line number	Diff line number	Diff line change
`@@ -365,7 +365,7 @@ void report_gcode_modes(Channel& channel) {`
`365`	`365`	`msg << " M56";`
`366`	`366`	`}`
`367`	`367`
`368`		`- msg << " T" + gc_state.tool;`
	`368`	`+ msg << " T" << gc_state.tool;`
`369`	`369`	`int digits = config->_reportInches ? 1 : 0;`
`370`	`370`	`msg << " F" << std::fixed << std::setprecision(digits) << gc_state.feed_rate;`
`371`	`371`	`msg << " S" << uint32_t(gc_state.spindle_speed);`
Original file line number	Diff line number	Diff line change
`@@ -32,8 +32,7 @@ void SDCard::init() {`
`32`	`32`	`csPin = static_cast<pinnum_t>(csFallback);`
`33`	`33`	`log_info("Using fallback CS pin " << int(csPin));`
`34`	`34`	`} else {`
`35`		`- log_info("No SD Card CS Pin");`
`36`		`- log_info("See http://wiki.fluidnc.com/en/config/sd_card#sdfallbackcs-access-sd-without-a-config-file");`
	`35`	`+ log_debug("See http://wiki.fluidnc.com/en/config/sd_card#sdfallbackcs-access-sd-without-a-config-file");`
`37`	`36`	`return;`
`38`	`37`	`}`
`39`	`38`