Merge pull request #11 from robertpaulp/master

Restructured project

CMakeLists.txt

@@ -18,6 +18,20 @@ if(WIN32)
 else()
     set(USERHOME $ENV{HOME})
 endif()
+set(sdkVersion 2.1.0)
+set(toolchainVersion 13_3_Rel1)
+set(picotoolVersion 2.1.0)
+set(picoVscode ${USERHOME}/.pico-sdk/cmake/pico-vscode.cmake)
+if (EXISTS ${picoVscode})
+    include(${picoVscode})
+endif()
+# ====================================================================================
+# == DO NOT EDIT THE FOLLOWING LINES for the Raspberry Pi Pico VS Code Extension to work ==
+if(WIN32)
+    set(USERHOME $ENV{USERPROFILE})
+else()
+    set(USERHOME $ENV{HOME})
+endif()
 set(sdkVersion 2.0.0)
 set(toolchainVersion 13_2_Rel1)
 set(picotoolVersion 2.0.0)
@@ -65,8 +79,6 @@ pico_sdk_init()
 
 add_subdirectory(manchester_codec)
 
-add_subdirectory(framing)
-
 add_subdirectory(ethernet)
 
 add_executable(pico_prj pico_prj.cpp )
@@ -85,9 +97,6 @@ target_link_libraries(pico_prj
 target_link_libraries(pico_prj
         manchester_codec)
 
-target_link_libraries(pico_prj
-        framing)
-
 target_link_libraries(pico_prj
         ethernet)
 

build/CMakeFiles/rules.ninja

@@ -120,47 +120,6 @@ rule CXX_STATIC_LIBRARY_LINKER__manchester_codec_Release
   restat = $RESTAT
 
 
-#############################################
-# Rule for compiling ASM files.
-
-rule ASM_COMPILER__framing_unscanned_Release
-  depfile = $DEP_FILE
-  deps = gcc
-  command = ${LAUNCHER}${CODE_CHECK}C:\Users\rober\.pico-sdk\toolchain\13_2_Rel1\bin\arm-none-eabi-gcc.exe $DEFINES $INCLUDES $FLAGS -MD -MT $out -MF $DEP_FILE -o $out   -c $in
-  description = Building ASM object $out
-
-
-#############################################
-# Rule for compiling C files.
-
-rule C_COMPILER__framing_unscanned_Release
-  depfile = $DEP_FILE
-  deps = gcc
-  command = ${LAUNCHER}${CODE_CHECK}C:\Users\rober\.pico-sdk\toolchain\13_2_Rel1\bin\arm-none-eabi-gcc.exe $DEFINES $INCLUDES $FLAGS -MD -MT $out -MF $DEP_FILE -o $out -c $in
-  description = Building C object $out
-
-
-#############################################
-# Rule for compiling CXX files.
-
-rule CXX_COMPILER__framing_unscanned_Release
-  depfile = $DEP_FILE
-  deps = gcc
-  command = ${LAUNCHER}${CODE_CHECK}C:\Users\rober\.pico-sdk\toolchain\13_2_Rel1\bin\arm-none-eabi-g++.exe $DEFINES $INCLUDES $FLAGS -MD -MT $out -MF $DEP_FILE -o $out -c $in
-  description = Building CXX object $out
-
-
-#############################################
-# Rule for linking CXX static library.
-
-rule CXX_STATIC_LIBRARY_LINKER__framing_Release
-  command = C:\WINDOWS\system32\cmd.exe /C "$PRE_LINK && C:\Users\rober\.pico-sdk\cmake\v3.29.9\bin\cmake.exe -E rm -f $TARGET_FILE && C:\Users\rober\.pico-sdk\toolchain\13_2_Rel1\bin\arm-none-eabi-ar.exe qc $TARGET_FILE $LINK_FLAGS @$RSP_FILE && C:\Users\rober\.pico-sdk\toolchain\13_2_Rel1\bin\arm-none-eabi-ranlib.exe $TARGET_FILE && $POST_BUILD"
-  description = Linking CXX static library $TARGET_FILE
-  rspfile = $RSP_FILE
-  rspfile_content = $in $LINK_PATH $LINK_LIBRARIES
-  restat = $RESTAT
-
-
 #############################################
 # Rule for compiling ASM files.
 
@@ -206,7 +165,7 @@ rule CXX_STATIC_LIBRARY_LINKER__ethernet_Release
 # Rule for re-running cmake.
 
 rule RERUN_CMAKE
-  command = C:\Users\rober\.pico-sdk\cmake\v3.29.9\bin\cmake.exe --regenerate-during-build -SC:\Users\rober\Desktop\PICO_prj\real_branch\phys-electric -BC:\Users\rober\Desktop\PICO_prj\real_branch\phys-electric\build
+  command = C:\Users\rober\.pico-sdk\cmake\v3.29.9\bin\cmake.exe --regenerate-during-build -SC:\Users\rober\Desktop\PICO_prj\refresh\phys-electric -BC:\Users\rober\Desktop\PICO_prj\refresh\phys-electric\build
   description = Re-running CMake...
   generator = 1
 

build/cmake_install.cmake

@@ -1,4 +1,4 @@
-# Install script for directory: C:/Users/rober/Desktop/PICO_prj/real_branch/phys-electric
+# Install script for directory: C:/Users/rober/Desktop/PICO_prj/refresh/phys-electric
 
 # Set the install prefix
 if(NOT DEFINED CMAKE_INSTALL_PREFIX)
@@ -39,10 +39,9 @@ endif()
 
 if(NOT CMAKE_INSTALL_LOCAL_ONLY)
   # Include the install script for each subdirectory.
-  include("C:/Users/rober/Desktop/PICO_prj/real_branch/phys-electric/build/pico-sdk/cmake_install.cmake")
-  include("C:/Users/rober/Desktop/PICO_prj/real_branch/phys-electric/build/manchester_codec/cmake_install.cmake")
-  include("C:/Users/rober/Desktop/PICO_prj/real_branch/phys-electric/build/framing/cmake_install.cmake")
-  include("C:/Users/rober/Desktop/PICO_prj/real_branch/phys-electric/build/ethernet/cmake_install.cmake")
+  include("C:/Users/rober/Desktop/PICO_prj/refresh/phys-electric/build/pico-sdk/cmake_install.cmake")
+  include("C:/Users/rober/Desktop/PICO_prj/refresh/phys-electric/build/manchester_codec/cmake_install.cmake")
+  include("C:/Users/rober/Desktop/PICO_prj/refresh/phys-electric/build/ethernet/cmake_install.cmake")
 
 endif()
 
@@ -54,5 +53,5 @@ endif()
 
 string(REPLACE ";" "\n" CMAKE_INSTALL_MANIFEST_CONTENT
        "${CMAKE_INSTALL_MANIFEST_FILES}")
-file(WRITE "C:/Users/rober/Desktop/PICO_prj/real_branch/phys-electric/build/${CMAKE_INSTALL_MANIFEST}"
+file(WRITE "C:/Users/rober/Desktop/PICO_prj/refresh/phys-electric/build/${CMAKE_INSTALL_MANIFEST}"
      "${CMAKE_INSTALL_MANIFEST_CONTENT}")