3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Yet another fix for OSX

Browse Source
This commit is contained in:
bubnikv 2018-05-21 17:48:32 +02:00 committed by Vojtech Kral
parent 0a328789ef
commit 1e8a0b69b2
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
xs/src/slic3r/Utils/Serial.cpp
View File

@ -23,6 +23,7 @@
#pragma comment(lib, "user32.lib") #pragma comment(lib, "user32.lib")
#elif __APPLE__ #elif __APPLE__
#include <CoreFoundation/CoreFoundation.h> #include <CoreFoundation/CoreFoundation.h>
#include <CoreFoundation/CFString.h>
#include <IOKit/IOKitLib.h> #include <IOKit/IOKitLib.h>
#include <IOKit/serial/IOSerialKeys.h> #include <IOKit/serial/IOSerialKeys.h>
#include <IOKit/serial/ioss.h> #include <IOKit/serial/ioss.h>
@ -117,13 +118,13 @@ std::vector<SerialPortInfo> scan_serial_ports_extended()
// Description limited to 127 char, anything longer would not be user friendly anyway. // Description limited to 127 char, anything longer would not be user friendly anyway.
char description[128]; char description[128];
if (CFStringGetCString(cf_property, description, sizeof(description), kCFStringEncodingUTF8)) { if (CFStringGetCString(cf_property, description, sizeof(description), kCFStringEncodingUTF8)) {
port_info.friendly_name = std::string(description) + " (" + port_info.path + ")"; port_info.friendly_name = std::string(description) + " (" + port_info.port + ")";
port_info.is_printer = looks_like_printer(port_info.friendly_name); port_info.is_printer = looks_like_printer(port_info.friendly_name);
} }
CFRelease(cf_property); CFRelease(cf_property);
} }
if (port_info.friendly_name.empty()) if (port_info.friendly_name.empty())
port_info.friendly_name = port_info.path; port_info.friendly_name = port_info.port;
output.emplace_back(std::move(port_info)); output.emplace_back(std::move(port_info));
} }
} }