IMPORTANT rework folder naming system

Makefile

@@ -109,7 +109,7 @@ ifeq ($(ENABLE_UART),1)
 OBJS += driver/aes.o
 endif
 ifeq ($(ENABLE_MESSENGER),1)
-	OBJS += app/messenger.o
+	OBJS += apps/messenger.o
 endif
 OBJS += driver/backlight.o
 ifeq ($(ENABLE_FMRADIO),1)
@@ -135,33 +135,33 @@ OBJS += driver/uart.o
 endif
 
 # Main
-OBJS += app/action.o
+OBJS += main/action.o
 ifeq ($(ENABLE_AM_FIX),1)
 OBJS += am_fix.o
 endif
 ifeq ($(ENABLE_AIRCOPY),1)
-OBJS += app/aircopy.o
+OBJS += main/aircopy.o
 endif
-OBJS += app/app.o
-OBJS += app/dtmf.o
-OBJS += app/finput.o
+OBJS += main/app.o
+OBJS += main/dtmf.o
+OBJS += main/finput.o
 ifeq ($(ENABLE_FMRADIO),1)
-OBJS += app/fm.o
+OBJS += main/fm.o
 endif
-OBJS += app/generic.o
-OBJS += app/main.o
-OBJS += app/menu.o
-OBJS += app/appmenu.o
-OBJS += app/scanner.o
+OBJS += main/generic.o
+OBJS += main/main.o
+OBJS += main/menu.o
+OBJS += main/appmenu.o
+OBJS += main/scanner.o
 ifeq ($(ENABLE_SPECTRUM), 1)
-OBJS += app/spectrum.o
+OBJS += main/spectrum.o
 endif
 ifeq ($(ENABLE_SPECTRUM_NUNU), 1)
-OBJS += app/spectrumnunu.o
+OBJS += main/spectrumnunu.o
 endif
 
 ifeq ($(ENABLE_UART),1)
-OBJS += app/uart.o
+OBJS += main/uart.o
 endif
 OBJS += audio.o
 OBJS += bitmaps.o
@@ -188,7 +188,7 @@ ifeq ($(ENABLE_MESSENGER),1)
 	OBJS += ui/messenger.o
 endif
 ifeq ($(ENABLE_LIVESEEK_MHZ_KEYPAD),1)
-OBJS += app/ceccommon.o
+OBJS += main/ceccommon.o
 endif
 OBJS += ui/helper.o
 OBJS += ui/inputbox.o

am_fix.c

@@ -21,7 +21,7 @@
 #include <string.h>
 
 #include "am_fix.h"
-#include "app/main.h"
+#include "main/main.h"
 #include "board.h"
 #include "driver/bk4819.h"
 #include "external/printf/printf.h"

app/messenger.c → apps/messenger.c

@@ -8,11 +8,11 @@
 #include "misc.h"
 #include "settings.h"
 #include "radio.h"
-#include "app.h"
+#include "main/app.h"
 #include "audio.h"
 #include "functions.h"
 #include "driver/system.h"
-#include "app/messenger.h"
+#include "apps/messenger.h"
 #include "ui/ui.h"
 #include "ui/status.h"
 #include "frequencies.h"

audio.c

@@ -15,7 +15,7 @@
  */
 
 #if defined(ENABLE_FMRADIO)
-#include "app/fm.h"
+#include "main/fm.h"
 #endif
 #include "audio.h"
 #include "bsp/dp32g030/gpio.h"

board.c

@@ -16,9 +16,9 @@
  */
 
 #include <string.h>
-#include "app/dtmf.h"
+#include "main/dtmf.h"
 #if defined(ENABLE_FMRADIO)
-#include "app/fm.h"
+#include "main/fm.h"
 #endif
 #include "board.h"
 #include "bsp/dp32g030/gpio.h"
@@ -44,7 +44,7 @@
 #include "sram-overlay.h"
 #endif
 #ifdef ENABLE_LIVESEEK_MHZ_KEYPAD
