CMCS_Oscilloscope WIP

Author: JonathSpirit

Diff for: CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.23)
-project(Projet_KMC_simul)
+project(C51MicroControllerSimulator)
 
 include(FetchContent)
 
@@ -71,6 +71,11 @@ add_custom_command(TARGET ${CMAKE_PROJECT_NAME} PRE_BUILD
         "${PROJECT_SOURCE_DIR}/extensions/CMCS_GUI/data"
         $<TARGET_FILE_DIR:${CMAKE_PROJECT_NAME}>/data)
 
+add_custom_command(TARGET ${CMAKE_PROJECT_NAME} PRE_BUILD
+        COMMAND ${CMAKE_COMMAND} -E copy_directory
+        "${PROJECT_SOURCE_DIR}/extensions/CMCS_Oscilloscope/data"
+        $<TARGET_FILE_DIR:${CMAKE_PROJECT_NAME}>/data)
+
 add_custom_command(TARGET ${CMAKE_PROJECT_NAME} PRE_BUILD
         COMMAND ${CMAKE_COMMAND} -E copy_directory
         "${PROJECT_SOURCE_DIR}/data"
@@ -98,5 +103,5 @@ add_custom_command(TARGET ${CMAKE_PROJECT_NAME} PRE_BUILD
         $<TARGET_FILE_DIR:${CMAKE_PROJECT_NAME}>)
 
 #Extensions
-
-add_subdirectory(extensions/CMCS_GUI)
+add_subdirectory(extensions/CMCS_GUI)
+add_subdirectory(extensions/CMCS_Oscilloscope)

Diff for: extensions/CMCS_GUI/C_pin.cpp

@@ -13,8 +13,10 @@ Pin::Pin(const SDL_FPoint& pos, uint8_t* dataStat, std::size_t posStat,
     this->setPosition(pos);
 }
 
-void Pin::update(const SDL_Event& event)
+bool Pin::update(const SDL_Event& event)
 {
+    bool returnTrueIfPressed = false;
+
     if (event.type == SDL_MOUSEMOTION)
     {
         SDL_FPoint mousePos = {(float)event.motion.x, (float)event.motion.y};
@@ -42,6 +44,7 @@ void Pin::update(const SDL_Event& event)
                     this->g_stat = !this->g_stat;
                 }
             }
+            returnTrueIfPressed = true;
         }
     }
     else if (event.type == SDL_MOUSEBUTTONUP)
@@ -60,6 +63,8 @@ void Pin::update(const SDL_Event& event)
     {
         this->g_sprite.setColorMod({255, 255, 255, 255});
     }
+
+    return returnTrueIfPressed;
 }
 void Pin::draw(SDL_Renderer* renderer) const
 {
@@ -104,6 +109,15 @@ bool Pin::getStat() const
     return this->g_stat;
 }
 
