[EGD-4191] added keyReleased handling from service-desktop (#930)

Co-authored-by: SP2FET <[email protected]>

Author: SP2FET

changelog.md

@@ -1,21 +1,17 @@
 # MuditaOS changelog
 
 
-### Added
-
-* `[cellular]` Set pin functionality with Action mockup
-### Changed
-
-* `[cellular]` Handled properly SIM READY and SIM PIN URC messages with Action mockup
-
 
 ## Current release
 
 ### Added
-* `[messages][db]` File Indexer db Agent
 
+* `[messages][db]` File Indexer db Agent
+* `[testing]` Added key release simulation through service-desktop developerMode
+* `[cellular]` Set pin functionality with Action mockup
 ### Changed
 
+* `[cellular]` Handled properly SIM READY and SIM PIN URC messages with Action mockup
 * `[calendar]` Rework to use database model instead of internal model in day events list.
 
 ## [0.44.1 2020-10-30]
@@ -569,4 +565,3 @@
 * `[test]` Improved modem testing with modem shutdown detection.
 * `[build]` Add support for auto-releases.
 
-

module-services/service-desktop/Constants.hpp

@@ -0,0 +1,11 @@
+// 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>
+
+namespace service::name
+{
+    inline const std::string service_desktop = "ServiceDesktop";
+};

module-services/service-desktop/ServiceDesktop.hpp

@@ -11,14 +11,11 @@
 #include "Service/Common.hpp"  // for ReturnCodes, ServicePowerMode
 #include "Service/Message.hpp" // for Message_t, DataMessage (ptr only), ResponseMessage (ptr only)
 #include "Service/Service.hpp" // for Service
+#include "Constants.hpp"
 
 class UpdateMuditaOS;
 class WorkerDesktop;
 
-namespace service::name
-{
-    const inline std::string service_desktop = "ServiceDesktop";
-};
 
 namespace sdesktop
 {

module-services/service-desktop/endpoints/developerMode/DeveloperModeEndpoint.cpp

@@ -11,16 +11,13 @@ auto DeveloperModeEndpoint::handle(Context &context) -> void
 {
     switch (context.getMethod()) {
     case http::Method::get:
-        helper->processGetRequest(context);
         break;
     case http::Method::post:
-
         break;
     case http::Method::put:
-
+        helper->processPutRequest(context);
         break;
     case http::Method::del:
-
         break;
     }
 }

module-services/service-desktop/endpoints/developerMode/DeveloperModeHelper.cpp

@@ -1,6 +1,9 @@
 // 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 <module-services/service-desktop/parser/MessageHandler.hpp>
 #include "DeveloperModeHelper.hpp"
 #include "ParserUtils.hpp" // for parserFSM
 
@@ -10,7 +13,83 @@ namespace parserFSM
 } // namespace parserFSM
 
 using namespace parserFSM;
-auto DeveloperModeHelper::processGetRequest(Context &context) -> sys::ReturnCodes
+auto DeveloperModeHelper::processPutRequest(Context &context) -> sys::ReturnCodes
 {
+    auto body = context.getBody();
+    if (body[json::developerMode::keyPressed].is_number()) {
+        auto keyValue = body[json::developerMode::keyPressed].int_value();
+        sendKeypress(getKeyCode(keyValue));
+        MessageHandler::putToSendQueue(context.createSimpleResponse());
+    }
+    else {
+        context.setResponseStatus(http::Code::BadRequest);
+        MessageHandler::putToSendQueue(context.createSimpleResponse());
+    }
     return sys::ReturnCodes::Unresolved;
 }
+auto DeveloperModeHelper::getKeyCode(int val) noexcept -> bsp::KeyCodes
+{
+    switch (val) {
+    case 0:
+        return bsp::KeyCodes::NumericKey0;
+    case 1:
+        return bsp::KeyCodes::NumericKey1;
+    case 2:
+        return bsp::KeyCodes::NumericKey2;
+    case 3:
+        return bsp::KeyCodes::NumericKey3;
+    case 4:
+        return bsp::KeyCodes::NumericKey4;
+    case 5:
+        return bsp::KeyCodes::NumericKey5;
+    case 6:
+        return bsp::KeyCodes::NumericKey6;
+    case 7:
+        return bsp::KeyCodes::NumericKey7;
+    case 8:
+        return bsp::KeyCodes::NumericKey8;
+    case 9:
+        return bsp::KeyCodes::NumericKey9;
+    case '*':
+        return bsp::KeyCodes::NumericKeyAst;
+    case '#':
+        return bsp::KeyCodes::NumericKeyPnd;
+    case 'a':
+        return bsp::KeyCodes::JoystickLeft;
+    case 'd':
+        return bsp::KeyCodes::JoystickRight;
+    case 'w':
+        return bsp::KeyCodes::JoystickUp;
+    case 's':
+        return bsp::KeyCodes::JoystickDown;
+    case '\n':
+        return bsp::KeyCodes::JoystickEnter;
+    case 11:
+        return bsp::KeyCodes::FnLeft;
+    case 12:
+        return bsp::KeyCodes::FnRight;
+    case 13:
+        return bsp::KeyCodes::VolUp;
+    case 14:
+        return bsp::KeyCodes::VolDown;
+    case 15:
+        return bsp::KeyCodes::Torch;
+    case 16:
+        return bsp::KeyCodes::SSwitchUp;
+    case 17:
+        return bsp::KeyCodes::SSwitchDown;
+    case 18:
+        return bsp::KeyCodes::SSwitchMid;
+    default:
+        LOG_ERROR("invalid keycode");
+        return bsp::KeyCodes::Undefined;
+    };
+}
+void DeveloperModeHelper::sendKeypress(bsp::KeyCodes keyCode)
+{
+    auto message          = std::make_shared<sevm::KbdMessage>();
+    message->key.key_code = keyCode;
+    message->key.state    = RawKey::State::Released;
+
+    sys::Bus::SendUnicast(std::move(message), service::name::evt_manager, ownerServicePtr);
+}

module-services/service-desktop/endpoints/developerMode/DeveloperModeHelper.hpp

@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include <string> // for allocator, string
-
+#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"
@@ -17,15 +17,16 @@ namespace sys
 
 namespace parserFSM
 {
-    class Context;
 
     class DeveloperModeHelper
     {
         sys::Service *ownerServicePtr = nullptr;
+        static auto getKeyCode(int val) noexcept -> bsp::KeyCodes;
+        void sendKeypress(bsp::KeyCodes keyCode);
 
       public:
         DeveloperModeHelper(sys::Service *_ownerServicePtr) : ownerServicePtr(_ownerServicePtr){};
-        auto processGetRequest(Context &context) -> sys::ReturnCodes;
+        auto processPutRequest(Context &context) -> sys::ReturnCodes;
     };
 
     namespace json::developerMode

module-services/service-evtmgr/EventManager.cpp

@@ -12,6 +12,7 @@
 
 #include <service-cellular/messages/CellularMessage.hpp> // for CellularTimeNotificationMessage, RawCommandResp
 #include <service-evtmgr/Constants.hpp>                  // for evt_manager
+#include <service-desktop/Constants.hpp>                 // for ServiceDesktop
 #include <cassert>                                       // for assert
 #include <list>                                          // for list
 #include <tuple>                                         // for tie, tuple
@@ -91,7 +92,8 @@ sys::Message_t EventManager::DataReceivedHandler(sys::DataMessage *msgl, sys::Re
     else if (msgl->messageType == MessageType::EVM_GPIO) {
         LOG_DEBUG("EVM_GPIO msg");
     }
-    else if (msgl->messageType == MessageType::KBDKeyEvent && msgl->sender == this->GetName()) {
+    else if (msgl->messageType == MessageType::KBDKeyEvent &&
+             (msgl->sender == this->GetName() || msgl->sender == service::name::service_desktop)) {
 
         auto *msg = dynamic_cast<sevm::KbdMessage *>(msgl);
         assert(msg);

module-utils/taglib

@@ -102,6 +102,7 @@ int main()
         ret &= sys::SystemManager::CreateService(std::make_shared<ServiceLwIP>(), sysmgr.get());
 
         ret &= sys::SystemManager::CreateService(std::make_shared<stm::ServiceTime>(), sysmgr.get());
+        ret &= sys::SystemManager::CreateService(std::make_shared<ServiceDesktop>(), sysmgr.get());
 
         // vector with launchers to applications
         std::vector<std::unique_ptr<app::ApplicationLauncher>> applications;

source/main.cpp

@@ -4,6 +4,9 @@
 from harness.common import Serial
 import logging
 
+from interface.CDCSerial import CDCSerial
+
 logging.basicConfig(format='%(asctime)s %(message)s', level=logging.DEBUG)
 log = logging.getLogger(__name__)
 conn = Serial()
+new_conn = CDCSerial()