Merge branch 'RINA_Net' into CDAP_Protobuf

PSU-Capstone-Team24 · Feb 11, 2024 · ea36c60 · ea36c60
2 parents 10d188e + fc4fdfc
commit ea36c60
Show file tree

Hide file tree

Showing 47 changed files with 2,788 additions and 1,351 deletions.
diff --git a/eRINA_STM32F7/alire.toml b/eRINA_STM32F7/alire.toml
@@ -18,9 +18,9 @@ name = "erina_stm32f7"
 version = "0.1.0-dev"
 
 [[depends-on]]
-ada_enet = "0.1.0-dev"
 stm32_gui = "0.1.0"
 stm32f746disco = "0.1.0"
+
 [[pins]]
 gnat_arm_elf = { version='12.2.1' }
 

diff --git a/eRINA_STM32F7/config/erina_stm32f7_config.gpr b/eRINA_STM32F7/config/erina_stm32f7_config.gpr
@@ -1,5 +1,4 @@
 --  Configuration for erina_stm32f7 generated by Alire
-with "ada_enet.gpr";
 with "stm32_gui.gpr";
 with "stm32f746disco.gpr";
 abstract project Erina_Stm32f7_Config is

diff --git a/eRINA_STM32F7/erina_stm32f7.gpr b/eRINA_STM32F7/erina_stm32f7.gpr
@@ -6,11 +6,11 @@ project eRINA_STM32F7 is
    for Target use "arm-eabi";
    for Runtime ("Ada") use "embedded-" & stm32_hal_config.DEVICE & "disco";
 
-   for Source_Dirs use ("src/", "src/rina", "src/dns", "src/echo", "src/ping", "src/time", "src/utils", "src/net", "config/");
+   for Source_Dirs use ("src/", "src/rina", "src/net", "src/net/stm32", "config/");
    for Object_Dir use "obj/" & eRINA_STM32F7_Config.Build_Profile;
    for Create_Missing_Dirs use "True";
    for Exec_Dir use "bin";
-   for Main use ("dns.adb", "echo.adb", "ping.adb", "time.adb", "demo.adb", "test.adb");
+   for Main use ("demo.adb");
 
    package Compiler is
       for Default_Switches ("Ada") use eRINA_STM32F7_Config.Ada_Compiler_Switches & "-mno-unaligned-access";

diff --git a/eRINA_STM32F7/src/dns/dns.adb b/eRINA_STM32F7/src/dns/dns.adb
diff --git a/eRINA_STM32F7/src/echo/echo.adb b/eRINA_STM32F7/src/echo/echo.adb
diff --git a/eRINA_STM32F7/src/echo/echo_server.adb b/eRINA_STM32F7/src/echo/echo_server.adb
diff --git a/eRINA_STM32F7/src/echo/echo_server.ads b/eRINA_STM32F7/src/echo/echo_server.ads