From bd90e575167d8170ad989ef8d6842d7db57bb0df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Smoczy=C5=84ski?= Date: Tue, 21 Sep 2021 15:57:43 +0200 Subject: [PATCH] [BH-907] Split utils module into components MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Split module-utils into smaller components for better dependency management. Fix many dependencies throughout the project. Signed-off-by: Marcin Smoczyński --- CMakeLists.txt | 4 + Target_Linux.cmake | 1 + Target_RT1051.cmake | 2 + board/CMakeLists.txt | 4 +- board/linux/CMakeLists.txt | 2 + board/rt1051/CMakeLists.txt | 6 +- board/rt1051/bellpx/CMakeLists.txt | 4 +- board/rt1051/crashdump/consoledump.cpp | 2 +- board/rt1051/crashdump/crashcatcher_impl.cpp | 2 +- .../rt1051/crashdump/crashdumpwriter_vfs.cpp | 2 +- board/rt1051/puretx/CMakeLists.txt | 8 +- cmake/modules/GenVersionHpp.cmake | 2 +- module-apps/CMakeLists.txt | 4 +- .../ApplicationAlarmClock.cpp | 1 + .../models/AlarmsRepository.cpp | 5 +- .../presenter/AlarmRRulePresenter.cpp | 2 +- .../presenter/AlarmRRulePresenter.hpp | 4 +- .../widgets/AlarmTimeItem.cpp | 1 + .../windows/AlarmClockMainWindow.cpp | 2 +- .../data/CalculatorUtility.cpp | 2 +- module-apps/application-call/CMakeLists.txt | 2 +- .../application-call/widgets/StateIcon.hpp | 4 +- .../application-call/windows/CallWindow.cpp | 4 +- .../ApplicationCallLog.cpp | 2 +- .../application-calllog/CMakeLists.txt | 2 +- .../application-clock/ApplicationClock.cpp | 2 +- .../application-desktop/CMakeLists.txt | 2 +- .../windows/ChargingBatteryWindow.cpp | 2 +- .../windows/DeadBatteryWindow.cpp | 2 +- .../windows/DesktopMainWindow.cpp | 8 +- .../windows/LogoWindow.cpp | 2 +- .../application-meditation/CMakeLists.txt | 2 +- .../widgets/TimerProperty.cpp | 2 +- .../application-messages/CMakeLists.txt | 2 +- .../models/ThreadsModel.cpp | 2 +- .../windows/MessagesMainWindow.cpp | 2 +- .../windows/SMSTemplatesWindow.cpp | 4 +- .../windows/SMSThreadViewWindow.cpp | 2 +- .../windows/ThreadWindowOptions.cpp | 2 +- .../ApplicationMusicPlayer.cpp | 2 +- .../application-music-player/CMakeLists.txt | 2 +- .../models/SongsRepository.cpp | 2 +- module-apps/application-notes/CMakeLists.txt | 2 +- .../model/NotesSearchListModel.cpp | 2 +- .../windows/UpdateDialogWindow.cpp | 2 +- .../application-phonebook/CMakeLists.txt | 2 +- .../system/TechnicalInformationModel.cpp | 2 +- .../windows/advanced/InformationWindow.cpp | 2 +- module-apps/apps-common/ApplicationCommon.cpp | 12 +- module-apps/apps-common/AsyncTask.cpp | 2 +- module-apps/apps-common/AudioOperations.cpp | 2 +- module-apps/apps-common/CMakeLists.txt | 3 +- .../locks/handlers/LockPolicyHandler.cpp | 2 +- .../apps-common/locks/widgets/Lock.cpp | 2 +- .../notifications/NotificationsHandler.cpp | 2 +- .../apps-common/popups/PowerOffWindow.cpp | 2 +- .../apps-common/widgets/TimeWidget.cpp | 1 + module-audio/Audio/Audio.cpp | 2 +- .../Audio/Operation/PlaybackOperation.cpp | 2 +- .../Audio/Operation/RecorderOperation.cpp | 2 +- .../Audio/Operation/RouterOperation.cpp | 2 +- module-audio/Audio/decoder/Decoder.hpp | 2 +- module-audio/Audio/encoder/EncoderWAV.cpp | 2 +- .../Audio/test/unittest_equalizer.cpp | 2 +- module-audio/CMakeLists.txt | 2 +- module-audio/board/linux/LinuxAudioDevice.cpp | 2 +- .../board/rt1051/RT1051AudioCodec.cpp | 2 +- .../board/rt1051/RT1051CellularAudio.cpp | 2 +- module-audio/tags_fetcher/CMakeLists.txt | 5 - .../Bluetooth/BluetoothWorker.cpp | 2 +- module-bluetooth/Bluetooth/BtKeysStorage.cpp | 4 +- .../Bluetooth/WorkerController.cpp | 2 +- .../Bluetooth/glucode/BluetoothRunLoop.hpp | 2 +- .../glucode/btstack_uart_block_rt1051.cpp | 2 +- .../interface/profiles/A2DP/A2DP.cpp | 2 +- .../interface/profiles/A2DP/A2DPImpl.hpp | 2 +- .../Bluetooth/interface/profiles/GAP/GAP.cpp | 6 +- .../Bluetooth/interface/profiles/HFP/HFP.cpp | 4 +- .../Bluetooth/interface/profiles/HSP/HSP.cpp | 4 +- module-bsp/CMakeLists.txt | 9 +- .../board/linux/audio/LinuxCellularAudio.cpp | 2 +- .../board/linux/audio/linux_audiocodec.cpp | 2 +- .../bell_temp_sensor/bell_temp_sensor.cpp | 2 +- .../board/linux/bluetooth/Bluetooth.cpp | 2 +- .../board/linux/cellular/linux_cellular.cpp | 2 +- .../board/linux/hal/key_input/KeyInput.hpp | 2 +- .../temperature_source/TemperatureSource.cpp | 2 +- module-bsp/board/linux/vibrator/vibrator.cpp | 2 +- .../linux/watchdog/software_watchdog.cpp | 2 +- .../bsp/bell_temp_sensor/bell_temp_sensor.cpp | 2 +- .../rt1051/bellpx/bsp/switches/switches.cpp | 2 +- .../board/rt1051/bellpx/clock_config.cpp | 2 +- .../rt1051/bellpx/hal/key_input/KeyInput.hpp | 2 +- .../temperature_source/TemperatureSource.cpp | 2 +- module-bsp/board/rt1051/bellpx/irq_gpio.cpp | 2 +- .../board/rt1051/bluetooth/BlueKitchen.cpp | 2 +- .../rt1051/bluetooth/BluetoothCommon.cpp | 2 +- .../board/rt1051/bluetooth/Bluetopia.cpp | 2 +- .../board/rt1051/bsp/audio/CodecMAX98090.cpp | 2 +- module-bsp/board/rt1051/bsp/eeprom/eeprom.cpp | 2 +- .../rt1051/bsp/light_sensor/light_sensor.cpp | 2 +- .../board/rt1051/bsp/lpm/CpuFreqLPM.cpp | 2 +- module-bsp/board/rt1051/bsp/lpm/RT1051LPM.cpp | 2 +- .../rt1051/bsp/magnetometer/magnetometer.cpp | 2 +- module-bsp/board/rt1051/common/chip.cpp | 2 +- .../rt1051/common/startup_mimxrt1052.cpp | 2 +- .../board/rt1051/drivers/RT1051DriverDMA.cpp | 2 +- .../board/rt1051/drivers/RT1051DriverGPIO.cpp | 2 +- .../board/rt1051/drivers/RT1051DriverI2C.cpp | 2 +- .../board/rt1051/drivers/RT1051DriverPLL.cpp | 2 +- .../board/rt1051/drivers/RT1051DriverPWM.cpp | 2 +- .../board/rt1051/puretx/clock_config.cpp | 2 +- .../rt1051/puretx/hal/key_input/KeyInput.hpp | 2 +- module-bsp/bsp/cellular/CellularResult.hpp | 4 +- module-bsp/bsp/usb/usb.hpp | 5 +- module-bsp/hal/CMakeLists.txt | 17 +++ .../hal/{ => include/hal}/GenericFactory.hpp | 0 .../AbstractBatteryCharger.hpp | 0 module-bsp/hal/include/hal/cellular/SIM.hpp | 14 ++ .../hal}/key_input/AbstractKeyInput.hpp | 0 .../hal}/key_input/KeyEventDefinitions.hpp | 0 .../hal/include/hal/key_input}/RawKey.hpp | 8 +- .../temperature_source/TemperatureSource.hpp | 0 module-cellular/at/Urc.hpp | 2 +- module-cellular/at/cmd/src/CFUN.cpp | 2 +- module-cellular/at/cmd/src/CPBR.cpp | 2 +- module-cellular/at/cmd/src/CPBS.cpp | 2 +- module-cellular/at/cmd/src/CSCA.cpp | 2 +- module-cellular/at/cmd/src/QECCNUM.cpp | 2 +- module-cellular/at/cmd/src/QNWINFO.cpp | 2 +- module-cellular/at/cmd/src/QSIMSTAT.cpp | 2 +- module-cellular/at/response.hpp | 2 +- module-cellular/at/src/UrcPoweredDown.cpp | 2 +- module-cellular/at/src/UrcResponse.cpp | 2 +- module-cellular/modem/ATCommon.cpp | 2 +- module-cellular/modem/mux/CellularMuxFrame.h | 2 +- module-cellular/modem/mux/DLCChannel.cpp | 2 +- module-db/CMakeLists.txt | 1 + module-db/Database/Database.cpp | 2 +- module-db/Database/DatabaseInitializer.cpp | 2 +- module-db/Database/Field.cpp | 2 +- module-db/Interface/CalllogRecord.cpp | 2 +- module-db/Interface/NotificationsRecord.cpp | 2 +- module-db/Interface/Record.cpp | 2 +- module-db/Interface/SMSRecord.cpp | 8 +- module-db/Interface/SMSTemplateRecord.cpp | 2 +- module-db/Interface/ThreadRecord.cpp | 6 +- module-db/Tables/CalllogTable.cpp | 2 +- module-db/Tables/ContactsTable.cpp | 2 +- module-db/Tables/NotesTable.cpp | 2 +- module-db/Tables/NotificationsTable.cpp | 2 +- module-db/Tables/Record.hpp | 2 +- module-db/Tables/SMSTable.cpp | 2 +- module-db/Tables/SMSTemplateTable.cpp | 2 +- module-db/Tables/ThreadsTable.cpp | 2 +- module-db/tests/DbInitializer.cpp | 2 +- module-gui/CMakeLists.txt | 11 +- module-gui/gui/core/DrawCommand.cpp | 2 +- module-gui/gui/core/Font.cpp | 2 +- module-gui/gui/core/FontManager.cpp | 2 +- module-gui/gui/core/ImageManager.cpp | 6 +- module-gui/gui/core/RawFont.cpp | 2 +- module-gui/gui/input/InputEvent.hpp | 3 +- module-gui/gui/input/Profile.cpp | 2 +- module-gui/gui/input/Translator.cpp | 2 +- module-gui/gui/input/Translator.hpp | 2 +- module-gui/gui/widgets/Arc.cpp | 2 +- module-gui/gui/widgets/BottomBar.cpp | 2 +- module-gui/gui/widgets/BoxLayout.cpp | 2 +- module-gui/gui/widgets/BoxLayout.hpp | 10 +- module-gui/gui/widgets/Circle.cpp | 2 +- module-gui/gui/widgets/GridLayout.cpp | 2 +- module-gui/gui/widgets/Image.cpp | 2 +- module-gui/gui/widgets/InputMode.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/ListViewEngine.cpp | 4 +- module-gui/gui/widgets/ProgressBar.cpp | 2 +- module-gui/gui/widgets/Rect.cpp | 2 +- module-gui/gui/widgets/RichTextParser.cpp | 4 +- module-gui/gui/widgets/Text.cpp | 2 +- module-gui/gui/widgets/TextBlock.cpp | 2 +- module-gui/gui/widgets/TextBlockCursor.cpp | 2 +- module-gui/gui/widgets/TextCursor.cpp | 2 +- module-gui/gui/widgets/TextLineCursor.cpp | 2 +- .../gui/widgets/status-bar/PhoneMode.cpp | 2 +- .../status-bar/StatusBarWidgetBase.hpp | 2 +- module-gui/test/mock/TestListViewProvider.cpp | 2 +- module-gui/test/test-catch/test-context.cpp | 2 +- module-gui/test/test-catch/test-gui.cpp | 2 +- module-gui/test/test-google/CMakeLists.txt | 2 + .../test/test-google/test-gui-boxlayout.cpp | 2 +- .../test/test-google/test-gui-gridlayout.cpp | 2 +- .../test/test-google/test-gui-listview.cpp | 2 +- module-os/CMakeLists.txt | 2 +- module-os/FreeRTOS/application.c | 51 +++---- module-os/FreeRTOS/include/FreeRTOSConfig.h | 144 +++++++++--------- module-os/board/rt1051/CMakeLists.txt | 1 + module-os/board/rt1051/_exit.c | 13 +- .../board/rt1051/systemview/FreeRTOSConfig.h | 106 ++++++------- module-os/memory/usermem.c | 2 +- module-platform/CMakeLists.txt | 3 + module-platform/linux/tests/CMakeLists.txt | 2 + module-services/CMakeLists.txt | 2 +- .../service-antenna/ServiceAntenna.cpp | 2 +- module-services/service-appmgr/CMakeLists.txt | 4 +- .../service-appmgr/model/ActionsRegistry.cpp | 2 +- .../model/ApplicationManagerCommon.cpp | 2 +- .../service-audio/AudioServiceAPI.cpp | 2 +- .../service-bluetooth/ServiceBluetooth.cpp | 2 +- .../service-bluetooth/SettingsHolder.hpp | 4 +- .../service-bluetooth/SettingsSerializer.cpp | 4 +- .../service-cellular/CMakeLists.txt | 3 +- .../service-cellular/CellularCall.cpp | 2 +- .../service-cellular/RequestFactory.cpp | 2 +- .../service-cellular/ServiceCellular.cpp | 4 +- .../service-cellular/SignalStrength.cpp | 2 +- .../include/service-cellular/api/common.hpp | 8 +- .../service-cellular/src/ImeiGetHandler.cpp | 2 - .../service-cellular/src/NetworkTime.cpp | 1 - .../service-cellular/src/SMSPartsHandler.cpp | 2 +- .../service-cellular/src/SimContacts.cpp | 1 - module-services/service-db/DBServiceAPI.cpp | 2 +- .../agents/settings/FactorySettings.cpp | 2 +- .../service-db/agents/settings/Settings.cpp | 2 +- .../service-desktop/ServiceDesktop.cpp | 2 +- .../service-desktop/WorkerDesktop.cpp | 2 +- .../service-desktop/endpoints/CMakeLists.txt | 2 + .../service-desktop/endpoints/HttpEnums.cpp | 2 +- .../endpoints/backup/BackupRestore.cpp | 4 +- .../endpoints/contacts/ContactHelper.cpp | 2 +- .../developerMode/DeveloperModeEndpoint.cpp | 2 +- .../developerMode/Mode/UI_Helper.cpp | 2 +- .../endpoints/developerMode/fs/FS_Helper.cpp | 2 +- .../deviceInfo/DeviceInfoEndpoint.cpp | 2 +- .../endpoints/filesystem/FileContext.cpp | 2 +- .../endpoints/filesystem/FileOperations.cpp | 2 +- .../endpoints/update/UpdateHelper.cpp | 2 +- .../include/endpoints/message/Common.hpp | 2 +- .../service-desktop/parser/MessageHandler.cpp | 2 +- .../service-desktop/parser/ParserFSM.cpp | 2 +- module-services/service-eink/ServiceEink.cpp | 2 +- module-services/service-evtmgr/CMakeLists.txt | 1 + .../service-evtmgr/EventManager.cpp | 2 +- .../service-evtmgr/WorkerEventCommon.cpp | 4 +- .../service-evtmgr/EventManagerCommon.hpp | 2 +- .../service-evtmgr/KbdMessage.hpp | 2 +- module-services/service-gui/ServiceGUI.cpp | 8 +- module-services/service-gui/WorkerGUI.cpp | 2 +- module-services/service-time/CMakeLists.txt | 2 +- module-services/service-time/ServiceTime.cpp | 2 +- .../service-time/api/CMakeLists.txt | 2 +- .../service-time/internal/StaticData.hpp | 2 +- module-sys/Service/CMakeLists.txt | 15 +- module-sys/Service/Service.cpp | 4 +- module-sys/SystemManager/CMakeLists.txt | 1 + module-sys/SystemManager/CpuGovernor.cpp | 2 +- module-sys/SystemManager/CpuStatistics.cpp | 2 +- module-sys/SystemManager/DeviceManager.cpp | 2 +- module-sys/SystemManager/PowerManager.cpp | 2 +- .../SystemManager/SystemManagerCommon.hpp | 2 +- module-sys/SystemWatchdog/CMakeLists.txt | 2 +- module-sys/SystemWatchdog/SystemWatchdog.cpp | 2 +- module-sys/Timers/CMakeLists.txt | 1 + module-sys/Timers/SystemTimer.cpp | 2 +- module-sys/Timers/TimerHandle.cpp | 2 +- module-utils/CMakeLists.txt | 74 +++------ module-utils/EventStore/CMakeLists.txt | 3 + module-utils/EventStore/EventStore.cpp | 2 +- module-utils/EventStore/EventStore.hpp | 7 +- module-utils/board/CMakeLists.txt | 2 - module-utils/bootconfig/CMakeLists.txt | 34 ++--- module-utils/bootconfig/src/bootconfig.cpp | 7 +- module-utils/i18n/CMakeLists.txt | 6 +- module-utils/i18n/i18n.cpp | 2 +- module-utils/i18n/tests/CMakeLists.txt | 1 + module-utils/ical/CMakeLists.txt | 25 +++ module-utils/ical/tests/CMakeLists.txt | 9 ++ .../{test => ical/tests}/test_ParserICS.cpp | 2 +- module-utils/locale/CMakeLists.txt | 7 + module-utils/{ => locale}/country.hpp | 0 module-utils/log/CMakeLists.txt | 28 +++- module-utils/log/Logger.cpp | 3 +- module-utils/log/Logger.hpp | 3 +- module-utils/log/LoggerBuffer.hpp | 2 +- .../StringCircularBuffer.cpp | 0 .../StringCircularBuffer.hpp | 0 module-utils/log/api/CMakeLists.txt | 12 ++ module-utils/log/{ => api/log}/debug.hpp | 0 module-utils/log/{ => api/log}/log.hpp | 8 +- module-utils/log/board/CMakeLists.txt | 1 + .../{ => log}/board/linux/CMakeLists.txt | 2 +- .../{ => log}/board/linux/log_linux.cpp | 2 +- .../{ => log}/board/rt1051/CMakeLists.txt | 14 +- .../{ => log}/board/rt1051/log_rt1051.cpp | 2 +- .../{ => log}/board/rt1051/log_writeLUART.cpp | 2 +- .../{ => log}/board/rt1051/log_writeRTT.cpp | 2 +- .../board/rt1051/log_writeSYSTEMVIEW.cpp | 2 +- .../{ => log}/board/rt1051/time_syscalls.cpp | 0 module-utils/log/log.cpp | 2 +- module-utils/log/tests/CMakeLists.txt | 37 +++++ .../tests}/RandomStringGenerator.cpp | 0 .../tests}/RandomStringGenerator.hpp | 0 .../{test => log/tests}/test_LoggerBuffer.cpp | 2 +- module-utils/{test => log/tests}/test_log.cpp | 2 +- .../{test => log/tests}/test_logDumps.cpp | 2 +- module-utils/math/CMakeLists.txt | 4 +- module-utils/math/tests/CMakeLists.txt | 2 +- module-utils/phonenumber/CMakeLists.txt | 26 ++++ .../{ => phonenumber}/NumberHolderMatcher.hpp | 0 .../{ => phonenumber}/PhoneNumber.cpp | 2 +- .../{ => phonenumber}/PhoneNumber.hpp | 0 module-utils/phonenumber/tests/CMakeLists.txt | 10 ++ .../tests}/unittest_numbermatcher.cpp | 0 .../tests}/unittest_phonenumber.cpp | 0 module-utils/rrule/CMakeLists.txt | 6 +- module-utils/test/CMakeLists.txt | 60 -------- module-utils/time/CMakeLists.txt | 30 ++-- module-utils/time/test/CMakeLists.txt | 8 +- module-utils/time/time/ScopedTime.hpp | 2 +- module-utils/time/time/dateCommon.hpp | 18 +-- module-utils/time/time/time_conversion.hpp | 2 +- .../time/time/time_date_validation.cpp | 2 +- module-utils/time/time/time_locale.hpp | 2 +- module-utils/unicode/CMakeLists.txt | 10 ++ .../{ => unicode}/ucs2/CMakeLists.txt | 4 +- .../{ => unicode}/ucs2/test/CMakeLists.txt | 0 .../{ => unicode}/ucs2/test/unittest_ucs2.cpp | 0 module-utils/{ => unicode}/ucs2/ucs2/UCS2.cpp | 2 +- module-utils/{ => unicode}/ucs2/ucs2/UCS2.hpp | 0 .../{ => unicode}/utf8/CMakeLists.txt | 4 +- .../{ => unicode}/utf8/test/CMakeLists.txt | 2 +- .../{ => unicode}/utf8/test/unittest_utf8.cpp | 0 module-utils/{ => unicode}/utf8/utf8/UTF8.cpp | 2 +- module-utils/{ => unicode}/utf8/utf8/UTF8.hpp | 0 module-utils/utility/CMakeLists.txt | 33 ++++ module-utils/{ => utility}/Split.hpp | 0 module-utils/{ => utility}/Temperature.hpp | 0 module-utils/{ => utility}/Utils.cpp | 0 module-utils/{ => utility}/Utils.hpp | 18 +-- module-utils/{ => utility}/integer.hpp | 0 module-utils/{ => utility}/split_sv.hpp | 0 module-utils/utility/tests/CMakeLists.txt | 18 +++ .../tests}/test-Utility-ConditionalInvoke.cpp | 2 +- .../tests}/unittest_utils.cpp | 0 .../src/purefs/fs/filesystem_littlefs.cpp | 20 +-- .../drivers/src/purefs/fs/filesystem_vfat.cpp | 2 +- .../src/thirdparty/littlefs/lfs_glue.cpp | 2 +- module-vfs/src/purefs/blkdev/disk_handle.cpp | 2 +- module-vfs/src/purefs/blkdev/disk_manager.cpp | 4 +- .../src/purefs/blkdev/partition_parser.cpp | 2 +- .../src/purefs/fs/filesystem_syscalls.cpp | 2 +- module-vfs/src/purefs/vfs_subsystem.cpp | 2 +- products/BellHybrid/BellHybridMain.cpp | 4 +- products/BellHybrid/CMakeLists.txt | 4 +- .../apps/application-bell-main/CMakeLists.txt | 2 +- .../models/TemperatureModel.hpp | 2 +- .../presenters/HomeScreenPresenter.hpp | 2 +- .../models/TemperatureUnitModel.hpp | 2 +- .../models/TimeUnitsModel.hpp | 2 +- .../widgets/TemperatureUnitListItem.hpp | 2 +- .../apps/common/include/common/TimeUtils.hpp | 2 +- .../services/evtmgr/EventManager.cpp | 2 +- .../include/evtmgr/api/TemperatureApi.hpp | 2 +- .../services/evtmgr/internal/StaticData.hpp | 2 +- products/PurePhone/CMakeLists.txt | 4 +- products/PurePhone/PurePhoneMain.cpp | 4 +- products/PurePhone/sys/SystemManager.cpp | 2 +- .../PurePhone/test/test-settings/Database.cpp | 2 +- test/CMakeLists.txt | 4 +- test/mock-logs.cpp | 2 +- third-party/libphonenumber/CMakeLists.txt | 3 +- 373 files changed, 919 insertions(+), 744 deletions(-) create mode 100644 module-bsp/hal/CMakeLists.txt rename module-bsp/hal/{ => include/hal}/GenericFactory.hpp (100%) rename module-bsp/hal/{ => include/hal}/battery_charger/AbstractBatteryCharger.hpp (100%) create mode 100644 module-bsp/hal/include/hal/cellular/SIM.hpp rename module-bsp/hal/{ => include/hal}/key_input/AbstractKeyInput.hpp (100%) rename module-bsp/hal/{ => include/hal}/key_input/KeyEventDefinitions.hpp (100%) rename {module-utils/common_data => module-bsp/hal/include/hal/key_input}/RawKey.hpp (89%) rename module-bsp/hal/{ => include/hal}/temperature_source/TemperatureSource.hpp (100%) delete mode 100644 module-utils/board/CMakeLists.txt create mode 100644 module-utils/ical/CMakeLists.txt create mode 100644 module-utils/ical/tests/CMakeLists.txt rename module-utils/{test => ical/tests}/test_ParserICS.cpp (99%) create mode 100644 module-utils/locale/CMakeLists.txt rename module-utils/{ => locale}/country.hpp (100%) rename module-utils/{circular_buffer => log}/StringCircularBuffer.cpp (100%) rename module-utils/{circular_buffer => log}/StringCircularBuffer.hpp (100%) create mode 100644 module-utils/log/api/CMakeLists.txt rename module-utils/log/{ => api/log}/debug.hpp (100%) rename module-utils/log/{ => api/log}/log.hpp (93%) create mode 100644 module-utils/log/board/CMakeLists.txt rename module-utils/{ => log}/board/linux/CMakeLists.txt (81%) rename module-utils/{ => log}/board/linux/log_linux.cpp (95%) rename module-utils/{ => log}/board/rt1051/CMakeLists.txt (77%) rename module-utils/{ => log}/board/rt1051/log_rt1051.cpp (99%) rename module-utils/{ => log}/board/rt1051/log_writeLUART.cpp (93%) rename module-utils/{ => log}/board/rt1051/log_writeRTT.cpp (93%) rename module-utils/{ => log}/board/rt1051/log_writeSYSTEMVIEW.cpp (93%) rename module-utils/{ => log}/board/rt1051/time_syscalls.cpp (100%) create mode 100644 module-utils/log/tests/CMakeLists.txt rename module-utils/{generators => log/tests}/RandomStringGenerator.cpp (100%) rename module-utils/{generators => log/tests}/RandomStringGenerator.hpp (100%) rename module-utils/{test => log/tests}/test_LoggerBuffer.cpp (99%) rename module-utils/{test => log/tests}/test_log.cpp (98%) rename module-utils/{test => log/tests}/test_logDumps.cpp (99%) create mode 100644 module-utils/phonenumber/CMakeLists.txt rename module-utils/{ => phonenumber}/NumberHolderMatcher.hpp (100%) rename module-utils/{ => phonenumber}/PhoneNumber.cpp (99%) rename module-utils/{ => phonenumber}/PhoneNumber.hpp (100%) create mode 100644 module-utils/phonenumber/tests/CMakeLists.txt rename module-utils/{test => phonenumber/tests}/unittest_numbermatcher.cpp (100%) rename module-utils/{test => phonenumber/tests}/unittest_phonenumber.cpp (100%) delete mode 100644 module-utils/test/CMakeLists.txt create mode 100644 module-utils/unicode/CMakeLists.txt rename module-utils/{ => unicode}/ucs2/CMakeLists.txt (88%) rename module-utils/{ => unicode}/ucs2/test/CMakeLists.txt (100%) rename module-utils/{ => unicode}/ucs2/test/unittest_ucs2.cpp (100%) rename module-utils/{ => unicode}/ucs2/ucs2/UCS2.cpp (99%) rename module-utils/{ => unicode}/ucs2/ucs2/UCS2.hpp (100%) rename module-utils/{ => unicode}/utf8/CMakeLists.txt (77%) rename module-utils/{ => unicode}/utf8/test/CMakeLists.txt (86%) rename module-utils/{ => unicode}/utf8/test/unittest_utf8.cpp (100%) rename module-utils/{ => unicode}/utf8/utf8/UTF8.cpp (99%) rename module-utils/{ => unicode}/utf8/utf8/UTF8.hpp (100%) create mode 100644 module-utils/utility/CMakeLists.txt rename module-utils/{ => utility}/Split.hpp (100%) rename module-utils/{ => utility}/Temperature.hpp (100%) rename module-utils/{ => utility}/Utils.cpp (100%) rename module-utils/{ => utility}/Utils.hpp (92%) rename module-utils/{ => utility}/integer.hpp (100%) rename module-utils/{ => utility}/split_sv.hpp (100%) create mode 100644 module-utils/utility/tests/CMakeLists.txt rename module-utils/{test => utility/tests}/test-Utility-ConditionalInvoke.cpp (99%) rename module-utils/{test => utility/tests}/unittest_utils.cpp (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index e08502b595dac0db6bae4f1efd617f1ac9aaba63..390167c02469a4c994822cda66c6805affeca5fd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -156,6 +156,10 @@ add_custom_target( "Generating version info" ) +add_library(version-header INTERFACE) +target_include_directories(version-header INTERFACE $) +add_dependencies(version-header version) + fetch_ecoboot() fetch_updater() diff --git a/Target_Linux.cmake b/Target_Linux.cmake index cfee416d0c5394c368b10e2556c4c6d97c40bc3e..4c4b33f5e5ec456e0aad7595aa31794e1f227462 100644 --- a/Target_Linux.cmake +++ b/Target_Linux.cmake @@ -8,6 +8,7 @@ set(TARGET_LIBRARIES portaudio CACHE INTERNAL "" ) +link_libraries(pthread rt) option (LINUX_ENABLE_SANITIZER "Enable address sanitizer for Linux" ON) if (LINUX_ENABLE_SANITIZER) diff --git a/Target_RT1051.cmake b/Target_RT1051.cmake index dcaeb8688ce2f9a9fdc423ccfe1576c38a2db461..61eaeb1e58be6c61714e6a92725cd564aa6c1d74 100644 --- a/Target_RT1051.cmake +++ b/Target_RT1051.cmake @@ -23,6 +23,8 @@ set(LDSCRIPTSDIR "${CMAKE_CURRENT_LIST_DIR}/board/rt1051/ldscripts" CACHE INTERN set(PROJECT_TARGET "TARGET_RT1051" CACHE INTERNAL "") +include_directories(${CMAKE_SOURCE_DIR}/board/rt1051/newlib/include) + add_compile_definitions( CPU_MIMXRT1051DVL6B_cm7 CPU_MIMXRT1051DVL6B diff --git a/board/CMakeLists.txt b/board/CMakeLists.txt index f3fc5db120b17e94e89c888603b2abaaa1adc6fc..4a6667ac1c3f9e9898c251146dcb606ba90fbf25 100644 --- a/board/CMakeLists.txt +++ b/board/CMakeLists.txt @@ -1,3 +1,3 @@ -add_library(board STATIC) - +add_library(board-config INTERFACE) add_board_subdirectory() +target_link_libraries(board INTERFACE board-config) diff --git a/board/linux/CMakeLists.txt b/board/linux/CMakeLists.txt index aba4005523827196f58ba65854427ac16846fac3..fd75e9a8e466821ed44739e16dac2d8b8aa1d50c 100644 --- a/board/linux/CMakeLists.txt +++ b/board/linux/CMakeLists.txt @@ -1 +1,3 @@ +add_library(board INTERFACE) add_subdirectory(libiosyscalls) +target_compile_definitions(board-config INTERFACE PROJECT_CONFIG_USER_DYNMEM_SIZE=0) diff --git a/board/rt1051/CMakeLists.txt b/board/rt1051/CMakeLists.txt index e8afdfd86e7d04ae5027a47db23d8a09c8ed556f..5ee3c2b387f1ef2a2e9c1f9af1eb9c3082b5013c 100644 --- a/board/rt1051/CMakeLists.txt +++ b/board/rt1051/CMakeLists.txt @@ -1,3 +1,5 @@ +add_library(board STATIC) + add_subdirectory(cmsis) add_subdirectory(${BOARD}) @@ -24,11 +26,13 @@ target_include_directories(board PUBLIC $ ) target_link_libraries(board PUBLIC + fsl + module-vfs + log-api CrashCatcher::CrashCatcher ) diff --git a/board/rt1051/bellpx/CMakeLists.txt b/board/rt1051/bellpx/CMakeLists.txt index c97dfddb2f149874571c7f10d9050a67c069db11..15487106ed3535b1268c6b1b330f05853b31eea1 100644 --- a/board/rt1051/bellpx/CMakeLists.txt +++ b/board/rt1051/bellpx/CMakeLists.txt @@ -1,6 +1,6 @@ target_compile_definitions( - board - PUBLIC + board-config + INTERFACE PROJECT_CONFIG_USER_DYNMEM_SIZE=9*1024*1024 HW_SDRAM_64_MB=0 ) diff --git a/board/rt1051/crashdump/consoledump.cpp b/board/rt1051/crashdump/consoledump.cpp index 9bbdcea8c6b2aa09f1fb17b686cef6868aa9ba24..0a4023596b68b4eae67a8ad723240c6837a4b4b8 100644 --- a/board/rt1051/crashdump/consoledump.cpp +++ b/board/rt1051/crashdump/consoledump.cpp @@ -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 +#include #include "consoledump.hpp" #include "MIMXRT1051.h" diff --git a/board/rt1051/crashdump/crashcatcher_impl.cpp b/board/rt1051/crashdump/crashcatcher_impl.cpp index 007dd16febc3d369e752ed8e2241049bf0431b02..04d810de07ac6c93876a1336ad9fe37a4c795970 100644 --- a/board/rt1051/crashdump/crashcatcher_impl.cpp +++ b/board/rt1051/crashdump/crashcatcher_impl.cpp @@ -5,7 +5,7 @@ #include -#include +#include #include #include "crashdumpwriter.hpp" #include "consoledump.hpp" diff --git a/board/rt1051/crashdump/crashdumpwriter_vfs.cpp b/board/rt1051/crashdump/crashdumpwriter_vfs.cpp index e22bd0ba134a71b33bb2dac6cf6bc4574b319f6e..d8a562400823adcf0ca9d05e1ee999384fd021e1 100644 --- a/board/rt1051/crashdump/crashdumpwriter_vfs.cpp +++ b/board/rt1051/crashdump/crashdumpwriter_vfs.cpp @@ -3,7 +3,7 @@ #include "crashdumpwriter_vfs.hpp" -#include +#include #include #include "purefs/vfs_subsystem.hpp" diff --git a/board/rt1051/puretx/CMakeLists.txt b/board/rt1051/puretx/CMakeLists.txt index f2861e30d36825a91e2b1baa0e12ccac3f5a984b..4c6c031bd80793b27132e819124ef34b2dd23227 100644 --- a/board/rt1051/puretx/CMakeLists.txt +++ b/board/rt1051/puretx/CMakeLists.txt @@ -1,16 +1,16 @@ if (${BOARD_REVISION} EQUAL 7) set (MEMORY_LINKER_FILE_PATH "${CMAKE_CURRENT_LIST_DIR}/memory_pure_T7.ld" CACHE INTERNAL "") target_compile_definitions( - board - PUBLIC + board-config + INTERFACE PROJECT_CONFIG_USER_DYNMEM_SIZE=28*1024*1024 HW_SDRAM_64_MB=1 ) elseif (${BOARD_REVISION} EQUAL 6) set (MEMORY_LINKER_FILE_PATH "${CMAKE_CURRENT_LIST_DIR}/memory_pure_T6.ld" CACHE INTERNAL "") target_compile_definitions( - board - PUBLIC + board-config + INTERFACE PROJECT_CONFIG_USER_DYNMEM_SIZE=9*1024*1024 HW_SDRAM_64_MB=0 ) diff --git a/cmake/modules/GenVersionHpp.cmake b/cmake/modules/GenVersionHpp.cmake index 23a699d776fe24a35d00c4b284f732b16bb43f57..627dc6f3495c0b903ea648f723135dfee040e705 100644 --- a/cmake/modules/GenVersionHpp.cmake +++ b/cmake/modules/GenVersionHpp.cmake @@ -5,7 +5,7 @@ list(APPEND CMAKE_MODULE_PATH "${SRC_DIR}/cmake/modules") include(Version) configure_file( ${SRC_DIR}/source/version.hpp.template - ${CMAKE_BINARY_DIR}/source/version.hpp + ${CMAKE_BINARY_DIR}/source/include/product/version.hpp ) message("GIT_REV: ${GIT_REV}") diff --git a/module-apps/CMakeLists.txt b/module-apps/CMakeLists.txt index 8398d8b521cc47a7346e75bea19aca4bf488cec0..e737342a066aa46d8f0dd0ffdd95f7f586783d01 100644 --- a/module-apps/CMakeLists.txt +++ b/module-apps/CMakeLists.txt @@ -84,6 +84,7 @@ endif() target_link_libraries(${PROJECT_NAME} PRIVATE app + application-calendar application-messages application-settings apps-common @@ -98,7 +99,8 @@ target_link_libraries(${PROJECT_NAME} service-cellular service-db service-evtmgr - time + service-time-api + utils-time utils-bootconfig PUBLIC module-audio diff --git a/module-apps/application-alarm-clock/ApplicationAlarmClock.cpp b/module-apps/application-alarm-clock/ApplicationAlarmClock.cpp index e25e478057debec5da102d59058c5b0d6ea3ff59..d7c43000f47c36535c03b95f56bb5799913ea8eb 100644 --- a/module-apps/application-alarm-clock/ApplicationAlarmClock.cpp +++ b/module-apps/application-alarm-clock/ApplicationAlarmClock.cpp @@ -13,6 +13,7 @@ #include "windows/OptionWindow.hpp" #include #include +#include namespace app { diff --git a/module-apps/application-alarm-clock/models/AlarmsRepository.cpp b/module-apps/application-alarm-clock/models/AlarmsRepository.cpp index b3ff5484b7b816f19993848c86b4bc903c7d3b66..34f76c7679ed030d4ed1c691a9f1fc1acc79cdff 100644 --- a/module-apps/application-alarm-clock/models/AlarmsRepository.cpp +++ b/module-apps/application-alarm-clock/models/AlarmsRepository.cpp @@ -6,7 +6,7 @@ #include #include "AsyncTask.hpp" -#include "log.hpp" +#include "log/log.hpp" namespace app::alarmClock { @@ -72,6 +72,5 @@ namespace app::alarmClock } void AlarmsDBRepository::turnOffAll(const AbstractAlarmsRepository::OnResultCallback &callback) - { - } + {} } // namespace app::alarmClock diff --git a/module-apps/application-alarm-clock/presenter/AlarmRRulePresenter.cpp b/module-apps/application-alarm-clock/presenter/AlarmRRulePresenter.cpp index 409e4ca6bf55b9119fcd165e5fb51fb8b6057511..049927433771c937f75c9fb438916ba4b9a253b5 100644 --- a/module-apps/application-alarm-clock/presenter/AlarmRRulePresenter.cpp +++ b/module-apps/application-alarm-clock/presenter/AlarmRRulePresenter.cpp @@ -2,7 +2,7 @@ // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md #include "AlarmRRulePresenter.hpp" -#include "log.hpp" +#include "log/log.hpp" namespace app::alarmClock { diff --git a/module-apps/application-alarm-clock/presenter/AlarmRRulePresenter.hpp b/module-apps/application-alarm-clock/presenter/AlarmRRulePresenter.hpp index 31369cbe07abe9330f926fd9e1cbe0615d19721b..8f0a44ddbb28f36891a72e5f3574398d5fe60e0f 100644 --- a/module-apps/application-alarm-clock/presenter/AlarmRRulePresenter.hpp +++ b/module-apps/application-alarm-clock/presenter/AlarmRRulePresenter.hpp @@ -3,11 +3,11 @@ #pragma once -#include "log.hpp" +#include "log/log.hpp" #include #include