Merge pull request #13 from cvetaevvitaliy/develop

Develop

CMakeLists.txt

@@ -5,13 +5,14 @@ cmake_minimum_required(VERSION 3.7)
 
 set(VERSION_RELEASE 1)
 set(VERSION_MAJOR 0)
-set(VERSION_MINOR 5)
+set(VERSION_MINOR 6)
 set(VERSIONFW "${VERSION_RELEASE}.${VERSION_MAJOR}.${VERSION_MINOR}")
 
 add_definitions(-DSOFTWARE_VERSION=\"${VERSIONFW}\")
-add_definitions(-DUSE_USB_DEBUG_PRINTF)
+if (DEBUG STREQUAL ON)
+    add_definitions(-DUSE_USB_DEBUG_PRINTF)
+endif()
 
-# specify cross compilers and tools
 SET(CMAKE_C_COMPILER_WORKS 1)
 SET(CMAKE_C_COMPILER arm-none-eabi-gcc)
 SET(CMAKE_CXX_COMPILER_WORKS 1)
@@ -24,13 +25,6 @@ set(SIZE arm-none-eabi-size)
 
 SET(LINKER_SCRIPT ${CMAKE_SOURCE_DIR}/STM32F103TBUx_FLASH.ld)
 
-#Uncomment for hardware floating point
-#SET(FPU_FLAGS "-mfloat-abi=hard -mfpu=fpv4-sp-d16")
-#add_definitions(-DARM_MATH_CM4 -DARM_MATH_MATRIX_CHECK -DARM_MATH_ROUNDING -D__FPU_PRESENT=1)
-
-#Uncomment for software floating point
-#SET(FPU_FLAGS "-mfloat-abi=soft")
-
 SET(COMMON_FLAGS
     "-mcpu=cortex-m3 ${FPU_FLAGS} -mthumb -mthumb-interwork -ffunction-sections -fdata-sections \
     -g  -fno-common -fmessage-length=0 -specs=nosys.specs -specs=nano.specs")
@@ -42,16 +36,31 @@ SET(CMAKE_EXE_LINKER_FLAGS_INIT "-Wl,-gc-sections,--print-memory-usage -T ${LINK
 PROJECT(FatShark_Power_V1 C CXX ASM)
 set(CMAKE_CXX_STANDARD 11)
 
-#add_definitions(-DARM_MATH_CM4 -DARM_MATH_MATRIX_CHECK -DARM_MATH_ROUNDING -D__FPU_PRESENT=1)
 add_definitions(-D__weak=__attribute__\(\(weak\)\) -D__packed=__attribute__\(\(__packed__\)\) -DUSE_HAL_DRIVER -DSTM32F103xB)
 
-file(GLOB_RECURSE SOURCES "startup/*.*" "Middlewares/*.*" "Drivers/*.*" "Src/*.*" "Inc/*.*"
-            "ssd1306/*.*"
-            "ssd1306/Image/*.*"
-            "ssd1306/Fonts/*.*"
-            "Main_App/*.*")
-
-include_directories(Inc Drivers/STM32F1xx_HAL_Driver/Inc Drivers/STM32F1xx_HAL_Driver/Inc/Legacy Middlewares/ST/STM32_USB_Device_Library/Core/Inc Middlewares/ST/STM32_USB_Device_Library/Class/CDC/Inc Drivers/CMSIS/Device/ST/STM32F1xx/Include Drivers/CMSIS/Include
+# todo need implement multilingual UI
+set(GUI_LANGUAGE EN DE FR RU)
+foreach(LANGUAGE ${GUI_LANGUAGE})
+    if (TRANSLATIONS STREQUAL ${LANGUAGE})
+        add_definitions(-DTRANSLATIONS_${LANGUAGE})
+    endif()
+endforeach()
+
+file(GLOB_RECURSE SOURCES "startup/*.*"
+        "Middlewares/*.*"
+        "Drivers/*.*" "Src/*.*"
+        "Inc/*.*"
+        "ssd1306/*.*"
+        "ssd1306/Image/*.*"
+        "ssd1306/Fonts/*.*"
+        "Main_App/*.*")
+
+include_directories(Inc
+        Drivers/STM32F1xx_HAL_Driver/Inc
+        Drivers/STM32F1xx_HAL_Driver/Inc/Legacy
+        Middlewares/ST/STM32_USB_Device_Library/Core/Inc
+        Middlewares/ST/STM32_USB_Device_Library/Class/CDC/Inc
+        Drivers/CMSIS/Device/ST/STM32F1xx/Include Drivers/CMSIS/Include
         ssd1306 ssd1306/Fonts ssd1306/Image Main_App)
 
 add_executable(${PROJECT_NAME}.elf ${SOURCES} ${LINKER_SCRIPT})
@@ -63,6 +72,8 @@ set(HEX_FILE ${PROJECT_BINARY_DIR}/${PROJECT_NAME}-${VERSION_RELEASE}.${VERSION_
 set(BIN_FILE ${PROJECT_BINARY_DIR}/${PROJECT_NAME}-${VERSION_RELEASE}.${VERSION_MAJOR}.${VERSION_MINOR}.bin)
 
 add_custom_command(TARGET ${PROJECT_NAME}.elf POST_BUILD
+        #COMMAND ${SIZE} --format=SysV ${PROJECT_NAME}.elf
+        COMMAND ${SIZE} --format=berkeley ${PROJECT_NAME}.elf
         COMMAND ${CMAKE_OBJCOPY} -Oihex $<TARGET_FILE:${PROJECT_NAME}.elf> ${HEX_FILE}
         COMMAND ${CMAKE_OBJCOPY} -Obinary $<TARGET_FILE:${PROJECT_NAME}.elf> ${BIN_FILE}
         COMMENT "Building ${HEX_FILE}

Main_App/Debug.c

@@ -28,6 +28,7 @@ void Debug_Task(Device_Status_t *Data){
         printf("Battery_Info.fast_charge = %d\n\r",Data->Battery_Info.fast_charge);
         printf("Battery_Info.battery_discharging = %d\n\r",Data->Battery_Info.battery_discharging);
         printf("Data->Device_Settings.low_volt = %d\n\r",Data->Device_Settings.low_volt);
+        printf("Data->work_time_minute_auto_off = %d\n\r",Data->work_time_minute_auto_off);
 
 
     }