diff options
| author | Trygve Laugstøl <trygvis@inamo.no> | 2015-02-22 15:36:06 +0100 |
|---|---|---|
| committer | Trygve Laugstøl <trygvis@inamo.no> | 2015-02-22 15:36:06 +0100 |
| commit | ba6324930118a62e05d3869f99543c4a7507f105 (patch) | |
| tree | 8f23c2104c7d4338ef60f1097184b48a4d2849ed /apps | |
| parent | e5b99b359cebd2145a891932686bb9cdab751809 (diff) | |
| download | ble-toys-ba6324930118a62e05d3869f99543c4a7507f105.tar.gz ble-toys-ba6324930118a62e05d3869f99543c4a7507f105.tar.bz2 ble-toys-ba6324930118a62e05d3869f99543c4a7507f105.tar.xz ble-toys-ba6324930118a62e05d3869f99543c4a7507f105.zip | |
o Splitting out public header files into it's own directory.
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | apps/ble-inspect-device.cpp | 7 | ||||
| -rw-r--r-- | apps/sm-get-value.cpp | 7 |
3 files changed, 7 insertions, 9 deletions
diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt index a138336..aefb0fb 100644 --- a/apps/CMakeLists.txt +++ b/apps/CMakeLists.txt @@ -10,7 +10,7 @@ pkg_check_modules(BLUEZ bluez REQUIRED) find_package(Threads REQUIRED) foreach(app ${APPS}) - include_directories("${PROJECT_SOURCE_DIR}/ble") + include_directories("${PROJECT_SOURCE_DIR}/include") add_executable(${app} ${app}.cpp) add_dependencies(${app} ble) diff --git a/apps/ble-inspect-device.cpp b/apps/ble-inspect-device.cpp index b9abe11..cdc8375 100644 --- a/apps/ble-inspect-device.cpp +++ b/apps/ble-inspect-device.cpp @@ -2,8 +2,7 @@ #include <iostream> #include <vector> #include <boost/uuid/uuid_io.hpp> -#include "Bluetooth.h" -#include "log.h" +#include "ble/Bluetooth.h" using namespace std; using namespace trygvis::bluetooth; @@ -50,10 +49,10 @@ int main(int argc, char *argv[]) { return EXIT_SUCCESS; } catch (std::runtime_error ex) { - W << "std::runtime_error: " << ex.what(); + cout << "std::runtime_error: " << ex.what() << endl; return EXIT_FAILURE; } catch (std::exception ex) { - W << "std::exception: " << ex.what(); + cout << "std::exception: " << ex.what() << endl; return EXIT_FAILURE; } } diff --git a/apps/sm-get-value.cpp b/apps/sm-get-value.cpp index 66d35f1..e4ddc16 100644 --- a/apps/sm-get-value.cpp +++ b/apps/sm-get-value.cpp @@ -1,9 +1,8 @@ #include <iostream> #include <boost/uuid/uuid_io.hpp> #include <boost/optional.hpp> -#include "Bluetooth.h" +#include "ble/Bluetooth.h" #include "soil-moisture.h" -#include "log.h" using namespace std; using namespace trygvis::bluetooth; @@ -135,10 +134,10 @@ int main(int argc, char *argv[]) { return EXIT_SUCCESS; } catch (std::runtime_error ex) { - W << "std::runtime_error: " << ex.what(); + cout << "std::runtime_error: " << ex.what() << endl; return EXIT_FAILURE; } catch (std::exception ex) { - W << "std::exception: " << ex.what(); + cout << "std::exception: " << ex.what() << endl; return EXIT_FAILURE; } } |