new menu

CMakeLists.txt

@@ -80,10 +80,9 @@ set(CMAKE_ASM_COMPILER arm-none-eabi-gcc)
 set(CMAKE_AR arm-none-eabi-ar)
 set(CMAKE_OBJCOPY arm-none-eabi-objcopy)
 set(CMAKE_OBJDUMP arm-none-eabi-objdump)
-set(SIZE arm-none-eabi-size)
+set(CMAKE_SIZE_UTIL arm-none-eabi-size)
 set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)
 
-message(${CMAKE_C_COMPILER})
 
 # project settings
 project(firmware ASM C)
@@ -170,7 +169,7 @@ set(HEX_FILE ${PROJECT_BINARY_DIR}/${PROJECT_NAME}.hex)
 set(BIN_FILE ${PROJECT_BINARY_DIR}/${PROJECT_NAME}.bin)
 
 add_custom_command(TARGET ${PROJECT_NAME}.elf POST_BUILD
-        COMMAND ${SIZE} $<TARGET_FILE:${PROJECT_NAME}.elf>
+        COMMAND ${CMAKE_SIZE_UTIL} $<TARGET_FILE:${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}
         COMMAND python3 ${CMAKE_SOURCE_DIR}/fw-pack.py ${BIN_FILE} ${GIT_HASH} ${PROJECT_NAME}.packed.bin

app/CMakeLists.txt

@@ -26,7 +26,8 @@ target_sources(firmware.elf PRIVATE
         ${CMAKE_CURRENT_SOURCE_DIR}/dtmf.c
         ${CMAKE_CURRENT_SOURCE_DIR}/generic.c
         ${CMAKE_CURRENT_SOURCE_DIR}/main.c
-        ${CMAKE_CURRENT_SOURCE_DIR}/menu.c
+ #       ${CMAKE_CURRENT_SOURCE_DIR}/menu.c
+        ${CMAKE_CURRENT_SOURCE_DIR}/menu_new.c
         ${CMAKE_CURRENT_SOURCE_DIR}/scanner.c
         ${CMAKE_CURRENT_SOURCE_DIR}/spectrum.c
         ${CMAKE_CURRENT_SOURCE_DIR}/userapps.c

app/app.c

@@ -26,7 +26,7 @@
 #endif
 #include "app/generic.h"
 #include "app/main.h"
-#include "app/menu.h"
+#include "app/menu_new.h"
 #include "app/scanner.h"
 #if defined(ENABLE_UART)
 #include "app/uart.h"
@@ -57,7 +57,6 @@
 #endif
 #include "ui/battery.h"
 #include "ui/inputbox.h"
-#include "ui/menu.h"
 #include "ui/rssi.h"
 #include "ui/status.h"
 #include "ui/ui.h"

app/generic.c

@@ -19,7 +19,7 @@
 #include "app/fm.h"
 #endif
 #include "app/generic.h"
-#include "app/menu.h"
+#include "app/menu_new.h"
 #include "app/scanner.h"
 #include "audio.h"
 #include "driver/keyboard.h"