-#include "app/ceccommon.h"
+#include "main/ceccommon.h"
 #endif
 
 static const uint32_t gDefaultFrequencyTable[5] = {

compile-with-docker.sh

@@ -1,3 +1,3 @@
 #!/bin/sh
 docker build -t uvk5 .
-docker run --rm -v ${PWD}/compiled-firmware:/app/compiled-firmware uvk5 /bin/bash -c "cd /app && make clean && make && cp firmware* compiled-firmware/"
+docker run --rm -v ${PWD}/compiled-firmware:/main/compiled-firmware uvk5 /bin/bash -c "cd /app && make clean && make && cp firmware* compiled-firmware/"

driver/bk4819old.c

@@ -23,7 +23,7 @@
 #include "../driver/uart.h"
 
 #ifdef ENABLE_CW
-#include "../app/scanner.h"
+#include "../main/scanner.h"
 #include "../audio.h"
 #include "../driver/bk4819.h"
 #include "../frequencies.h"
@@ -32,7 +32,7 @@
 #include "../settings.h"
 #include "../ui/inputbox.h"
 #include "../ui/ui.h"
-#include "../app/generic.h"
+#include "../main/generic.h"
 #endif
 
 #ifdef ENABLE_MDC

external/CMSIS_5/CMSIS/CoreValidation/Project/Bootloader.cproject.yml

@@ -3,7 +3,7 @@
 project:
   layers:
     # App: CMSIS-Core Validation for Cortex-M (Bootloader part)
-    - layer: ../Layer/App/Bootloader_Cortex-M/App.clayer.yml
+    - layer: ../Layer/main/Bootloader_Cortex-M/App.clayer.yml
       for-context:
         - .AC6_low
         - .AC6_mid

external/CMSIS_5/CMSIS/CoreValidation/Project/Validation.cproject.yml

@@ -3,7 +3,7 @@
 project:
   layers:
     # App: CMSIS-Core Validation for Cortex-M
-    - layer: ../Layer/App/Validation_Cortex-M/App.clayer.yml
+    - layer: ../Layer/main/Validation_Cortex-M/App.clayer.yml
       for-context:
         - +CM0
         - +CM0plus
@@ -28,7 +28,7 @@ project:
         - +CM85NS
 
     # App: CMSIS-Core Validation for Cortex-A
-    - layer: ../Layer/App/Validation_Cortex-A/App.clayer.yml
+    - layer: ../Layer/main/Validation_Cortex-A/App.clayer.yml
       for-context:
         - +CA5
         - +CA7

functions.c

@@ -14,13 +14,13 @@
  *     limitations under the License.
  */
 
-#include "app/dtmf.h"
+#include "main/dtmf.h"
 #include <string.h>
 #if defined(ENABLE_FMRADIO)
-#include "app/fm.h"
+#include "main/fm.h"
 #endif
 #ifdef ENABLE_MESSENGER
-	#include "app/messenger.h"
+	#include "apps/messenger.h"
 #endif
 #include "bsp/dp32g030/gpio.h"
 #include "dcs.h"

helper/boot.c

@@ -14,7 +14,7 @@
  *     limitations under the License.
  */
 
-#include "app/aircopy.h"
+#include "main/aircopy.h"
 #include "bsp/dp32g030/gpio.h"
 #include "driver/bk4819.h"
 #include "driver/keyboard.h"

main.c

@@ -14,10 +14,10 @@
  *     limitations under the License.
  */
 
-#include "app/app.h"
-#include "app/dtmf.h"
+#include "main/app.h"
+#include "main/dtmf.h"
 #ifdef ENABLE_MESSENGER
-	#include "app/messenger.h"
+	#include "apps/messenger.h"
 #endif
 
 #include "audio.h"
@@ -52,7 +52,7 @@
 
 #include "driver/eeprom.h"
 #ifdef ENABLE_LIVESEEK_MHZ_KEYPAD
-#include "app/ceccommon.h"
+#include "main/ceccommon.h"
 #endif
 
 void _putchar(char c) {

app/action.c → main/action.c

@@ -14,13 +14,13 @@
  *     limitations under the License.
  */
 
-#include "app/action.h"
-#include "app/app.h"
-#include "app/dtmf.h"
+#include "main/action.h"
+#include "main/app.h"
+#include "main/dtmf.h"
 #if defined(ENABLE_FMRADIO)
-#include "app/fm.h"
+#include "main/fm.h"
 #endif
-#include "app/scanner.h"
+#include "main/scanner.h"
 #include "audio.h"
 #include "bsp/dp32g030/gpio.h"
 #include "driver/bk1080.h"

app/aircopy.c → main/aircopy.c

@@ -14,7 +14,7 @@
  *     limitations under the License.
  */
 
-#include "app/aircopy.h"
+#include "main/aircopy.h"
 #include "audio.h"
 #include "driver/bk4819.h"
 #include "driver/crc.h"

app/app.c → main/app.c

@@ -14,29 +14,29 @@
  *     limitations under the License.
  */
 
-#include "app/action.h"
+#include "main/action.h"
 #include <string.h>
 #if defined(ENABLE_AIRCOPY)
-#include "app/aircopy.h"
+#include "main/aircopy.h"
 #endif
 #if defined(ENABLE_AM_FIX)
 #include "am_fix.h"
 #endif
-#include "app/app.h"
+#include "main/app.h"
 #include "dtmf.h"
 #if defined(ENABLE_FMRADIO)
-#include "app/fm.h"
+#include "main/fm.h"
 #endif
 #include "appmenu.h"
-#include "app/generic.h"
-#include "app/main.h"
-#include "app/menu.h"
-#include "app/scanner.h"
+#include "main/generic.h"
+#include "main/main.h"
+#include "main/menu.h"
+#include "main/scanner.h"
 #if defined(ENABLE_UART)
-#include "app/uart.h"
+#include "main/uart.h"
 #endif
 #ifdef ENABLE_MESSENGER
-	#include "messenger.h"
+	#include "apps/messenger.h"
 #endif
 #include "../apps/scanlist.h"
 #include "ARMCM0.h"

app/appmenu.c → main/appmenu.c

@@ -1,7 +1,7 @@
 #include "appmenu.h"
 #include "../ui/welcome.h"
 #ifdef ENABLE_MESSENGER
-	#include "../app/messenger.h"
+	#include "../apps/messenger.h"
   #include "frequencies.h"
   #include "external/printf/printf.h"
   #include "settings.h"

app/ceccommon.c → main/ceccommon.c

@@ -33,7 +33,7 @@ TADC_RANGE CW_KEY_ADC[3];
 
 //================================= For Reduce Use Memory ====================
 //gMR_ChannelAttributes[207]; -> function
-//resize to 7 byte and Move to app/ceccommon.c 
+//resize to 7 byte and Move to main/ceccommon.c 
 uint16_t CEC_GetRssi() 
 {
   int _wait_count = 0;

app/chFrScanner.c → main/chFrScanner.c

@@ -1,6 +1,6 @@
 
-#include "app/app.h"
-#include "app/chFrScanner.h"
+#include "main/app.h"
+#include "main/chFrScanner.h"
 #include "functions.h"
 #include "misc.h"
 #include "settings.h"

app/dtmf.c → main/dtmf.c

@@ -17,9 +17,9 @@
 
 #include <string.h>
 #if defined(ENABLE_FMRADIO)
-#include "app/fm.h"
+#include "main/fm.h"
 #endif
-#include "app/scanner.h"
+#include "main/scanner.h"
 #include "bsp/dp32g030/gpio.h"
 #include "driver/bk4819.h"
 #include "driver/eeprom.h"

app/fm.c → main/fm.c

@@ -15,9 +15,9 @@
  */
 
 #include <string.h>
-#include "app/action.h"
-#include "app/fm.h"
-#include "app/generic.h"
+#include "main/action.h"
+#include "main/fm.h"
+#include "main/generic.h"
 #include "audio.h"
 #include "bsp/dp32g030/gpio.h"
 #if defined(ENABLE_FMRADIO)

app/generic.c → main/generic.c

@@ -14,13 +14,13 @@
  *     limitations under the License.
  */
 
-#include "app/app.h"
+#include "main/app.h"
 #if defined(ENABLE_FMRADIO)
-#include "app/fm.h"
+#include "main/fm.h"
 #endif
-#include "app/generic.h"
-#include "app/menu.h"
-#include "app/scanner.h"
+#include "main/generic.h"
+#include "main/menu.h"
+#include "main/scanner.h"
 #include "audio.h"
 #include "driver/keyboard.h"
 #include "dtmf.h"