M board/rt1051/_exit.c => board/rt1051/_exit.c +1 -1
@@ 32,7 32,7 @@
#include <FreeRTOS.h>
#include <MIMXRT1051.h>
-#include <log/log.hpp>
+#include <log.hpp>
#include <task.h>
#include <macros.h>
// ----------------------------------------------------------------------------
M board/rt1051/crashdump/consoledump.cpp => board/rt1051/crashdump/consoledump.cpp +1 -1
@@ 1,7 1,7 @@
// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
-#include <log/log.hpp>
+#include <log.hpp>
#include "consoledump.hpp"
#include "MIMXRT1051.h"
M board/rt1051/crashdump/crashcatcher_impl.cpp => board/rt1051/crashdump/crashcatcher_impl.cpp +1 -1
@@ 5,7 5,7 @@
#include <CrashCatcher.h>
-#include <log/log.hpp>
+#include <log.hpp>
#include <date/date.h>
#include "crashdumpwriter.hpp"
M board/rt1051/crashdump/crashdumpwriter_vfs.cpp => board/rt1051/crashdump/crashdumpwriter_vfs.cpp +1 -1
@@ 3,7 3,7 @@
#include "crashdumpwriter_vfs.hpp"
-#include <log/log.hpp>
+#include <log.hpp>
#include <fcntl.h>
#include "purefs/vfs_subsystem.hpp"
M module-apps/Application.cpp => module-apps/Application.cpp +1 -1
@@ 14,7 14,7 @@
#include "common_data/RawKey.hpp" // for RawKey, key...
#include "gui/input/InputEvent.hpp" // for InputEvent
#include "log/debug.hpp" // for DEBUG_APPLI...
-#include "log/log.hpp" // for LOG_INFO
+#include "log.hpp" // for LOG_INFO
#include "messages/AppMessage.hpp" // for AppSwitchMe...
#include "service-appmgr/Controller.hpp" // for Controller
#include <service-cellular-api>
M module-apps/application-call/ApplicationCall.cpp => module-apps/application-call/ApplicationCall.cpp +1 -1
@@ 14,7 14,7 @@
#include <MessageType.hpp>
#include <PhoneNumber.hpp>
#include <Dialog.hpp>
-#include <log/log.hpp>
+#include <log.hpp>
#include <memory>
#include <service-cellular/ServiceCellular.hpp>
#include <service-cellular/CellularServiceAPI.hpp>
M module-apps/application-call/widgets/StateIcon.hpp => module-apps/application-call/widgets/StateIcon.hpp +1 -1
@@ 6,7 6,7 @@
#include "Image.hpp"
#include "Label.hpp"
#include <Style.hpp>
-#include <log/log.hpp>
+#include <log.hpp>
#include <i18n/i18n.hpp>
#include <map>
M module-apps/application-call/windows/CallWindow.cpp => module-apps/application-call/windows/CallWindow.cpp +1 -1
@@ 7,7 7,7 @@
#include "InputEvent.hpp"
#include "application-call/data/CallState.hpp"
#include "application-call/widgets/StateIcons.hpp"
-#include "log/log.hpp"
+#include "log.hpp"
#include "service-appmgr/Controller.hpp"
#include "application-call/ApplicationCall.hpp"
M module-apps/application-calllog/ApplicationCallLog.cpp => module-apps/application-calllog/ApplicationCallLog.cpp +1 -1
@@ 13,7 13,7 @@
#include <Dialog.hpp>
#include <OptionWindow.hpp>
#include <i18n/i18n.hpp>
-#include <log/log.hpp>
+#include <log.hpp>
#include <MessageType.hpp>
#include <module-db/queries/calllog/QueryCalllogSetAllRead.hpp>
#include <module-db/queries/notifications/QueryNotificationsClear.hpp>
M module-apps/application-clock/ApplicationClock.cpp => module-apps/application-clock/ApplicationClock.cpp +1 -1
@@ 6,7 6,7 @@
#include "gui/widgets/Window.hpp"
// module-utils
-#include "log/log.hpp"
+#include "log.hpp"
#include <service-evtmgr/EVMessages.hpp>
#include <service-evtmgr/EventManager.hpp>
#include <service-appmgr/model/ApplicationManager.hpp>
M module-apps/application-desktop/windows/ChargingBatteryWindow.cpp => module-apps/application-desktop/windows/ChargingBatteryWindow.cpp +1 -1
@@ 4,7 4,7 @@
#include "ChargingBatteryWindow.hpp"
#include "InputEvent.hpp"
#include "gui/widgets/Image.hpp"
-#include "log/log.hpp"
+#include <log.hpp>
#include <application-desktop/windows/Names.hpp>
#include <service-appmgr/model/ApplicationManager.hpp>
#include <service-appmgr/Controller.hpp>
M module-apps/application-desktop/windows/DeadBatteryWindow.cpp => module-apps/application-desktop/windows/DeadBatteryWindow.cpp +1 -1
@@ 4,7 4,7 @@
#include "DeadBatteryWindow.hpp"
#include "InputEvent.hpp"
#include "gui/widgets/Image.hpp"
-#include "log/log.hpp"
+#include <log.hpp>
#include <application-desktop/windows/Names.hpp>
#include <service-appmgr/model/ApplicationManager.hpp>
#include <service-appmgr/Controller.hpp>
M module-apps/application-desktop/windows/DesktopMainWindow.cpp => module-apps/application-desktop/windows/DesktopMainWindow.cpp +1 -1
@@ 17,7 17,7 @@
#include <windows/DialogMetadata.hpp>
#include <messages/DialogMetadataMessage.hpp>
-#include <log/log.hpp>
+#include <log.hpp>
namespace gui
{
M module-apps/application-desktop/windows/LogoWindow.cpp => module-apps/application-desktop/windows/LogoWindow.cpp +1 -1
@@ 3,7 3,7 @@
#include "LogoWindow.hpp"
#include "gui/widgets/Image.hpp"
-#include "log/log.hpp"
+#include "log.hpp"
#include <application-desktop/windows/Names.hpp>
namespace gui
M module-apps/application-desktop/windows/Update.cpp => module-apps/application-desktop/windows/Update.cpp +1 -1
@@ 1,7 1,7 @@
// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
-#include "log/log.hpp"
+#include "log.hpp"
#include "application-desktop/data/DesktopData.hpp"
#include <source/version.hpp>
M module-apps/application-desktop/windows/UpdateProgress.cpp => module-apps/application-desktop/windows/UpdateProgress.cpp +1 -1
@@ 1,7 1,7 @@
// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
-#include <log/log.hpp>
+#include <log.hpp>
#include <source/version.hpp>
#include <boot/bootconfig.hpp>
M module-apps/application-messages/models/ThreadsModel.cpp => module-apps/application-messages/models/ThreadsModel.cpp +1 -1
@@ 10,7 10,7 @@
#include "application-messages/data/MessagesStyle.hpp"
#include "application-messages/widgets/ThreadItem.hpp"
#include "application-messages/windows/ThreadWindowOptions.hpp"
-#include "log/log.hpp"
+#include "log.hpp"
#include <module-db/queries/messages/threads/QueryThreadsGet.hpp>
#include <module-db/queries/messages/threads/QueryThreadsGetForList.hpp>
#include <service-db/DBServiceAPI.hpp>
M module-apps/application-messages/windows/MessagesMainWindow.cpp => module-apps/application-messages/windows/MessagesMainWindow.cpp +1 -1
@@ 16,7 16,7 @@
#include <i18n/i18n.hpp>
#include <application-phonebook/data/PhonebookItemData.hpp>
#include <Style.hpp>
-#include <log/log.hpp>
+#include <log.hpp>
#include <module-db/queries/notifications/QueryNotificationsClear.hpp>
#include <module-db/queries/messages/threads/QueryThreadGetByContactID.hpp>
M module-apps/application-messages/windows/SMSTemplatesWindow.cpp => module-apps/application-messages/windows/SMSTemplatesWindow.cpp +1 -1
@@ 10,7 10,7 @@
#include <service-appmgr/Controller.hpp>
#include <i18n/i18n.hpp>
#include <Style.hpp>
-#include <log/log.hpp>
+#include <log.hpp>
#include <cassert>
#include <memory>
M module-apps/application-messages/windows/SMSThreadViewWindow.cpp => module-apps/application-messages/windows/SMSThreadViewWindow.cpp +1 -1
@@ 15,7 15,7 @@
#include <service-db/DBNotificationMessage.hpp>
#include <module-db/queries/phonebook/QueryContactGetByID.hpp>
-#include <log/log.hpp>
+#include <log.hpp>
#include <Style.hpp>
#include <cassert>
M module-apps/application-messages/windows/ThreadWindowOptions.cpp => module-apps/application-messages/windows/ThreadWindowOptions.cpp +1 -1
@@ 3,7 3,7 @@
#include "ThreadWindowOptions.hpp"
#include <i18n/i18n.hpp>
-#include "log/log.hpp"
+#include "log.hpp"
#include <OptionWindow.hpp>
#include <module-services/service-db/service-db/DBServiceAPI.hpp>
#include <OptionCall.hpp>
M module-apps/application-music-player/ApplicationMusicPlayer.cpp => module-apps/application-music-player/ApplicationMusicPlayer.cpp +1 -1
@@ 6,7 6,7 @@
#include "windows/MusicPlayerEmptyWindow.hpp"
#include <filesystem>
-#include <log/log.hpp>
+#include <log.hpp>
#include <i18n/i18n.hpp>
#include <purefs/filesystem_paths.hpp>
#include <service-audio/AudioServiceAPI.hpp>
M module-apps/application-music-player/windows/MusicPlayerEmptyWindow.cpp => module-apps/application-music-player/windows/MusicPlayerEmptyWindow.cpp +1 -1
@@ 7,7 7,7 @@
#include <Style.hpp>
#include <i18n/i18n.hpp>
-#include <log/log.hpp>
+#include <log.hpp>
#include <service-audio/AudioServiceAPI.hpp>
namespace gui
M module-apps/application-notes/model/NotesSearchListModel.cpp => module-apps/application-notes/model/NotesSearchListModel.cpp +1 -1
@@ 2,7 2,7 @@
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#include "NotesSearchListModel.hpp"
-#include "log/log.hpp"
+#include "log.hpp"
namespace app::notes
{
M module-apps/application-settings-new/models/AudioSettingsModel.cpp => module-apps/application-settings-new/models/AudioSettingsModel.cpp +1 -1
@@ 4,7 4,7 @@
#include "AudioSettingsModel.hpp"
#include <service-audio/AudioServiceAPI.hpp>
-#include <log/log.hpp>
+#include <log.hpp>
namespace audio_settings
{
M module-apps/application-settings-new/windows/SettingsMainWindow.cpp => module-apps/application-settings-new/windows/SettingsMainWindow.cpp +1 -1
@@ 5,7 5,7 @@
#include "application-settings-new/ApplicationSettings.hpp"
#include <i18n/i18n.hpp>
-#include <log/log.hpp>
+#include <log.hpp>
#include <service-appmgr/Controller.hpp>
std::list<gui::Option> mainWindowOptionsNew(app::Application *app)
M module-apps/application-settings/windows/Info.cpp => module-apps/application-settings/windows/Info.cpp +1 -1
@@ 7,7 7,7 @@
#include <service-cellular/CellularServiceAPI.hpp>
#include <source/version.hpp>
-#include <log/log.hpp>
+#include <log.hpp>
#include <gui/widgets/BoxLayout.hpp>
#include <gui/widgets/Label.hpp>
M module-apps/application-settings/windows/SettingsMainWindow.cpp => module-apps/application-settings/windows/SettingsMainWindow.cpp +1 -1
@@ 5,7 5,7 @@
#include "../ApplicationSettings.hpp"
#include "Info.hpp"
#include <i18n/i18n.hpp>
-#include "log/log.hpp"
+#include "log.hpp"
#include "CellularPassthroughWindow.hpp"
#include "FotaWindow.hpp"
#include "EinkModeWindow.hpp"
M module-apps/application-settings/windows/UITestWindow.cpp => module-apps/application-settings/windows/UITestWindow.cpp +1 -1
@@ 6,7 6,7 @@
#include "Label.hpp"
#include "Margins.hpp"
#include <i18n/i18n.hpp>
-#include "log/log.hpp"
+#include "log.hpp"
#include "messages/AppMessage.hpp"
#include <service-appmgr/model/ApplicationManager.hpp>
#include <GridLayout.hpp>
M module-apps/locks/handlers/LockPolicyHandler.cpp => module-apps/locks/handlers/LockPolicyHandler.cpp +1 -1
@@ 2,7 2,7 @@
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#include "LockPolicyHandler.hpp"
-#include <log/log.hpp>
+#include <log.hpp>
#include <Application.hpp>
#include <gsl/assert>
M module-apps/locks/widgets/Lock.cpp => module-apps/locks/widgets/Lock.cpp +1 -1
@@ 2,7 2,7 @@
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#include "Lock.hpp"
-#include <module-utils/log/log.hpp>
+#include <log.hpp>
namespace locks
{
M => +1 -1
@@ 3,7 3,7 @@
#include "PowerOffWindow.hpp"
#include <log/log.hpp>
#include <log.hpp>
#include <messages/DialogMetadataMessage.hpp>
namespace gui
M module-apps/windows/NoEvents.cpp => module-apps/windows/NoEvents.cpp +1 -1
@@ 4,7 4,7 @@
#include "NoEvents.hpp"
#include "Dialog.hpp"
#include "DialogMetadataMessage.hpp"
-#include "log/log.hpp"
+#include "log.hpp"
#include <service-appmgr/Controller.hpp>
#include <Image.hpp>
M module-apps/windows/OptionWindow.cpp => module-apps/windows/OptionWindow.cpp +1 -1
@@ 4,7 4,7 @@
#include "OptionWindow.hpp"
#include "Label.hpp"
#include <i18n/i18n.hpp>
-#include "log/log.hpp"
+#include "log.hpp"
#include <service-appmgr/model/ApplicationManager.hpp>
#include <Style.hpp>
#include <memory>
M module-audio/Audio/Audio.cpp => module-audio/Audio/Audio.cpp +1 -1
@@ 4,7 4,7 @@
#include "Audio.hpp"
#include "Operation/Operation.hpp"
-#include <log/log.hpp>
+#include <log.hpp>
#include <bsp/headset/headset.hpp>
namespace audio
M module-audio/Audio/Operation/PlaybackOperation.cpp => module-audio/Audio/Operation/PlaybackOperation.cpp +1 -1
@@ 9,7 9,7 @@
#include "Audio/AudioCommon.hpp"
-#include <log/log.hpp>
+#include <log.hpp>
namespace audio
{
M module-audio/Audio/Operation/RecorderOperation.cpp => module-audio/Audio/Operation/RecorderOperation.cpp +1 -1
@@ 10,7 10,7 @@
#include "Audio/Profiles/ProfileRecordingOnBoardMic.hpp"
#include "Audio/AudioCommon.hpp"
-#include "log/log.hpp"
+#include "log.hpp"
#include "FreeRTOS.h"
#include "task.h"
M module-audio/Audio/Operation/RouterOperation.cpp => module-audio/Audio/Operation/RouterOperation.cpp +1 -1
@@ 9,7 9,7 @@
#include <Audio/StreamFactory.hpp>
#include <Audio/transcode/TransformFactory.hpp>
-#include <log/log.hpp>
+#include <log.hpp>
#include <mutex.hpp>
#include <algorithm>
M module-audio/Audio/decoder/Decoder.hpp => module-audio/Audio/decoder/Decoder.hpp +1 -1
@@ 8,7 8,7 @@
#include "Audio/Stream.hpp"
#include "DecoderWorker.hpp"
-#include <log/log.hpp>
+#include <log.hpp>
#include <memory>
#include <optional>
M module-audio/Audio/encoder/EncoderWAV.cpp => module-audio/Audio/encoder/EncoderWAV.cpp +1 -1
@@ 2,7 2,7 @@
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#include "EncoderWAV.hpp"
-#include "log/log.hpp"
+#include "log.hpp"
namespace audio
{
M module-audio/board/rt1051/RT1051AudioCodec.cpp => module-audio/board/rt1051/RT1051AudioCodec.cpp +1 -1
@@ 4,7 4,7 @@
#include "RT1051AudioCodec.hpp"
#include "board.h"
#include "dma_config.h"
-#include "log/log.hpp"
+#include "log.hpp"
#include "bsp/BoardDefinitions.hpp"
#include "board/rt1051/common/audio.hpp"
M module-audio/board/rt1051/RT1051CellularAudio.cpp => module-audio/board/rt1051/RT1051CellularAudio.cpp +1 -1
@@ 4,7 4,7 @@
#include "RT1051CellularAudio.hpp"
#include "board.h"
#include "dma_config.h"
-#include "log/log.hpp"
+#include "log.hpp"
#include "bsp/BoardDefinitions.hpp"
M module-bluetooth/Bluetooth/BluetoothWorker.cpp => module-bluetooth/Bluetooth/BluetoothWorker.cpp +1 -1
@@ 4,7 4,7 @@
#include <service-bluetooth/ServiceBluetooth.hpp>
#include "BluetoothWorker.hpp"
#include "BtCommand.hpp"
-#include "log/log.hpp"
+#include "log.hpp"
#include "interface/BluetoothDriverImpl.hpp"
#include "interface/profiles/A2DP/A2DP.hpp"
#include "interface/profiles/HSP/HSP.hpp"
M module-bluetooth/Bluetooth/BtKeysStorage.cpp => module-bluetooth/Bluetooth/BtKeysStorage.cpp +1 -1
@@ 3,7 3,7 @@
#include <algorithm>
#include "BtKeysStorage.hpp"
-#include <log/log.hpp>
+#include <log.hpp>
json11::Json bluetooth::KeyStorage::keysJson = json11::Json();
btstack_link_key_db_t bluetooth::KeyStorage::keyStorage;
M module-bluetooth/Bluetooth/WorkerController.cpp => module-bluetooth/Bluetooth/WorkerController.cpp +1 -1
@@ 6,7 6,7 @@
#include "Device.hpp"
#include "interface/profiles/ProfileManager.hpp"
-#include <module-utils/log/log.hpp>
+#include <log.hpp>
#define BOOST_SML_CFG_DISABLE_MIN_SIZE // GCC10 fix
#include <boost/sml.hpp>
#include <magic_enum.hpp>
M module-bluetooth/Bluetooth/glucode/BluetoothRunLoop.hpp => module-bluetooth/Bluetooth/glucode/BluetoothRunLoop.hpp +1 -1
@@ 2,7 2,7 @@
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#pragma once
-#include <log/log.hpp>
+#include <log.hpp>
#include "queue.hpp"
#include <btstack_run_loop.h>
#include <timer.hpp>
M module-bluetooth/Bluetooth/glucode/btstack_uart_block_rt1051.cpp => module-bluetooth/Bluetooth/glucode/btstack_uart_block_rt1051.cpp +1 -1
@@ 2,7 2,7 @@
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#include <bsp/bluetooth/Bluetooth.hpp>
-#include <log/log.hpp>
+#include <log.hpp>
using namespace bsp;
M module-bluetooth/Bluetooth/interface/profiles/A2DP/A2DP.cpp => module-bluetooth/Bluetooth/interface/profiles/A2DP/A2DP.cpp +2 -2
@@ 11,12 11,12 @@
#include "AVRCP.hpp"
#include <Bluetooth/Device.hpp>
#include <Bluetooth/Error.hpp>
-#include <log/log.hpp>
+#include <log.hpp>
#include <service-bluetooth/BluetoothMessage.hpp>
#include <Audio/AudioCommon.hpp>
#include <service-audio/AudioMessage.hpp>
#include <service-evtmgr/Constants.hpp>
-#include <log/log.hpp>
+#include <log.hpp>
#include "service-bluetooth/messages/Connect.hpp"
#include "service-bluetooth/messages/Disconnect.hpp"
#include "service-bluetooth/Constants.hpp"
M module-bluetooth/Bluetooth/interface/profiles/A2DP/A2DPImpl.hpp => module-bluetooth/Bluetooth/interface/profiles/A2DP/A2DPImpl.hpp +1 -1
@@ 6,7 6,7 @@
#include <Bluetooth/Device.hpp>
#include <Bluetooth/Error.hpp>
#include <BtCommand.hpp>
-#include <log/log.hpp>
+#include <log.hpp>
#include <Audio/AudioCommon.hpp>
#include <audio/BluetoothAudioDevice.hpp>
M module-bluetooth/Bluetooth/interface/profiles/GAP/GAP.cpp => module-bluetooth/Bluetooth/interface/profiles/GAP/GAP.cpp +1 -1
@@ 3,7 3,7 @@
#include "GAP.hpp"
-#include <log/log.hpp>
+#include <log.hpp>
#include <service-bluetooth/BluetoothMessage.hpp>
#include <service-bluetooth/messages/ResponseVisibleDevices.hpp>
#include <service-bluetooth/messages/Unpair.hpp>
M module-bluetooth/Bluetooth/interface/profiles/HSP/HSP.cpp => module-bluetooth/Bluetooth/interface/profiles/HSP/HSP.cpp +1 -1
@@ 5,7 5,7 @@
#include "HSP.hpp"
#include <Bluetooth/Error.hpp>
-#include <log/log.hpp>
+#include <log.hpp>
#include <service-evtmgr/Constants.hpp>
#include <service-audio/AudioMessage.hpp>
#include <service-cellular/service-cellular/CellularServiceAPI.hpp>
M module-bluetooth/Bluetooth/interface/profiles/PAN.cpp => module-bluetooth/Bluetooth/interface/profiles/PAN.cpp +1 -1
@@ 1,7 1,7 @@
// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
-#include <log/log.hpp>
+#include <log.hpp>
extern "C"
{
M module-bsp/board/linux/audio/LinuxCellularAudio.cpp => module-bsp/board/linux/audio/LinuxCellularAudio.cpp +1 -1
@@ 5,7 5,7 @@
#include "linux_audiocodec.hpp"
-#include "log/log.hpp"
+#include "log.hpp"
namespace bsp
{
M module-bsp/board/linux/audio/linux_audiocodec.cpp => module-bsp/board/linux/audio/linux_audiocodec.cpp +1 -1
@@ 3,7 3,7 @@
#include "linux_audiocodec.hpp"
-#include "log/log.hpp"
+#include "log.hpp"
namespace bsp
{
M module-bsp/board/linux/bluetooth/Bluetooth.cpp => module-bsp/board/linux/bluetooth/Bluetooth.cpp +1 -1
@@ 3,7 3,7 @@
#include "bsp/bluetooth/Bluetooth.hpp"
#include "BluetoothWorker.hpp"
-#include "log/log.hpp"
+#include "log.hpp"
/// stubs
M module-bsp/board/linux/cellular/linux_cellular.cpp => module-bsp/board/linux/cellular/linux_cellular.cpp +1 -1
@@ 7,7 7,7 @@
#include <iostream>
#include <algorithm>
-#include "log/log.hpp"
+#include "log.hpp"
#include "mutex.hpp"
#include <common_data/EventStore.hpp>
#include <errno.h>
M module-bsp/board/linux/vibrator/vibrator.cpp => module-bsp/board/linux/vibrator/vibrator.cpp +1 -1
@@ 2,7 2,7 @@
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#include "bsp/vibrator/vibrator.hpp"
-#include <module-utils/log/log.hpp>
+#include <log.hpp>
namespace bsp
{
M module-bsp/board/linux/watchdog/software_watchdog.cpp => module-bsp/board/linux/watchdog/software_watchdog.cpp +1 -1
@@ 5,7 5,7 @@
#include <module-os/RTOSWrapper/include/critical.hpp>
#include <module-os/RTOSWrapper/include/ticks.hpp>
#include <module-sys/Service/Common.hpp>
-#include <module-utils/log/log.hpp>
+#include <log.hpp>
#include <cstdlib>
namespace bsp::watchdog
M module-bsp/board/rt1051/bluetooth/BlueKitchen.cpp => module-bsp/board/rt1051/bluetooth/BlueKitchen.cpp +1 -1
@@ 3,7 3,7 @@
#include "bsp/bluetooth/Bluetooth.hpp"
#include "BluetoothWorker.hpp"
-#include "log/log.hpp"
+#include "log.hpp"
#include "FreeRTOS.h"
#include "fsl_lpuart.h"
#include "board.h"
M module-bsp/board/rt1051/bluetooth/BluetoothCommon.cpp => module-bsp/board/rt1051/bluetooth/BluetoothCommon.cpp +1 -1
@@ 3,7 3,7 @@
#include "BluetoothWorker.hpp"
#include "bsp/bluetooth/Bluetooth.hpp"
-#include "log/log.hpp"
+#include "log.hpp"
#include "FreeRTOS.h"
#include "board.h"
#include "fsl_lpuart_edma.h"
M module-bsp/board/rt1051/bluetooth/Bluetopia.cpp => module-bsp/board/rt1051/bluetooth/Bluetopia.cpp +1 -1
@@ 2,7 2,7 @@
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#include "bluetooth/Bluetooth.hpp"
-#include "log/log.hpp"
+#include "log.hpp"
#include "fsl_lpuart.h"
#include "board.h"
M module-bsp/board/rt1051/bsp/eeprom/eeprom.cpp => module-bsp/board/rt1051/bsp/eeprom/eeprom.cpp +1 -1
@@ 7,7 7,7 @@
#include "drivers/i2c/DriverI2C.hpp"
#include "fsl_common.h"
-#include "log/log.hpp"
+#include "log.hpp"
#include "task.h"
M module-bsp/board/rt1051/bsp/light_sensor/light_sensor.cpp => module-bsp/board/rt1051/bsp/light_sensor/light_sensor.cpp +1 -1
@@ 8,7 8,7 @@
#include "drivers/gpio/DriverGPIO.hpp"
#include "fsl_common.h"
-#include "log/log.hpp"
+#include "log.hpp"
namespace bsp::light_sensor
{
M module-bsp/board/rt1051/bsp/lpm/CpuFreqLPM.cpp => module-bsp/board/rt1051/bsp/lpm/CpuFreqLPM.cpp +1 -1
@@ 2,7 2,7 @@
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#include "CpuFreqLPM.hpp"
-#include "log/log.hpp"
+#include "log.hpp"
#include "fsl_dcdc.h"
namespace bsp
M module-bsp/board/rt1051/bsp/lpm/RT1051LPM.cpp => module-bsp/board/rt1051/bsp/lpm/RT1051LPM.cpp +1 -1
@@ 4,7 4,7 @@
#include "RT1051LPM.hpp"
#include "board.h"
-#include "log/log.hpp"
+#include "log.hpp"
#include "bsp/BoardDefinitions.hpp"
#include "bsp/watchdog/watchdog.hpp"
#include <clock_config.h>
M module-bsp/board/rt1051/common/chip.cpp => module-bsp/board/rt1051/common/chip.cpp +1 -1
@@ 3,7 3,7 @@
#include "chip.hpp"
-#include <log/log.hpp>
+#include <log.hpp>
#include <map>
#include <string>
M module-bsp/board/rt1051/common/clock_config.cpp => module-bsp/board/rt1051/common/clock_config.cpp +1 -1
@@ 54,7 54,7 @@
#include "fsl_iomuxc.h"
#include "fsl_dcdc.h"
#include "fsl_gpc.h"
-#include "log/log.hpp"
+#include "log.hpp"
/*******************************************************************************
* Definitions
M module-bsp/board/rt1051/common/startup_mimxrt1052.cpp => module-bsp/board/rt1051/common/startup_mimxrt1052.cpp +1 -1
@@ 453,7 453,7 @@ extern "C"
#include "MIMXRT1051.h"
#include "macros.h"
-#include <log/log.hpp>
+#include <log.hpp>
#include <cinttypes>
#include <cstdlib>
#include <cstdint>
M module-bsp/board/rt1051/drivers/RT1051DriverDMA.cpp => module-bsp/board/rt1051/drivers/RT1051DriverDMA.cpp +1 -1
@@ 3,7 3,7 @@
#include "RT1051DriverDMA.hpp"
#include <algorithm>
-#include "log/log.hpp"
+#include "log.hpp"
namespace drivers
{
M module-bsp/board/rt1051/drivers/RT1051DriverGPIO.cpp => module-bsp/board/rt1051/drivers/RT1051DriverGPIO.cpp +1 -1
@@ 2,7 2,7 @@
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#include "RT1051DriverGPIO.hpp"
-#include "log/log.hpp"
+#include "log.hpp"
namespace drivers
{
M module-bsp/board/rt1051/drivers/RT1051DriverI2C.cpp => module-bsp/board/rt1051/drivers/RT1051DriverI2C.cpp +1 -1
@@ 2,7 2,7 @@
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#include "RT1051DriverI2C.hpp"
-#include "log/log.hpp"
+#include "log.hpp"
#include "../board.h"
namespace drivers
M module-bsp/board/rt1051/drivers/RT1051DriverPLL.cpp => module-bsp/board/rt1051/drivers/RT1051DriverPLL.cpp +1 -1
@@ 2,7 2,7 @@
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#include "RT1051DriverPLL.hpp"
-#include "log/log.hpp"
+#include "log.hpp"
#include "../common/clock_config.h"
namespace drivers
M module-bsp/board/rt1051/drivers/RT1051DriverPWM.cpp => module-bsp/board/rt1051/drivers/RT1051DriverPWM.cpp +1 -1
@@ 3,7 3,7 @@
#include "RT1051DriverPWM.hpp"
#include "RT1051DriverPWMhelper.hpp"
-#include "log/log.hpp"
+#include "log.hpp"
#include "../board.h"
#include <algorithm>
M module-bsp/bsp/usb/usb.hpp => module-bsp/bsp/usb/usb.hpp +1 -1
@@ 12,7 12,7 @@ extern "C"
#include <errno.h>
#include <iostream>
-#include <log/log.hpp>
+#include <log.hpp>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
M module-cellular/at/cmd/src/CFUN.cpp => module-cellular/at/cmd/src/CFUN.cpp +1 -1
@@ 1,7 1,7 @@
// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
-#include <log/log.hpp>
+#include <log.hpp>
#include <memory>
#include <string>
#include <type_traits>
M module-cellular/at/cmd/src/CSCA.cpp => module-cellular/at/cmd/src/CSCA.cpp +1 -1
@@ 1,7 1,7 @@
// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
-#include <log/log.hpp>
+#include <log.hpp>
#include <memory>
#include <string>
#include <type_traits>
M module-cellular/at/cmd/src/QECCNUM.cpp => module-cellular/at/cmd/src/QECCNUM.cpp +1 -1
@@ 1,7 1,7 @@
// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
-#include <log/log.hpp>
+#include <log.hpp>
#include <memory>
#include <string>
#include <type_traits>
M module-cellular/at/response.hpp => module-cellular/at/response.hpp +1 -1
@@ 4,7 4,7 @@
#pragma once
#include "Result.hpp"
-#include <log/log.hpp>
+#include <log.hpp>
#include <map>
#include <memory>
#include <string>
M module-cellular/modem/ATCommon.cpp => module-cellular/modem/ATCommon.cpp +1 -1
@@ 5,7 5,7 @@
#include <at/Cmd.hpp>
#include "time/ScopedTime.hpp"
#include <functional>
-#include <log/log.hpp>
+#include <log.hpp>
#include <string>
#include <Utils.hpp>
#include "ATStream.hpp"
M module-cellular/modem/mux/CellularMuxFrame.h => module-cellular/modem/mux/CellularMuxFrame.h +1 -1
@@ 7,7 7,7 @@
#include <inttypes.h>
#include <vector>
#include <iostream>
-#include "log/log.hpp"
+#include "log.hpp"
#define TS0710_FLAG 0xF9
#define TS0710_FRAME_HDR_LEN 6 // without extended address byte
M module-cellular/modem/mux/DLCChannel.cpp => module-cellular/modem/mux/DLCChannel.cpp +1 -1
@@ 6,7 6,7 @@
#include "CellularMuxData.h"
#include "CellularMuxFrame.h"
-#include <module-utils/log/log.hpp>
+#include <log.hpp>
#include <ticks.hpp>
#include <Utils.hpp>
#include <magic_enum.hpp>
M module-db/Common/Query.hpp => module-db/Common/Query.hpp +1 -1
@@ 6,7 6,7 @@
#include <memory>
#include <string>
#include <functional>
-#include <log/log.hpp>
+#include <log.hpp>
#include <module-services/service-desktop/endpoints/Context.hpp>
namespace db
M module-db/Database/Database.cpp => module-db/Database/Database.cpp +1 -1
@@ 4,7 4,7 @@
#include "Database.hpp"
#include "DatabaseInitializer.hpp"
-#include "log/log.hpp"
+#include "log.hpp"
#include <purefs/filesystem_paths.hpp>
#include <gsl/util>
M module-db/Database/DatabaseInitializer.cpp => module-db/Database/DatabaseInitializer.cpp +1 -1
@@ 9,7 9,7 @@
#include <set>
#include <string>
#include <sstream>
-#include <log/log.hpp>
+#include <log.hpp>
DatabaseInitializer::DatabaseInitializer(Database *db) : db(db)
{}
M module-db/Database/Field.cpp => module-db/Database/Field.cpp +1 -1
@@ 2,7 2,7 @@
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#include "Field.hpp"
-#include <log/log.hpp>
+#include <log.hpp>
#include <functional>
const char *Field::getCString() const
M module-db/Interface/CalllogRecord.cpp => module-db/Interface/CalllogRecord.cpp +1 -1
@@ 4,7 4,7 @@
#include "CalllogRecord.hpp"
#include <ContactRecord.hpp>
-#include <log/log.hpp>
+#include <log.hpp>
#include <Tables/CalllogTable.hpp>
#include <PhoneNumber.hpp>
#include <Utils.hpp>
M module-db/Interface/EventsRecord.cpp => module-db/Interface/EventsRecord.cpp +1 -1
@@ 13,7 13,7 @@
#include <module-db/queries/calendar/QueryEventsGetFilteredByDay.hpp>
#include <module-db/queries/calendar/QueryEventsGetAllLimited.hpp>
#include <module-db/queries/calendar/QueryEventsSelectFirstUpcoming.hpp>
-#include <log/log.hpp>
+#include <log.hpp>
#include <Utils.hpp>
#include <cassert>
#include <vector>
M module-db/Interface/NotificationsRecord.cpp => module-db/Interface/NotificationsRecord.cpp +1 -1
@@ 9,7 9,7 @@
#include "module-db/queries/notifications/QueryNotificationsGetAll.hpp"
#include "Databases/NotificationsDB.hpp"
-#include <log/log.hpp>
+#include <log.hpp>
#include <Utils.hpp>
#include <cassert>
M module-db/Interface/Record.cpp => module-db/Interface/Record.cpp +1 -1
@@ 3,7 3,7 @@
#include "Record.hpp"
#include <Common/Query.hpp>
-#include <log/log.hpp>
+#include <log.hpp>
namespace db
{
M module-db/Interface/SMSRecord.cpp => module-db/Interface/SMSRecord.cpp +1 -1
@@ 19,7 19,7 @@
#include "queries/messages/sms/QuerySMSGetLastByThreadID.hpp"
#include <queries/messages/sms/QuerySMSGetForList.hpp>
-#include <log/log.hpp>
+#include <log.hpp>
#include <PhoneNumber.hpp>
#include <optional>
M module-db/Interface/SMSTemplateRecord.cpp => module-db/Interface/SMSTemplateRecord.cpp +1 -1
@@ 10,7 10,7 @@
#include "queries/messages/templates/QuerySMSTemplateUpdate.hpp"
#include <queries/messages/templates/QuerySMSTemplateGetForList.hpp>
-#include <log/log.hpp>
+#include <log.hpp>
#include <cassert>
M module-db/Interface/ThreadRecord.cpp => module-db/Interface/ThreadRecord.cpp +1 -1
@@ 15,7 15,7 @@
#include <queries/messages/threads/QueryThreadsGetCount.hpp>
#include <cassert>
-#include <log/log.hpp>
+#include <log.hpp>
ThreadRecordInterface::ThreadRecordInterface(SmsDB *smsDb, ContactsDB *contactsDb)
: smsDB(smsDb), contactsDB(contactsDb)
M module-db/Tables/CalllogTable.cpp => module-db/Tables/CalllogTable.cpp +1 -1
@@ 2,7 2,7 @@
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#include "CalllogTable.hpp"
-#include "log/log.hpp"
+#include "log.hpp"
#include <Utils.hpp>
CalllogTable::CalllogTable(Database *db) : Table(db)
M module-db/Tables/ContactsTable.cpp => module-db/Tables/ContactsTable.cpp +1 -1
@@ 2,7 2,7 @@
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#include "ContactsTable.hpp"
-#include <log/log.hpp>
+#include <log.hpp>
#include <Utils.hpp>
namespace ColumnName
M module-db/Tables/EventsTable.cpp => module-db/Tables/EventsTable.cpp +1 -1
@@ 6,7 6,7 @@
//#include <module-apps/application-calendar/widgets/CalendarStyle.hpp>
//#include <module-apps/application-calendar/data/OptionParser.hpp>
-#include <log/log.hpp>
+#include <log.hpp>
#include <Utils.hpp>
#include <cassert>
M module-db/Tables/NotesTable.cpp => module-db/Tables/NotesTable.cpp +1 -1
@@ 2,7 2,7 @@
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#include "NotesTable.hpp"
-#include "log/log.hpp"
+#include "log.hpp"
#include <string>
NotesTable::NotesTable(Database *db) : Table(db)
M module-db/Tables/NotificationsTable.cpp => module-db/Tables/NotificationsTable.cpp +1 -1
@@ 4,7 4,7 @@
#include "NotificationsTable.hpp"
#include "Database/Database.hpp"
-#include <log/log.hpp>
+#include <log.hpp>
#include <Utils.hpp>
#include <cassert>
M module-db/Tables/Record.hpp => module-db/Tables/Record.hpp +1 -1
@@ 3,7 3,7 @@
#pragma once
-#include <log/log.hpp>
+#include <log.hpp>
#include <cstdint>
constexpr uint32_t DB_ID_NONE = 0;
M module-db/Tables/SMSTable.cpp => module-db/Tables/SMSTable.cpp +1 -1
@@ 2,7 2,7 @@
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#include "SMSTable.hpp"
-#include <log/log.hpp>
+#include <log.hpp>
SMSTable::SMSTable(Database *db) : Table(db)
{}
M module-db/Tables/SMSTemplateTable.cpp => module-db/Tables/SMSTemplateTable.cpp +1 -1
@@ 4,7 4,7 @@
#include "SMSTemplateTable.hpp"
#include <Utils.hpp>
-#include <log/log.hpp>
+#include <log.hpp>
#include <cassert>
M module-db/Tables/ThreadsTable.cpp => module-db/Tables/ThreadsTable.cpp +1 -1
@@ 2,7 2,7 @@
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#include "ThreadsTable.hpp"
-#include "log/log.hpp"
+#include "log.hpp"
ThreadsTable::ThreadsTable(Database *db) : Table(db)
{}
M module-db/tests/DbInitializer.cpp => module-db/tests/DbInitializer.cpp +1 -1
@@ 8,7 8,7 @@
#include <memory>
#include <set>
#include <string>
-#include <log/log.hpp>
+#include <log.hpp>
DatabaseInitializer::DatabaseInitializer(Database *db) : db(db)
{}
M module-gui/gui/core/DrawCommand.cpp => module-gui/gui/core/DrawCommand.cpp +1 -1
@@ 18,7 18,7 @@
#include "FontManager.hpp"
#include "RawFont.hpp"
// utils
-#include "log/log.hpp"
+#include "log.hpp"
// module-utils
#include <cmath>
#include <cassert>
M module-gui/gui/core/Font.cpp => module-gui/gui/core/Font.cpp +1 -1
@@ 4,7 4,7 @@
#include "Font.hpp"
#include "FontManager.hpp" // for FontManager
#include "RawFont.hpp"
-#include "log/log.hpp"
+#include "log.hpp"
#include <algorithm>
#include <sstream>
M module-gui/gui/core/FontManager.cpp => module-gui/gui/core/FontManager.cpp +1 -1
@@ 5,7 5,7 @@
#include "Common.hpp" // for Status, Status::GUI_SUCCESS
#include "FontInfo.hpp" // for FontInfo
#include "RawFont.hpp" // for RawFont
-#include "log/log.hpp" // for LOG_ERROR, LOG_INFO, LOG_WARN
+#include "log.hpp" // for LOG_ERROR, LOG_INFO, LOG_WARN
#include <Utils.hpp>
#include <filesystem>
#include <cstdio>
M module-gui/gui/core/ImageManager.cpp => module-gui/gui/core/ImageManager.cpp +1 -1
@@ 17,7 17,7 @@
#include "ImageManager.hpp"
#include "utf8/UTF8.hpp"
-#include "log/log.hpp"
+#include "log.hpp"
// module-gui
#include "ImageMap.hpp"
#include "VecMap.hpp"
M module-gui/gui/core/RawFont.cpp => module-gui/gui/core/RawFont.cpp +1 -1
@@ 8,7 8,7 @@
#include "FontKerning.hpp" // for FontKerning
#include "Renderer.hpp" // for Renderer
#include "TextConstants.hpp" // for newline
-#include "log/log.hpp" // for LOG_ERROR
+#include "log.hpp" // for LOG_ERROR
#include "utf8/UTF8.hpp" // for UTF8
#include <cstring> // for memcpy
#include <utility> // for pair
M module-gui/gui/input/Profile.cpp => module-gui/gui/input/Profile.cpp +1 -1
@@ 1,7 1,7 @@
// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
-#include "log/log.hpp"
+#include "log.hpp"
#include "utf8/UTF8.hpp"
#include "Profile.hpp"
#include <Utils.hpp>
M module-gui/gui/input/Translator.cpp => module-gui/gui/input/Translator.cpp +1 -1
@@ 2,7 2,7 @@
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#include "Translator.hpp"
-#include "log/log.hpp"
+#include "log.hpp"
#include <algorithm>
#include <filesystem>
#include "i18n/i18n.hpp"
M module-gui/gui/widgets/Arc.cpp => module-gui/gui/widgets/Arc.cpp +1 -1
@@ 1,7 1,7 @@
// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
-#include <module-utils/log/log.hpp>
+#include <log.hpp>
#include "Arc.hpp"
#include "DrawCommand.hpp"
M module-gui/gui/widgets/BottomBar.cpp => module-gui/gui/widgets/BottomBar.cpp +1 -1
@@ 12,7 12,7 @@
#include "Margins.hpp"
#include "utf8/UTF8.hpp"
#include <Style.hpp>
-#include <log/log.hpp>
+#include <log.hpp>
namespace gui
{
M module-gui/gui/widgets/BoxLayout.cpp => module-gui/gui/widgets/BoxLayout.cpp +1 -1
@@ 5,7 5,7 @@
#include "BoxLayoutSizeStore.hpp"
#include <InputEvent.hpp>
#include <Label.hpp>
-#include <log/log.hpp>
+#include <log.hpp>
#include "assert.h"
namespace gui
M module-gui/gui/widgets/BoxLayout.hpp => module-gui/gui/widgets/BoxLayout.hpp +1 -1
@@ 9,7 9,7 @@
#include "Rect.hpp"
#include <Alignment.hpp>
#include "LayoutSizeStore.hpp"
-#include "log/log.hpp"
+#include "log.hpp"
namespace gui
{
M module-gui/gui/widgets/Circle.cpp => module-gui/gui/widgets/Circle.cpp +1 -1
@@ 1,7 1,7 @@
// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
-#include <module-utils/log/log.hpp>
+#include <log.hpp>
#include "Circle.hpp"
#include "DrawCommand.hpp"
M module-gui/gui/widgets/GridLayout.cpp => module-gui/gui/widgets/GridLayout.cpp +1 -1
@@ 4,7 4,7 @@
#include "GridLayout.hpp"
#include "InputEvent.hpp"
#include "Style.hpp"
-#include <log/log.hpp>
+#include <log.hpp>
using namespace gui;
M module-gui/gui/widgets/Image.cpp => module-gui/gui/widgets/Image.cpp +1 -1
@@ 7,7 7,7 @@
#include "ImageManager.hpp"
#include <utf8/UTF8.hpp>
-#include <module-utils/log/log.hpp>
+#include <log.hpp>
namespace gui
{
M module-gui/gui/widgets/InputMode.cpp => module-gui/gui/widgets/InputMode.cpp +1 -1
@@ 4,7 4,7 @@
#include <InputMode.hpp>
#include <i18n/i18n.hpp>
#include <map>
-#include <log/log.hpp>
+#include <log.hpp>
/// input mode strings - as these are stored in json (in files...)
const std::map<InputMode::Mode, std::string> input_mode = {
M module-gui/gui/widgets/Label.cpp => module-gui/gui/widgets/Label.cpp +1 -1
@@ 1,7 1,7 @@
// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
-#include "log/log.hpp"
+#include "log.hpp"
#include "utf8/UTF8.hpp"
#include "../core/DrawCommand.hpp"
M module-gui/gui/widgets/ListItem.cpp => module-gui/gui/widgets/ListItem.cpp +1 -1
@@ 2,7 2,7 @@
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#include "ListItem.hpp"
-#include <log/log.hpp>
+#include <log.hpp>
#include <Style.hpp>
namespace gui
M module-gui/gui/widgets/ListView.cpp => module-gui/gui/widgets/ListView.cpp +1 -1
@@ 4,7 4,7 @@
#include "ListView.hpp"
#include "InputEvent.hpp"
#include "cassert"
-#include <log/log.hpp>
+#include <log.hpp>
namespace gui
{
M module-gui/gui/widgets/ProgressBar.cpp => module-gui/gui/widgets/ProgressBar.cpp +1 -1
@@ 1,7 1,7 @@
// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
-#include <module-utils/log/log.hpp>
+#include <log.hpp>
#include <module-utils/math/Math.hpp>
#include "DrawCommand.hpp"
M module-gui/gui/widgets/Rect.cpp => module-gui/gui/widgets/Rect.cpp +2 -2
@@ 10,11 10,11 @@
#include "../core/BoundingBox.hpp"
#include "../core/DrawCommand.hpp"
-#include <log/log.hpp>
+#include <log.hpp>
#include "Rect.hpp"
#include "Style.hpp"
-#include <log/log.hpp>
+#include <log.hpp>
namespace gui
{
M module-gui/gui/widgets/RichTextParser.cpp => module-gui/gui/widgets/RichTextParser.cpp +1 -1
@@ 9,7 9,7 @@
#include <sstream>
#include <string>
#include <map>
-#include <log/log.hpp>
+#include <log.hpp>
#include "TextFormat.hpp"
#include <pugixml.hpp>
M module-gui/gui/widgets/Text.cpp => module-gui/gui/widgets/Text.cpp +1 -1
@@ 15,7 15,7 @@
#include "TextDocument.hpp"
#include "TextLine.hpp"
#include "TextParse.hpp"
-#include "log/log.hpp"
+#include "log.hpp"
#include "utf8/UTF8.hpp"
#include <Style.hpp>
#include <cassert>
M module-gui/gui/widgets/TextBlock.cpp => module-gui/gui/widgets/TextBlock.cpp +1 -1
@@ 3,7 3,7 @@
#include "TextBlock.hpp"
#include "TextConstants.hpp"
-#include "log/log.hpp"
+#include "log.hpp"
#include <cassert>
#include <TextFormat.hpp>
#include <RawFont.hpp>
M module-gui/gui/widgets/TextBlockCursor.cpp => module-gui/gui/widgets/TextBlockCursor.cpp +1 -1
@@ 5,7 5,7 @@
#include "TextBlock.hpp"
#include "TextDocument.hpp"
#include "TextParse.hpp"
-#include "log/log.hpp"
+#include "log.hpp"
#include <cassert>
static const int last_char_inclusive = 0; // if then -1 / else 0
M module-gui/gui/widgets/TextCursor.cpp => module-gui/gui/widgets/TextCursor.cpp +1 -1
@@ 6,7 6,7 @@
#include "Text.hpp"
#include "TextBlockCursor.hpp"
#include "TextDocument.hpp"
-#include "log/log.hpp"
+#include "log.hpp"
#include "TextLine.hpp"
#include <cassert>
#include <RawFont.hpp>
M module-gui/gui/widgets/TextLineCursor.cpp => module-gui/gui/widgets/TextLineCursor.cpp +1 -1
@@ 3,7 3,7 @@
#include "TextLineCursor.hpp"
#include "Text.hpp"
-#include "log/log.hpp"
+#include "log.hpp"
#define debug_text_cursor(...)
// #define debug_text_cursor(...) LOG_DEBUG(__VA_ARGS__)
M module-gui/gui/widgets/status-bar/PhoneMode.cpp => module-gui/gui/widgets/status-bar/PhoneMode.cpp +1 -1
@@ 3,7 3,7 @@
#include "PhoneMode.hpp"
-#include <log/log.hpp>
+#include <log.hpp>
#include <i18n/i18n.hpp>
#include "Item.hpp"
M module-gui/gui/widgets/status-bar/StatusBarWidgetBase.hpp => module-gui/gui/widgets/status-bar/StatusBarWidgetBase.hpp +1 -1
@@ 3,7 3,7 @@
#pragma once
-#include <log/log.hpp>
+#include <log.hpp>
namespace gui::status_bar
{
M module-gui/test/mock/TestListViewProvider.cpp => module-gui/test/mock/TestListViewProvider.cpp +1 -1
@@ 2,7 2,7 @@
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#include "TestListViewProvider.hpp"
-#include <log/log.hpp>
+#include <log.hpp>
namespace gui
{
M module-gui/test/test-catch/test-context.cpp => module-gui/test/test-catch/test-context.cpp +1 -1
@@ 6,7 6,7 @@
#include <catch2/catch.hpp>
#include <module-gui/gui/core/Context.hpp>
-#include <log/log.hpp>
+#include <log.hpp>
TEST_CASE("test context size and position")
{
M module-gui/test/test-catch/test-gui.cpp => module-gui/test/test-catch/test-gui.cpp +1 -1
@@ 17,7 17,7 @@
#include <fcntl.h>
#include <catch2/catch.hpp>
-#include <log/log.hpp>
+#include <log.hpp>
#include <utf8/UTF8.hpp>
#include <module-gui/gui/core/ImageManager.hpp>
M module-gui/test/test-google/test-gui-boxlayout.cpp => module-gui/test/test-google/test-gui-boxlayout.cpp +1 -1
@@ 2,7 2,7 @@
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#include "gtest/gtest.h"
-#include <module-utils/log/log.hpp>
+#include <log.hpp>
#include <module-gui/gui/widgets/BoxLayout.hpp>
#include <module-gui/test/mock/TestListViewProvider.hpp>
#include <gui/input/InputEvent.hpp>
M module-gui/test/test-google/test-gui-gridlayout.cpp => module-gui/test/test-google/test-gui-gridlayout.cpp +1 -1
@@ 2,7 2,7 @@
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#include "gtest/gtest.h"
-#include <module-utils/log/log.hpp>
+#include <log.hpp>
#include <module-gui/gui/widgets/BoxLayout.hpp>
#include <module-gui/gui/widgets/GridLayout.hpp>
#include <gui/input/InputEvent.hpp>
M module-gui/test/test-google/test-gui-listview.cpp => module-gui/test/test-google/test-gui-listview.cpp +1 -1
@@ 3,7 3,7 @@
#include "gtest/gtest.h"
#include <module-gui/gui/widgets/ListView.hpp>
-#include <module-utils/log/log.hpp>
+#include <log.hpp>
#include <mock/TestListViewProvider.hpp>
#include <gui/input/InputEvent.hpp>
M module-os/FreeRTOS/application.c => module-os/FreeRTOS/application.c +1 -1
@@ 1,6 1,6 @@
#include "FreeRTOS.h"
#include "task.h"
-#include "log/log.hpp"
+#include "log.hpp"
#include <assert.h>
#include <stdlib.h>
M module-os/FreeRTOS/include/FreeRTOSConfig.h => module-os/FreeRTOS/include/FreeRTOSConfig.h +1 -1
@@ 39,7 39,7 @@
*----------------------------------------------------------*/
#include <assert.h>
#include <stdint.h>
-#include "log/log.hpp"
+#include "log.hpp"
//TODO: Look at tasks.c: void vTaskStepTick( const TickType_t xTicksToJump ) before upgrading FreeRTOS
#ifdef __cplusplus
M module-os/systemviewPatch/FreeRTOSConfig.h => module-os/systemviewPatch/FreeRTOSConfig.h +1 -1
@@ 39,7 39,7 @@
*----------------------------------------------------------*/
#include <assert.h>
#include <stdint.h>
-#include "log/log.hpp"
+#include "log.hpp"
//TODO: Look at tasks.c: void vTaskStepTick( const TickType_t xTicksToJump ) before upgrading FreeRTOS
#ifdef __cplusplus
M module-services/service-antenna/ServiceAntenna.cpp => module-services/service-antenna/ServiceAntenna.cpp +1 -1
@@ 9,7 9,7 @@
#include <at/response.hpp>
#include <common_data/EventStore.hpp>
-#include <log/log.hpp>
+#include <log.hpp>
#include <MessageType.hpp>
#include <module-utils/state/ServiceState.hpp>
#include <projdefs.h>
M module-services/service-appmgr/model/ActionsRegistry.cpp => module-services/service-appmgr/model/ActionsRegistry.cpp +1 -1
@@ 3,7 3,7 @@
#include <service-appmgr/model/ActionsRegistry.hpp>
-#include <module-utils/log/log.hpp>
+#include <log.hpp>
#include <magic_enum.hpp>
#include <cassert>
M module-services/service-appmgr/model/ApplicationManager.cpp => module-services/service-appmgr/model/ApplicationManager.cpp +1 -1
@@ 20,7 20,7 @@
#include <application-onboarding/ApplicationOnBoarding.hpp>
#include <application-onboarding/data/OnBoardingMessages.hpp>
#include <i18n/i18n.hpp>
-#include <log/log.hpp>
+#include <log.hpp>
#include <service-appmgr/messages/Message.hpp>
#include <service-evtmgr/EventManager.hpp>
#include <service-evtmgr/EVMessages.hpp>
M module-services/service-audio/AudioServiceAPI.cpp => module-services/service-audio/AudioServiceAPI.cpp +1 -1
@@ 7,7 7,7 @@
#include <Audio/decoder/Decoder.hpp>
#include <Service/Common.hpp>
-#include <log/log.hpp>
+#include <log.hpp>
#include <utility>
M module-services/service-bluetooth/ServiceBluetooth.cpp => module-services/service-bluetooth/ServiceBluetooth.cpp +1 -1
@@ 24,7 24,7 @@
#include "SystemManager/messages/SentinelRegistrationMessage.hpp"
-#include <log/log.hpp>
+#include <log.hpp>
#include <bits/exception.h>
#include <utility>
#include <service-desktop/service-desktop/DesktopMessages.hpp>
M module-services/service-bluetooth/service-bluetooth/SettingsSerializer.cpp => module-services/service-bluetooth/service-bluetooth/SettingsSerializer.cpp +1 -1
@@ 3,7 3,7 @@
#include "SettingsSerializer.hpp"
#include "btstack_util.h"
-#include <log/log.hpp>
+#include <log.hpp>
namespace strings
{
M module-services/service-cellular/CellularCall.cpp => module-services/service-cellular/CellularCall.cpp +1 -1
@@ 6,7 6,7 @@
#include <CalllogRecord.hpp>
#include <PhoneNumber.hpp>
#include <Utils.hpp>
-#include <log/log.hpp>
+#include <log.hpp>
#include <cinttypes>
#include <ctime>
M module-services/service-cellular/CellularServiceAPI.cpp => module-services/service-cellular/CellularServiceAPI.cpp +1 -1
@@ 10,7 10,7 @@
#include <PhoneNumber.hpp>
#include <Service/Common.hpp>
#include <bsp/cellular/bsp_cellular.hpp>
-#include <log/log.hpp>
+#include <log.hpp>
#include <memory>
#include <string>
M module-services/service-cellular/RequestFactory.cpp => module-services/service-cellular/RequestFactory.cpp +1 -1
@@ 6,7 6,7 @@
#include <re2/re2.h>
#include <at/Commands.hpp>
-#include <log/log.hpp>
+#include <log.hpp>
#include "service-cellular/requests/CallRequest.hpp"
#include "service-cellular/requests/SupplementaryServicesRequest.hpp"
M module-services/service-cellular/ServiceCellular.cpp => module-services/service-cellular/ServiceCellular.cpp +1 -1
@@ 54,7 54,7 @@
#include <bsp/cellular/bsp_cellular.hpp>
#include <common_data/EventStore.hpp>
#include <country.hpp>
-#include <log/log.hpp>
+#include <log.hpp>
#include <at/UrcFactory.hpp>
#include <queries/messages/sms/QuerySMSSearchByType.hpp>
#include <queries/notifications/QueryNotificationsIncrement.hpp>
M module-services/service-cellular/SignalStrength.cpp => module-services/service-cellular/SignalStrength.cpp +1 -1
@@ 2,7 2,7 @@
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#include "service-cellular/SignalStrength.hpp"
-#include <log/log.hpp>
+#include <log.hpp>
SignalStrength::SignalStrength(int rssi)
{
M module-services/service-db/DBServiceAPI.cpp => module-services/service-db/DBServiceAPI.cpp +1 -1
@@ 18,7 18,7 @@
#include <Tables/CountryCodesTable.hpp>
#include <ThreadRecord.hpp>
#include <Utils.hpp>
-#include <log/log.hpp>
+#include <log.hpp>
#include <queries/messages/threads/QueryThreadGetByNumber.hpp>
#include <utility>
M module-services/service-db/ServiceDB.cpp => module-services/service-db/ServiceDB.cpp +1 -1
@@ 34,7 34,7 @@
#include <SMSTemplateRecord.hpp>
#include <Tables/Record.hpp>
#include <ThreadRecord.hpp>
-#include <log/log.hpp>
+#include <log.hpp>
#include <time/ScopedTime.hpp>
#include <cassert>
M module-services/service-db/agents/file_indexer/FileIndexerAgent.cpp => module-services/service-db/agents/file_indexer/FileIndexerAgent.cpp +1 -1
@@ 4,7 4,7 @@
#include "FileIndexerAgent.hpp"
#include "FileIndexer_queries.hpp"
-#include <log/log.hpp>
+#include <log.hpp>
#include <purefs/filesystem_paths.hpp>
#include <Application.hpp>
#include <memory>
M module-services/service-db/agents/settings/Settings.cpp => module-services/service-db/agents/settings/Settings.cpp +1 -1
@@ 10,7 10,7 @@
#include <vector>
#if defined(DEBUG_SETTINGS_DB) and DEBUG_SETTINGS_DB == 1
-#include <log/log.hpp>
+#include <log.hpp>
#define log_debug(...) LOG_DEBUG(__VA_ARGS__);
#else
#define log_debug(...)
M module-services/service-db/agents/settings/Settings_queries.hpp => module-services/service-db/agents/settings/Settings_queries.hpp +1 -1
@@ 3,7 3,7 @@
#pragma once
-#include <log/log.hpp>
+#include <log.hpp>
namespace settings::Statements
{
M module-services/service-db/test/test-settings/Database.cpp => module-services/service-db/test/test-settings/Database.cpp +1 -1
@@ 3,7 3,7 @@
#include "module-db/Database/Database.hpp"
-#include "log/log.hpp"
+#include "log.hpp"
#include <purefs/filesystem_paths.hpp>
#include <gsl/util>
M module-services/service-desktop/ServiceDesktop.cpp => module-services/service-desktop/ServiceDesktop.cpp +1 -1
@@ 14,7 14,7 @@
#include <MessageType.hpp>
#include <Service/Worker.hpp>
#include <json/json11.hpp>
-#include <log/log.hpp>
+#include <log.hpp>
#include <module-apps/application-desktop/ApplicationDesktop.hpp>
#include <service-db/service-db/Settings.hpp>
#include <service-db/QueryMessage.hpp>
M module-services/service-desktop/WorkerDesktop.cpp => module-services/service-desktop/WorkerDesktop.cpp +1 -1
@@ 11,7 11,7 @@
#include "Timers/TimerFactory.hpp"
#include <bsp/usb/usb.hpp>
-#include <log/log.hpp>
+#include <log.hpp>
#include <map>
#include <vector>
M module-services/service-desktop/endpoints/backup/BackupRestore.cpp => module-services/service-desktop/endpoints/backup/BackupRestore.cpp +1 -1
@@ 4,7 4,7 @@
#include "BackupRestore.hpp"
#include <SystemManager/SystemManager.hpp>
-#include <log/log.hpp>
+#include <log.hpp>
#include <microtar.hpp>
#include <purefs/filesystem_paths.hpp>
#include <service-db/DBServiceAPI.hpp>
M module-services/service-desktop/endpoints/calendarEvents/CalendarEventsHelper.cpp => module-services/service-desktop/endpoints/calendarEvents/CalendarEventsHelper.cpp +1 -1
@@ 7,7 7,7 @@
#include <parser/ParserUtils.hpp>
#include "Service/Common.hpp"
#include <service-db/DBServiceAPI.hpp>
-#include "log/log.hpp"
+#include "log.hpp"
#include "json/json11.hpp"
#include <queries/calendar/QueryEventsGetAll.hpp>
#include <queries/calendar/QueryEventsGet.hpp>
M module-services/service-desktop/endpoints/contacts/ContactHelper.cpp => module-services/service-desktop/endpoints/contacts/ContactHelper.cpp +1 -1
@@ 17,7 17,7 @@
#include <PhoneNumber.hpp>
#include <Service/Common.hpp>
#include <json/json11.hpp>
-#include <log/log.hpp>
+#include <log.hpp>
#include <queries/RecordQuery.hpp>
#include <queries/phonebook/QueryContactGetByID.hpp>
#include <queries/phonebook/QueryContactUpdate.hpp>
M module-services/service-desktop/endpoints/developerMode/DeveloperModeEndpoint.cpp => module-services/service-desktop/endpoints/developerMode/DeveloperModeEndpoint.cpp +1 -1
@@ 2,7 2,7 @@
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#include "DeveloperModeEndpoint.hpp"
-#include "log/log.hpp"
+#include "log.hpp"
#include <endpoints/Context.hpp>
#include <service-desktop/parser/MessageHandler.hpp>
M module-services/service-desktop/endpoints/developerMode/Mode/UI_Helper.cpp => module-services/service-desktop/endpoints/developerMode/Mode/UI_Helper.cpp +1 -1
@@ 2,7 2,7 @@
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#include "UI_Helper.hpp"
-#include "log/log.hpp"
+#include "log.hpp"
#include "service-desktop/Constants.hpp"
#include "service-desktop/DeveloperModeMessage.hpp"
#include <variant>
M module-services/service-desktop/endpoints/factoryReset/FactoryReset.cpp => module-services/service-desktop/endpoints/factoryReset/FactoryReset.cpp +1 -1
@@ 3,7 3,7 @@
#include "FactoryReset.hpp"
#include <SystemManager/SystemManager.hpp>
-#include <log/log.hpp>
+#include <log.hpp>
#include <service-db/DBServiceName.hpp>
#include <Utils.hpp>
M module-services/service-desktop/parser/HttpEnums.cpp => module-services/service-desktop/parser/HttpEnums.cpp +1 -1
@@ 3,7 3,7 @@
#include "HttpEnums.hpp"
-#include <log/log.hpp>
+#include <log.hpp>
using namespace parserFSM;
M module-services/service-desktop/parser/MessageHandler.cpp => module-services/service-desktop/parser/MessageHandler.cpp +1 -1
@@ 7,7 7,7 @@
#include <endpoints/EndpointFactory.hpp>
#include <FreeRTOS.h>
-#include <log/log.hpp>
+#include <log.hpp>
#include <bits/exception.h>
#include <memory>
M module-services/service-desktop/parser/MessageHandler.hpp => module-services/service-desktop/parser/MessageHandler.hpp +1 -1
@@ 5,7 5,7 @@
#include <Service/Service.hpp>
#include <json/json11.hpp>
-#include <log/log.hpp>
+#include <log.hpp>
#include <string>
M module-services/service-desktop/parser/ParserFSM.cpp => module-services/service-desktop/parser/ParserFSM.cpp +1 -1
@@ 10,7 10,7 @@ namespace sys
} // namespace sys
#include <service-desktop/ServiceDesktop.hpp>
-#include <log/log.hpp>
+#include <log.hpp>
#include <json/json11.hpp>
#include <memory>
#include <string>
M module-services/service-desktop/parser/ParserUtils.hpp => module-services/service-desktop/parser/ParserUtils.hpp +1 -1
@@ 2,7 2,7 @@
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#pragma once
-#include <log/log.hpp> // for LOG_ERROR
+#include <log.hpp> // for LOG_ERROR
#include <bits/exception.h> // for exception
#include <cstddef> // for size_t
#include <string> // for string, allocator, basic_string, stol
M module-services/service-eink/ServiceEink.cpp => module-services/service-eink/ServiceEink.cpp +1 -1
@@ 9,7 9,7 @@
#include <time/ScopedTime.hpp>
#include <Timers/TimerFactory.hpp>
-#include <log/log.hpp>
+#include <log.hpp>
#include <messages/EinkMessage.hpp>
#include <messages/ImageMessage.hpp>
#include <SystemManager/messages/DeviceRegistrationMessage.hpp>
M module-services/service-evtmgr/EventManager.cpp => module-services/service-evtmgr/EventManager.cpp +2 -2
@@ 25,8 25,8 @@
#include <bsp/torch/torch.hpp>
#include <bsp/battery-charger/battery_charger.hpp>
#include <common_data/RawKey.hpp>
-#include <log/log.hpp>
-#include <log/Logger.hpp>
+#include <log.hpp>
+#include <Logger.hpp>
#include <module-utils/time/time_conversion.hpp>
#include <service-appmgr/Controller.hpp>
#include <service-audio/AudioMessage.hpp>
M module-services/service-evtmgr/WorkerEvent.cpp => module-services/service-evtmgr/WorkerEvent.cpp +1 -1
@@ 23,7 23,7 @@
#include <bsp/eink_frontlight/eink_frontlight.hpp>
#include <common_data/RawKey.hpp>
#include <headset.hpp>
-#include <log/log.hpp>
+#include <log.hpp>
#include <service-audio/AudioMessage.hpp>
#include <service-desktop/Constants.hpp>
#include <service-desktop/DesktopMessages.hpp>
M module-services/service-fileindexer/notesIndexer.cpp => module-services/service-fileindexer/notesIndexer.cpp +1 -1
@@ 1,7 1,7 @@
// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
-#include <log/log.hpp>
+#include <log.hpp>
#include "notesIndexer.hpp"
#include <cwctype>
#include <cstdio>
M module-services/service-fota/FotaServiceAPI.cpp => module-services/service-fota/FotaServiceAPI.cpp +1 -1
@@ 6,7 6,7 @@
#include "service-fota/ServiceFota.hpp"
#include <MessageType.hpp>
-#include <log/log.hpp>
+#include <log.hpp>
#include <memory>
#include <sstream>
M module-services/service-fota/ServiceFota.cpp => module-services/service-fota/ServiceFota.cpp +1 -1
@@ 12,7 12,7 @@
#include <Service/Message.hpp>
#include <Service/Service.hpp>
#include <Timers/TimerFactory.hpp>
-#include <log/log.hpp>
+#include <log.hpp>
#include <at/Result.hpp>
#include <at/UrcFactory.hpp>
#include <portmacro.h>
M module-services/service-gui/ServiceGUI.cpp => module-services/service-gui/ServiceGUI.cpp +1 -1
@@ 12,7 12,7 @@
#include <DrawCommand.hpp>
#include <FontManager.hpp>
#include <gui/core/ImageManager.hpp>
-#include <log/log.hpp>
+#include <log.hpp>
#include <service-eink/Common.hpp>
#include <service-eink/messages/ImageMessage.hpp>
#include <service-eink/messages/EinkMessage.hpp>
M module-services/service-gui/WorkerGUI.cpp => module-services/service-gui/WorkerGUI.cpp +1 -1
@@ 4,7 4,7 @@
#include "WorkerGUI.hpp"
#include <DrawCommand.hpp>
-#include <log/log.hpp>
+#include <log.hpp>
#include <Renderer.hpp>
#include <Service/Worker.hpp>
#include <service-gui/ServiceGUI.hpp>
M module-services/service-lwip/ServiceLwIP.cpp => module-services/service-lwip/ServiceLwIP.cpp +1 -1
@@ 6,7 6,7 @@
#include <MessageType.hpp>
#include <Service/Message.hpp>
#include <Service/Service.hpp>
-#include <log/log.hpp>
+#include <log.hpp>
extern "C"
{
M module-services/service-time/ServiceTime.cpp => module-services/service-time/ServiceTime.cpp +1 -1
@@ 9,7 9,7 @@
#include <BaseInterface.hpp>
#include <Common/Query.hpp>
#include <MessageType.hpp>
-#include <log/log.hpp>
+#include <log.hpp>
#include <module-db/queries/calendar/QueryEventsSelectFirstUpcoming.hpp>
#include <service-db/DBNotificationMessage.hpp>
#include <service-db/QueryMessage.hpp>
M module-sys/Service/Service.cpp => module-sys/Service/Service.cpp +1 -1
@@ 11,7 11,7 @@
#include "module-sys/Timers/TimerHandle.hpp" // for Timer
#include "module-sys/Timers/TimerMessage.hpp" // for TimerMessage
#include "log/debug.hpp" // for DEBUG_SERVICE_MESSAGES
-#include "log/log.hpp" // for LOG_ERROR, LOG_DEBUG, LOG_FATAL
+#include "log.hpp" // for LOG_ERROR, LOG_DEBUG, LOG_FATAL
#include "mutex.hpp" // for cpp_freertos
#include "portmacro.h" // for UBaseType_t
#include "thread.hpp" // for Thread
M module-sys/SystemManager/CpuGovernor.cpp => module-sys/SystemManager/CpuGovernor.cpp +1 -1
@@ 3,7 3,7 @@
#include "CpuGovernor.hpp"
#include <algorithm>
-#include <log/log.hpp>
+#include <log.hpp>
namespace sys
{
M module-sys/SystemManager/CpuStatistics.cpp => module-sys/SystemManager/CpuStatistics.cpp +1 -1
@@ 2,7 2,7 @@
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#include "CpuStatistics.hpp"
-#include <log/log.hpp>
+#include <log.hpp>
#include <FreeRTOS.h>
#include <task.h>
#include <limits>
M module-sys/SystemManager/DeviceManager.cpp => module-sys/SystemManager/DeviceManager.cpp +1 -1
@@ 3,7 3,7 @@
#include "DeviceManager.hpp"
#include <algorithm>
-#include <log/log.hpp>
+#include <log.hpp>
namespace sys
{
M module-sys/SystemManager/PowerManager.cpp => module-sys/SystemManager/PowerManager.cpp +1 -1
@@ 1,7 1,7 @@
// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
-#include <log/log.hpp>
+#include <log.hpp>
#include "PowerManager.hpp"
M module-sys/SystemWatchdog/SystemWatchdog.cpp => module-sys/SystemWatchdog/SystemWatchdog.cpp +1 -1
@@ 6,7 6,7 @@
#include "critical.hpp"
#include "ticks.hpp"
#include "bsp/watchdog/watchdog.hpp"
-#include "log/log.hpp"
+#include "log.hpp"
namespace sys
{
M module-sys/Timers/SystemTimer.cpp => module-sys/Timers/SystemTimer.cpp +1 -1
@@ 4,7 4,7 @@
#include "SystemTimer.hpp"
#include "module-sys/Service/Service.hpp"
#include "TimerMessage.hpp"
-#include <log/log.hpp>
+#include <log.hpp>
#include <projdefs.h>
#include <memory>
M module-utils/CMakeLists.txt => module-utils/CMakeLists.txt +2 -3
@@ 37,9 37,6 @@ set (SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/time/TimeRangeParser.cpp
${CMAKE_CURRENT_SOURCE_DIR}/time/DateAndTimeSettings.cpp
${CMAKE_CURRENT_SOURCE_DIR}/Utils.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/log/Logger.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/log/log.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/log/LoggerBuffer.cpp
${CMAKE_CURRENT_SOURCE_DIR}/circular_buffer/StringCircularBuffer.cpp
${CMAKE_CURRENT_SOURCE_DIR}/generators/RandomStringGenerator.cpp
)
@@ 64,6 61,7 @@ PUBLIC
module-os
module-vfs
magic_enum
+ log
)
# Board specific compilation definitions,options,include directories and features
@@ 91,3 89,4 @@ if (${ENABLE_TESTS})
endif()
add_subdirectory(bootconfig)
+add_subdirectory(log)
M module-utils/PhoneNumber.cpp => module-utils/PhoneNumber.cpp +1 -1
@@ 4,7 4,7 @@
#include "PhoneNumber.hpp"
#include "country.hpp"
-#include "log/log.hpp"
+#include "log.hpp"
#include <phonenumbers/phonenumberutil.h>
#include <phonenumbers/asyoutypeformatter.h>
M module-utils/Utils.hpp => module-utils/Utils.hpp +1 -1
@@ 4,7 4,7 @@
#pragma once
#include "Split.hpp"
#include <i18n/i18n.hpp>
-#include <log/log.hpp>
+#include <log.hpp>
#include <magic_enum.hpp>
M module-utils/board/cross/log_rt1051.cpp => module-utils/board/cross/log_rt1051.cpp +2 -2
@@ 4,8 4,8 @@
#include <board.h>
#include <critical.hpp>
#include <macros.h>
-#include "log/log.hpp"
-#include "log/Logger.hpp"
+#include "log.hpp"
+#include "Logger.hpp"
#include "segger/rtt/SEGGER_RTT.h"
#include <ticks.hpp>
M module-utils/board/cross/log_writeLUART.cpp => module-utils/board/cross/log_writeLUART.cpp +1 -1
@@ 1,7 1,7 @@
// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
-#include "../../log/log.hpp"
+#include "log.hpp"
#include "fsl_lpuart.h"
#define LOG_UART_DEV LPUART3
M module-utils/board/cross/log_writeRTT.cpp => module-utils/board/cross/log_writeRTT.cpp +1 -1
@@ 1,7 1,7 @@
// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
-#include "../../log/log.hpp"
+#include "log.hpp"
#include "../../segger/rtt/SEGGER_RTT.h"
#define LOG_RTT_BUFF_INDEX 0
M module-utils/board/cross/log_writeSYSTEMVIEW.cpp => module-utils/board/cross/log_writeSYSTEMVIEW.cpp +1 -1
@@ 1,7 1,7 @@
// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
-#include "../../log/log.hpp"
+#include "log.hpp"
#include "../../segger/systemview/SEGGER/SEGGER_SYSVIEW.h"
void log_WriteToDevice(const uint8_t *pBuffer, unsigned NumBytes)
M module-utils/board/linux/log_linux.cpp => module-utils/board/linux/log_linux.cpp +2 -2
@@ 1,8 1,8 @@
// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
-#include "log/log.hpp"
-#include "log/Logger.hpp"
+#include "log.hpp"
+#include "Logger.hpp"
#include <iostream>
#include <string_view>
#include <ticks.hpp>
M module-utils/bootconfig/src/bootconfig.cpp => module-utils/bootconfig/src/bootconfig.cpp +1 -1
@@ 10,7 10,7 @@
#include <time/time_conversion.hpp>
#include <ticks.hpp>
#include <cstdio>
-#include <log/log.hpp>
+#include <log.hpp>
#include <crc32.h>
#include <array>
#include <Utils.hpp>
M module-utils/common_data/EventStore.cpp => module-utils/common_data/EventStore.cpp +1 -1
@@ 2,7 2,7 @@
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#include "EventStore.hpp"
-#include <log/log.hpp>
+#include <log.hpp>
#include <memory>
#include <mutex.hpp>
M module-utils/i18n/i18n.cpp => module-utils/i18n/i18n.cpp +1 -1
@@ 2,7 2,7 @@
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#include "i18nImpl.hpp"
-#include <log/log.hpp>
+#include <log.hpp>
#include <Utils.hpp>
#include <cstdio>
#include <purefs/filesystem_paths.hpp>
A module-utils/log/CMakeLists.txt => module-utils/log/CMakeLists.txt +9 -0
@@ 0,0 1,9 @@
+add_library(log STATIC)
+target_sources(log
+ PRIVATE
+ ${CMAKE_CURRENT_SOURCE_DIR}/Logger.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/log.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/LoggerBuffer.cpp
+)
+target_include_directories(log PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+target_link_libraries(log PRIVATE module-bsp)<
\ No newline at end of file
M module-utils/test/test_LoggerBuffer.cpp => module-utils/test/test_LoggerBuffer.cpp +1 -1
@@ 5,7 5,7 @@
#include <catch2/catch.hpp>
#include "generators/RandomStringGenerator.hpp"
-#include "log/LoggerBuffer.hpp"
+#include "LoggerBuffer.hpp"
#include <string>
#include <vector>
M module-utils/test/test_log.cpp => module-utils/test/test_log.cpp +1 -1
@@ 4,7 4,7 @@
#define CATCH_CONFIG_MAIN // This tells Catch to provide a main() - only do this in one cpp file
#include <catch2/catch.hpp>
-#include "log/log.hpp"
+#include "log.hpp"
#include <string>
using namespace std;
M module-utils/time/ScopedTime.hpp => module-utils/time/ScopedTime.hpp +1 -1
@@ 4,7 4,7 @@
#pragma once
#include <FreeRTOS.h>
-#include <log/log.hpp>
+#include <log.hpp>
#include <string>
#include <ticks.hpp>
M module-utils/time/time_conversion.hpp => module-utils/time/time_conversion.hpp +1 -1
@@ 8,7 8,7 @@
#include "time/time_locale.hpp"
#include <bsp/rtc/rtc.hpp>
-#include <log/log.hpp>
+#include <log.hpp>
#include <vector>
#include <string>
M module-utils/time/time_date_validation.cpp => module-utils/time/time_date_validation.cpp +1 -1
@@ 8,7 8,7 @@
* Author: kuba
*/
#include "time_date_validation.hpp"
-#include "log/log.hpp"
+#include "log.hpp"
namespace utils
{
namespace time
M module-utils/time/time_locale.hpp => module-utils/time/time_locale.hpp +1 -1
@@ 6,7 6,7 @@
#include <array>
#include <utf8/UTF8.hpp>
#include "i18n/i18n.hpp"
-#include <log/log.hpp>
+#include <log.hpp>
namespace utils
{
M module-utils/ucs2/UCS2.cpp => module-utils/ucs2/UCS2.cpp +1 -1
@@ 7,7 7,7 @@
#include <sstream>
#include <iomanip>
-#include "log/log.hpp"
+#include "log.hpp"
#include <iterator>
#include <locale>
#include <codecvt>
M module-utils/utf8/UTF8.cpp => module-utils/utf8/UTF8.cpp +1 -1
@@ 7,7 7,7 @@
#include <ostream>
#include "UTF8.hpp"
-#include "log/log.hpp"
+#include "log.hpp"
#define debug_utf(...)
M module-vfs/drivers/src/purefs/fs/filesystem_littlefs.cpp => module-vfs/drivers/src/purefs/fs/filesystem_littlefs.cpp +1 -1
@@ 10,7 10,7 @@
#include <purefs/blkdev/disk_handle.hpp>
#include <purefs/fs/mount_flags.hpp>
#include <lfs.h>
-#include <log/log.hpp>
+#include <log.hpp>
#include <climits>
#include <syslimits.h>
M module-vfs/drivers/src/purefs/fs/filesystem_vfat.cpp => module-vfs/drivers/src/purefs/fs/filesystem_vfat.cpp +1 -1
@@ 8,7 8,7 @@
#include <purefs/fs/drivers/file_handle_vfat.hpp>
#include <purefs/fs/drivers/directory_handle_vfat.hpp>
#include <purefs/fs/mount_flags.hpp>
-#include <log/log.hpp>
+#include <log.hpp>
#include <fatfs/volume_mapper.hpp>
#include <ff.h>
#include <sys/statvfs.h>
M module-vfs/drivers/src/thirdparty/littlefs/lfs_glue.cpp => module-vfs/drivers/src/thirdparty/littlefs/lfs_glue.cpp +1 -1
@@ 4,7 4,7 @@
#include <lfs.h>
#include <purefs/blkdev/disk_handle.hpp>
#include <purefs/blkdev/disk_manager.hpp>
-#include <log/log.hpp>
+#include <log.hpp>
#include <mutex.hpp>
#include <errno.h>
M module-vfs/src/purefs/blkdev/disk_handle.cpp => module-vfs/src/purefs/blkdev/disk_handle.cpp +1 -1
@@ 2,7 2,7 @@
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#include <purefs/blkdev/disk_handle.hpp>
#include <purefs/blkdev/disk.hpp>
-#include <log/log.hpp>
+#include <log.hpp>
namespace purefs::blkdev::internal
{
M module-vfs/src/purefs/blkdev/disk_manager.cpp => module-vfs/src/purefs/blkdev/disk_manager.cpp +1 -1
@@ 3,7 3,7 @@
#include <purefs/blkdev/disk_manager.hpp>
#include <purefs/blkdev/disk.hpp>
-#include <log/log.hpp>
+#include <log.hpp>
#include <mutex.hpp>
#include <errno.h>
#include <charconv>
M module-vfs/src/purefs/blkdev/partition_parser.cpp => module-vfs/src/purefs/blkdev/partition_parser.cpp +1 -1
@@ 3,7 3,7 @@
#include <purefs/blkdev/partition_parser.hpp>
#include <purefs/blkdev/disk.hpp>
-#include <log/log.hpp>
+#include <log.hpp>
#include <errno.h>
#include <limits>
M module-vfs/src/purefs/fs/filesystem_syscalls.cpp => module-vfs/src/purefs/fs/filesystem_syscalls.cpp +1 -1
@@ 2,7 2,7 @@
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#include <purefs/fs/filesystem.hpp>
#include <errno.h>
-#include <log/log.hpp>
+#include <log.hpp>
#include <purefs/fs/filesystem_operations.hpp>
#include <purefs/fs/file_handle.hpp>
#include <purefs/fs/directory_handle.hpp>
M module-vfs/src/purefs/vfs_subsystem.cpp => module-vfs/src/purefs/vfs_subsystem.cpp +1 -1
@@ 8,7 8,7 @@
#include <purefs/vfs_subsystem.hpp>
#include <purefs/vfs_subsystem_internal.hpp>
#include <purefs/fs/thread_local_cwd.hpp>
-#include <log/log.hpp>
+#include <log.hpp>
#include <purefs/filesystem_paths.hpp>
#include <module-utils/json/json11.hpp>
#include <sys/stat.h>
M products/PurePhone/PurePhoneMain.cpp => products/PurePhone/PurePhoneMain.cpp +2 -2
@@ 46,8 46,8 @@
#include <bsp/bsp.hpp>
#include <Application.hpp>
#include <ApplicationLauncher.hpp>
-#include <log/log.hpp>
-#include <log/Logger.hpp>
+#include <log.hpp>
+#include <Logger.hpp>
#include <phonenumbers/phonenumberutil.h>
#include <source/version.hpp>
#include <SystemManager/SystemManager.hpp>
M test/mock-logs.cpp => test/mock-logs.cpp +1 -1
@@ 1,7 1,7 @@
// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
-#include <log/log.hpp>
+#include <log.hpp>
#include <cstdarg>
__attribute__((weak)) int log_Log(
logger_level level, const char *file, int line, const char *function, const char *fmt, ...)