M CMakeLists.txt => CMakeLists.txt +1 -0
@@ 185,6 185,7 @@ set_target_properties(${CMAKE_PROJECT_NAME} PROPERTIES LINK_FLAGS "-Xlinker -Map
target_link_libraries(${PROJECT_NAME}
service-antenna
service-bluetooth
+ service-desktop
module-bluetooth
module-audio
module-bsp
M module-apps/application-desktop/ApplicationDesktop.hpp => module-apps/application-desktop/ApplicationDesktop.hpp +3 -3
@@ 11,9 11,9 @@
#include <service-cellular/CellularMessage.hpp>
#include <service-db/DBNotificationMessage.hpp>
#include <module-db/queries/notifications/QueryNotificationsGetAll.hpp>
-#include <service-desktop/endpoints/update/UpdateMuditaOS.hpp>
-#include <module-services/service-desktop/ServiceDesktop.hpp>
-#include "DesktopMessages.hpp"
+#include <endpoints/update/UpdateMuditaOS.hpp>
+#include <service-desktop/ServiceDesktop.hpp>
+#include <service-desktop/DesktopMessages.hpp>
namespace app
{
M module-apps/application-desktop/CMakeLists.txt => module-apps/application-desktop/CMakeLists.txt +1 -0
@@ 56,4 56,5 @@ target_link_libraries(${PROJECT_NAME}
PRIVATE
service-cellular
service-db
+ service-desktop
)
M module-apps/application-desktop/data/LockPhoneData.hpp => module-apps/application-desktop/data/LockPhoneData.hpp +2 -2
@@ 1,12 1,12 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#ifndef MODULE_APPS_APPLICATION_DESKTOP_DATA_LOCKPHONEDATA_HPP_
#define MODULE_APPS_APPLICATION_DESKTOP_DATA_LOCKPHONEDATA_HPP_
#include "gui/SwitchData.hpp"
+#include <service-desktop/DesktopMessages.hpp>
#include <service-desktop/ServiceDesktop.hpp>
-#include "DesktopMessages.hpp"
#include <filesystem>
namespace gui
M module-services/service-desktop/CMakeLists.txt => module-services/service-desktop/CMakeLists.txt +44 -12
@@ 1,22 1,54 @@
-message( "${PROJECT_NAME} ${CMAKE_CURRENT_LIST_DIR}" )
+project(service-desktop)
+message( "${PROJECT_NAME} ${CMAKE_CURRENT_LIST_DIR}" )
-add_subdirectory( parser )
-add_subdirectory( endpoints )
-add_subdirectory( messages )
+set(SOURCES
+ endpoints/backup/BackupEndpoint.cpp
+ endpoints/backup/BackupRestore.cpp
+ endpoints/calllog/CalllogEndpoint.cpp
+ endpoints/calllog/CalllogHelper.cpp
+ endpoints/contacts/ContactHelper.cpp
+ endpoints/contacts/ContactsEndpoint.cpp
+ endpoints/developerMode/DeveloperModeEndpoint.cpp
+ endpoints/developerMode/DeveloperModeHelper.cpp
+ endpoints/deviceInfo/DeviceInfoEndpoint.cpp
+ endpoints/factoryReset/FactoryReset.cpp
+ endpoints/factoryReset/FactoryResetEndpoint.cpp
+ endpoints/messages/MessageHelper.cpp
+ endpoints/messages/MessagesEndpoint.cpp
+ endpoints/restore/RestoreEndpoint.cpp
+ endpoints/update/UpdateEndpoint.cpp
+ endpoints/update/UpdateMuditaOS.cpp
-target_sources( ${PROJECT_NAME}
- PRIVATE
- "${CMAKE_CURRENT_LIST_DIR}/ServiceDesktop.cpp"
- "${CMAKE_CURRENT_LIST_DIR}/WorkerDesktop.cpp"
+ parser/ParserUtils.cpp
+ parser/ParserFSM.cpp
+ parser/MessageHandler.cpp
+
+ DesktopMessages.cpp
+ ServiceDesktop.cpp
+ WorkerDesktop.cpp
)
+add_library(${PROJECT_NAME} STATIC ${SOURCES})
+
+#add_subdirectory( parser )
+#add_subdirectory( endpoints )
+#add_subdirectory( messages )
+
add_dependencies(${PROJECT_NAME} version)
-# Host target configuration(mainly used for unit testing)
-if (${ENABLE_TESTS})
- add_subdirectory(tests)
-endif ()
+target_include_directories(${PROJECT_NAME}
+ PUBLIC
+ ${CMAKE_CURRENT_LIST_DIR}
+)
+
target_link_libraries(${PROJECT_NAME}
PRIVATE
service-cellular
+ module-utils
+ module-cellular
)
+
+if (${ENABLE_TESTS})
+ add_subdirectory(tests)
+endif ()
+
R module-services/service-desktop/messages/DesktopMessages.cpp => module-services/service-desktop/DesktopMessages.cpp +3 -2
@@ 1,7 1,8 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
-#include "DesktopMessages.hpp"
+#include "service-desktop/DesktopMessages.hpp"
+#include "parser/MessageHandler.hpp"
namespace sdesktop::developerMode
{
M module-services/service-desktop/ServiceDesktop.cpp => module-services/service-desktop/ServiceDesktop.cpp +19 -19
@@ 1,25 1,25 @@
// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
-#include <service-db/QueryMessage.hpp> // for QueryResponse
-#include <module-apps/application-desktop/ApplicationDesktop.hpp> // for name_desktop
-#include <module-services/service-desktop/ServiceDesktop.hpp>
-#include <cinttypes> // for PRIu32
-#include <filesystem> // for path
-
-#include "ServiceDesktop.hpp" // for ServiceDesktop, cdc_queue_len, cdc_queue_object_size, service_desktop, service_stack
-#include "BackupRestore.hpp" // for BackupRestore
-#include "DesktopMessages.hpp" // for UpdateOsMessage, BackupMessage, FactoryMessage, RestoreMessage
-#include "module-services/service-desktop/endpoints/factoryReset/FactoryReset.hpp" // for Run
-#include "log/log.hpp" // for LOG_DEBUG, LOG_INFO, LOG_ERROR
-#include "Common/Query.hpp" // for QueryResult
-#include "MessageType.hpp" // for MessageType, MessageType::DBQuery
-#include "Service/Bus.hpp" // for Bus
-#include "Service/Worker.hpp" // for WorkerQueueInfo
-#include "UpdateMuditaOS.hpp" // for UpdateMuditaOS, UpdateStats, UpdateMessageType, UpdateError, UpdateError::NoError, UpdateMessageType::UpdateCheckForUpdateOnce, UpdateMessageType::UpdateFoundOnBoot, UpdateMessageType::UpdateNow
-#include "WorkerDesktop.hpp" // for WorkerDesktop
-#include "json/json11.hpp" // for Json
-#include "vfs.hpp" // for vfs
+#include "service-desktop/DesktopMessages.hpp"
+#include "service-desktop/ServiceDesktop.hpp"
+#include "service-desktop/WorkerDesktop.hpp"
+#include "endpoints/factoryReset/FactoryReset.hpp"
+#include "endpoints/backup/BackupRestore.hpp"
+#include "endpoints/update/UpdateMuditaOS.hpp"
+
+#include <Common/Query.hpp>
+#include <MessageType.hpp>
+#include <Service/Bus.hpp>
+#include <Service/Worker.hpp>
+#include <json/json11.hpp>
+#include <log/log.hpp>
+#include <module-apps/application-desktop/ApplicationDesktop.hpp>
+#include <service-db/QueryMessage.hpp>
+#include <vfs.hpp>
+
+#include <cinttypes>
+#include <filesystem>
ServiceDesktop::ServiceDesktop() : sys::Service(service::name::service_desktop, "", sdesktop::service_stack)
{
M module-services/service-desktop/WorkerDesktop.cpp => module-services/service-desktop/WorkerDesktop.cpp +10 -10
@@ 1,17 1,17 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
-#include "WorkerDesktop.hpp"
+#include "service-desktop/WorkerDesktop.hpp"
+#include "parser/MessageHandler.hpp"
+#include "parser/ParserFSM.hpp"
-#include <map> // for map
-#include <vector> // for vector
+#include <bsp/usb/usb.hpp>
+#include <log/log.hpp>
+#include <projdefs.h>
+#include <queue.h>
-#include "MessageHandler.hpp" // for MessageHandler, MessageHandler::sendQueue
-#include "ParserFSM.hpp" // for StateMachine
-#include "bsp/usb/usb.hpp" // for usbCDCInit, usbCDCSend
-#include "log/log.hpp" // for LOG_ERROR, LOG_INFO
-#include "projdefs.h" // for pdTRUE
-#include "queue.h" // for xQueueReceive, QueueDefinition, QueueHandle_t
+#include <map>
+#include <vector>
bool WorkerDesktop::handleMessage(uint32_t queueID)
{
D module-services/service-desktop/endpoints/CMakeLists.txt => module-services/service-desktop/endpoints/CMakeLists.txt +0 -40
@@ 1,40 0,0 @@
-target_include_directories(${PROJECT_NAME}
- PUBLIC
- "${CMAKE_CURRENT_LIST_DIR}"
- "${CMAKE_CURRENT_LIST_DIR}/.."
- "${CMAKE_CURRENT_LIST_DIR}/../messages"
- "${CMAKE_CURRENT_LIST_DIR}/messages"
- "${CMAKE_CURRENT_LIST_DIR}/calllog"
- "${CMAKE_CURRENT_LIST_DIR}/backup"
- "${CMAKE_CURRENT_LIST_DIR}/deviceInfo"
- "${CMAKE_CURRENT_LIST_DIR}/factoryReset"
- "${CMAKE_CURRENT_LIST_DIR}/restore"
- "${CMAKE_CURRENT_LIST_DIR}/update"
- "${CMAKE_CURRENT_LIST_DIR}/developerMode"
-)
-target_include_directories(${CMAKE_PROJECT_NAME}
- PUBLIC
- ${CMAKE_CURRENT_LIST_DIR}
- ${CMAKE_BINARY_DIR}
- )
-target_sources(${PROJECT_NAME}
- PRIVATE
- "deviceInfo/DeviceInfoEndpoint.cpp"
- "calllog/CalllogHelper.cpp"
- "calllog/CalllogEndpoint.cpp"
- "contacts/ContactHelper.cpp"
- "contacts/ContactsEndpoint.cpp"
- "messages/MessageHelper.cpp"
- "messages/MessagesEndpoint.cpp"
- "backup/BackupEndpoint.cpp"
- "backup/BackupRestore.cpp"
- "deviceInfo/DeviceInfoEndpoint.cpp"
- "factoryReset/FactoryResetEndpoint.cpp"
- "factoryReset/FactoryReset.cpp"
- "restore/RestoreEndpoint.cpp"
- "update/UpdateEndpoint.cpp"
- "update/UpdateMuditaOS.cpp"
- "developerMode/DeveloperModeEndpoint.cpp"
- "developerMode/DeveloperModeHelper.cpp"
-
-)
M module-services/service-desktop/endpoints/Context.hpp => module-services/service-desktop/endpoints/Context.hpp +4 -3
@@ 1,9 1,10 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#pragma once
-#include "json/json11.hpp"
-#include "module-services/service-desktop/parser/ParserUtils.hpp"
+
+#include <json/json11.hpp>
+#include <module-services/service-desktop/parser/ParserUtils.hpp>
namespace parserFSM
{
M module-services/service-desktop/endpoints/DBHelper.hpp => module-services/service-desktop/endpoints/DBHelper.hpp +4 -4
@@ 3,13 3,13 @@
#pragma once
-#include "Common/Query.hpp"
#include "Context.hpp"
-#include "ParserFSM.hpp"
-#include "queries/messages/threads/QueryThreadsSearchForList.hpp"
+#include "Endpoint.hpp"
+#include <parser/ParserFSM.hpp>
+
+#include <Common/Query.hpp>
#include <Service/Common.hpp>
#include <Service/Service.hpp>
-#include "Endpoint.hpp"
namespace parserFSM
{
M module-services/service-desktop/endpoints/Endpoint.hpp => module-services/service-desktop/endpoints/Endpoint.hpp +7 -5
@@ 1,12 1,14 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#pragma once
-#include "module-services/service-desktop/parser/ParserUtils.hpp"
-#include "json/json11.hpp"
-#include "Common/Query.hpp"
+
#include "Context.hpp"
-#include "Service/Service.hpp"
+#include <parser/ParserUtils.hpp>
+
+#include <json/json11.hpp>
+#include <Common/Query.hpp>
+#include <Service/Service.hpp>
#include <string>
namespace parserFSM
M module-services/service-desktop/endpoints/EndpointFactory.hpp => module-services/service-desktop/endpoints/EndpointFactory.hpp +8 -7
@@ 1,19 1,20 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#pragma once
#include "Endpoint.hpp"
+
#include "Service/Service.hpp"
-#include "contacts/ContactsEndpoint.hpp"
-#include "messages/MessagesEndpoint.hpp"
#include "backup/BackupEndpoint.hpp"
-#include "deviceInfo/DeviceInfoEndpoint.hpp"
-#include "update/UpdateEndpoint.hpp"
-#include "restore/RestoreEndpoint.hpp"
-#include "factoryReset/FactoryResetEndpoint.hpp"
#include "calllog/CalllogEndpoint.hpp"
+#include "contacts/ContactsEndpoint.hpp"
#include "developerMode/DeveloperModeEndpoint.hpp"
+#include "deviceInfo/DeviceInfoEndpoint.hpp"
+#include "factoryReset/FactoryResetEndpoint.hpp"
+#include "messages/MessagesEndpoint.hpp"
+#include "restore/RestoreEndpoint.hpp"
+#include "update/UpdateEndpoint.hpp"
using namespace parserFSM;
M module-services/service-desktop/endpoints/backup/BackupEndpoint.cpp => module-services/service-desktop/endpoints/backup/BackupEndpoint.cpp +12 -11
@@ 1,20 1,21 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#include "BackupEndpoint.hpp"
-#include <Service/Bus.hpp> // for Bus
-#include <filesystem> // for path
-#include <memory> // for make_shared
+#include <endpoints/Context.hpp>
+#include <parser/MessageHandler.hpp>
+#include <parser/ParserUtils.hpp>
+#include <service-desktop/DesktopMessages.hpp>
+#include <service-desktop/ServiceDesktop.hpp>
-#include "DesktopMessages.hpp" // for BackupMessage
-#include "ParserUtils.hpp" // for Method, backupReady, backupRequest, backupUpload, Code, Code::BadRequest, Method::del, Method::get, Method::post, Method::put
-#include "ServiceDesktop.hpp" // for service_desktop
-#include "Context.hpp" // for Context
-#include "MessageHandler.hpp" // for MessageHandler
-#include "json/json11.hpp" // for Json, Json::object
-#include "vfs.hpp" // for vfs, os_backup
+#include <Service/Bus.hpp>
+#include <json/json11.hpp>
#include <purefs/filesystem_paths.hpp>
+#include <vfs.hpp>
+
+#include <filesystem>
+#include <memory>
static bool backupReady = false;
M module-services/service-desktop/endpoints/backup/BackupEndpoint.hpp => module-services/service-desktop/endpoints/backup/BackupEndpoint.hpp +9 -6
@@ 1,12 1,15 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
-#include <string> // for string
+#pragma once
-#include "Endpoint.hpp" // for Endpoint
-#include "ParserUtils.hpp" // for parserFSM
-#include "ServiceDesktop.hpp"
-#include "Service/Common.hpp" // for ReturnCodes
+#include <endpoints/Endpoint.hpp>
+#include <parser/ParserUtils.hpp>
+#include <service-desktop/ServiceDesktop.hpp>
+
+#include <Service/Common.hpp>
+
+#include <string>
namespace parserFSM
{
M module-services/service-desktop/endpoints/backup/BackupRestore.cpp => module-services/service-desktop/endpoints/backup/BackupRestore.cpp +12 -13
@@ 3,20 3,19 @@
#include "BackupRestore.hpp"
-#include <assert.h> // for assert
-#include <stdint.h> // for uint32_t
-#include <filesystem> // for path
-#include <memory> // for allocator, unique_ptr
-#include <string> // for string, operator+, basic_string, char_traits
-#include <vector> // for vector
-
-#include "vfs.hpp" // for vfs, vfs::DirectoryEntry, os_backup, tar_buf, PATH_BACKUP, vfs::FILE, user_disk
+#include <SystemManager/SystemManager.hpp>
+#include <log/log.hpp>
+#include <microtar/src/microtar.hpp>
#include <purefs/filesystem_paths.hpp>
-#include "microtar/src/microtar.hpp" // for mtar_close, mtar_header_t, MTAR_ESUCCESS, mtar_strerror, mtar_open, mtar_finalize, mtar_next, mtar_read_data, mtar_read_header, mtar_write_data, mtar_write_file_header, mtar_t, MTAR_TREG
-#include <service-db/DBServiceAPI.hpp> // for DBServiceAPI
-#include <service-db/DBServiceName.hpp> // for db
-#include "SystemManager/SystemManager.hpp" // for SystemManager
-#include "log/log.hpp" // for LOG_INFO, LOG_ERROR
+#include <service-db/DBServiceAPI.hpp>
+#include <service-db/DBServiceName.hpp>
+#include <vfs.hpp>
+
+#include <cassert>
+#include <filesystem>
+#include <memory>
+#include <string>
+#include <vector>
namespace sys
{
M module-services/service-desktop/endpoints/backup/BackupRestore.hpp => module-services/service-desktop/endpoints/backup/BackupRestore.hpp +2 -2
@@ 1,9 1,9 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#pragma once
-#include "Service/Service.hpp"
+#include <Service/Service.hpp>
namespace sys
{
M module-services/service-desktop/endpoints/calllog/CalllogEndpoint.cpp => module-services/service-desktop/endpoints/calllog/CalllogEndpoint.cpp +2 -2
@@ 1,9 1,9 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#include "CalllogEndpoint.hpp"
-#include "Context.hpp" // for Context
+#include <endpoints/Context.hpp>
using namespace parserFSM;
M module-services/service-desktop/endpoints/calllog/CalllogEndpoint.hpp => module-services/service-desktop/endpoints/calllog/CalllogEndpoint.hpp +7 -7
@@ 1,15 1,15 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#pragma once
-#include <memory> // for make_unique, unique_ptr
-#include <string> // for string
+#include "CalllogHelper.hpp"
+#include <Service/Service.hpp>
+#include <endpoints/Endpoint.hpp>
+#include <parser/ParserUtils.hpp>
-#include "Endpoint.hpp" // for Endpoint
-#include "Service/Service.hpp"
-#include "CalllogHelper.hpp" // for CalllogHelper
-#include "ParserUtils.hpp" // for parserFSM
+#include <memory>
+#include <string>
namespace parserFSM
{
M module-services/service-desktop/endpoints/calllog/CalllogHelper.cpp => module-services/service-desktop/endpoints/calllog/CalllogHelper.cpp +18 -17
@@ 1,24 1,25 @@
// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
-#include <module-db/queries/calllog/QueryCalllogGet.hpp> // for CalllogGet, CalllogGetResult
-#include <module-db/queries/calllog/QueryCalllogGetCount.hpp> // for CalllogGetCount, CalllogGetCountResult
-#include <module-db/queries/calllog/QueryCalllogRemove.hpp> // for CalllogRemove, CalllogRemoveResult
-#include <module-db/queries/calllog/QueryCalllogGetByContactID.hpp> // for CalllogGetByContactID, CalllogGetByContactIDResult
-#include <memory> // for make_unique, unique_ptr
-#include <ostream> // for stringstream, basic_ostream, basic_ios::clear
-#include <utility> // for move
-#include <vector> // for vector
-
#include "CalllogHelper.hpp"
-#include "BaseInterface.hpp" // for Interface, Interface::Name, Interface::Name::Calllog
-#include "Common/Query.hpp" // for EndpointListener, Query, QueryListener, QueryResult
-#include "Context.hpp" // for Context
-#include "MessageHandler.hpp" // for MessageHandler
-#include "ParserUtils.hpp" // for Code, Code::InternalServerError, Code::OK, parserFSM
-#include "PhoneNumber.hpp" // for PhoneNumber::View
-#include <service-db/DBServiceAPI.hpp> // for DBServiceAPI
-#include "utf8/UTF8.hpp" // for UTF8
+#include <endpoints/Context.hpp>
+#include <parser/MessageHandler.hpp>
+#include <parser/ParserUtils.hpp>
+
+#include <BaseInterface.hpp>
+#include <Common/Query.hpp>
+#include <PhoneNumber.hpp>
+#include <module-db/queries/calllog/QueryCalllogGet.hpp>
+#include <module-db/queries/calllog/QueryCalllogGetByContactID.hpp>
+#include <module-db/queries/calllog/QueryCalllogGetCount.hpp>
+#include <module-db/queries/calllog/QueryCalllogRemove.hpp>
+#include <service-db/DBServiceAPI.hpp>
+#include <utf8/UTF8.hpp>
+
+#include <memory>
+#include <ostream>
+#include <utility>
+#include <vector>
using namespace parserFSM;
M module-services/service-desktop/endpoints/calllog/CalllogHelper.hpp => module-services/service-desktop/endpoints/calllog/CalllogHelper.hpp +10 -9
@@ 3,16 3,17 @@
#pragma once
+#include <endpoints/Context.hpp>
+#include <endpoints/DBHelper.hpp>
+
+#include <CalllogRecord.hpp>
+#include <Common/Query.hpp>
+#include <Service/Common.hpp>
+#include <Service/Service.hpp>
#include <application-phonebook/models/PhonebookModel.hpp>
-#include <string> // for string, allocator
-
-#include "Common/Query.hpp"
-#include "Context.hpp"
-#include "Service/Service.hpp"
-#include "Service/Common.hpp" // for ReturnCodes
-#include "DBHelper.hpp" // for DBHelper
-#include "CalllogRecord.hpp" // for CalllogRecord
-#include "json/json11.hpp" // for Json
+#include <json/json11.hpp>
+
+#include <string>
namespace sys
{
M module-services/service-desktop/endpoints/contacts/ContactHelper.cpp => module-services/service-desktop/endpoints/contacts/ContactHelper.cpp +25 -23
@@ 1,30 1,32 @@
// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
-#include <queries/phonebook/QueryContactGet.hpp> // for ContactGet, ContactGetSize, ContactGetResult
-#include <queries/phonebook/QueryContactAdd.hpp> // for ContactAdd, ContactAddResult
-#include <queries/phonebook/QueryContactRemove.hpp> // for ContactRemove, ContactRemoveResult
-#include <memory> // for make_unique, unique_ptr
-#include <utility> // for move
-#include <vector> // for vector
-
-#include "ContactRecord.hpp" // for ContactRecord, ContactRecord::Number
#include "ContactHelper.hpp"
-#include "Common/Query.hpp" // for EndpointListener, Query, QueryListener, QueryResult
-#include "ParserUtils.hpp" // for Code, Code::InternalServerError, Code::OK, parserFSM
-#include "Service/Common.hpp" // for ReturnCodes, ReturnCodes::Success, ReturnCodes::Failure
-#include <service-db/DBServiceAPI.hpp> // for DBServiceAPI
-#include "log/log.hpp" // for LOG_ERROR
-#include "queries/phonebook/QueryContactGetByID.hpp" // for ContactGetByID, ContactGetByIDResult
-#include "queries/phonebook/QueryContactUpdate.hpp" // for ContactUpdate, ContactUpdateResult
-#include "json/json11.hpp" // for Json, Json::array, Json::object
-#include "BaseInterface.hpp" // for Interface, Interface::Name, Interface::Name::Contact
-#include "Common/Common.hpp" // for ContactNumberType, ContactNumberType::CELL
-#include "Context.hpp" // for Context
-#include "MessageHandler.hpp" // for MessageHandler
-#include "PhoneNumber.hpp" // for PhoneNumber, PhoneNumber::View
-#include "queries/RecordQuery.hpp" // for RecordsSizeQueryResult
-#include "utf8/UTF8.hpp" // for UTF8
+#include <endpoints/Context.hpp>
+#include <parser/MessageHandler.hpp>
+#include <parser/ParserUtils.hpp>
+
+#include <queries/phonebook/QueryContactGet.hpp>
+#include <queries/phonebook/QueryContactAdd.hpp>
+#include <queries/phonebook/QueryContactRemove.hpp>
+
+#include <BaseInterface.hpp>
+#include <Common/Common.hpp>
+#include <Common/Query.hpp>
+#include <ContactRecord.hpp>
+#include <PhoneNumber.hpp>
+#include <Service/Common.hpp>
+#include <json/json11.hpp>
+#include <log/log.hpp>
+#include <queries/RecordQuery.hpp>
+#include <queries/phonebook/QueryContactGetByID.hpp>
+#include <queries/phonebook/QueryContactUpdate.hpp>
+#include <service-db/DBServiceAPI.hpp>
+#include <utf8/UTF8.hpp>
+
+#include <memory>
+#include <utility>
+#include <vector>
using namespace parserFSM;
M module-services/service-desktop/endpoints/contacts/ContactHelper.hpp => module-services/service-desktop/endpoints/contacts/ContactHelper.hpp +10 -9
@@ 3,16 3,17 @@
#pragma once
+#include <endpoints/Context.hpp>
+#include <endpoints/DBHelper.hpp>
+
+#include <Common/Query.hpp>
+#include <ContactRecord.hpp>
+#include <Service/Common.hpp>
+#include <Service/Service.hpp>
#include <application-phonebook/models/PhonebookModel.hpp>
-#include <string> // for string, allocator
-
-#include "Common/Query.hpp"
-#include "Context.hpp"
-#include "Service/Service.hpp"
-#include "Service/Common.hpp" // for ReturnCodes
-#include "DBHelper.hpp" // for DBHelper
-#include "ContactRecord.hpp" // for ContactRecord
-#include "json/json11.hpp" // for Json
+#include <json/json11.hpp>
+
+#include <string>
namespace sys
{
M module-services/service-desktop/endpoints/contacts/ContactsEndpoint.cpp => module-services/service-desktop/endpoints/contacts/ContactsEndpoint.cpp +4 -4
@@ 1,12 1,12 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
+#include "ContactHelper.hpp"
#include "ContactsEndpoint.hpp"
-#include <memory> // for unique_ptr
+#include <endpoints/Context.hpp>
-#include "Context.hpp" // for Context
-#include "contacts/ContactHelper.hpp" // for ContactHelper
+#include <memory>
using namespace parserFSM;
M module-services/service-desktop/endpoints/contacts/ContactsEndpoint.hpp => module-services/service-desktop/endpoints/contacts/ContactsEndpoint.hpp +9 -7
@@ 1,15 1,17 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#pragma once
-#include <memory> // for make_unique, unique_ptr
-#include <string> // for string
+#include "ContactHelper.hpp"
-#include "Endpoint.hpp" // for Endpoint
-#include "Service/Service.hpp"
-#include "ContactHelper.hpp" // for ContactHelper
-#include "ParserUtils.hpp" // for parserFSM
+#include <endpoints/Endpoint.hpp>
+#include <parser/ParserUtils.hpp>
+
+#include <Service/Service.hpp>
+
+#include <memory>
+#include <string>
namespace parserFSM
{
M module-services/service-desktop/endpoints/developerMode/DeveloperModeEndpoint.cpp => module-services/service-desktop/endpoints/developerMode/DeveloperModeEndpoint.cpp +2 -2
@@ 1,9 1,9 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#include "DeveloperModeEndpoint.hpp"
-#include "Context.hpp" // for Context
+#include <endpoints/Context.hpp>
using namespace parserFSM;
M module-services/service-desktop/endpoints/developerMode/DeveloperModeEndpoint.hpp => module-services/service-desktop/endpoints/developerMode/DeveloperModeEndpoint.hpp +8 -7
@@ 1,15 1,16 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#pragma once
-#include <memory> // for make_unique, unique_ptr
-#include <string> // for string
+#include "DeveloperModeHelper.hpp"
+#include <endpoints/Endpoint.hpp>
+#include <parser/ParserUtils.hpp>
-#include "Endpoint.hpp" // for Endpoint
-#include "Service/Service.hpp"
-#include "DeveloperModeHelper.hpp" // for DeveloperModeHelper
-#include "ParserUtils.hpp" // for parserFSM
+#include <Service/Service.hpp>
+
+#include <memory>
+#include <string>
namespace parserFSM
{
M module-services/service-desktop/endpoints/developerMode/DeveloperModeHelper.cpp => module-services/service-desktop/endpoints/developerMode/DeveloperModeHelper.cpp +6 -5
@@ 1,14 1,15 @@
// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
-#include <module-sys/Service/Bus.hpp>
-#include <module-services/service-evtmgr/Constants.hpp>
+#include "DeveloperModeHelper.hpp"
+#include <service-desktop/DesktopMessages.hpp>
+#include <parser/ParserUtils.hpp>
+
#include <module-services/service-desktop/parser/MessageHandler.hpp>
+#include <module-services/service-evtmgr/Constants.hpp>
+#include <module-sys/Service/Bus.hpp>
#include <service-cellular/CellularMessage.hpp>
#include <service-cellular/ServiceCellular.hpp>
-#include <module-services/service-desktop/messages/DesktopMessages.hpp>
-#include "DeveloperModeHelper.hpp"
-#include "ParserUtils.hpp" // for parserFSM
namespace parserFSM
{
M module-services/service-desktop/endpoints/developerMode/DeveloperModeHelper.hpp => module-services/service-desktop/endpoints/developerMode/DeveloperModeHelper.hpp +6 -5
@@ 1,14 1,15 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#pragma once
+#include <endpoints/Context.hpp>
+
+#include <Common/Query.hpp>
+#include <Service/Common.hpp>
+#include <Service/Service.hpp>
#include <module-bsp/bsp/keyboard/key_codes.hpp>
#include <module-services/service-evtmgr/messages/KbdMessage.hpp>
-#include "Common/Query.hpp"
-#include "Context.hpp"
-#include "Service/Service.hpp"
-#include "Service/Common.hpp" // for ReturnCodes
namespace sys
{
M module-services/service-desktop/endpoints/deviceInfo/DeviceInfoEndpoint.cpp => module-services/service-desktop/endpoints/deviceInfo/DeviceInfoEndpoint.cpp +10 -10
@@ 1,18 1,18 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#include "DeviceInfoEndpoint.hpp"
+#include <endpoints/Context.hpp>
+#include <parser/MessageHandler.hpp>
-#include <source/version.hpp> // for GIT_BRANCH, GIT_REV, GIT_TAG
-#include <vfs.hpp> // for vfs::FilesystemStats, vfs
-#include <common_data/EventStore.hpp> // for GSM, Battery, SignalStrength
-#include <time/time_conversion.hpp> // for Time
-#include <stdint.h> // for uint32_t
-#include <string> // for to_string, allocator, string
+#include <common_data/EventStore.hpp>
+#include <json/json11.hpp>
+#include <source/version.hpp>
+#include <time/time_conversion.hpp>
+#include <vfs.hpp>
-#include "Context.hpp" // for Context
-#include "MessageHandler.hpp" // for MessageHandler
-#include "json/json11.hpp" // for Json, Json::object
+#include <cstdint>
+#include <string>
auto DeviceInfoEndpoint::handle(Context &context) -> void
{
M module-services/service-desktop/endpoints/deviceInfo/DeviceInfoEndpoint.hpp => module-services/service-desktop/endpoints/deviceInfo/DeviceInfoEndpoint.hpp +6 -5
@@ 1,13 1,14 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#pragma once
-#include <string> // for string
+#include <endpoints/Endpoint.hpp>
+#include <parser/ParserUtils.hpp>
-#include "Endpoint.hpp" // for Endpoint
-#include "Service/Service.hpp"
-#include "ParserUtils.hpp" // for parserFSM
+#include <Service/Service.hpp>
+
+#include <string>
namespace parserFSM
{
M module-services/service-desktop/endpoints/factoryReset/FactoryReset.cpp => module-services/service-desktop/endpoints/factoryReset/FactoryReset.cpp +9 -9
@@ 1,18 1,18 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#include "FactoryReset.hpp"
-#include <stdint.h> // for uint32_t
-#include <filesystem> // for path
-#include <memory> // for unique_ptr, allocator
-#include <vector> // for vector
-
-#include "vfs.hpp" // for vfs, vfs::DirectoryEntry, copy_buf, os_factory, vfs::FILE, eMMC_disk, vfs::FileAttributes, vfs::FileAttributes::Directory, PATH_FACTORY
+#include <SystemManager/SystemManager.hpp>
+#include <log/log.hpp>
#include <purefs/filesystem_paths.hpp>
#include <service-db/DBServiceName.hpp>
-#include "SystemManager/SystemManager.hpp" // for SystemManager
-#include "log/log.hpp" // for LOG_ERROR, LOG_INFO
+#include <vfs.hpp>
+
+#include <cstdint>
+#include <filesystem>
+#include <memory>
+#include <vector>
namespace sys
{
M module-services/service-desktop/endpoints/factoryReset/FactoryReset.hpp => module-services/service-desktop/endpoints/factoryReset/FactoryReset.hpp +3 -3
@@ 1,11 1,11 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#pragma once
-#include <string> // for string
+#include <Service/Service.hpp>
-#include "Service/Service.hpp"
+#include <string>
namespace sys
{
M module-services/service-desktop/endpoints/factoryReset/FactoryResetEndpoint.cpp => module-services/service-desktop/endpoints/factoryReset/FactoryResetEndpoint.cpp +9 -8
@@ 1,16 1,17 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#include "FactoryResetEndpoint.hpp"
-#include <Service/Bus.hpp> // for Bus
-#include <memory> // for make_shared
+#include <endpoints/Context.hpp>
+#include <parser/MessageHandler.hpp>
+#include <service-desktop/DesktopMessages.hpp>
+#include <service-desktop/ServiceDesktop.hpp>
-#include "DesktopMessages.hpp" // for FactoryMessage
-#include "ServiceDesktop.hpp" // for service_desktop
-#include "Context.hpp" // for Context
-#include "MessageHandler.hpp" // for MessageHandler
-#include "json/json11.hpp" // for Json, Json::object
+#include <Service/Bus.hpp>
+#include <json/json11.hpp>
+
+#include <memory>
auto FactoryResetEndpoint::handle(Context &context) -> void
{
M module-services/service-desktop/endpoints/factoryReset/FactoryResetEndpoint.hpp => module-services/service-desktop/endpoints/factoryReset/FactoryResetEndpoint.hpp +6 -5
@@ 1,13 1,14 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#pragma once
-#include <string> // for string
+#include <endpoints/Endpoint.hpp>
+#include <parser/ParserUtils.hpp>
-#include "Endpoint.hpp" // for Endpoint
-#include "Service/Service.hpp"
-#include "ParserUtils.hpp" // for parserFSM
+#include <Service/Service.hpp>
+
+#include <string>
namespace parserFSM
{
M module-services/service-desktop/endpoints/messages/MessageHelper.cpp => module-services/service-desktop/endpoints/messages/MessageHelper.cpp +33 -32
@@ 3,38 3,39 @@
#include "MessageHelper.hpp"
-#include <memory> // for make_unique, unique_ptr
-#include <string> // for string
-#include <utility> // for move
-#include <vector> // for vector
-
-#include "Common/Query.hpp" // for EndpointListener, Query, QueryListener, QueryResult
-#include "ParserUtils.hpp" // for Code, id, count, Code::InternalServerError, Code::OK, contactID, msgTemplate, threadID, messageBody, templateText, date, isUnread, offset, type, dateSent, msgCount, parserFSM, phoneNumber, snippet, unreadMsgCount
-#include "PhoneNumber.hpp" // for PhoneNumber::View
-#include "SMSRecord.hpp" // for SMSRecord
-#include "SMSTemplateRecord.hpp" // for SMSTemplateRecord
-#include "Service/Common.hpp" // for ReturnCodes, ReturnCodes::Success
-#include "ThreadRecord.hpp" // for ThreadRecord
-#include <service-db/DBServiceAPI.hpp> // for DBServiceAPI
-#include "queries/messages/sms/QuerySMSGet.hpp" // for SMSGet, SMSGetResult
-#include "queries/messages/sms/QuerySMSGetByContactID.hpp" // for SMSGetByContactID, SMSGetByContactIDResult
-#include "queries/messages/sms/QuerySMSGetByThreadID.hpp" // for SMSGetByThreadID, SMSGetByThreadIDResult
-#include "queries/messages/sms/QuerySMSGetByID.hpp" // for SMSGetByID, SMSGetByIDResult
-#include "queries/messages/sms/QuerySMSGetByText.hpp" // for SMSGetByText, SMSGetByTextResult
-#include "queries/messages/sms/QuerySMSGetCount.hpp" // for SMSGetCount, SMSGetCountResult
-#include "queries/messages/sms/QuerySMSRemove.hpp" // for SMSRemove, SMSRemoveResult
-#include "queries/messages/templates/QuerySMSTemplateGet.hpp" // for SMSTemplateGet, SMSTemplateGetResult
-#include "queries/messages/templates/QuerySMSTemplateRemove.hpp" // for SMSTemplateRemove, SMSTemplateRemoveResult
-#include "queries/messages/templates/QuerySMSTemplateUpdate.hpp" // for SMSTemplateUpdate, SMSTemplateUpdateResult
-#include "queries/messages/templates/QuerySMSTemplateAdd.hpp" // for SMSTemplateAdd, SMSTemplateAddResult
-#include "queries/messages/templates/QuerySMSTemplateGetByID.hpp" // for SMSTemplateGetByID, SMSTemplateGetByIDResult
-#include "queries/messages/templates/QuerySMSTemplateGetCount.hpp" // for SMSTemplateGetCount, SMSTemplateGetCountResult
-#include "queries/messages/threads/QueryThreadMarkAsRead.hpp" // for MarkAsRead, MarkAsRead::Read, MarkAsReadResult, MarkAsRead::Read::False, MarkAsRead::Read::True, query
-#include "utf8/UTF8.hpp" // for UTF8
-#include "json/json11.hpp" // for Json, Json::array, Json::object
-#include "BaseInterface.hpp" // for Interface, Interface::Name, Interface::Name::SMS, Interface::Name::SMSTemplate, Interface::Name::SMSThread
-#include "Context.hpp" // for Context
-#include "MessageHandler.hpp" // for MessageHandler
+#include <endpoints/Context.hpp>
+#include <parser/MessageHandler.hpp>
+#include <parser/ParserUtils.hpp>
+
+#include <BaseInterface.hpp>
+#include <Common/Query.hpp>
+#include <PhoneNumber.hpp>
+#include <SMSRecord.hpp>
+#include <SMSTemplateRecord.hpp>
+#include <Service/Common.hpp>
+#include <ThreadRecord.hpp>
+#include <json/json11.hpp>
+#include <queries/messages/sms/QuerySMSGet.hpp>
+#include <queries/messages/sms/QuerySMSGetByContactID.hpp>
+#include <queries/messages/sms/QuerySMSGetByID.hpp>
+#include <queries/messages/sms/QuerySMSGetByText.hpp>
+#include <queries/messages/sms/QuerySMSGetByThreadID.hpp>
+#include <queries/messages/sms/QuerySMSGetCount.hpp>
+#include <queries/messages/sms/QuerySMSRemove.hpp>
+#include <queries/messages/templates/QuerySMSTemplateAdd.hpp>
+#include <queries/messages/templates/QuerySMSTemplateGet.hpp>
+#include <queries/messages/templates/QuerySMSTemplateGetByID.hpp>
+#include <queries/messages/templates/QuerySMSTemplateGetCount.hpp>
+#include <queries/messages/templates/QuerySMSTemplateRemove.hpp>
+#include <queries/messages/templates/QuerySMSTemplateUpdate.hpp>
+#include <queries/messages/threads/QueryThreadMarkAsRead.hpp>
+#include <service-db/DBServiceAPI.hpp>
+#include <utf8/UTF8.hpp>
+
+#include <memory>
+#include <string>
+#include <utility>
+#include <vector>
using namespace parserFSM;
M module-services/service-desktop/endpoints/messages/MessageHelper.hpp => module-services/service-desktop/endpoints/messages/MessageHelper.hpp +12 -11
@@ 3,18 3,19 @@
#pragma once
+#include <endpoints/Endpoint.hpp>
+#include <endpoints/DBHelper.hpp>
+
+#include <Common/Query.hpp>
+#include <SMSRecord.hpp>
+#include <SMSTemplateRecord.hpp>
+#include <Service/Common.hpp>
+#include <Service/Service.hpp>
+#include <ThreadRecord.hpp>
+#include <json/json11.hpp>
+
#include <memory>
-#include <string> // for string, allocator
-
-#include "Common/Query.hpp"
-#include "SMSTemplateRecord.hpp" // for SMSTemplateRecord
-#include "Service/Service.hpp"
-#include "Service/Common.hpp" // for ReturnCodes
-#include "DBHelper.hpp" // for DBHelper
-#include "Endpoint.hpp"
-#include "SMSRecord.hpp" // for SMSRecord
-#include "ThreadRecord.hpp" // for ThreadRecord
-#include "json/json11.hpp" // for Json
+#include <string>
namespace sys
{
M module-services/service-desktop/endpoints/messages/MessagesEndpoint.cpp => module-services/service-desktop/endpoints/messages/MessagesEndpoint.cpp +2 -2
@@ 1,9 1,9 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#include "MessagesEndpoint.hpp"
-#include "Context.hpp" // for Context
+#include <endpoints/Context.hpp>
using namespace parserFSM;
M module-services/service-desktop/endpoints/messages/MessagesEndpoint.hpp => module-services/service-desktop/endpoints/messages/MessagesEndpoint.hpp +8 -7
@@ 1,15 1,16 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#pragma once
-#include <memory> // for make_shared, shared_ptr
-#include <string> // for string
+#include "MessageHelper.hpp"
+#include <endpoints/Endpoint.hpp>
+#include <parser/ParserUtils.hpp>
-#include "Endpoint.hpp" // for Endpoint
-#include "Service/Service.hpp"
-#include "MessageHelper.hpp" // for MessageHelper
-#include "ParserUtils.hpp" // for parserFSM
+#include <Service/Service.hpp>
+
+#include <memory>
+#include <string>
namespace parserFSM
{
M module-services/service-desktop/endpoints/restore/RestoreEndpoint.cpp => module-services/service-desktop/endpoints/restore/RestoreEndpoint.cpp +10 -9
@@ 1,17 1,18 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#include "RestoreEndpoint.hpp"
-#include <Service/Bus.hpp> // for Bus
-#include <memory> // for make_shared
+#include <endpoints/Context.hpp>
+#include <endpoints/messages/MessageHelper.hpp>
+#include <parser/ParserUtils.hpp>
+#include <service-desktop/DesktopMessages.hpp>
+#include <service-desktop/ServiceDesktop.hpp>
-#include "DesktopMessages.hpp" // for RestoreMessage
-#include "ParserUtils.hpp" // for restoreRequest, Method, Method::post
-#include "ServiceDesktop.hpp" // for service_desktop
-#include "Context.hpp" // for Context
-#include "MessageHandler.hpp" // for MessageHandler
-#include "json/json11.hpp" // for Json, Json::object
+#include <Service/Bus.hpp>
+#include <json/json11.hpp>
+
+#include <memory>
auto RestoreEndpoint::handle(Context &context) -> void
{
M module-services/service-desktop/endpoints/restore/RestoreEndpoint.hpp => module-services/service-desktop/endpoints/restore/RestoreEndpoint.hpp +5 -5
@@ 1,11 1,11 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
-#include <string> // for string
+#include <endpoints/Endpoint.hpp>
+#include <parser/ParserUtils.hpp>
+#include <service-desktop/ServiceDesktop.hpp>
-#include "Endpoint.hpp" // for Endpoint
-#include "ParserUtils.hpp" // for parserFSM
-#include "ServiceDesktop.hpp"
+#include <string>
namespace parserFSM
{
M module-services/service-desktop/endpoints/update/UpdateEndpoint.cpp => module-services/service-desktop/endpoints/update/UpdateEndpoint.cpp +12 -11
@@ 1,20 1,21 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#include "UpdateEndpoint.hpp"
+#include "UpdateMuditaOS.hpp"
-#include <Service/Bus.hpp> // for Bus
-#include <filesystem> // for operator/, path
-#include <memory> // for allocator, make_shared
+#include <service-desktop/DesktopMessages.hpp>
+#include <service-desktop/ServiceDesktop.hpp>
+#include <endpoints/Context.hpp>
+#include <endpoints/messages/MessageHelper.hpp>
-#include "DesktopMessages.hpp" // for UpdateOsMessage
-#include "ServiceDesktop.hpp" // for service_desktop
-#include "Context.hpp" // for Context
-#include "MessageHandler.hpp" // for MessageHandler
-#include "UpdateMuditaOS.hpp" // for update
-#include "json/json11.hpp" // for Json, Json::object
-#include "vfs.hpp" // for vfs, os_updates
+#include <Service/Bus.hpp>
+#include <json/json11.hpp>
#include <purefs/filesystem_paths.hpp>
+#include <vfs.hpp>
+
+#include <filesystem>
+#include <memory>
auto UpdateEndpoint::handle(Context &context) -> void
{
M module-services/service-desktop/endpoints/update/UpdateEndpoint.hpp => module-services/service-desktop/endpoints/update/UpdateEndpoint.hpp +7 -6
@@ 1,14 1,15 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#pragma once
-#include <string> // for string
+#include <endpoints/Endpoint.hpp>
+#include <parser/ParserUtils.hpp>
-#include "Endpoint.hpp" // for Endpoint
-#include "Service/Service.hpp"
-#include "ParserUtils.hpp" // for parserFSM
-#include "Service/Common.hpp" // for ReturnCodes
+#include <Service/Common.hpp>
+#include <Service/Service.hpp>
+
+#include <string>
namespace parserFSM
{
M module-services/service-desktop/endpoints/update/UpdateMuditaOS.cpp => module-services/service-desktop/endpoints/update/UpdateMuditaOS.cpp +21 -19
@@ 1,27 1,29 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#include "UpdateMuditaOS.hpp"
+#include <service-desktop/ServiceDesktop.hpp>
+#include <service-desktop/DesktopMessages.hpp>
+
+#include <Service/Bus.hpp>
+#include <SystemManager/SystemManager.hpp>
+#include <crc32/crc32.h>
+#include <json/json11.hpp>
+#include <log/log.hpp>
+#include <microtar/src/microtar.hpp>
+#include <module-apps/application-desktop/ApplicationDesktop.hpp>
+#include <purefs/filesystem_paths.hpp>
+#include <vfs.hpp>
+
#if defined(TARGET_RT1051)
-#include "board/cross/eMMC/eMMC.hpp"
+#include <board/cross/eMMC/eMMC.hpp>
#endif
-#include <service-desktop/ServiceDesktop.hpp> // for ServiceDesktop
-#include <module-apps/application-desktop/ApplicationDesktop.hpp> // for name_desktop
-#include <stdarg.h> // for va_end, va_list, va_start
-#include <stdio.h> // for vsnprintf, snprintf, sprintf
-#include <stdlib.h> // for strtoull
-#include <array> // for array
-#include <memory> // for unique_ptr, make_shared, allocator, __shared_ptr_access, shared_ptr
-
-#include "DesktopMessages.hpp" // for UpdateOsMessage
-#include "Service/Bus.hpp" // for Bus
-#include "SystemManager/SystemManager.hpp" // for SystemManager
-#include "crc32/crc32.h" // for Crc32_ComputeBuf
-#include "json/json11.hpp" // for Json, Json::object
-#include "log/log.hpp" // for LOG_INFO, LOG_DEBUG, LOG_ERROR
-#include "microtar/src/microtar.hpp" // for mtar_header_t, mtar_close, mtar_open, mtar_read_data, MTAR_ESUCCESS, mtar_find, mtar_next, mtar_read_header, mtar_t, MTAR_ENOTFOUND, MTAR_ENULLRECORD, MTAR_EOPENFAIL, MTAR_TDIR
-#include "vfs.hpp" // for vfs, tar_buf, os_previous, os_updates, os_current, tmp, vfs::FILE, crc_char_size, vfs::DirectoryEntry, os_version, user_disk, version_string, boot_json, crc32, crc_buf, crc_radix, eMMC_disk
-#include <purefs/filesystem_paths.hpp>
+
+#include <array>
+#include <cstdarg>
+#include <cstdio>
+#include <cstdlib>
+#include <memory>
FileInfo::FileInfo(mtar_header_t &h, unsigned long crc32) : fileSize(h.size), fileCRC32(crc32)
{
M module-services/service-desktop/endpoints/update/UpdateMuditaOS.hpp => module-services/service-desktop/endpoints/update/UpdateMuditaOS.hpp +10 -9
@@ 1,16 1,17 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#pragma once
-#include <module-utils/microtar/src/microtar.hpp> // for mtar_header_t, mtar_t
-#include <vfs.hpp> // for PATH_SYS, PATH_TMP
-#include <json/json11.hpp> // for Json
-#include <stdint.h> // for uint32_t
-#include <filesystem> // for path, filesystem
-#include <iosfwd> // for size_t
-#include <string> // for string, allocator
-#include <vector> // for vector
+#include <json/json11.hpp>
+#include <module-utils/microtar/src/microtar.hpp>
+#include <vfs.hpp>
+
+#include <cstdint>
+#include <filesystem>
+#include <iosfwd>
+#include <string>
+#include <vector>
class ServiceDesktop;
D module-services/service-desktop/messages/CMakeLists.txt => module-services/service-desktop/messages/CMakeLists.txt +0 -13
@@ 1,13 0,0 @@
-target_include_directories(${PROJECT_NAME}
- PUBLIC
- "${CMAKE_CURRENT_LIST_DIR}"
-)
-target_include_directories(${CMAKE_PROJECT_NAME}
- PUBLIC
- ${CMAKE_CURRENT_LIST_DIR}
- ${CMAKE_BINARY_DIR}
- )
-target_sources( ${PROJECT_NAME}
- PRIVATE
- "${CMAKE_CURRENT_LIST_DIR}/DesktopMessages.cpp"
- )
D module-services/service-desktop/parser/CMakeLists.txt => module-services/service-desktop/parser/CMakeLists.txt +0 -12
@@ 1,12 0,0 @@
-target_include_directories(${PROJECT_NAME}
- PUBLIC
- "${CMAKE_CURRENT_LIST_DIR}"
-)
-target_include_directories(${CMAKE_PROJECT_NAME} PUBLIC "${CMAKE_CURRENT_LIST_DIR}")
-target_sources(${PROJECT_NAME}
- PRIVATE
- "${CMAKE_CURRENT_LIST_DIR}/ParserFSM.cpp"
- "${CMAKE_CURRENT_LIST_DIR}/ParserUtils.cpp"
- "${CMAKE_CURRENT_LIST_DIR}/MessageHandler.cpp"
-
-)
M module-services/service-desktop/parser/MessageHandler.cpp => module-services/service-desktop/parser/MessageHandler.cpp +10 -9
@@ 1,17 1,18 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#include "MessageHandler.hpp"
-#include <bits/exception.h> // for exception
-#include <inttypes.h> // for PRIu32
-#include <memory> // for operator!=, unique_ptr
+#include <endpoints/Context.hpp>
+#include <endpoints/Endpoint.hpp>
+#include <endpoints/EndpointFactory.hpp>
-#include "Context.hpp" // for Context
-#include "EndpointFactory.hpp" // for EndpointFactory
-#include "log/log.hpp" // for LOG_ERROR, LOG_DEBUG
-#include "Endpoint.hpp" // for Endpoint
-#include "FreeRTOS.h" // for xQueueHandle
+#include <FreeRTOS.h>
+#include <log/log.hpp>
+
+#include <bits/exception.h>
+#include <cinttypes>
+#include <memory>
namespace sys
{
M module-services/service-desktop/parser/MessageHandler.hpp => module-services/service-desktop/parser/MessageHandler.hpp +5 -4
@@ 1,12 1,13 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#pragma once
+
+#include <Service/Service.hpp>
+#include <json/json11.hpp>
#include <log/log.hpp>
-#include <string> // for string
-#include "Service/Service.hpp"
-#include "json/json11.hpp" // for Json
+#include <string>
namespace sys
{
M module-services/service-desktop/parser/ParserFSM.cpp => module-services/service-desktop/parser/ParserFSM.cpp +6 -6
@@ 1,14 1,14 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
+#include "MessageHandler.hpp"
#include "ParserFSM.hpp"
+#include "ParserUtils.hpp"
-#include <log/log.hpp> // for LOG_DEBUG, LOG_ERROR
-#include <memory> // for unique_ptr, make_unique
-#include <string> // for string
+#include <log/log.hpp>
-#include "MessageHandler.hpp" // for MessageHandler
-#include "ParserUtils.hpp" // for eraseFront, calcPayloadLength, extractPayload, getHeader, removeHeader, size_header, endpointChar, parserFSM
+#include <memory>
+#include <string>
namespace sys
{
M module-services/service-desktop/parser/ParserFSM.hpp => module-services/service-desktop/parser/ParserFSM.hpp +6 -4
@@ 1,12 1,14 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#pragma once
-#include <string> // for string
-#include "ParserUtils.hpp"
-#include "json/json11.hpp"
#include "MessageHandler.hpp"
+#include "ParserUtils.hpp"
+
+#include <json/json11.hpp>
+
+#include <string>
namespace sys
{
M module-services/service-desktop/parser/ParserUtils.cpp => module-services/service-desktop/parser/ParserUtils.cpp +2 -2
@@ 1,9 1,9 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#include "ParserUtils.hpp"
-#include "log/log.hpp" // for LOG_ERROR
+#include <log/log.hpp>
using namespace parserFSM;
M module-services/service-desktop/parser/ParserUtils.hpp => module-services/service-desktop/parser/ParserUtils.hpp +8 -6
@@ 1,12 1,14 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#pragma once
-#include <stdint.h> // for uint8_t
-#include <log/log.hpp> // for LOG_ERROR
-#include <bits/exception.h> // for exception
-#include <stddef.h> // for size_t
-#include <string> // for string, allocator, basic_string, stol
+
+#include <log/log.hpp>
+
+#include <bits/exception.h>
+#include <cstddef>
+#include <cstdint>
+#include <string>
#include <vector>
namespace parserFSM
R module-services/service-desktop/Constants.hpp => module-services/service-desktop/service-desktop/Constants.hpp +0 -0
R module-services/service-desktop/messages/DesktopMessages.hpp => module-services/service-desktop/service-desktop/DesktopMessages.hpp +7 -6
@@ 1,13 1,14 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#pragma once
-#include "Service/Message.hpp"
-#include "MessageType.hpp"
-#include "UpdateMuditaOS.hpp"
-#include "DeveloperModeHelper.hpp"
-#include "parser/MessageHandler.hpp"
+#include <endpoints/update/UpdateMuditaOS.hpp>
+#include <endpoints/developerMode/DeveloperModeEndpoint.hpp>
+
+#include <Service/Message.hpp>
+#include <MessageType.hpp>
+
#include <vfs.hpp>
namespace sdesktop
R module-services/service-desktop/ServiceDesktop.hpp => module-services/service-desktop/service-desktop/ServiceDesktop.hpp +10 -8
@@ 1,16 1,18 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#pragma once
-#include <memory> // for allocator, unique_ptr
-
-#include "WorkerDesktop.hpp"
-#include "module-services/service-desktop/endpoints/update/UpdateMuditaOS.hpp"
-#include "Service/Common.hpp" // for ReturnCodes, ServicePowerMode
-#include "Service/Message.hpp" // for MessagePointer, DataMessage (ptr only), ResponseMessage (ptr only)
-#include "Service/Service.hpp" // for Service
#include "Constants.hpp"
+#include "WorkerDesktop.hpp"
+
+#include <endpoints/update/UpdateMuditaOS.hpp>
+
+#include <Service/Common.hpp>
+#include <Service/Message.hpp>
+#include <Service/Service.hpp>
+
+#include <memory>
class UpdateMuditaOS;
class WorkerDesktop;
R module-services/service-desktop/WorkerDesktop.hpp => module-services/service-desktop/service-desktop/WorkerDesktop.hpp +11 -13
@@ 1,25 1,23 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#pragma once
-#include <string.h>
-#include <stdint.h> // for uint32_t
-#include <list> // for list
-#include <string> // for allocator, string
+#include <Service/Message.hpp>
+#include <Service/Service.hpp>
+#include <Service/Worker.hpp>
+#include <bsp/usb/usb.hpp>
+#include <parser/ParserFSM.hpp>
extern "C"
{
-#include "FreeRTOS.h"
-#include "task.h"
+#include <FreeRTOS.h>
+#include <task.h>
}
-#include "Service/Message.hpp"
-#include "Service/Service.hpp"
-#include "Service/Worker.hpp"
-#include "parser/ParserFSM.hpp"
-
-#include "bsp/usb/usb.hpp"
+#include <cstdint>
+#include <list>
+#include <string>
namespace sys
{
M module-services/service-desktop/tests/CMakeLists.txt => module-services/service-desktop/tests/CMakeLists.txt +13 -14
@@ 1,18 1,17 @@
-file (COPY "${CMAKE_CURRENT_LIST_DIR}/muditaos-unittest.tar" DESTINATION "${CMAKE_BINARY_DIR}/sys/updates")
+file (COPY "${CMAKE_CURRENT_LIST_DIR}/muditaos-unittest.tar" DESTINATION "${CMAKE_BINARY_DIR}/sys/updates")
file (COPY "${CMAKE_CURRENT_LIST_DIR}/factory-test" DESTINATION "${CMAKE_BINARY_DIR}/sys")
add_catch2_executable(
- NAME
- service-desktop
- SRCS
- "${CMAKE_CURRENT_LIST_DIR}/unittest.cpp"
- "${CMAKE_CURRENT_LIST_DIR}/tests-main.cpp"
- "../endpoints/update/UpdateMuditaOS.cpp"
- "../endpoints/factoryReset/FactoryReset.cpp"
- "${CMAKE_CURRENT_LIST_DIR}/../parser/MessageHandler.cpp"
-
-
- LIBS
- module-services
- module-sys
+ NAME
+ service-desktop
+ SRCS
+ unittest.cpp
+ tests-main.cpp
+ #"../endpoints/update/UpdateMuditaOS.cpp"
+ #"../endpoints/factoryReset/FactoryReset.cpp"
+ #"${CMAKE_CURRENT_LIST_DIR}/../parser/MessageHandler.cpp"
+ LIBS
+ module-services
+ module-sys
+ service-desktop
)
M module-services/service-desktop/tests/unittest.cpp => module-services/service-desktop/tests/unittest.cpp +25 -25
@@ 1,30 1,30 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
-#include <purefs/filesystem_paths.hpp> // for eMMC_disk
-#include <catch2/catch.hpp> // for AssertionHandler, operator""_catch_sr, SourceLineInfo, StringRef, REQUIRE, Section, SECTION, SectionInfo, TEST_CASE
-#include <memory> // for allocator, unique_ptr, make_unique, operator==, allocator_traits<>::value_type
-#include <filesystem> // for path
-#include <string> // for string, operator==, basic_string, operator+, char_traits
-#include <vector> // for vector
-
-#include "Common/Common.hpp" // for ContactNumberType, ContactNumberType::PAGER, SMSType, SMSType::DRAFT
-#include "ContactRecord.hpp" // for ContactRecord, ContactRecord::Number
-#include "ParserUtils.hpp" // for EndpointType, Method, Method::get, id, EndpointType::contacts, EndpointType::invalid, contactID, date, dateSent, messageBody, templateText, threadID, parserFSM
-#include "module-services/service-desktop/endpoints/update/UpdateMuditaOS.hpp" // for UpdateError, UpdateError::NoError, UpdateMuditaOS
-#include "module-services/service-desktop/endpoints/factoryReset/FactoryReset.hpp" // for CopyDirContent, DeleteDirContent
-#include "ParserFSM.hpp" // for State, StateMachine, State::NoMsg, State::ReceivedPayload, State::ReceivedPartialPayload, State::ReceivedPartialHeader
-#include "contacts/ContactHelper.hpp" // for ContactHelper, address, alternativeName, isBlocked, isFavourite, numbers, primaryName
-#include "messages/MessageHelper.hpp" // for MessageHelper
-#include "EndpointFactory.hpp" // for EndpointFactory
-#include "contacts/ContactsEndpoint.hpp" // for ContactsEndpoint
-#include "json/json11.hpp" // for Json
-#include "Context.hpp" // for Context, invalidUuid
-#include "Endpoint.hpp" // for Endpoint
-#include "PhoneNumber.hpp" // for PhoneNumber, PhoneNumber::View
-#include "SMSRecord.hpp" // for SMSRecord
-#include "SMSTemplateRecord.hpp" // for SMSTemplateRecord
-#include "utf8/UTF8.hpp" // for UTF8, operator<<
+#include <endpoints/Endpoint.hpp>
+#include <endpoints/EndpointFactory.hpp>
+#include <endpoints/contacts/ContactHelper.hpp>
+#include <endpoints/contacts/ContactsEndpoint.hpp>
+#include <endpoints/factoryReset/FactoryReset.hpp>
+#include <endpoints/messages/MessageHelper.hpp>
+#include <endpoints/update/UpdateMuditaOS.hpp>
+#include <parser/ParserFSM.hpp>
+#include <parser/ParserUtils.hpp>
+
+#include <Common/Common.hpp>
+#include <ContactRecord.hpp>
+#include <PhoneNumber.hpp>
+#include <SMSRecord.hpp>
+#include <SMSTemplateRecord.hpp>
+#include <catch2/catch.hpp>
+#include <json/json11.hpp>
+#include <purefs/filesystem_paths.hpp>
+#include <utf8/UTF8.hpp>
+
+#include <memory>
+#include <filesystem>
+#include <string>
+#include <vector>
class vfs vfs;
M module-services/service-evtmgr/CMakeLists.txt => module-services/service-evtmgr/CMakeLists.txt +1 -0
@@ 34,5 34,6 @@ target_link_libraries(${PROJECT_NAME}
PRIVATE
service-audio
service-cellular
+ service-desktop
)
M module-services/service-evtmgr/EventManager.cpp => module-services/service-evtmgr/EventManager.cpp +1 -1
@@ 17,7 17,7 @@
#include <list> // for list
#include <tuple> // for tie, tuple
#include <vector> // for vector
-#include <module-services/service-desktop/messages/DesktopMessages.hpp>
+#include <service-desktop/DesktopMessages.hpp>
#include "log/log.hpp" // for LOG_INFO, LOG_DEBUG, LOG_FATAL
#include "WorkerEvent.hpp" // for WorkerEvent
M module-services/service-evtmgr/WorkerEvent.cpp => module-services/service-evtmgr/WorkerEvent.cpp +2 -2
@@ 31,8 31,8 @@ extern "C"
#include <optional> // for optional
#include <string> // for string
#include <vector> // for vector
-#include <module-services/service-desktop/messages/DesktopMessages.hpp>
-#include <module-services/service-desktop/Constants.hpp>
+#include <service-desktop/DesktopMessages.hpp>
+#include <service-desktop/Constants.hpp>
#include "Service/Worker.hpp" // for WorkerQueueInfo, Worker, WorkerCommand
#include "MessageType.hpp" // for MessageType, MessageType::EVMMinuteUpdated, MessageType::EVMModemStatus, MessageType::EVMRingIndicator