From c547d510f535699138fb7bf8af4d94d37e52dfea Mon Sep 17 00:00:00 2001 From: slimeth Date: Tue, 17 Nov 2020 17:07:54 +0100 Subject: [PATCH] minor changes --- flightros/CMakeLists.txt | 2 ++ flightros/include/flightros/racing/racing.hpp | 1 - flightros/launch/camera/camera.rviz | 24 +++++-------------- 3 files changed, 8 insertions(+), 19 deletions(-) diff --git a/flightros/CMakeLists.txt b/flightros/CMakeLists.txt index e9289266be..068ca2abfa 100644 --- a/flightros/CMakeLists.txt +++ b/flightros/CMakeLists.txt @@ -29,6 +29,8 @@ endif () # Setup General C++ Flags SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DEIGEN_STACK_ALLOCATION_LIMIT=1048576") +# otherwise double free or corruption (out) error when running racing or motion_planning example +add_compile_options(-O3) # Setup Release and Debug flags set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_ARCH_FLAGS} -Wall -DNDEBUG -fPIC") diff --git a/flightros/include/flightros/racing/racing.hpp b/flightros/include/flightros/racing/racing.hpp index 09ee78ec3f..1d6d294152 100644 --- a/flightros/include/flightros/racing/racing.hpp +++ b/flightros/include/flightros/racing/racing.hpp @@ -6,7 +6,6 @@ // standard libraries #include #include -#include #include #include #include diff --git a/flightros/launch/camera/camera.rviz b/flightros/launch/camera/camera.rviz index e77467182d..a8e091819c 100644 --- a/flightros/launch/camera/camera.rviz +++ b/flightros/launch/camera/camera.rviz @@ -7,7 +7,7 @@ Panels: - /Global Options1 - /Status1 Splitter Ratio: 0.5 - Tree Height: 70 + Tree Height: 190 - Class: rviz/Selection Name: Selection - Class: rviz/Tool Properties @@ -38,7 +38,7 @@ Visualization Manager: Cell Size: 1 Class: rviz/Grid Color: 160; 160; 164 - Enabled: true + Enabled: false Line Style: Line Width: 0.029999999329447746 Value: Lines @@ -51,7 +51,7 @@ Visualization Manager: Plane: XY Plane Cell Count: 10 Reference Frame: - Value: true + Value: false - Class: rviz/Image Enabled: true Image Topic: /depth @@ -76,18 +76,6 @@ Visualization Manager: Transport Hint: raw Unreliable: false Value: true - - Class: rviz/Image - Enabled: false - Image Topic: /rgb - Max Value: 1 - Median window: 5 - Min Value: 0 - Name: Image - Normalize Range: true - Queue Size: 2 - Transport Hint: raw - Unreliable: false - Value: false - Class: rviz/Image Enabled: true Image Topic: /rgb @@ -115,7 +103,7 @@ Visualization Manager: Enabled: true Global Options: Background Color: 48; 48; 48 - Default Light: true + Default Light: false Fixed Frame: map Frame Rate: 30 Name: root @@ -163,12 +151,12 @@ Visualization Manager: Window Geometry: Displays: collapsed: false - Height: 1010 + Height: 1130 Hide Left Dock: false Hide Right Dock: true Image: collapsed: false - QMainWindow State: 000000ff00000000fd00000004000000000000075a000000c9fc0200000008fb0000001200530065006c0065006300740069006f006e00000001e10000009b0000005c00fffffffb0000001e0054006f006f006c002000500072006f007000650072007400690065007302000001ed000001df00000185000000a3fb000000120056006900650077007300200054006f006f02000001df000002110000018500000122fb000000200054006f006f006c002000500072006f0070006500720074006900650073003203000002880000011d000002210000017afb000000100044006900730070006c00610079007301000002cd000000c9000000c900fffffffb0000002000730065006c0065006300740069006f006e00200062007500660066006500720200000138000000aa0000023a00000294fb00000014005700690064006500530074006500720065006f02000000e6000000d2000003ee0000030bfb0000000c004b0069006e0065006300740200000186000001060000030c00000261000000010000010f00000354fc0200000003fb0000001e0054006f006f006c002000500072006f00700065007200740069006500730100000041000000780000000000000000fb0000000a00560069006500770073000000003d00000354000000a400fffffffb0000001200530065006c0065006300740069006f006e010000025a000000b2000000000000000000000002000007800000028afc0100000006fb0000000a0049006d0061006700650100000000000001e00000005e00fffffffb0000000a0049006d00610067006501000001e6000001e00000005e00fffffffb0000000a0049006d00610067006501000003cc000001dd0000005e00fffffffb0000000a0049006d00610067006501000005af000001d10000005e00fffffffb0000000a0049006d006100670065000000069b000000e50000005e00fffffffb0000000a00560069006500770073030000004e00000080000002e100000197000000030000078000000039fc0100000002fb0000000800540069006d0065010000000000000780000002eb00fffffffb0000000800540069006d0065010000000000000450000000000000000000000020000000c900000004000000040000000800000008fc0000000100000002000000010000000a0054006f006f006c00730100000000ffffffff0000000000000000 + QMainWindow State: 000000ff00000000fd00000004000000000000075a00000141fc0200000008fb0000001200530065006c0065006300740069006f006e00000001e10000009b0000005c00fffffffb0000001e0054006f006f006c002000500072006f007000650072007400690065007302000001ed000001df00000185000000a3fb000000120056006900650077007300200054006f006f02000001df000002110000018500000122fb000000200054006f006f006c002000500072006f0070006500720074006900650073003203000002880000011d000002210000017afb000000100044006900730070006c00610079007301000002cd00000141000000c900fffffffb0000002000730065006c0065006300740069006f006e00200062007500660066006500720200000138000000aa0000023a00000294fb00000014005700690064006500530074006500720065006f02000000e6000000d2000003ee0000030bfb0000000c004b0069006e0065006300740200000186000001060000030c00000261000000010000010f00000354fc0200000003fb0000001e0054006f006f006c002000500072006f00700065007200740069006500730100000041000000780000000000000000fb0000000a00560069006500770073000000003d00000354000000a400fffffffb0000001200530065006c0065006300740069006f006e010000025a000000b2000000000000000000000002000007800000028afc010000000afb0000000a0049006d0061006700650100000000000001e80000005e00fffffffb0000000a0049006d00610067006501000001ee000001e40000005e00fffffffb0000000a0049006d00610067006501000003d8000001cb0000005e00fffffffb0000000a0049006d00610067006501000005a9000001d70000005e00fffffffb0000000a0049006d00610067006501000001e3000001e00000000000000000fb0000000a0049006d00610067006501000003c9000001e20000000000000000fb0000000a0049006d00610067006501000005a0000001e00000000000000000fb0000000a0049006d00610067006500000005c7000001b90000000000000000fb0000000a0049006d00610067006501000005b1000001cf0000000000000000fb0000000a00560069006500770073030000004e00000080000002e100000197000000030000078000000039fc0100000002fb0000000800540069006d0065010000000000000780000002eb00fffffffb0000000800540069006d00650100000000000004500000000000000000000000200000014100000004000000040000000800000008fc0000000100000002000000010000000a0054006f006f006c00730100000000ffffffff0000000000000000 Selection: collapsed: false Time: