From c0822b6658ccd1635606c673579296ea430c102f Mon Sep 17 00:00:00 2001 From: Przemyslaw Brudny Date: Tue, 24 Mar 2020 13:56:18 +0100 Subject: [PATCH] [EDG-3019] Moved log.hpp and debug.hpp into main PurePhone repo --- board/rt1051/_exit.c | 2 +- module-apps/Application.cpp | 2 +- module-apps/UiCommonActions.cpp | 2 +- .../application-call/ApplicationCall.cpp | 2 +- module-apps/application-call/widgets/Icon.hpp | 2 +- .../ApplicationCallLog.cpp | 2 +- .../windows/CallLogOptionsWindow.cpp | 2 +- .../application-clock/ApplicationClock.cpp | 2 +- .../windows/PowerOffWindow.cpp | 2 +- .../windows/MessagesMainWindow.cpp | 2 +- .../windows/OptionsMessages.cpp | 2 +- .../windows/OptionsWindow.cpp | 2 +- .../windows/ThreadViewWindow.cpp | 2 +- .../widgets/PhonebookListView.cpp | 2 +- .../windows/PhonebookContact.cpp | 2 +- .../windows/PhonebookDialogs.cpp | 2 +- .../windows/PhonebookNewContact.cpp | 2 +- .../windows/PhonebookOptions.cpp | 2 +- .../windows/PhonebookOptionsNamecard.cpp | 2 +- .../windows/SettingsMainWindow.cpp | 2 +- .../windows/SimSelectWindow.cpp | 2 +- .../application-viewer/ApplicationViewer.cpp | 2 +- module-apps/windows/OptionWindow.hpp | 2 +- module-audio/Audio/Audio.cpp | 2 +- .../Audio/Operation/PlaybackOperation.cpp | 2 +- .../Audio/Operation/RecorderOperation.cpp | 2 +- .../Audio/Operation/RouterOperation.cpp | 2 +- module-audio/Audio/encoder/EncoderWAV.cpp | 2 +- .../Bluetooth/BluetoothWorker.cpp | 2 +- .../Bluetooth/glucode/HCITRANS.cpp | 2 +- .../glucode/btstack_uart_block_rt1051.cpp | 2 +- .../Bluetooth/interface/bluekitchen/GAP.cpp | 2 +- .../Bluetooth/interface/bluekitchen/PAN.cpp | 2 +- .../interface/bluekitchen/Worker.cpp | 2 +- .../Bluetooth/interface/bluetopia/GAVD.cpp | 2 +- .../interface/bluetopia/WorkerImpl.cpp | 2 +- module-bluetooth/lib/btstack | 2 +- .../board/linux/audio/LinuxCellularAudio.cpp | 2 +- .../board/linux/audio/linux_audiocodec.cpp | 2 +- .../board/linux/bluetooth/Bluetooth.cpp | 2 +- .../board/linux/cellular/linux_cellular.cpp | 2 +- .../board/rt1051/bluetooth/BlueKitchen.cpp | 2 +- .../rt1051/bluetooth/BluetoothCommon.cpp | 2 +- .../board/rt1051/bluetooth/Bluetopia.cpp | 2 +- .../rt1051/bsp/audio/RT1051Audiocodec.cpp | 2 +- .../rt1051/bsp/audio/RT1051CellularAudio.cpp | 2 +- .../bsp/harness/rt1051_harness_gpio.cpp | 2 +- module-bsp/board/rt1051/bsp/lpm/RT1051LPM.cpp | 2 +- .../board/rt1051/common/clock_config.cpp | 2 +- .../rt1051/common/startup_mimxrt1052.cpp | 4 +- .../board/rt1051/drivers/RT1051DriverDMA.cpp | 2 +- .../board/rt1051/drivers/RT1051DriverGPIO.cpp | 2 +- .../board/rt1051/drivers/RT1051DriverI2C.cpp | 2 +- .../board/rt1051/drivers/RT1051DriverPLL.cpp | 2 +- module-bsp/bsp/usb_cdc/usb_cdc.hpp | 2 +- module-cellular/Modem/ATCommon.cpp | 2 +- module-cellular/Modem/TS0710/DLC_channel.cpp | 2 +- .../Modem/TS0710/TS0710_DLC_ESTABL.cpp | 2 +- module-cellular/Modem/TS0710/TS0710_Frame.h | 2 +- module-cellular/Modem/TS0710/TS0710_START.cpp | 2 +- module-cellular/at/Commands.hpp | 2 +- module-cellular/at/URC_Any.hpp | 2 +- module-cellular/at/src/URC_QIND.cpp | 2 +- module-db/Database/Database.cpp | 2 +- module-db/Database/Field.cpp | 2 +- module-db/Interface/CalllogRecord.cpp | 2 +- module-db/Interface/ContactRecord.cpp | 2 +- module-db/Interface/SMSRecord.cpp | 2 +- module-db/Interface/ThreadRecord.cpp | 2 +- module-db/Tables/CalllogTable.cpp | 2 +- module-db/Tables/ContactsTable.cpp | 2 +- module-db/Tables/SMSTable.cpp | 2 +- module-gui/gui/core/Font.cpp | 2 +- module-gui/gui/core/ImageManager.cpp | 2 +- module-gui/gui/core/Renderer.cpp | 2 +- module-gui/gui/input/Profile.cpp | 2 +- module-gui/gui/input/Translator.cpp | 2 +- module-gui/gui/widgets/BottomBar.cpp | 2 +- module-gui/gui/widgets/BoxLayout.cpp | 2 +- module-gui/gui/widgets/GridLayout.cpp | 2 +- module-gui/gui/widgets/Label.cpp | 2 +- module-gui/gui/widgets/ListItem.cpp | 2 +- module-gui/gui/widgets/ListView.cpp | 2 +- module-gui/gui/widgets/PageLayout.cpp | 2 +- module-gui/gui/widgets/Rect.cpp | 4 +- module-gui/gui/widgets/Text.cpp | 2 +- module-gui/test/unittest_gui.cpp | 2 +- module-os/FreeRTOS/application.c | 2 +- module-os/FreeRTOS/include/FreeRTOSConfig.h | 2 +- module-os/systemviewPatch/FreeRTOSConfig.h | 2 +- .../service-appmgr/ApplicationManager.cpp | 2 +- .../service-bluetooth/ServiceBluetooth.cpp | 2 +- .../service-cellular/CellularCall.cpp | 2 +- .../service-cellular/ServiceCellular.cpp | 2 +- .../service-cellular/SignalStrength.cpp | 2 +- module-services/service-db/ServiceDB.cpp | 2 +- .../service-desktop/parser/EndpointFsm.cpp | 2 +- .../service-desktop/parser/ParserFsm.cpp | 2 +- .../service-desktop/parser/ParserUtils.cpp | 2 +- .../service-desktop/parser/RawDataFsm.cpp | 2 +- module-services/service-eink/ServiceEink.cpp | 2 +- .../service-evtmgr/EventManager.cpp | 2 +- .../alarm/EventManagerAlarm.cpp | 2 +- .../service-evtmgr/harness/Parser.cpp | 2 +- .../service-evtmgr/harness/events/GPIO.cpp | 2 +- module-services/service-gui/ServiceGUI.cpp | 2 +- module-services/service-gui/WorkerGUI.cpp | 2 +- module-services/service-lwip/ServiceLwIP.cpp | 2 +- module-sys/SystemManager/PowerManager.cpp | 2 +- module-utils/CMakeLists.txt | 2 +- module-utils/Utils.hpp | 2 +- module-utils/board/cross/log.cpp | 4 +- module-utils/board/cross/log_writeLUART.cpp | 2 +- module-utils/board/cross/log_writeRTT.cpp | 4 +- .../board/cross/log_writeSYSTEMVIEW.cpp | 2 +- module-utils/board/linux/log.cpp | 2 +- module-utils/common_data/EventStore.cpp | 2 +- module-utils/i18/i18.hpp | 2 +- module-utils/log/debug.hpp | 6 ++ module-utils/log/log.hpp | 84 +++++++++++++++++++ module-utils/segger | 2 +- module-utils/test/unittest_log.cpp | 2 +- module-utils/test/unittest_log2.cpp | 2 +- module-utils/time/ScopedTime.hpp | 2 +- module-utils/time/time_conversion.hpp | 2 +- module-utils/time/time_date_validation.cpp | 2 +- module-utils/time/time_locale.hpp | 2 +- module-utils/ucs2/UCS2.cpp | 2 +- module-utils/utf8/UTF8.cpp | 2 +- .../freeRTOS_FAT/include/FreeRTOSFATConfig.h | 2 +- .../portable/ff_eMMC_user_disk.cpp | 2 +- source/main.cpp | 2 +- 132 files changed, 224 insertions(+), 134 deletions(-) create mode 100644 module-utils/log/debug.hpp create mode 100644 module-utils/log/log.hpp diff --git a/board/rt1051/_exit.c b/board/rt1051/_exit.c index cf4a7ffa5..efa705cad 100644 --- a/board/rt1051/_exit.c +++ b/board/rt1051/_exit.c @@ -32,7 +32,7 @@ #include #include #include "MIMXRT1051.h" -#include +#include // ---------------------------------------------------------------------------- // Forward declaration diff --git a/module-apps/Application.cpp b/module-apps/Application.cpp index 1f89362e0..a79e6416c 100644 --- a/module-apps/Application.cpp +++ b/module-apps/Application.cpp @@ -9,7 +9,7 @@ #include #include // module-utils -#include "segger/log/log.hpp" +#include "log/log.hpp" // module-services #include "service-gui/messages/DrawMessage.hpp" #include "service-appmgr/messages/APMMessage.hpp" diff --git a/module-apps/UiCommonActions.cpp b/module-apps/UiCommonActions.cpp index 869a347c6..a16d06f95 100644 --- a/module-apps/UiCommonActions.cpp +++ b/module-apps/UiCommonActions.cpp @@ -12,7 +12,7 @@ #include "service-appmgr/ApplicationManager.hpp" #include #include -#include +#include namespace app { diff --git a/module-apps/application-call/ApplicationCall.cpp b/module-apps/application-call/ApplicationCall.cpp index 224c3616e..810f9eefe 100644 --- a/module-apps/application-call/ApplicationCall.cpp +++ b/module-apps/application-call/ApplicationCall.cpp @@ -11,7 +11,7 @@ #include "MessageType.hpp" #include "data/CallSwitchData.hpp" -#include "segger/log/log.hpp" +#include "log/log.hpp" #include "time/time_conversion.hpp" #include "windows/CallMainWindow.hpp" #include "windows/CallWindow.hpp" diff --git a/module-apps/application-call/widgets/Icon.hpp b/module-apps/application-call/widgets/Icon.hpp index 105ba1489..5846321fa 100644 --- a/module-apps/application-call/widgets/Icon.hpp +++ b/module-apps/application-call/widgets/Icon.hpp @@ -3,7 +3,7 @@ #include "Image.hpp" #include "Label.hpp" #include -#include +#include #include namespace gui diff --git a/module-apps/application-calllog/ApplicationCallLog.cpp b/module-apps/application-calllog/ApplicationCallLog.cpp index cc6ed2690..6e3d8eeed 100644 --- a/module-apps/application-calllog/ApplicationCallLog.cpp +++ b/module-apps/application-calllog/ApplicationCallLog.cpp @@ -17,7 +17,7 @@ #include #include #include -#include +#include using namespace calllog; diff --git a/module-apps/application-calllog/windows/CallLogOptionsWindow.cpp b/module-apps/application-calllog/windows/CallLogOptionsWindow.cpp index c2a3e220f..03cd59e20 100644 --- a/module-apps/application-calllog/windows/CallLogOptionsWindow.cpp +++ b/module-apps/application-calllog/windows/CallLogOptionsWindow.cpp @@ -1,6 +1,6 @@ #include "CallLogOptionsWindow.hpp" #include "i18/i18.hpp" -#include "segger/log/log.hpp" +#include "log/log.hpp" #include /// below just for apps names... diff --git a/module-apps/application-clock/ApplicationClock.cpp b/module-apps/application-clock/ApplicationClock.cpp index 735473c0c..4fb1a3957 100644 --- a/module-apps/application-clock/ApplicationClock.cpp +++ b/module-apps/application-clock/ApplicationClock.cpp @@ -11,7 +11,7 @@ #include "gui/widgets/Window.hpp" // module-utils -#include "segger/log/log.hpp" +#include "log/log.hpp" // module-services #include "service-evtmgr/EventManager.hpp" #include "service-evtmgr/messages/EVMessages.hpp" diff --git a/module-apps/application-desktop/windows/PowerOffWindow.cpp b/module-apps/application-desktop/windows/PowerOffWindow.cpp index dbf186ccf..7895fc72c 100644 --- a/module-apps/application-desktop/windows/PowerOffWindow.cpp +++ b/module-apps/application-desktop/windows/PowerOffWindow.cpp @@ -6,7 +6,7 @@ * @copyright Copyright (C) 2019 mudita.com * @details */ -#include "segger/log/log.hpp" +#include "log/log.hpp" #include "gui/widgets/BottomBar.hpp" #include "gui/widgets/TopBar.hpp" diff --git a/module-apps/application-messages/windows/MessagesMainWindow.cpp b/module-apps/application-messages/windows/MessagesMainWindow.cpp index c9523790b..4ed4e71b0 100644 --- a/module-apps/application-messages/windows/MessagesMainWindow.cpp +++ b/module-apps/application-messages/windows/MessagesMainWindow.cpp @@ -31,7 +31,7 @@ #include "OptionsWindow.hpp" #include "application-phonebook/data/PhonebookItemData.hpp" #include -#include +#include #include "time/time_conversion.hpp" diff --git a/module-apps/application-messages/windows/OptionsMessages.cpp b/module-apps/application-messages/windows/OptionsMessages.cpp index 24877d4af..0bef3df86 100644 --- a/module-apps/application-messages/windows/OptionsMessages.cpp +++ b/module-apps/application-messages/windows/OptionsMessages.cpp @@ -1,7 +1,7 @@ #include "OptionsMessages.hpp" #include "Options.hpp" #include "i18/i18.hpp" -#include "segger/log/log.hpp" +#include "log/log.hpp" #include diff --git a/module-apps/application-messages/windows/OptionsWindow.cpp b/module-apps/application-messages/windows/OptionsWindow.cpp index dde7c8fff..c3c6ff9d6 100644 --- a/module-apps/application-messages/windows/OptionsWindow.cpp +++ b/module-apps/application-messages/windows/OptionsWindow.cpp @@ -1,6 +1,6 @@ #include "OptionsWindow.hpp" #include "i18/i18.hpp" -#include "segger/log/log.hpp" +#include "log/log.hpp" #include /// below just for apps names... diff --git a/module-apps/application-messages/windows/ThreadViewWindow.cpp b/module-apps/application-messages/windows/ThreadViewWindow.cpp index b890a8641..9ee54b881 100644 --- a/module-apps/application-messages/windows/ThreadViewWindow.cpp +++ b/module-apps/application-messages/windows/ThreadViewWindow.cpp @@ -12,7 +12,7 @@ #include "service-db/messages/DBMessage.hpp" -#include +#include #include "ThreadViewWindow.hpp" #include diff --git a/module-apps/application-phonebook/widgets/PhonebookListView.cpp b/module-apps/application-phonebook/widgets/PhonebookListView.cpp index 1ec0cf3b4..d817d7265 100644 --- a/module-apps/application-phonebook/widgets/PhonebookListView.cpp +++ b/module-apps/application-phonebook/widgets/PhonebookListView.cpp @@ -12,7 +12,7 @@ #include "PhonebookItem.hpp" #include "UiCommonActions.hpp" #include "application-call/ApplicationCall.hpp" -#include "segger/log/log.hpp" +#include "log/log.hpp" #include "service-cellular/api/CellularServiceAPI.hpp" namespace gui diff --git a/module-apps/application-phonebook/windows/PhonebookContact.cpp b/module-apps/application-phonebook/windows/PhonebookContact.cpp index 7ead21575..7d4eccf3f 100644 --- a/module-apps/application-phonebook/windows/PhonebookContact.cpp +++ b/module-apps/application-phonebook/windows/PhonebookContact.cpp @@ -14,7 +14,7 @@ #include "i18/i18.hpp" #include "service-appmgr/ApplicationManager.hpp" #include "service-db/api/DBServiceAPI.hpp" -#include +#include namespace gui { diff --git a/module-apps/application-phonebook/windows/PhonebookDialogs.cpp b/module-apps/application-phonebook/windows/PhonebookDialogs.cpp index 52e04698c..33ac15b26 100644 --- a/module-apps/application-phonebook/windows/PhonebookDialogs.cpp +++ b/module-apps/application-phonebook/windows/PhonebookDialogs.cpp @@ -18,7 +18,7 @@ #include "i18/i18.hpp" #include "service-appmgr/ApplicationManager.hpp" #include "service-db/api/DBServiceAPI.hpp" -#include +#include #include PhonebookDialog::PhonebookDialog(app::Application *app, const std::string &dialogName) : AppWindow(app, dialogName) diff --git a/module-apps/application-phonebook/windows/PhonebookNewContact.cpp b/module-apps/application-phonebook/windows/PhonebookNewContact.cpp index ae4056ae9..a8e99ac99 100644 --- a/module-apps/application-phonebook/windows/PhonebookNewContact.cpp +++ b/module-apps/application-phonebook/windows/PhonebookNewContact.cpp @@ -12,7 +12,7 @@ #include "service-appmgr/ApplicationManager.hpp" #include "service-cellular/api/CellularServiceAPI.hpp" #include "service-db/api/DBServiceAPI.hpp" -#include +#include namespace gui { diff --git a/module-apps/application-phonebook/windows/PhonebookOptions.cpp b/module-apps/application-phonebook/windows/PhonebookOptions.cpp index 36d6310d1..e181017d6 100644 --- a/module-apps/application-phonebook/windows/PhonebookOptions.cpp +++ b/module-apps/application-phonebook/windows/PhonebookOptions.cpp @@ -17,7 +17,7 @@ #include "i18/i18.hpp" #include "service-appmgr/ApplicationManager.hpp" #include "service-db/api/DBServiceAPI.hpp" -#include +#include PhonebookOptions::PhonebookOptions(app::Application *app) : AppWindow(app, "Options") { diff --git a/module-apps/application-phonebook/windows/PhonebookOptionsNamecard.cpp b/module-apps/application-phonebook/windows/PhonebookOptionsNamecard.cpp index 52b65b416..571f1520c 100644 --- a/module-apps/application-phonebook/windows/PhonebookOptionsNamecard.cpp +++ b/module-apps/application-phonebook/windows/PhonebookOptionsNamecard.cpp @@ -16,7 +16,7 @@ #include "i18/i18.hpp" #include "service-appmgr/ApplicationManager.hpp" #include "service-db/api/DBServiceAPI.hpp" -#include +#include PhonebookOptionsNamecard::PhonebookOptionsNamecard(app::Application *app) : AppWindow(app, "OptionsNamecard") { diff --git a/module-apps/application-settings/windows/SettingsMainWindow.cpp b/module-apps/application-settings/windows/SettingsMainWindow.cpp index b031dc6b3..b1e98d06d 100644 --- a/module-apps/application-settings/windows/SettingsMainWindow.cpp +++ b/module-apps/application-settings/windows/SettingsMainWindow.cpp @@ -2,7 +2,7 @@ #include "../ApplicationSettings.hpp" #include "Info.hpp" #include "i18/i18.hpp" -#include "segger/log/log.hpp" +#include "log/log.hpp" std::list mainWindowOptions(app::Application *app) { diff --git a/module-apps/application-settings/windows/SimSelectWindow.cpp b/module-apps/application-settings/windows/SimSelectWindow.cpp index 3784854b6..f743746c2 100644 --- a/module-apps/application-settings/windows/SimSelectWindow.cpp +++ b/module-apps/application-settings/windows/SimSelectWindow.cpp @@ -2,7 +2,7 @@ #include "Info.hpp" #include "SettingsMainWindow.hpp" #include "i18/i18.hpp" -#include "segger/log/log.hpp" +#include "log/log.hpp" #include #include #include diff --git a/module-apps/application-viewer/ApplicationViewer.cpp b/module-apps/application-viewer/ApplicationViewer.cpp index cd8f24c4a..bc9b4f036 100644 --- a/module-apps/application-viewer/ApplicationViewer.cpp +++ b/module-apps/application-viewer/ApplicationViewer.cpp @@ -22,7 +22,7 @@ #include "gui/widgets/Label.hpp" #include "gui/widgets/BoxLayout.hpp" // module-utils -#include "segger/log/log.hpp" +#include "log/log.hpp" // module-services #include "service-evtmgr/EventManager.hpp" #include "service-evtmgr/messages/EVMessages.hpp" diff --git a/module-apps/windows/OptionWindow.hpp b/module-apps/windows/OptionWindow.hpp index 42bb5fc72..76a5c56a0 100644 --- a/module-apps/windows/OptionWindow.hpp +++ b/module-apps/windows/OptionWindow.hpp @@ -5,7 +5,7 @@ #include "PageLayout.hpp" #include -#include +#include namespace gui { diff --git a/module-audio/Audio/Audio.cpp b/module-audio/Audio/Audio.cpp index 3462379b8..c578937a8 100644 --- a/module-audio/Audio/Audio.cpp +++ b/module-audio/Audio/Audio.cpp @@ -11,7 +11,7 @@ #include "Operation/Operation.hpp" -#include "segger/log/log.hpp" +#include "log/log.hpp" namespace audio { diff --git a/module-audio/Audio/Operation/PlaybackOperation.cpp b/module-audio/Audio/Operation/PlaybackOperation.cpp index 0b2223f9f..8b6913c00 100644 --- a/module-audio/Audio/Operation/PlaybackOperation.cpp +++ b/module-audio/Audio/Operation/PlaybackOperation.cpp @@ -15,7 +15,7 @@ #include "Audio/Profiles/ProfilePlaybackHeadphones.hpp" #include "Audio/AudioCommon.hpp" -#include "segger/log/log.hpp" +#include "log/log.hpp" #include "FreeRTOS.h" #include "task.h" diff --git a/module-audio/Audio/Operation/RecorderOperation.cpp b/module-audio/Audio/Operation/RecorderOperation.cpp index dc8d66e47..2654ce4c4 100644 --- a/module-audio/Audio/Operation/RecorderOperation.cpp +++ b/module-audio/Audio/Operation/RecorderOperation.cpp @@ -15,7 +15,7 @@ #include "Audio/Profiles/ProfileRecordingOnBoardMic.hpp" #include "Audio/AudioCommon.hpp" -#include "segger/log/log.hpp" +#include "log/log.hpp" #include "FreeRTOS.h" #include "task.h" diff --git a/module-audio/Audio/Operation/RouterOperation.cpp b/module-audio/Audio/Operation/RouterOperation.cpp index 80adbbe1d..db2c9b955 100644 --- a/module-audio/Audio/Operation/RouterOperation.cpp +++ b/module-audio/Audio/Operation/RouterOperation.cpp @@ -13,7 +13,7 @@ #include "../Profiles/ProfileRoutingHeadset.hpp" #include "../Profiles/ProfileRoutingSpeakerphone.hpp" -#include "segger/log/log.hpp" +#include "log/log.hpp" namespace audio { diff --git a/module-audio/Audio/encoder/EncoderWAV.cpp b/module-audio/Audio/encoder/EncoderWAV.cpp index 1c47573ec..1ba53c71d 100644 --- a/module-audio/Audio/encoder/EncoderWAV.cpp +++ b/module-audio/Audio/encoder/EncoderWAV.cpp @@ -8,7 +8,7 @@ */ #include "EncoderWAV.hpp" -#include "segger/log/log.hpp" +#include "log/log.hpp" namespace audio { diff --git a/module-bluetooth/Bluetooth/BluetoothWorker.cpp b/module-bluetooth/Bluetooth/BluetoothWorker.cpp index 690318532..951e292ad 100644 --- a/module-bluetooth/Bluetooth/BluetoothWorker.cpp +++ b/module-bluetooth/Bluetooth/BluetoothWorker.cpp @@ -1,5 +1,5 @@ #include "BluetoothWorker.hpp" -#include "segger/log/log.hpp" +#include "log/log.hpp" #include "BtCommand.hpp" using namespace bsp; diff --git a/module-bluetooth/Bluetooth/glucode/HCITRANS.cpp b/module-bluetooth/Bluetooth/glucode/HCITRANS.cpp index 952a8380d..892e9f333 100644 --- a/module-bluetooth/Bluetooth/glucode/HCITRANS.cpp +++ b/module-bluetooth/Bluetooth/glucode/HCITRANS.cpp @@ -1,5 +1,5 @@ #include -#include "segger/log/log.hpp" +#include "log/log.hpp" using namespace bsp; diff --git a/module-bluetooth/Bluetooth/glucode/btstack_uart_block_rt1051.cpp b/module-bluetooth/Bluetooth/glucode/btstack_uart_block_rt1051.cpp index 1c70cfb5a..ec2c74b35 100644 --- a/module-bluetooth/Bluetooth/glucode/btstack_uart_block_rt1051.cpp +++ b/module-bluetooth/Bluetooth/glucode/btstack_uart_block_rt1051.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace bsp; diff --git a/module-bluetooth/Bluetooth/interface/bluekitchen/GAP.cpp b/module-bluetooth/Bluetooth/interface/bluekitchen/GAP.cpp index 3e32e2b46..a63dc1eee 100644 --- a/module-bluetooth/Bluetooth/interface/bluekitchen/GAP.cpp +++ b/module-bluetooth/Bluetooth/interface/bluekitchen/GAP.cpp @@ -1,5 +1,5 @@ #include -#include +#include #include #include diff --git a/module-bluetooth/Bluetooth/interface/bluekitchen/PAN.cpp b/module-bluetooth/Bluetooth/interface/bluekitchen/PAN.cpp index af70d816d..965a87c79 100644 --- a/module-bluetooth/Bluetooth/interface/bluekitchen/PAN.cpp +++ b/module-bluetooth/Bluetooth/interface/bluekitchen/PAN.cpp @@ -1,4 +1,4 @@ -#include +#include extern "C" { diff --git a/module-bluetooth/Bluetooth/interface/bluekitchen/Worker.cpp b/module-bluetooth/Bluetooth/interface/bluekitchen/Worker.cpp index 0a8e1dc3b..d297292ee 100644 --- a/module-bluetooth/Bluetooth/interface/bluekitchen/Worker.cpp +++ b/module-bluetooth/Bluetooth/interface/bluekitchen/Worker.cpp @@ -1,4 +1,4 @@ -#include +#include // #define __BTSTACK_FILE__ ".c" diff --git a/module-bluetooth/Bluetooth/interface/bluetopia/GAVD.cpp b/module-bluetooth/Bluetooth/interface/bluetopia/GAVD.cpp index 32232952c..082579cfc 100644 --- a/module-bluetooth/Bluetooth/interface/bluetopia/GAVD.cpp +++ b/module-bluetooth/Bluetooth/interface/bluetopia/GAVD.cpp @@ -1,6 +1,6 @@ #include "../../profiles/GAVD.hpp" #include "BtDev.hpp" -#include "segger/log/log.hpp" +#include "log/log.hpp" extern "C" { diff --git a/module-bluetooth/Bluetooth/interface/bluetopia/WorkerImpl.cpp b/module-bluetooth/Bluetooth/interface/bluetopia/WorkerImpl.cpp index f63246017..d77c86822 100644 --- a/module-bluetooth/Bluetooth/interface/bluetopia/WorkerImpl.cpp +++ b/module-bluetooth/Bluetooth/interface/bluetopia/WorkerImpl.cpp @@ -1,6 +1,6 @@ #include "WorkerImpl.hpp" -#include +#include #include diff --git a/module-bluetooth/lib/btstack b/module-bluetooth/lib/btstack index 58c6eeaec..20011e8bd 160000 --- a/module-bluetooth/lib/btstack +++ b/module-bluetooth/lib/btstack @@ -1 +1 @@ -Subproject commit 58c6eeaec55241165e11bba17c0526f557ce81bc +Subproject commit 20011e8bdce0640c62c1d28f8b0bcc4e317e030d diff --git a/module-bsp/board/linux/audio/LinuxCellularAudio.cpp b/module-bsp/board/linux/audio/LinuxCellularAudio.cpp index 6c55272b5..65cb43ef9 100644 --- a/module-bsp/board/linux/audio/LinuxCellularAudio.cpp +++ b/module-bsp/board/linux/audio/LinuxCellularAudio.cpp @@ -11,7 +11,7 @@ #include "linux_audiocodec.hpp" -#include "segger/log/log.hpp" +#include "log/log.hpp" namespace bsp { diff --git a/module-bsp/board/linux/audio/linux_audiocodec.cpp b/module-bsp/board/linux/audio/linux_audiocodec.cpp index 876ed9dc2..fb2491828 100644 --- a/module-bsp/board/linux/audio/linux_audiocodec.cpp +++ b/module-bsp/board/linux/audio/linux_audiocodec.cpp @@ -9,7 +9,7 @@ #include "linux_audiocodec.hpp" -#include "segger/log/log.hpp" +#include "log/log.hpp" namespace bsp { diff --git a/module-bsp/board/linux/bluetooth/Bluetooth.cpp b/module-bsp/board/linux/bluetooth/Bluetooth.cpp index 864ae2fd0..2d50a4abe 100644 --- a/module-bsp/board/linux/bluetooth/Bluetooth.cpp +++ b/module-bsp/board/linux/bluetooth/Bluetooth.cpp @@ -1,6 +1,6 @@ #include "bsp/bluetooth/Bluetooth.hpp" #include "BluetoothWorker.hpp" -#include "segger/log/log.hpp" +#include "log/log.hpp" /// stubs diff --git a/module-bsp/board/linux/cellular/linux_cellular.cpp b/module-bsp/board/linux/cellular/linux_cellular.cpp index 713347d43..35eb75b32 100644 --- a/module-bsp/board/linux/cellular/linux_cellular.cpp +++ b/module-bsp/board/linux/cellular/linux_cellular.cpp @@ -13,7 +13,7 @@ #include #include -#include "segger/log/log.hpp" +#include "log/log.hpp" #include "mutex.hpp" #include #include diff --git a/module-bsp/board/rt1051/bluetooth/BlueKitchen.cpp b/module-bsp/board/rt1051/bluetooth/BlueKitchen.cpp index 4d32e58dd..2d9822ebf 100644 --- a/module-bsp/board/rt1051/bluetooth/BlueKitchen.cpp +++ b/module-bsp/board/rt1051/bluetooth/BlueKitchen.cpp @@ -1,6 +1,6 @@ #include "bsp/bluetooth/Bluetooth.hpp" #include "BluetoothWorker.hpp" -#include "segger/log/log.hpp" +#include "log/log.hpp" #include "FreeRTOS.h" #include "fsl_lpuart.h" #include "board.h" diff --git a/module-bsp/board/rt1051/bluetooth/BluetoothCommon.cpp b/module-bsp/board/rt1051/bluetooth/BluetoothCommon.cpp index af29ac5c4..b95f62121 100644 --- a/module-bsp/board/rt1051/bluetooth/BluetoothCommon.cpp +++ b/module-bsp/board/rt1051/bluetooth/BluetoothCommon.cpp @@ -1,5 +1,5 @@ #include "bsp/bluetooth/Bluetooth.hpp" -#include "segger/log/log.hpp" +#include "log/log.hpp" #include "FreeRTOS.h" #include "fsl_lpuart.h" #include "board.h" diff --git a/module-bsp/board/rt1051/bluetooth/Bluetopia.cpp b/module-bsp/board/rt1051/bluetooth/Bluetopia.cpp index 8cda77a8d..464986e44 100644 --- a/module-bsp/board/rt1051/bluetooth/Bluetopia.cpp +++ b/module-bsp/board/rt1051/bluetooth/Bluetopia.cpp @@ -1,5 +1,5 @@ #include "bluetooth/Bluetooth.hpp" -#include "segger/log/log.hpp" +#include "log/log.hpp" #include "fsl_lpuart.h" #include "board.h" diff --git a/module-bsp/board/rt1051/bsp/audio/RT1051Audiocodec.cpp b/module-bsp/board/rt1051/bsp/audio/RT1051Audiocodec.cpp index 7cfd92ba4..f1465adc8 100644 --- a/module-bsp/board/rt1051/bsp/audio/RT1051Audiocodec.cpp +++ b/module-bsp/board/rt1051/bsp/audio/RT1051Audiocodec.cpp @@ -10,7 +10,7 @@ #include "RT1051Audiocodec.hpp" #include "board.h" #include "dma_config.h" -#include "segger/log/log.hpp" +#include "log/log.hpp" #include "bsp/BoardDefinitions.hpp" diff --git a/module-bsp/board/rt1051/bsp/audio/RT1051CellularAudio.cpp b/module-bsp/board/rt1051/bsp/audio/RT1051CellularAudio.cpp index 0e141efe0..44feb4884 100644 --- a/module-bsp/board/rt1051/bsp/audio/RT1051CellularAudio.cpp +++ b/module-bsp/board/rt1051/bsp/audio/RT1051CellularAudio.cpp @@ -11,7 +11,7 @@ #include "board.h" #include "dma_config.h" -#include "segger/log/log.hpp" +#include "log/log.hpp" #include "bsp/BoardDefinitions.hpp" diff --git a/module-bsp/board/rt1051/bsp/harness/rt1051_harness_gpio.cpp b/module-bsp/board/rt1051/bsp/harness/rt1051_harness_gpio.cpp index 6c2f6a905..122e0225b 100644 --- a/module-bsp/board/rt1051/bsp/harness/rt1051_harness_gpio.cpp +++ b/module-bsp/board/rt1051/bsp/harness/rt1051_harness_gpio.cpp @@ -1,6 +1,6 @@ #include "board.h" #include "fsl_gpio.h" -#include "segger/log/log.hpp" +#include "log/log.hpp" #include "rt1051_harness.hpp" using namespace bsp::harness::gpio; diff --git a/module-bsp/board/rt1051/bsp/lpm/RT1051LPM.cpp b/module-bsp/board/rt1051/bsp/lpm/RT1051LPM.cpp index b17630b96..ab0623adc 100644 --- a/module-bsp/board/rt1051/bsp/lpm/RT1051LPM.cpp +++ b/module-bsp/board/rt1051/bsp/lpm/RT1051LPM.cpp @@ -10,7 +10,7 @@ #include "RT1051LPM.hpp" #include "board.h" -#include "segger/log/log.hpp" +#include "log/log.hpp" #include "bsp/BoardDefinitions.hpp" namespace bsp diff --git a/module-bsp/board/rt1051/common/clock_config.cpp b/module-bsp/board/rt1051/common/clock_config.cpp index 164bdef02..1c6d92368 100644 --- a/module-bsp/board/rt1051/common/clock_config.cpp +++ b/module-bsp/board/rt1051/common/clock_config.cpp @@ -51,7 +51,7 @@ #include "fsl_iomuxc.h" #include "fsl_dcdc.h" #include "fsl_gpc.h" -#include "segger/log/log.hpp" +#include "log/log.hpp" /******************************************************************************* * Definitions diff --git a/module-bsp/board/rt1051/common/startup_mimxrt1052.cpp b/module-bsp/board/rt1051/common/startup_mimxrt1052.cpp index 56cf294a1..17e826a79 100644 --- a/module-bsp/board/rt1051/common/startup_mimxrt1052.cpp +++ b/module-bsp/board/rt1051/common/startup_mimxrt1052.cpp @@ -453,8 +453,8 @@ extern "C" #include "MIMXRT1051.h" #include #include -#include -#include +#include +#include #include //***************************************************************************** diff --git a/module-bsp/board/rt1051/drivers/RT1051DriverDMA.cpp b/module-bsp/board/rt1051/drivers/RT1051DriverDMA.cpp index 2bac6b15f..616789240 100644 --- a/module-bsp/board/rt1051/drivers/RT1051DriverDMA.cpp +++ b/module-bsp/board/rt1051/drivers/RT1051DriverDMA.cpp @@ -9,7 +9,7 @@ #include "RT1051DriverDMA.hpp" #include -#include "segger/log/log.hpp" +#include "log/log.hpp" namespace drivers { diff --git a/module-bsp/board/rt1051/drivers/RT1051DriverGPIO.cpp b/module-bsp/board/rt1051/drivers/RT1051DriverGPIO.cpp index b6c132302..476b36f66 100644 --- a/module-bsp/board/rt1051/drivers/RT1051DriverGPIO.cpp +++ b/module-bsp/board/rt1051/drivers/RT1051DriverGPIO.cpp @@ -9,7 +9,7 @@ */ #include "RT1051DriverGPIO.hpp" -#include "segger/log/log.hpp" +#include "log/log.hpp" namespace drivers { diff --git a/module-bsp/board/rt1051/drivers/RT1051DriverI2C.cpp b/module-bsp/board/rt1051/drivers/RT1051DriverI2C.cpp index 74e9e9948..7a9426900 100644 --- a/module-bsp/board/rt1051/drivers/RT1051DriverI2C.cpp +++ b/module-bsp/board/rt1051/drivers/RT1051DriverI2C.cpp @@ -8,7 +8,7 @@ */ #include "RT1051DriverI2C.hpp" -#include "segger/log/log.hpp" +#include "log/log.hpp" #include "../board.h" namespace drivers diff --git a/module-bsp/board/rt1051/drivers/RT1051DriverPLL.cpp b/module-bsp/board/rt1051/drivers/RT1051DriverPLL.cpp index f63d2f87e..47041abe0 100644 --- a/module-bsp/board/rt1051/drivers/RT1051DriverPLL.cpp +++ b/module-bsp/board/rt1051/drivers/RT1051DriverPLL.cpp @@ -8,7 +8,7 @@ */ #include "RT1051DriverPLL.hpp" -#include "segger/log/log.hpp" +#include "log/log.hpp" #include "../common/clock_config.h" namespace drivers diff --git a/module-bsp/bsp/usb_cdc/usb_cdc.hpp b/module-bsp/bsp/usb_cdc/usb_cdc.hpp index f89656d28..bbaf4198b 100644 --- a/module-bsp/bsp/usb_cdc/usb_cdc.hpp +++ b/module-bsp/bsp/usb_cdc/usb_cdc.hpp @@ -10,7 +10,7 @@ extern "C" #include #include #include -#include +#include #include #include #include diff --git a/module-cellular/Modem/ATCommon.cpp b/module-cellular/Modem/ATCommon.cpp index 36adf7e6c..1e8f1e2a5 100644 --- a/module-cellular/Modem/ATCommon.cpp +++ b/module-cellular/Modem/ATCommon.cpp @@ -1,6 +1,6 @@ #include "ATCommon.hpp" #include -#include +#include #include #include #include diff --git a/module-cellular/Modem/TS0710/DLC_channel.cpp b/module-cellular/Modem/TS0710/DLC_channel.cpp index e63eb3e10..234a09b68 100644 --- a/module-cellular/Modem/TS0710/DLC_channel.cpp +++ b/module-cellular/Modem/TS0710/DLC_channel.cpp @@ -8,7 +8,7 @@ #include "TS0710_DLC_ESTABL.h" #include "TS0710_DLC_RELEASE.h" #include "TS0710_Frame.h" -#include "segger/log/log.hpp" +#include "log/log.hpp" #include "ticks.hpp" #include #include diff --git a/module-cellular/Modem/TS0710/TS0710_DLC_ESTABL.cpp b/module-cellular/Modem/TS0710/TS0710_DLC_ESTABL.cpp index 5f442e5bf..b62048ed8 100644 --- a/module-cellular/Modem/TS0710/TS0710_DLC_ESTABL.cpp +++ b/module-cellular/Modem/TS0710/TS0710_DLC_ESTABL.cpp @@ -15,7 +15,7 @@ extern "C" #include "TS0710_Frame.h" #include "TS0710_types.h" -#include "segger/log/log.hpp" +#include "log/log.hpp" #include "FreeRTOS.h" /** diff --git a/module-cellular/Modem/TS0710/TS0710_Frame.h b/module-cellular/Modem/TS0710/TS0710_Frame.h index 17a9feed2..071020c78 100644 --- a/module-cellular/Modem/TS0710/TS0710_Frame.h +++ b/module-cellular/Modem/TS0710/TS0710_Frame.h @@ -5,7 +5,7 @@ #include #include #include -#include "segger/log/log.hpp" +#include "log/log.hpp" #define TS0710_FLAG 0xF9 #define TS0710_FRAME_HDR_LEN 6 // without extended address byte diff --git a/module-cellular/Modem/TS0710/TS0710_START.cpp b/module-cellular/Modem/TS0710/TS0710_START.cpp index 437283215..e2027a8be 100644 --- a/module-cellular/Modem/TS0710/TS0710_START.cpp +++ b/module-cellular/Modem/TS0710/TS0710_START.cpp @@ -4,7 +4,7 @@ #include "TS0710_START.h" #include "DLC_channel.h" -#include "segger/log/log.hpp" +#include "log/log.hpp" /** * TS0710_START implementation diff --git a/module-cellular/at/Commands.hpp b/module-cellular/at/Commands.hpp index eeda9f205..0983ce61e 100644 --- a/module-cellular/at/Commands.hpp +++ b/module-cellular/at/Commands.hpp @@ -3,7 +3,7 @@ /// This file goal is to provide one place to store all at commands, with their respectable timeouts if these have #include "Result.hpp" -#include +#include #include #include #include diff --git a/module-cellular/at/URC_Any.hpp b/module-cellular/at/URC_Any.hpp index 24edf864b..7fd5a398e 100644 --- a/module-cellular/at/URC_Any.hpp +++ b/module-cellular/at/URC_Any.hpp @@ -1,7 +1,7 @@ #pragma once #include "Utils.hpp" -#include +#include #include #include diff --git a/module-cellular/at/src/URC_QIND.cpp b/module-cellular/at/src/URC_QIND.cpp index fbf7b3ad0..6535e2425 100644 --- a/module-cellular/at/src/URC_QIND.cpp +++ b/module-cellular/at/src/URC_QIND.cpp @@ -1,5 +1,5 @@ #include "../URC_QIND.hpp" -#include +#include using namespace at::urc; diff --git a/module-db/Database/Database.cpp b/module-db/Database/Database.cpp index 7180db7ba..fcfe43d8c 100644 --- a/module-db/Database/Database.cpp +++ b/module-db/Database/Database.cpp @@ -9,7 +9,7 @@ */ #include "Database.hpp" -#include "segger/log/log.hpp" +#include "log/log.hpp" #include "vfs.hpp" #include #include diff --git a/module-db/Database/Field.cpp b/module-db/Database/Field.cpp index 3fd0e7ba2..d3ebaa911 100644 --- a/module-db/Database/Field.cpp +++ b/module-db/Database/Field.cpp @@ -1,5 +1,5 @@ #include "Field.hpp" -#include +#include #include const char *Field::GetCString() const diff --git a/module-db/Interface/CalllogRecord.cpp b/module-db/Interface/CalllogRecord.cpp index 77c8894a2..f19203e6f 100644 --- a/module-db/Interface/CalllogRecord.cpp +++ b/module-db/Interface/CalllogRecord.cpp @@ -11,7 +11,7 @@ #include "ContactRecord.hpp" #include #include -#include +#include #include CalllogRecord::CalllogRecord(const CalllogTableRow &tableRow, const UTF8 &num, const UTF8 &name) diff --git a/module-db/Interface/ContactRecord.cpp b/module-db/Interface/ContactRecord.cpp index 344df4a7b..0924f4e32 100644 --- a/module-db/Interface/ContactRecord.cpp +++ b/module-db/Interface/ContactRecord.cpp @@ -10,7 +10,7 @@ #include "ContactRecord.hpp" #include -#include +#include ContactRecordInterface::ContactRecordInterface(ContactsDB *db) : contactDB(db) {} diff --git a/module-db/Interface/SMSRecord.cpp b/module-db/Interface/SMSRecord.cpp index 3965bc5fe..3ce518afd 100644 --- a/module-db/Interface/SMSRecord.cpp +++ b/module-db/Interface/SMSRecord.cpp @@ -11,7 +11,7 @@ #include "SMSRecord.hpp" #include "ContactRecord.hpp" #include "ThreadRecord.hpp" -#include +#include SMSRecord::SMSRecord(const SMSTableRow &w, const UTF8 &num) { diff --git a/module-db/Interface/ThreadRecord.cpp b/module-db/Interface/ThreadRecord.cpp index 5b0f87b71..c8398b4a2 100644 --- a/module-db/Interface/ThreadRecord.cpp +++ b/module-db/Interface/ThreadRecord.cpp @@ -11,7 +11,7 @@ #include "ThreadRecord.hpp" #include "SMSRecord.hpp" #include -#include +#include ThreadRecordInterface::ThreadRecordInterface(SmsDB *smsDb, ContactsDB *contactsDb) : smsDB(smsDb), contactsDB(contactsDb) diff --git a/module-db/Tables/CalllogTable.cpp b/module-db/Tables/CalllogTable.cpp index a186ee89b..92c337bec 100644 --- a/module-db/Tables/CalllogTable.cpp +++ b/module-db/Tables/CalllogTable.cpp @@ -7,7 +7,7 @@ * @details */ #include "CalllogTable.hpp" -#include "segger/log/log.hpp" +#include "log/log.hpp" #include CalllogTable::CalllogTable(Database *db) : Table(db) diff --git a/module-db/Tables/ContactsTable.cpp b/module-db/Tables/ContactsTable.cpp index 24a9dfd8a..2a2387129 100644 --- a/module-db/Tables/ContactsTable.cpp +++ b/module-db/Tables/ContactsTable.cpp @@ -9,7 +9,7 @@ */ #include "ContactsTable.hpp" -#include +#include ContactsTable::ContactsTable(Database *db) : Table(db) {} diff --git a/module-db/Tables/SMSTable.cpp b/module-db/Tables/SMSTable.cpp index 3c8178ba9..c62088d1e 100644 --- a/module-db/Tables/SMSTable.cpp +++ b/module-db/Tables/SMSTable.cpp @@ -9,7 +9,7 @@ */ #include "SMSTable.hpp" -#include +#include SMSTable::SMSTable(Database *db) : Table(db) {} diff --git a/module-gui/gui/core/Font.cpp b/module-gui/gui/core/Font.cpp index 9e04c759b..9b999a81a 100644 --- a/module-gui/gui/core/Font.cpp +++ b/module-gui/gui/core/Font.cpp @@ -12,7 +12,7 @@ #include "Font.hpp" #include "utf8/UTF8.hpp" -#include "segger/log/log.hpp" +#include "log/log.hpp" // for loading files #include "Context.hpp" #include "DrawCommand.hpp" diff --git a/module-gui/gui/core/ImageManager.cpp b/module-gui/gui/core/ImageManager.cpp index 872485a95..c0981f992 100644 --- a/module-gui/gui/core/ImageManager.cpp +++ b/module-gui/gui/core/ImageManager.cpp @@ -12,7 +12,7 @@ #include "ImageManager.hpp" #include "utf8/UTF8.hpp" -#include "segger/log/log.hpp" +#include "log/log.hpp" // module-gui #include "ImageMap.hpp" #include "VecMap.hpp" diff --git a/module-gui/gui/core/Renderer.cpp b/module-gui/gui/core/Renderer.cpp index 8d6d05be3..392bcebd6 100644 --- a/module-gui/gui/core/Renderer.cpp +++ b/module-gui/gui/core/Renderer.cpp @@ -20,7 +20,7 @@ extern "C" #include "ImageManager.hpp" #include "../Common.hpp" // utils -#include "segger/log/log.hpp" +#include "log/log.hpp" #include "PixMap.hpp" #include "VecMap.hpp" diff --git a/module-gui/gui/input/Profile.cpp b/module-gui/gui/input/Profile.cpp index 4a7759822..570afb5dd 100644 --- a/module-gui/gui/input/Profile.cpp +++ b/module-gui/gui/input/Profile.cpp @@ -10,7 +10,7 @@ #include #include #include -#include "segger/log/log.hpp" +#include "log/log.hpp" #include "utf8/UTF8.hpp" #include "vfs.hpp" #include "Profile.hpp" diff --git a/module-gui/gui/input/Translator.cpp b/module-gui/gui/input/Translator.cpp index 51680d615..3f9354ba4 100644 --- a/module-gui/gui/input/Translator.cpp +++ b/module-gui/gui/input/Translator.cpp @@ -1,5 +1,5 @@ #include "Translator.hpp" -#include "segger/log/log.hpp" +#include "log/log.hpp" #include "vfs.hpp" #include diff --git a/module-gui/gui/widgets/BottomBar.cpp b/module-gui/gui/widgets/BottomBar.cpp index 24a969a51..caef04637 100644 --- a/module-gui/gui/widgets/BottomBar.cpp +++ b/module-gui/gui/widgets/BottomBar.cpp @@ -9,7 +9,7 @@ #include "Margins.hpp" #include "utf8/UTF8.hpp" #include -#include +#include namespace gui { diff --git a/module-gui/gui/widgets/BoxLayout.cpp b/module-gui/gui/widgets/BoxLayout.cpp index 1ed4be909..1e5c8dbd6 100644 --- a/module-gui/gui/widgets/BoxLayout.cpp +++ b/module-gui/gui/widgets/BoxLayout.cpp @@ -6,7 +6,7 @@ */ #include "BoxLayout.hpp" -#include +#include #include diff --git a/module-gui/gui/widgets/GridLayout.cpp b/module-gui/gui/widgets/GridLayout.cpp index ea17607f4..a47337ca7 100644 --- a/module-gui/gui/widgets/GridLayout.cpp +++ b/module-gui/gui/widgets/GridLayout.cpp @@ -1,6 +1,6 @@ #include "GridLayout.hpp" #include "Style.hpp" -#include +#include using namespace gui; diff --git a/module-gui/gui/widgets/Label.cpp b/module-gui/gui/widgets/Label.cpp index 7f630fd0c..45d48531f 100644 --- a/module-gui/gui/widgets/Label.cpp +++ b/module-gui/gui/widgets/Label.cpp @@ -4,7 +4,7 @@ * Created on: 7 mar 2019 * Author: robert */ -#include "segger/log/log.hpp" +#include "log/log.hpp" #include "utf8/UTF8.hpp" #include "../core/DrawCommand.hpp" diff --git a/module-gui/gui/widgets/ListItem.cpp b/module-gui/gui/widgets/ListItem.cpp index f687ce64b..324d71066 100644 --- a/module-gui/gui/widgets/ListItem.cpp +++ b/module-gui/gui/widgets/ListItem.cpp @@ -6,7 +6,7 @@ */ #include "ListItem.hpp" -#include "segger/log/log.hpp" +#include "log/log.hpp" namespace gui { diff --git a/module-gui/gui/widgets/ListView.cpp b/module-gui/gui/widgets/ListView.cpp index b3b894120..ef390c9a7 100644 --- a/module-gui/gui/widgets/ListView.cpp +++ b/module-gui/gui/widgets/ListView.cpp @@ -7,7 +7,7 @@ #include #include "ListView.hpp" -#include +#include namespace gui { diff --git a/module-gui/gui/widgets/PageLayout.cpp b/module-gui/gui/widgets/PageLayout.cpp index b96322cd2..ca80d753d 100644 --- a/module-gui/gui/widgets/PageLayout.cpp +++ b/module-gui/gui/widgets/PageLayout.cpp @@ -1,6 +1,6 @@ #include "PageLayout.hpp" #include "Style.hpp" -#include +#include namespace gui { diff --git a/module-gui/gui/widgets/Rect.cpp b/module-gui/gui/widgets/Rect.cpp index 47336cd46..eca959754 100644 --- a/module-gui/gui/widgets/Rect.cpp +++ b/module-gui/gui/widgets/Rect.cpp @@ -7,11 +7,11 @@ #include "../core/BoundingBox.hpp" #include "../core/DrawCommand.hpp" -#include +#include #include "Rect.hpp" #include "Style.hpp" -#include +#include namespace gui { diff --git a/module-gui/gui/widgets/Text.cpp b/module-gui/gui/widgets/Text.cpp index ea0ea32ef..ad79f4289 100644 --- a/module-gui/gui/widgets/Text.cpp +++ b/module-gui/gui/widgets/Text.cpp @@ -10,7 +10,7 @@ #include "../core/Font.hpp" #include "Text.hpp" -#include "segger/log/log.hpp" +#include "log/log.hpp" #include "utf8/UTF8.hpp" #include "vfs.hpp" #include diff --git a/module-gui/test/unittest_gui.cpp b/module-gui/test/unittest_gui.cpp index d5e3fabd2..87836c418 100644 --- a/module-gui/test/unittest_gui.cpp +++ b/module-gui/test/unittest_gui.cpp @@ -15,7 +15,7 @@ #include #include "../gui/core/ImageManager.hpp" -#include "segger/log/log.hpp" +#include "log/log.hpp" #include "utf8/UTF8.hpp" #include "vfs.hpp" diff --git a/module-os/FreeRTOS/application.c b/module-os/FreeRTOS/application.c index a9efbec42..53a592c67 100644 --- a/module-os/FreeRTOS/application.c +++ b/module-os/FreeRTOS/application.c @@ -1,6 +1,6 @@ #include "FreeRTOS.h" #include "task.h" -#include "segger/log/log.hpp" +#include "log/log.hpp" #include #include diff --git a/module-os/FreeRTOS/include/FreeRTOSConfig.h b/module-os/FreeRTOS/include/FreeRTOSConfig.h index e5db186b9..c68785a3b 100644 --- a/module-os/FreeRTOS/include/FreeRTOSConfig.h +++ b/module-os/FreeRTOS/include/FreeRTOSConfig.h @@ -38,7 +38,7 @@ * See http://www.freertos.org/a00110.html. *----------------------------------------------------------*/ #include -#include "segger/log/log.hpp" +#include "log/log.hpp" //TODO: Look at tasks.c: void vTaskStepTick( const TickType_t xTicksToJump ) before upgrading FreeRTOS #ifdef __cplusplus diff --git a/module-os/systemviewPatch/FreeRTOSConfig.h b/module-os/systemviewPatch/FreeRTOSConfig.h index dad2d0841..b88cfffd9 100644 --- a/module-os/systemviewPatch/FreeRTOSConfig.h +++ b/module-os/systemviewPatch/FreeRTOSConfig.h @@ -38,7 +38,7 @@ * See http://www.freertos.org/a00110.html. *----------------------------------------------------------*/ #include -#include "segger/log/log.hpp" +#include "log/log.hpp" //TODO: Look at tasks.c: void vTaskStepTick( const TickType_t xTicksToJump ) before upgrading FreeRTOS #ifdef __cplusplus diff --git a/module-services/service-appmgr/ApplicationManager.cpp b/module-services/service-appmgr/ApplicationManager.cpp index ae54e348d..2402fa5bb 100644 --- a/module-services/service-appmgr/ApplicationManager.cpp +++ b/module-services/service-appmgr/ApplicationManager.cpp @@ -33,7 +33,7 @@ /// #define AUTO_PHONE_LOCK_ENABLED // module-utils -#include "segger/log/log.hpp" +#include "log/log.hpp" #include "i18/i18.hpp" #include diff --git a/module-services/service-bluetooth/ServiceBluetooth.cpp b/module-services/service-bluetooth/ServiceBluetooth.cpp index 61346029f..d24451670 100644 --- a/module-services/service-bluetooth/ServiceBluetooth.cpp +++ b/module-services/service-bluetooth/ServiceBluetooth.cpp @@ -3,7 +3,7 @@ #include "Service/Message.hpp" #include "MessageType.hpp" #include "messages/BluetoothMessage.hpp" -#include +#include #include const char *ServiceBluetooth::serviceName = "ServiceBluetooth"; diff --git a/module-services/service-cellular/CellularCall.cpp b/module-services/service-cellular/CellularCall.cpp index 0abcb5855..1e5d85fb7 100644 --- a/module-services/service-cellular/CellularCall.cpp +++ b/module-services/service-cellular/CellularCall.cpp @@ -1,7 +1,7 @@ #include "CellularCall.hpp" #include #include -#include +#include #include #include "bsp/rtc/rtc.hpp" diff --git a/module-services/service-cellular/ServiceCellular.cpp b/module-services/service-cellular/ServiceCellular.cpp index 02c2bde6e..546641cda 100644 --- a/module-services/service-cellular/ServiceCellular.cpp +++ b/module-services/service-cellular/ServiceCellular.cpp @@ -30,7 +30,7 @@ #include "messages/CellularMessage.hpp" #include -#include "segger/log/log.hpp" +#include "log/log.hpp" #include "service-appmgr/ApplicationManager.hpp" #include "service-appmgr/messages/APMMessage.hpp" diff --git a/module-services/service-cellular/SignalStrength.cpp b/module-services/service-cellular/SignalStrength.cpp index ff6c9f84c..83ff4ab8f 100644 --- a/module-services/service-cellular/SignalStrength.cpp +++ b/module-services/service-cellular/SignalStrength.cpp @@ -1,5 +1,5 @@ #include "SignalStrength.hpp" -#include +#include SignalStrength::SignalStrength(int rssi) { diff --git a/module-services/service-db/ServiceDB.cpp b/module-services/service-db/ServiceDB.cpp index 958bed77f..20ab741e6 100644 --- a/module-services/service-db/ServiceDB.cpp +++ b/module-services/service-db/ServiceDB.cpp @@ -18,7 +18,7 @@ #include "Database/Database.hpp" -#include "segger/log/log.hpp" +#include "log/log.hpp" #include #include