Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[apps][fix] Make examples compilable in Visual Studios 2017 and 2019 #25

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion sdk/app/frame_grabber/stdafx.h
Original file line number Diff line number Diff line change
Expand Up @@ -75,4 +75,5 @@ using namespace WTL;

//STL
#include <vector>
#include <map>
#include <map>
#include <string>
4 changes: 2 additions & 2 deletions sdk/app/simple_grabber/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ using namespace rp::standalone::rplidar;
void print_usage(int argc, const char * argv[])
{
printf("Simple LIDAR data grabber for RPLIDAR.\n"
"Version: "RPLIDAR_SDK_VERSION"\n"
"Version: " RPLIDAR_SDK_VERSION "\n"
"Usage:\n"
"%s <com port> [baudrate]\n"
"The default baudrate is 115200(for A2) or 256000(for A3). Please refer to the datasheet for details.\n"
Expand Down Expand Up @@ -189,7 +189,7 @@ int main(int argc, const char * argv[]) {
}

printf("\n"
"Version: "RPLIDAR_SDK_VERSION"\n"
"Version: " RPLIDAR_SDK_VERSION "\n"
"Firmware Ver: %d.%02d\n"
"Hardware Rev: %d\n"
, devinfo.firmware_version>>8
Expand Down
5 changes: 2 additions & 3 deletions sdk/app/ultra_simple/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ int main(int argc, const char * argv[]) {
bool useArgcBaudrate = false;

printf("Ultra simple LIDAR data grabber for RPLIDAR.\n"
"Version: "RPLIDAR_SDK_VERSION"\n");
"Version: " RPLIDAR_SDK_VERSION "\n");

// read serial port from the command line...
if (argc>1) opt_com_path = argv[1]; // or set to a fixed value: e.g. "com3"
Expand All @@ -105,7 +105,7 @@ int main(int argc, const char * argv[]) {
if (!opt_com_path) {
#ifdef _WIN32
// use default com port
opt_com_path = "\\\\.\\com3";
opt_com_path = "\\\\.\\com57";
#elif __APPLE__
opt_com_path = "/dev/tty.SLAB_USBtoUART";
#else
Expand Down Expand Up @@ -205,7 +205,6 @@ int main(int argc, const char * argv[]) {
size_t count = _countof(nodes);

op_result = drv->grabScanDataHq(nodes, count);

if (IS_OK(op_result)) {
drv->ascendScanData(nodes, count);
for (int pos = 0; pos < (int)count ; ++pos) {
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#v4.0:v100
Debug|Win32|D:\sdk\rplidar_sdk\rplidar_sdk\sdk\workspaces\vc10\|
Binary file not shown.
Loading