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

sort includes ble #687

Merged
merged 2 commits into from
May 14, 2020
Merged
Changes from 1 commit
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
4 changes: 2 additions & 2 deletions src/ble/BLEEndPoint.cpp
Original file line number Diff line number Diff line change
@@ -36,10 +36,10 @@
#if CONFIG_NETWORK_LAYER_BLE
#include <core/CHIPConfig.h>

#include <support/logging/CHIPLogging.h>
#include <support/CHIPFaultInjection.h>
#include <support/CodeUtils.h>
#include <support/FlagUtils.hpp>
#include <support/CHIPFaultInjection.h>
#include <support/logging/CHIPLogging.h>

#include <ble/BLEEndPoint.h>
#include <ble/BleLayer.h>
3 changes: 1 addition & 2 deletions src/ble/Ble.h
Original file line number Diff line number Diff line change
@@ -27,11 +27,10 @@
#ifndef CHIP_BLE_H
#define CHIP_BLE_H

#include <ble/BLEEndPoint.h>
#include <ble/BleApplicationDelegate.h>
#include <ble/BleConfig.h>
rwalker-apple marked this conversation as resolved.
Show resolved Hide resolved
#include <ble/BLEEndPoint.h>
#include <ble/BleError.h>
#include <ble/Ble.h>
#include <ble/BleLayer.h>
#include <ble/BlePlatformDelegate.h>
#include <ble/BleUUID.h>
2 changes: 1 addition & 1 deletion src/ble/BleError.cpp
Original file line number Diff line number Diff line change
@@ -27,8 +27,8 @@

#if CONFIG_NETWORK_LAYER_BLE

#include <ble/BleLayer.h>
#include <ble/BleError.h>
#include <ble/BleLayer.h>

#include <support/ErrorStr.h>

6 changes: 3 additions & 3 deletions src/ble/BleLayer.cpp
Original file line number Diff line number Diff line change
@@ -56,15 +56,15 @@

#include <string.h>

#include <ble/BlePlatformDelegate.h>
#include <ble/BLEEndPoint.h>
#include <ble/BleApplicationDelegate.h>
#include <ble/BleLayer.h>
#include <ble/BlePlatformDelegate.h>
#include <ble/BleUUID.h>
#include <ble/BLEEndPoint.h>

#include <core/CHIPEncoding.h>
#include <support/logging/CHIPLogging.h>
#include <support/CodeUtils.h>
#include <support/logging/CHIPLogging.h>

// clang-format off

4 changes: 2 additions & 2 deletions src/ble/BleLayer.h
Original file line number Diff line number Diff line change
@@ -58,10 +58,10 @@
#include <system/SystemLayer.h>
#include <system/SystemPacketBuffer.h>

#include <ble/BlePlatformDelegate.h>
#include <ble/BleApplicationDelegate.h>
#include <ble/BleUUID.h>
#include <ble/BleError.h>
#include <ble/BlePlatformDelegate.h>
#include <ble/BleUUID.h>

#if BLE_CONFIG_PROVIDE_OBSOLESCENT_INTERFACES
#include <inet/InetLayer.h>
2 changes: 1 addition & 1 deletion src/ble/BlePlatformDelegate.h
Original file line number Diff line number Diff line change
@@ -29,8 +29,8 @@

#include <ble/BleUUID.h>

#include <system/SystemPacketBuffer.h>
#include <support/DLLUtil.h>
#include <system/SystemPacketBuffer.h>

namespace chip {
namespace Ble {
2 changes: 1 addition & 1 deletion src/ble/BtpEngine.cpp
Original file line number Diff line number Diff line change
@@ -34,8 +34,8 @@
#include <ble/BtpEngineTest.h>
#endif

#include <support/logging/CHIPLogging.h>
#include <support/CodeUtils.h>
#include <support/logging/CHIPLogging.h>

// Define below to enable extremely verbose BLE-specific debug logging.
#undef CHIP_BTP_PROTOCOL_ENGINE_DEBUG_LOGGING_ENABLED
2 changes: 1 addition & 1 deletion src/ble/BtpEngine.h
Original file line number Diff line number Diff line change
@@ -38,8 +38,8 @@
#include <ble/BleConfig.h>

#include <ble/BleError.h>
#include <system/SystemPacketBuffer.h>
#include <support/FlagUtils.hpp>
#include <system/SystemPacketBuffer.h>

namespace chip {
namespace Ble {