diff --git a/cores/arduino/SPI.cpp b/cores/arduino/hal/Maix_SPI.cpp similarity index 99% rename from cores/arduino/SPI.cpp rename to cores/arduino/hal/Maix_SPI.cpp index d0eb6e4..e4abe44 100644 --- a/cores/arduino/SPI.cpp +++ b/cores/arduino/hal/Maix_SPI.cpp @@ -6,7 +6,7 @@ #include "fpioa.h" #include "stdint.h" #include "stdbool.h" -#include "./kendryte-standalone-sdk/lib/drivers/include/spi.h" +#include "../kendryte-standalone-sdk/lib/drivers/include/spi.h" #include "SPI_hal.h" #include "sysctl.h" diff --git a/libraries/KPU/examples/mobilenet_v1/MBNet_1000.cpp b/libraries/Maxi_KPU/examples/mobilenet_v1/MBNet_1000.cpp similarity index 100% rename from libraries/KPU/examples/mobilenet_v1/MBNet_1000.cpp rename to libraries/Maxi_KPU/examples/mobilenet_v1/MBNet_1000.cpp diff --git a/libraries/KPU/examples/mobilenet_v1/MBNet_1000.h b/libraries/Maxi_KPU/examples/mobilenet_v1/MBNet_1000.h similarity index 97% rename from libraries/KPU/examples/mobilenet_v1/MBNet_1000.h rename to libraries/Maxi_KPU/examples/mobilenet_v1/MBNet_1000.h index 436f36c..95a8147 100644 --- a/libraries/KPU/examples/mobilenet_v1/MBNet_1000.h +++ b/libraries/Maxi_KPU/examples/mobilenet_v1/MBNet_1000.h @@ -11,7 +11,7 @@ #include "Sipeed_OV2640.h" #include "Sipeed_ST7789.h" #include -#include +#include #define KMODEL_SIZE (4220 * 1024) #define STATISTICS_NUM 5 diff --git a/libraries/KPU/examples/mobilenet_v1/mobilenet_v1.ino b/libraries/Maxi_KPU/examples/mobilenet_v1/mobilenet_v1.ino similarity index 97% rename from libraries/KPU/examples/mobilenet_v1/mobilenet_v1.ino rename to libraries/Maxi_KPU/examples/mobilenet_v1/mobilenet_v1.ino index 0241d38..1c76d40 100644 --- a/libraries/KPU/examples/mobilenet_v1/mobilenet_v1.ino +++ b/libraries/Maxi_KPU/examples/mobilenet_v1/mobilenet_v1.ino @@ -15,7 +15,7 @@ #include #include #include "MBNet_1000.h" - +#include "Maix_KPU.h" SPIClass spi_(SPI0); // MUST be SPI0 for Maix series on board LCD Sipeed_ST7789 lcd(320, 240, spi_); diff --git a/libraries/KPU/examples/mobilenet_v1/names.cpp b/libraries/Maxi_KPU/examples/mobilenet_v1/names.cpp similarity index 100% rename from libraries/KPU/examples/mobilenet_v1/names.cpp rename to libraries/Maxi_KPU/examples/mobilenet_v1/names.cpp diff --git a/libraries/KPU/examples/mobilenet_v1/names.h b/libraries/Maxi_KPU/examples/mobilenet_v1/names.h similarity index 100% rename from libraries/KPU/examples/mobilenet_v1/names.h rename to libraries/Maxi_KPU/examples/mobilenet_v1/names.h diff --git a/libraries/KPU/keywords.txt b/libraries/Maxi_KPU/keywords.txt similarity index 100% rename from libraries/KPU/keywords.txt rename to libraries/Maxi_KPU/keywords.txt diff --git a/libraries/KPU/library.properties b/libraries/Maxi_KPU/library.properties similarity index 92% rename from libraries/KPU/library.properties rename to libraries/Maxi_KPU/library.properties index abe87f7..452d6be 100644 --- a/libraries/KPU/library.properties +++ b/libraries/Maxi_KPU/library.properties @@ -1,4 +1,4 @@ -name=KPU +name=Maix_KPU version=1.0.0 author= Neucrack Sipeed maintainer=Sipeed diff --git a/libraries/KPU/src/KPU.cpp b/libraries/Maxi_KPU/src/Maix_KPU.cpp similarity index 98% rename from libraries/KPU/src/KPU.cpp rename to libraries/Maxi_KPU/src/Maix_KPU.cpp index bf507a1..83a904d 100644 --- a/libraries/KPU/src/KPU.cpp +++ b/libraries/Maxi_KPU/src/Maix_KPU.cpp @@ -1,6 +1,6 @@ -#include "KPU.h" +#include "Maix_KPU.h" #include "sysctl.h" diff --git a/libraries/KPU/src/KPU.h b/libraries/Maxi_KPU/src/Maix_KPU.h similarity index 94% rename from libraries/KPU/src/KPU.h rename to libraries/Maxi_KPU/src/Maix_KPU.h index 8ab2a42..706476f 100644 --- a/libraries/KPU/src/KPU.h +++ b/libraries/Maxi_KPU/src/Maix_KPU.h @@ -5,6 +5,9 @@ extern "C" { #include "kpu.h" } +#include "stdint.h" +#include "stdbool.h" + typedef enum{ KPU_ERROR_BUSY = -3, diff --git a/libraries/SPI/keywords.txt b/libraries/SPI/keywords.txt new file mode 100644 index 0000000..6399ef1 --- /dev/null +++ b/libraries/SPI/keywords.txt @@ -0,0 +1,35 @@ +####################################### +# Syntax Coloring Map SPI +####################################### + + ####################################### +# Datatypes (KEYWORD1) +####################################### + + SPI KEYWORD1 + + ####################################### +# Methods and Functions (KEYWORD2) +####################################### +begin KEYWORD2 +end KEYWORD2 +transfer KEYWORD2 +transferBytes KEYWORD2 +setBitOrder KEYWORD2 +setDataMode KEYWORD2 +setFrequency KEYWORD2 +beginTransaction KEYWORD2 +endTransaction KEYWORD2 +bus KEYWORD2 + + + ####################################### +# Constants (LITERAL1) +####################################### +SPI_MODE0 LITERAL1 +SPI_MODE1 LITERAL1 +SPI_MODE2 LITERAL1 +SPI_MODE3 LITERAL1 +SPI_MSBFIRST LITERAL1 +SPI0 LITERAL1 +SPI1 LITERAL1 \ No newline at end of file diff --git a/libraries/SPI/library.properties b/libraries/SPI/library.properties new file mode 100644 index 0000000..332afd8 --- /dev/null +++ b/libraries/SPI/library.properties @@ -0,0 +1,9 @@ +name=SPI +version=1.0 +author=Neucrack +maintainer=Neucrack +sentence=Enables the communication with devices that use the Serial Peripheral Interface (SPI) Bus. +paragraph=SPI is a synchronous serial data protocol used by microcontrollers for communicating with one or more peripheral devices quickly over short distances. It uses three lines common to all devices (MISO, MOSI and SCK) and one specific for each device. +category=Communication +url=http://arduino.cc/en/Reference/SPI +architectures=k210 \ No newline at end of file diff --git a/cores/arduino/SPI.h b/libraries/SPI/src/SPI.h similarity index 96% rename from cores/arduino/SPI.h rename to libraries/SPI/src/SPI.h index bc29b46..9f153bb 100644 --- a/cores/arduino/SPI.h +++ b/libraries/SPI/src/SPI.h @@ -1,5 +1,5 @@ -#ifndef __SPI_H -#define __SPI_H +#ifndef __SPI__fafefef_H +#define __SPI__fafefef_H #include "stdint.h" diff --git a/platform.txt b/platform.txt index 4b29615..d1b788c 100644 --- a/platform.txt +++ b/platform.txt @@ -27,7 +27,7 @@ compiler.debug.flags=-DCONFIG_LOG_ENABLE -DCONFIG_LOG_LEVEL=LOG_INFO -DDEBUG=1 - compiler.c.flags=-c {compiler.debug.flags} {compiler.both.flags} {compiler.preproc.flags} -std=gnu11 -Wno-pointer-to-int-cast -Wno-old-style-declaration -g -Wno-error=unused-variable -Wno-error=unused-function -Wno-error=unused-const-variable -compiler.cpp.flags=-c {compiler.debug.flags} {compiler.both.flags} {compiler.preproc.flags} -std=gnu++17 -g -Wno-error=unused-variable -Wno-error=unused-function -Wno-error=unused-const-variable +compiler.cpp.flags=-c {compiler.debug.flags} {compiler.both.flags} -I{runtime.platform.path}/libraries/SPI/src {compiler.preproc.flags} -std=gnu++17 -g -Wno-error=unused-variable -Wno-error=unused-function -Wno-error=unused-const-variable compiler.ld.flags=-mcmodel=medany -mabi=lp64f -march=rv64imafc -fno-common -ffunction-sections -fdata-sections -fstrict-volatile-bitfields -fno-zero-initialized-in-bss -Os -ggdb -nostartfiles -static -Wl,--gc-sections -Wl,-static -Wl,--whole-archive -Wl,--no-whole-archive -Wl,-EL -Wl,--no-relax -T {build.ldscript}