+cmcs::Bits<uint8_t>& Pin::getBitsStat()
+{
+    return this->g_stat;
+}
+cmcs::Bits<uint8_t>& Pin::getBitsOutputMod()
+{
+    return this->g_outputMod;
+}
+
 void Pin::setOutputMod(bool mod)
 {
     this->g_outputMod = mod;

Diff for: extensions/CMCS_GUI/C_pin.hpp

@@ -12,7 +12,7 @@ class Pin
     Pin(const SDL_FPoint& pos, uint8_t* dataStat, std::size_t posStat,
         uint8_t* dataOutputMod, std::size_t posOutputMod);
 
-    void update(const SDL_Event& event);
+    bool update(const SDL_Event& event);
     void draw(SDL_Renderer* renderer) const;
 
     void setPosition(const SDL_FPoint& pos);
@@ -24,6 +24,9 @@ class Pin
     void setStat(bool stat);
     bool getStat() const;
 
+    cmcs::Bits<uint8_t>& getBitsStat();
+    cmcs::Bits<uint8_t>& getBitsOutputMod();
+
     void setOutputMod(bool mod);
 
 private:

Diff for: extensions/CMCS_GUI/main.cpp

@@ -8,6 +8,7 @@
 #include <string>
 #include <vector>
 #include <thread>
+#include <functional>
 
 #define NUM_OF_PORTS 3
 
@@ -16,6 +17,8 @@ using namespace cmcs;
 ShareableData* gCoreData;
 std::thread* gThread;
 bool gRunning;
+std::shared_ptr<SharedData> gPinPressedCallbacks;
+using gPinPressedCallbacks_t = std::vector<std::function<void(uint8_t*, std::size_t, uint8_t*, std::size_t)> >;
 
 void ThreadUpdate()
 {
@@ -94,10 +97,10 @@ void ThreadUpdate()
     float posx=0.0f;
     float posy=20.0f;
     pins.resize(NUM_OF_PORTS);
-    for (unsigned int i=0; i<NUM_OF_PORTS; ++i)
+    for (std::size_t i=0; i<NUM_OF_PORTS; ++i)
     {
         pins[i].reserve(8);
-        for (unsigned int a=0; a<8; ++a)
+        for (std::size_t a=0; a<8; ++a)
         {
             pins[i].emplace_back(SDL_FPoint{posx, posy}, dataPorts[i], 7-a, dataPortOutputModes[i], 7-a);
             pins[i].back().setLedTextures(textureLedOn, textureLedOff);
@@ -122,11 +125,20 @@ void ThreadUpdate()
             {
                 gRunning=false;
             }
-            for (unsigned int i=0; i<NUM_OF_PORTS; ++i)
+            for (std::size_t i=0; i<pins.size(); ++i)
             {
-                for (unsigned int a=0; a<8; ++a)
+                for (std::size_t a=0; a<pins[i].size(); ++a)
                 {
-                    pins[i][a].update(event);
+                    if ( pins[i][a].update(event) )
+                    {//The button has been pressed
+                        auto callbacks = gPinPressedCallbacks->acquirePointer<gPinPressedCallbacks_t>();
+                        for (auto& callback : *callbacks.second)
+                        {
+                            auto& stat = pins[i][a].getBitsStat();
+                            auto& outputMod = pins[i][a].getBitsOutputMod();
+                            callback(stat.getData(), stat.getPos(), outputMod.getData(), outputMod.getPos());
+                        }
+                    }
                 }
             }
         }
@@ -138,9 +150,9 @@ void ThreadUpdate()
 
         SDL_RenderClear(renderer);
 
-        for (unsigned int i=0; i<pins.size(); ++i)
+        for (std::size_t i=0; i<pins.size(); ++i)
         {
-            for (unsigned int a=0; a<pins[i].size(); ++a)
+            for (std::size_t a=0; a<pins[i].size(); ++a)
             {
                 pins[i][a].draw(renderer);
             }
@@ -163,6 +175,10 @@ void ThreadUpdate()
 
 CMCS_API void CMCSlib_Init(ShareableData& data)
 {
+    //Shared data with others extensions
+    static gPinPressedCallbacks_t pinPressedCallbacks;
+    gPinPressedCallbacks = data.add(&pinPressedCallbacks, "CMCS_GUI:pinPressedCallbacks");
+
     gRunning = true;
     gCoreData = &data;
     gThread = new std::thread(ThreadUpdate);
@@ -180,6 +196,8 @@ CMCS_API bool CMCSlib_Update()
 
 CMCS_API void CMCSlib_Uninit()
 {
+    gCoreData->remove("CMCS_GUI:pinPressedCallbacks");
+
     gRunning = false;
     if (gThread->joinable())
     {

Diff for: extensions/CMCS_Oscilloscope/CMakeLists.txt

@@ -0,0 +1,18 @@
+project(CMCS_Oscilloscope)
+
+set(CMAKE_CXX_STANDARD 17)
+
+set(CMAKE_SHARED_LIBRARY_PREFIX "")
+
+include_directories(${PROJECT_NAME} ${SDL2_INCLUDE_DIR})
+include_directories(${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/..)
+include_directories(${PROJECT_NAME} ${DRAWINGUTILS_INCLUDE_DIR})
+
+add_library(${PROJECT_NAME} SHARED)
+
+target_sources(${PROJECT_NAME} PRIVATE main.cpp)
+target_sources(${PROJECT_NAME} PRIVATE main.hpp)
+
+target_sources(${PROJECT_NAME} PRIVATE ../CMCS_API.hpp)
+
+target_link_libraries(${PROJECT_NAME} SDL2 SDL2_ttf drawingUtils replxx)