Graphics ready for merge (#1721)

* First Preview of graphics (#1641)

* Intial changes for Graphic merge

Move Graphic allocation and init to TargetHal. After SPI driver has been initialised.
Allow Graphics on devices without Spiram. Maybe look at  small displays. now gives out of memory error.
Tidy up CmakeLIst.txt as create process error has been fixed.
Change SPi to use new driver api

* Graphic updates 2

Update copyright
Remove GraphicsInitialise.cpp
Make Spi_to_Display.cpp generic and move
Update cpu_spi.cpp
Now complete for ESP32

* Graphics update 3

* Update CMakeSettings.json

* Code style fixes

Automated fixes for code style.

* change for review

Delete spurios CPU_GPIO.decl.h header

* Removed Graphics Memory config and added wrover config to variants

* Update copyright header

* Update Jpeg files with .Net foundation header

Co-authored-by: TerryFogg <[email protected]>
Co-authored-by: nfbot <[email protected]>
Co-authored-by: José Simões <[email protected]>

Author: 4 people

CMake/Modules/FindnanoFramework.Graphics.cmake

@@ -0,0 +1,134 @@
+#
+# Copyright (c) .NET Foundation and Contributors
+# See LICENSE file in the project root for full license information.
+#
+ 
+list(APPEND nanoFramework.Graphics_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}/src/nanoFramework.Runtime.Events")
+list(APPEND nanoFramework.Graphics_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}/src/PAL/include")
+list(APPEND nanoFramework.Graphics_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}/src/nanoFramework.Graphics/Graphics/Core")
+list(APPEND nanoFramework.Graphics_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}/src/nanoFramework.Graphics/Graphics/Core/Support/Gif")
+list(APPEND nanoFramework.Graphics_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}/src/nanoFramework.Graphics/Graphics/Core/Support/Jpeg")
+list(APPEND nanoFramework.Graphics_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}/src/nanoFramework.Graphics/Graphics/Native")
+list(APPEND nanoFramework.Graphics_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}/src/nanoFramework.Graphics/TouchPanel/Core")
+list(APPEND nanoFramework.Graphics_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}/src/nanoFramework.Graphics/Graphics/Displays")
+list(APPEND nanoFramework.Graphics_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}/src/nanoFramework.Graphics/TouchPanel/Devices")
+
+ set (  nanoFramework.Graphics_SRCS
+        nanoPAL_Events_functions.cpp
+        nanoPAL_Events_driver.cpp
+        Bitmap_Decoder.cpp
+        Font.cpp
+        Gif.cpp
+        GifDecoder.cpp
+        lzwread.cpp
+        jbytearraydatasrc.c
+        jcapimin.c
+        jcapistd.c
+        jccoefct.c
+        jccolor.c
+        jcdctmgr.c
+        jchuff.c
+        jcinit.c
+        jcmainct.c
+        jcmarker.c
+        jcmaster.c
+        jcomapi.c
+        jcparam.c
+        jcphuff.c
+        jcprepct.c
+        jcsample.c
+        jctrans.c
+        jdapimin.c
+        jdapistd.c
+        jdcoefct.c
+        jdcolor.c
+        jddctmgr.c
+        jdhuff.c
+        jdinput.c
+        jdmainct.c
+        jdmarker.c
+        jdmaster.c
+        jdmerge.c
+        jdphuff.c
+        jdpostct.c
+        jdsample.c
+        jdtrans.c
+        jerror.c
+        jfdctflt.c
+        jfdctfst.c
+        jfdctint.c
+        jidctflt.c
+        jidctfst.c
+        jidctint.c
+        jidctred.c
+        jmemmgr.c
+        jmemnanoclr.cpp
+        Jpeg.cpp
+        jquant1.c
+        jquant2.c
+        jutils.c
+        mcbcr.c
+        mfint.c
+        miint.c
+        pfint.c
+        piint.c
+        transupp.c
+        Graphics.cpp
+        GraphicsDriver.cpp
+        GraphicsMemoryHeap.cpp
+        
+        nanoFramework_Graphics.cpp
+        nanoFramework_Graphics_nanoFramework_UI_Ink.cpp
+        nanoFramework_Graphics_nanoFramework_UI_TouchCollectorConfiguration.cpp
+        nanoFramework_Graphics_nanoFramework_UI_TouchEventProcessor.cpp
+        nanoFramework_Graphics_nanoFramework_UI_TouchPanel.cpp
+        nanoFramework_Graphics_nanoFramework_UI_Bitmap.cpp
+        nanoFramework_Graphics_nanoFramework_UI_DisplayControl.cpp
+        nanoFramework_Graphics_nanoFramework_UI_Font.cpp
+        
+        TouchPanel.cpp
+        Gestures.cpp
+        Ink.cpp
+        
+        #Common Display/Touch Code
+        "${GRAPHICS_DISPLAY}"
+        "${TOUCHPANEL_DEVICE}"
+        
+        #Target board Display/Touch Code
+        Graphics_Memory.cpp
+        "${GRAPHICS_DISPLAY_INTERFACE}"
+        "${TOUCHPANEL_INTERFACE}"
+)
+
+foreach(SRC_FILE ${nanoFramework.Graphics_SRCS})
+    set(nanoFramework.Graphics_SRC_FILE ${SRC_FILE}-NOTFOUND)
+    find_file(nanoFramework.Graphics_SRC_FILE ${SRC_FILE}
+        PATHS 
+        "${PROJECT_SOURCE_DIR}/src/PAL/Events"
+        "${PROJECT_SOURCE_DIR}/src/CLR/Core"
+        
+        "${PROJECT_SOURCE_DIR}/src/nanoFramework.Graphics/Graphics/Core"
+        "${PROJECT_SOURCE_DIR}/src/nanoFramework.Graphics/Graphics/Core/Support/Bmp"
+        "${PROJECT_SOURCE_DIR}/src/nanoFramework.Graphics/Graphics/Core/Support/Fonts"
+        "${PROJECT_SOURCE_DIR}/src/nanoFramework.Graphics/Graphics/Core/Support/Gif"
+        "${PROJECT_SOURCE_DIR}/src/nanoFramework.Graphics/Graphics/Core/Support/Jpeg"
+        "${PROJECT_SOURCE_DIR}/src/nanoFramework.Graphics/Graphics/Displays"
+        "${PROJECT_SOURCE_DIR}/src/nanoFramework.Graphics/Graphics/Native"
+        "${PROJECT_SOURCE_DIR}/src/nanoFramework.Graphics/TouchPanel/Core"
+        "${PROJECT_SOURCE_DIR}/src/nanoFramework.Graphics/TouchPanel/Devices"
+
+        "${TARGET_BASE_LOCATION}/nanoCLR/nanoFramework.Graphics" 
+
+        CMAKE_FIND_ROOT_PATH_BOTH     )
+
+        if( ${nanoFramework.Graphics_SRC_FILE} STREQUAL "nanoFramework.Graphics_SRC_FILE-NOTFOUND")
+           message( "___________________________________________________________________________")
+           message( "Cannot find file : ${SRC_FILE} in FindnanoFramework.Graphics.cmake")
+           message( "___________________________________________________________________________")
+        endif()
+
+    list(APPEND nanoFramework.Graphics_SOURCES ${nanoFramework.Graphics_SRC_FILE} )
+endforeach()
+
+include(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(nanoFramework.Graphics DEFAULT_MSG nanoFramework.Graphics_INCLUDE_DIRS nanoFramework.Graphics_SOURCES)

CMake/Modules/FindnanoFramework.ResourceManager.cmake

@@ -8,6 +8,11 @@
 list(APPEND nanoFramework.ResourceManager_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}/src/HAL/Include")
 list(APPEND nanoFramework.ResourceManager_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}/src/nanoFramework.ResourceManager")
 
+if(API_nanoFramework.Graphics)
+list(APPEND nanoFramework.ResourceManager_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}/src/nanoFramework.Graphics/Graphics/Core")
+list(APPEND nanoFramework.ResourceManager_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}/src/nanoFramework.Graphics/Graphics/Displays")
+endif()
+
 
 # source files
 set(nanoFramework.ResourceManager_SRCS

CMake/Modules/NF_NativeAssemblies.cmake

@@ -27,6 +27,7 @@ option(API_Windows.Devices.SerialCommunication  "option for Windows.Devices.Seri
 option(API_Windows.Devices.Spi                  "option for Windows.Devices.Spi API")
 option(API_Windows.Networking.Sockets           "option for Windows.Networking.Sockets")
 option(API_Windows.Storage                      "option for Windows.Storage")
+option(API_nanoFramework.Graphics               "option for nanoFramework.Graphics")
 
 
 # Esp32 only
@@ -106,6 +107,12 @@ macro(ParseNativeAssemblies)
         PerformSettingsForApiEntry("nanoFramework.Devices.Can")
     endif()
 
+    # nanoFramework.Graphics
+    if(API_nanoFramework.Graphics)
+        ##### API name here (doted name)
+        PerformSettingsForApiEntry("nanoFramework.Graphics")
+    endif()
+
     # nanoFramework.Devices.OneWire
     if(API_nanoFramework.Devices.OneWire)
         ##### API name here (doted name)

CMakeLists.txt

@@ -549,6 +549,15 @@ else()
     set(HAL_USE_STM32_ONEWIRE_OPTION FALSE CACHE INTERNAL "HAL STM32_ONEWIRE for nanoFramework.Devices.OneWire")
 endif()
 
+#################################################################################
+#  Option to include the graphics bitmap primitives
+#################################################################################
+if(API_nanoFramework.Graphics)
+    set(NANOCLR_GRAPHICS TRUE CACHE INTERNAL "Graphics Support")
+else()
+    set(NANOCLR_GRAPHICS FALSE CACHE INTERNAL "No Graphics Support")
+endif()
+
 if(NF_FEATURE_HAS_SDCARD)
     set(HAL_USE_SDC_OPTION TRUE CACHE INTERNAL "HAL SDC for NF_FEATURE_HAS_SDCARD")
 else()