Conan2 and minor layout fixes

Author: pgolovin

3rd_party/conan/conan.cmake

@@ -0,0 +1,6 @@
+[requires]
+gtest/1.15.0
+
+[generators]
+CMakeDeps
+CMakeToolchain

3rd_party/conan/conanfile.txt

@@ -5,17 +5,10 @@ project(stm_simulator_project)
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_BINARY_DIR})
 list(APPEND CMAKE_PREFIX_PATH ${CMAKE_BINARY_DIR})
 
-include(${PROJECT_SOURCE_DIR}/3rd_party/conan/conan.cmake)
-
-conan_cmake_configure(REQUIRES gtest/1.11.0 
-                      GENERATORS cmake_find_package)
-
-conan_cmake_autodetect(CONAN_SETTINGS)
-
-conan_cmake_install(PATH_OR_REFERENCE ${CMAKE_BINARY_DIR}
-                    BUILD missing
-                    REMOTE conancenter
-                    SETTINGS ${CONAN_SETTINGS})
+execute_process(COMMAND conan profile detect --force)
+execute_process(COMMAND conan install ${PROJECT_SOURCE_DIR}\\3rd_party\\conan --output-folder=${CMAKE_BINARY_DIR} --build=missing -s build_type=${CMAKE_BUILD_TYPE})
+#include(${CMAKE_BINARY_DIR}/conan_toolchain.cmake)
+add_compile_definitions(CMAKE_TOOLCHAIN_FILE="${CMAKE_BINARY_DIR}/conan_toolchain.cmake")
 
 # specify the C++ standard
 set(CMAKE_CXX_STANDARD 17)

CMakeLists.txt

@@ -80,8 +80,8 @@ int main(int argc, char** argv)
     Device device(ds);
     AttachDevice(device);
 
-    SDcardMock external_card(4096);
-    SDcardMock internal_card(4096);
+    SDcardMock external_card(256*1024); //128MB
+    SDcardMock internal_card(256*1024); //128MB
 
     app.config.storages[STORAGE_EXTERNAL] = &external_card;
     app.config.storages[STORAGE_INTERNAL] = &internal_card;
@@ -91,7 +91,7 @@ int main(int argc, char** argv)
 
     MKFS_PARM fs_params =
     {
-        FM_FAT,
+        FM_FAT32,
         1,
         0,
         0,

emulator/applications/printer_emulator/main.cpp

@@ -26,11 +26,16 @@ set(SOURCES
 # add sub-project
 add_executable(driver_tests ${SOURCES})
 
+find_package(GTest REQUIRED)
+
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/resources/model.gcode" "${CMAKE_BINARY_DIR}/bin/${CMAKE_BUILD_TYPE}/model.gcode" COPYONLY)
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/resources/wanhao.gcode" "${CMAKE_BINARY_DIR}/bin/${CMAKE_BUILD_TYPE}/wanhao.gcode" COPYONLY)
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/resources/pla.mtl" "${CMAKE_BINARY_DIR}/bin/${CMAKE_BUILD_TYPE}/pla.mtl" COPYONLY)
 
-target_link_libraries(driver_tests PUBLIC device_mock drivers libraries solutions fatfs GTest::gtest)
+target_link_libraries(driver_tests PUBLIC device_mock drivers libraries solutions fatfs 
+        GTest::GTest
+        GTest::gtest
+        GTest::gtest_main)
 target_include_directories(driver_tests PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 add_test(NAME drivers 
          COMMAND driver_tests.exe)

emulator/tests/CMakeLists.txt

@@ -269,7 +269,7 @@ static void DrawLabel(UI_CORE* ui, Label* label)
 
 static void DrawProgressFrame(UI_CORE* ui, Progress* progress)
 {
-    DrawRect(ui, &progress->frame, "", true, true, false, ui_item_frame, ui->color_schema[ColorMain], progress->font_height);
+    DrawRect(ui, &progress->frame, "", true, true, false, ui_item_frame, ui->color_schema[ColorMain], 0);
 }
 
 static void DrawProgressBar(UI_CORE* ui, Progress* progress, uint16_t previous_state)
@@ -722,7 +722,7 @@ void UI_SetProgressMaximum(HProgress hprogress, uint32_t new_maximum)
 void UI_ProgressStep(HProgress hprogress)
 {
     Progress* progress = (Progress*)hprogress;
-    UI_SetProgressValue(progress, progress->current_value + progress->step);
+    UI_SetProgressValue(hprogress, progress->current_value + progress->step);
 }
 
 uint32_t UI_GetProgressDrawPosition(HProgress hprogress)

lib/libraries/sources/user_interface.c

@@ -27,16 +27,16 @@ typedef struct
     HGCODE         interpreter;
 
     HFILEMANAGER file_manager;
-    FIL* file;
-    DIR* dir;
-    size_t gcode_blocks_count;
-    HSDCARD* storages;
-
-    HDRIVER driver;
-    HTOUCH htouch;
-    UI ui_handle;
+    FIL*      file;
+    DIR*      dir;
+    size_t    gcode_blocks_count;
+    HSDCARD*  storages;
+
+    HDRIVER    driver;
+    HTOUCH     htouch;
+    UI         ui_handle;
     HIndicator temperature[TERMO_REGULATOR_COUNT];
-    uint16_t current_temperature[TERMO_REGULATOR_COUNT];
+    uint16_t   current_temperature[TERMO_REGULATOR_COUNT];
 
     HIndicator operation_name;
     HProgress  progress;
@@ -142,7 +142,8 @@ HPRINTER Configure(PrinterConfiguration* cfg)
 
     printer->ui_handle = UI_Configure(cfg->hdisplay, viewport, 1, 1, false);
 
-    uint16_t colors[ColorsCount] = { 0x0000, 0x5BDF, 0x0007, 0xFEE0 };
+    //uint16_t colors[ColorsCount] = { 0x0000, 0x5BDF, 0x0007, 0xFEE0 };
+    uint16_t colors[ColorsCount] = { 0x0000, 0xa082, 0x0000, 0xf800 };
     UI_SetUIColors(printer->ui_handle, colors);
 
     DriverConfig drv_cfg = {
@@ -164,9 +165,6 @@ HPRINTER Configure(PrinterConfiguration* cfg)
         PrinterSetTemperature(printer->driver, i, 25, 0);
     }
 
-    Rect progress = { 0, 50, 320, 75 };
-    printer->progress = UI_CreateProgress(printer->ui_handle, 0, progress, false, LARGE_FONT, 0, 100, 1);
-
     Rect operation = { 100, 0, 220, 50 };
     printer->operation_name = UI_CreateIndicator(printer->ui_handle, 0, operation, "0000", LARGE_FONT, 0, true);
 
@@ -176,6 +174,9 @@ HPRINTER Configure(PrinterConfiguration* cfg)
     Rect indicator = { 220, 0, 320, 50 };
     printer->temperature[TERMO_TABLE] = UI_CreateIndicator(printer->ui_handle, 0, indicator, "0000", LARGE_FONT, 0, true);
 
+    Rect progress = { 0, 50, 320, 75 };
+    printer->progress = UI_CreateProgress(printer->ui_handle, 0, progress, false, LARGE_FONT, 0, 100, 1);
+
     Rect frame = { 0, 75, 320, 240 };
     printer->printing_frame = UI_CreateFrame(printer->ui_handle, 0, frame, true);