[EGD-3852] convert to libs services: gui, eink (#933)

Author: rwicik

module-gui/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.12)
+cmake_minimum_required(VERSION 3.12)
 
 
 project(module-gui VERSION 1.0
@@ -35,10 +35,9 @@ target_link_options(${PROJECT_NAME} PUBLIC ${TARGET_LINK_OPTIONS})
 
 
 target_include_directories(${PROJECT_NAME}
-
-        PUBLIC
-
+    PUBLIC
         ${CMAKE_CURRENT_SOURCE_DIR}
+        ${CMAKE_CURRENT_SOURCE_DIR}/gui/core
 )
 
 

module-services/CMakeLists.txt

@@ -1,6 +1,4 @@
-cmake_minimum_required(VERSION 3.14)
-
-project(module-services VERSION 1.0
+project(module-services VERSION 1.0
         DESCRIPTION "Library with all services.")
 
 include(${CMAKE_SOURCE_DIR}/module-lwip/lwip-includes.cmake)
@@ -14,10 +12,12 @@ else()
     message(FATAL_ERROR "Invalid target!")
 endif()
 
+include_directories(${CMAKE_CURRENT_LIST_DIR})
+
 add_library(${PROJECT_NAME} STATIC ${SOURCES} ${BOARD_SOURCES})
 
-add_subdirectory( service-gui )
 add_subdirectory( service-eink )
+add_subdirectory( service-gui )
 add_subdirectory( service-evtmgr )
 add_subdirectory( service-appmgr )
 add_subdirectory( service-db )
@@ -30,7 +30,19 @@ add_subdirectory( service-fota )
 add_subdirectory( service-antenna )
 add_subdirectory( service-time )
 
-target_link_libraries(${PROJECT_NAME} PUBLIC module-bsp module-os module-sys module-utils module-gui module-apps module-db module-cellular module-audio  ${TARGET_LIBRARIES} )
+target_link_libraries(${PROJECT_NAME} PUBLIC
+    service-eink
+    service-gui
+    module-bsp
+    module-os
+    module-sys
+    module-utils
+    module-gui
+    module-apps
+    module-db
+    module-cellular
+    module-audio
+    ${TARGET_LIBRARIES} )
 
 # Board specific compilation definitions,options,include directories and features
 target_compile_definitions(${PROJECT_NAME} PUBLIC ${PROJECT_CONFIG_DEFINITIONS})

module-services/service-eink/CMakeLists.txt

@@ -1,8 +1,8 @@
-
+project(service-eink)
+message( "${PROJECT_NAME}  ${CMAKE_CURRENT_LIST_DIR}" )
 if(${PROJECT_TARGET} STREQUAL "TARGET_RT1051")
     set( EINK_BOARD_PATH "board/rt1051" )
 elseif(${PROJECT_TARGET} STREQUAL "TARGET_Linux")
-    set(CMAKE_CXX_STANDARD 17)
     set( EINK_BOARD_PATH "board/linux" )
     add_subdirectory( "board/linux/renderer" )
 else()
@@ -11,27 +11,23 @@ endif()
 
 message( "EINK BOARD PATH: ${CMAKE_CURRENT_LIST_DIR}/${EINK_BOARD_PATH}" )
 
-include_directories( ${CMAKE_PROJECT_NAME}
+add_library(${PROJECT_NAME} STATIC)
 
-	PUBLIC
-		"${CMAKE_CURRENT_LIST_DIR}"
-		"${CMAKE_CURRENT_LIST_DIR}/messages"
-		"${CMAKE_CURRENT_LIST_DIR}/${EINK_BOARD_PATH}"
+target_link_libraries( ${PROJECT_NAME}
+    module-utils
+    service-gui
 )
 
-include_directories( ${PROJECT_NAME}
-
-	PUBLIC
-		"${CMAKE_CURRENT_LIST_DIR}"
-		"${CMAKE_CURRENT_LIST_DIR}/messages"
-		"${CMAKE_CURRENT_LIST_DIR}/${EINK_BOARD_PATH}"
-#		"${CMAKE_CURRENT_LIST_DIR}/../"
+target_include_directories(${PROJECT_NAME}
+    PUBLIC
+        "${CMAKE_CURRENT_LIST_DIR}"
+        "${CMAKE_CURRENT_LIST_DIR}/messages"
+        "${CMAKE_CURRENT_LIST_DIR}/${EINK_BOARD_PATH}"
 )
 
 target_sources( ${PROJECT_NAME}
-
-	PRIVATE
-		"${CMAKE_CURRENT_LIST_DIR}/ServiceEink.cpp"
-		"${CMAKE_CURRENT_LIST_DIR}/messages/ImageMessage.cpp"
+    PRIVATE
+        ServiceEink.cpp
+        messages/ImageMessage.cpp
 )
 

module-services/service-eink/ServiceEink.cpp

@@ -1,32 +1,19 @@
-// 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
 
-/*
- * ServiceEink.cpp
- *
- *  Created on: 22 maj 2019
- *      Author: robert
- */
-
-// FreeRTOS
-extern "C"
-{
-}
-#include <stdio.h>  // for SEEK_SET
-#include <string.h> // for memset, memcpy
-#include <memory>   // for make_shared, allocator
-
-// module-utils
-#include "log/log.hpp" // for LOG_FATAL, LOG_ERROR, LOG_DEBUG, LOG_INFO
-// module-vfs
-#include "vfs.hpp" // for vfs
-// eink messages
-#include "messages/EinkMessage.hpp"            // for EinkMessage
-#include "messages/ImageMessage.hpp"           // for ImageMessage
-#include "service-gui/messages/GUIMessage.hpp" // for GUIMessage
-#include "MessageType.hpp" // for MessageType, MessageType::GUIDisplayReady, MessageType::EinkDMATransfer, MessageType::EinkImageData, MessageType::EinkStateRequest, MessageType::EinkTemperatureUpdate
 #include "ServiceEink.hpp"
-#include "Service/Bus.hpp" // for Bus
+
+#include <log/log.hpp>
+#include <messages/EinkMessage.hpp>
+#include <messages/ImageMessage.hpp>
+#include <MessageType.hpp>
+#include <Service/Bus.hpp>
+#include <service-gui/messages/GUIMessage.hpp>
+#include <vfs.hpp>
+
+#include <cstdio>
+#include <cstring>
+#include <memory>
 
 enum class EinkWorkerCommands
 {

module-services/service-eink/ServiceEink.hpp

@@ -1,27 +1,16 @@
 // Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-/*
- * ServiceGUI.hpp
- *
- *  Created on: 22 maj 2019
- *      Author: robert
- */
+#pragma once
 
-#ifndef MODULE_SERVICES_SERVICE_EINK_SERVICEEINK_HPP_
-#define MODULE_SERVICES_SERVICE_EINK_SERVICEEINK_HPP_
+#include <EinkIncludes.hpp>
+#include <Service/Common.hpp>
+#include <Service/Message.hpp>
+#include <Service/Service.hpp>
+#include <Service/Timer.hpp>
 
-//#include "board.h"
-
-#include <stdint.h> // for uint32_t, int32_t, int8_t, uint8_t
-#include <string>   // for string, allocator
-
-#include "Service/Service.hpp" // for Service
-#include "Service/Message.hpp" // for Message_t, DataMessage (ptr only), ResponseMessage (ptr only)
-// eink bsp
-#include "EinkIncludes.hpp"   // for EinkWaveFormSettings_t, EinkWaveforms_e
-#include "Service/Timer.hpp"  // for Timer, ms
-#include "Service/Common.hpp" // for ReturnCodes, ServicePowerMode
+#include <cstdint>
+#include <string>
 
 class ServiceEink : public sys::Service
 {
@@ -74,5 +63,3 @@ class ServiceEink : public sys::Service
 
     sys::ReturnCodes SwitchPowerModeHandler(const sys::ServicePowerMode mode) override final;
 };
-
-#endif /* MODULE_SERVICES_SERVICE_EINK_SERVICEEINK_HPP_ */

module-services/service-eink/board/linux/renderer/src/RArea.cpp

@@ -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
 
-#include <cairomm/context.h> // for Context
-#include <gdkmm/pixbuf.h>    // for Pixbuf, COLORSPACE_RGB
-#include <glib.h>            // for guchar
-
 #include "RArea.hpp"
-#include "cairomm/refptr.h" // for RefPtr
-#include "gdkmm/general.h"  // for set_source_pixbuf
-#include "glibmm/refptr.h"  // for RefPtr
-#include "gtkmm/widget.h"   // for Allocation
+
+#include <cairomm/context.h>
+#include <cairomm/refptr.h>
+#include <gdkmm/general.h>
+#include <gdkmm/pixbuf.h>
+#include <gtkmm/widget.h>
+#include <glibmm/refptr.h>
+#include <glib.h>
 
 RArea::RArea() : data{nullptr}
 {}

module-services/service-eink/board/linux/renderer/src/RArea.hpp

@@ -1,19 +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
 
-/*
- * RArea.hpp
- *
- *  Created on: 24 kwi 2019
- *      Author: robert
- */
-
-#ifndef RENDERER_RAREA_HPP_
-#define RENDERER_RAREA_HPP_
+#pragma once
 
 #include <cairomm/context.h>
 #include <gtkmm.h>
-#include <gtkmm/drawingarea.h> // for DrawingArea
+#include <gtkmm/drawingarea.h>
 
 namespace Cairo
 {
@@ -36,5 +28,3 @@ class RArea : public Gtk::DrawingArea
     char *data;
     bool on_draw(const Cairo::RefPtr<Cairo::Context> &cr) override;
 };
-
-#endif /* RENDERER_RAREA_HPP_ */

module-services/service-eink/board/linux/renderer/src/RWindow.cpp

@@ -1,24 +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
 
-#include <glib.h>   // for g_timeout_add, gboolean, gpointer
-#include <stddef.h> // for size_t
-#include <unistd.h> // for write, ssize_t
-/*
- * RWindow.cpp
- *
- *  Created on: 24 kwi 2019
- *      Author: robert
- */
-#include <map>     // for map, operator!=, _Rb_tree_iterator<>::_Self, map<>::iterator, operator==, _Rb_tree_iterator
-#include <utility> // for pair
-
 #include "RWindow.hpp"
-#include "module-bsp/bsp/keyboard/key_codes.hpp" // for KeyCodes, KeyCodes::FnLeft, KeyCodes::FnRight, KeyCodes::JoystickDown, KeyCodes::JoystickEnter, KeyCodes::JoystickLeft, KeyCodes::JoystickRight, KeyCodes::JoystickUp, KeyCodes::NumericKey0, KeyCodes::NumericKey1, KeyCodes::NumericKey2, KeyCodes::NumericKey3, KeyCodes::NumericKey4, KeyCodes::NumericKey5, KeyCodes::NumericKey6, KeyCodes::NumericKey7, KeyCodes::NumericKey8, KeyCodes::NumericKey9, KeyCodes::NumericKeyAst, KeyCodes::NumericKeyPnd, KeyCodes::SSwitchDown, KeyCodes::SSwitchMid, KeyCodes::SSwitchUp, KeyCodes::Torch, KeyCodes::VolDown, KeyCodes::VolUp
-#include "module-bsp/bsp/common.hpp"             // for KeyEvents, KeyEvents::Pressed, KeyEvents::Released
-#include "glibmm/signalproxy.h"                  // for SignalProxy
-#include "module-services/service-eink/board/linux/renderer/src/RArea.hpp" // for RArea
-#include "sigc++/functors/mem_fun.h"                                       // for bound_mem_functor1, mem_fun
+
+#include <module-bsp/bsp/common.hpp>
+#include <module-bsp/bsp/keyboard/key_codes.hpp>
+#include <module-services/service-eink/board/linux/renderer/src/RArea.hpp>
+
+#include <glibmm/signalproxy.h>
+#include <sigc++/functors/mem_fun.h>
+
+#include <cstddef>
+#include <glib.h>
+#include <map>
+#include <unistd.h>
+#include <utility>
 
 static gboolean viewUpdate(gpointer data)
 {

module-services/service-eink/board/linux/renderer/src/RWindow.hpp

@@ -1,25 +1,19 @@
-// 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
 
-/*
- * RWindow.hpp
- *
- *  Created on: 24 kwi 2019
- *      Author: robert
- */
+#pragma once
 
-#ifndef RENDERER_RWINDOW_HPP_
-#define RENDERER_RWINDOW_HPP_
+#include "RArea.hpp"
 
+#include <module-bsp/bsp/keyboard/key_codes.hpp>
+
+#include <gdk/gdk.h>
 #include <gtkmm.h>
 #include <gtkmm/drawingarea.h>
-#include <gdk/gdk.h> // for GdkEventKey
-#include <map>       // for map
-#include <cstdint>   // for uint32_t, int8_t
+#include <gtkmm/window.h>
 
-#include "RArea.hpp" // for RArea
-#include "module-bsp/bsp/keyboard/key_codes.hpp"
-#include "gtkmm/window.h" // for Window
+#include <cstdint>
+#include <map>
 
 class RWindow : public Gtk::Window
 {
@@ -52,5 +46,3 @@ class RWindow : public Gtk::Window
 
     void updateDrawBuffer();
 };
-
-#endif /* RENDERER_RWINDOW_HPP_ */

module-services/service-eink/board/linux/renderer/src/gui_renderer.cpp

@@ -1,27 +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
 
-//============================================================================
-// Name        : pure-gui.cpp
-// Author      :
-// Version     :
-// Copyright   : Your copyright notice
-// Description : Hello World in C++, Ansi-style
-//============================================================================
-
-#include <sys/mman.h>          // for mmap, shm_open, MAP_FAILED, MAP_SHARED, PROT_READ, PROT_WRITE
-#include <sys/stat.h>          // for mkfifo
-#include <fcntl.h>             // for open, O_WRONLY, O_NONBLOCK, O_CREAT, O_RDWR
-#include <unistd.h>            // for ftruncate
-#include <gtkmm/application.h> // for Application
-#include <errno.h>             // for errno
-#include <stdint.h>            // for uint32_t, uint8_t
-#include <iostream>            // for operator<<, basic_ostream, endl, char_traits, ostream, cerr, cout, std
-#include <cstring>             // for strerror, NULL
-#include <string>              // for string, allocator
-
-#include "RWindow.hpp"     // for RWindow
-#include "glibmm/refptr.h" // for RefPtr
+#include "RWindow.hpp"
+
+#include <glibmm/refptr.h>
+#include <fcntl.h>
+#include <gtkmm/application.h>
+#include <sys/mman.h>
+#include <sys/stat.h>
+
+#include <unistd.h>
+
+#include <cstdint>
+#include <cstring>
+#include <errno.h>
+#include <iostream>
+#include <string>
 
 using namespace std;