Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer

src/slic3r/GUI/FirmwareDialog.cpp

@@ -354,7 +354,7 @@ bool FirmwareDialog::priv::check_model_id()
 	// Therefore, regretably, so far the check cannot be used and we just return true here.
 	// TODO: Rewrite Serial using more platform-native code.
 	return true;
-	
+
 	// if (hex_file.model_id.empty()) {
 	// 	// No data to check against, assume it's ok
 	// 	return true;

src/slic3r/Utils/Serial.cpp

@@ -353,6 +353,8 @@ void Serial::set_baud_rate(unsigned baud_rate)
 	}
 }
 
+
+/*
 void Serial::set_DTR(bool on)
 {
 	auto handle = native_handle();
@@ -495,6 +497,7 @@ std::string Serial::printer_format_line(const std::string &line, unsigned line_n
 
 	return (boost::format("N%1% %2%*%3%\n") % line_num_str % line % checksum).str();
 }
+*/
 
 
 } // namespace Utils

src/slic3r/Utils/Serial.hpp

@@ -46,6 +46,17 @@ public:
 	~Serial();
 
 	void set_baud_rate(unsigned baud_rate);
+
+	// The Serial implementation is currently in disarray and therefore commented out.
+	// The boost implementation seems to have several problems, such as lack of support
+	// for custom baud rates, few weird implementation bugs and a history of API breakages.
+	// It's questionable whether it solves more problems than causes. Probably not.
+	// TODO: Custom implementation not based on asio.
+	//
+	// As of now, this class is only kept for the purpose of rebooting AVR109,
+	// see FirmwareDialog::priv::avr109_reboot()
+
+/*
 	void set_DTR(bool on);
 
 	// Resets the line number both internally as well as with the firmware using M110
@@ -68,7 +79,7 @@ public:
 
 	// Same as above, but with internally-managed line number
 	size_t printer_write_line(const std::string &line);
-	
+
 	// Toggles DTR to reset the printer
 	void printer_reset();
 
@@ -76,6 +87,7 @@ public:
 	static std::string printer_format_line(const std::string &line, unsigned line_num);
 private:
 	unsigned m_line_num = 0;
+*/
 };