diff options
| author | Trygve Laugstøl <trygvis@inamo.no> | 2015-02-17 20:14:34 +0100 |
|---|---|---|
| committer | Trygve Laugstøl <trygvis@inamo.no> | 2015-02-17 23:30:04 +0100 |
| commit | 254be95ff2f37df8adec7ce068448ba8abc8d734 (patch) | |
| tree | f1483c2ff4c2e194cf90c59ce741d96917f7aaf5 /Bluetooth.h | |
| parent | 0d0543e4daeb1c6b01d4799736026b6f3aef9779 (diff) | |
| parent | 0d0749ff0f842f10fea6929dc466e4e1be458234 (diff) | |
| download | ble-toys-254be95ff2f37df8adec7ce068448ba8abc8d734.tar.gz ble-toys-254be95ff2f37df8adec7ce068448ba8abc8d734.tar.bz2 ble-toys-254be95ff2f37df8adec7ce068448ba8abc8d734.tar.xz ble-toys-254be95ff2f37df8adec7ce068448ba8abc8d734.zip | |
Merge remote-tracking branch 'origin/master'
Conflicts:
Bluetooth.cpp
Bluetooth.h
ByteBuffer.cpp
CMakeLists.txt
LinuxBluetooth.cpp
main.cpp
test/ByteBufferTest.cpp
Diffstat (limited to 'Bluetooth.h')
| -rw-r--r-- | Bluetooth.h | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/Bluetooth.h b/Bluetooth.h index 7ed7b8c..1b5d5f0 100644 --- a/Bluetooth.h +++ b/Bluetooth.h @@ -5,20 +5,9 @@ #include <stdexcept> // For now -#include <boost/log/core.hpp> -#include <boost/log/trivial.hpp> -#include "ByteBuffer.h" - -#define D BOOST_LOG_TRIVIAL(debug) -#define I BOOST_LOG_TRIVIAL(info) -#define W BOOST_LOG_TRIVIAL(warning) +#include "log.h" -#define DF BOOST_LOG_TRIVIAL(debug) << __FUNCTION__ << ": " -#define IF BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ": " -#define WF BOOST_LOG_TRIVIAL(warning) << __FUNCTION__ << ": " - -#define UUID_PRIMARY_SERVICE 0x2800 -#define UUID_SECONDARY_SERVICE 0x2801 +#include "ByteBuffer.h" namespace trygvis { namespace bluetooth { @@ -130,7 +119,7 @@ class AttributeData { public: ~AttributeData(); - static AttributeData fromByteBuffer(ByteBuffer &value, uint8_t length); + static AttributeData fromByteBuffer(ByteBuffer &value); const uint16_t handle; const uint16_t groupEndHandle; |