nemunaire/waveshareteam-e-Paper
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge 4d90c425bc into 751a9fb93f

Browse source
This commit is contained in:
Prime9999 2020-09-11 22:41:38 +09:00 • committed by GitHub
commit 00459cdb98
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 60 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
RaspberryPi&JetsonNano/c/Makefile
View file

@ -14,13 +14,16 @@ JETSON_DEV_C = $(wildcard $(DIR_BIN)/sysfs_software_spi.o $(DIR_BIN)/sysfs_gpio.
DEBUG = -D DEBUG
# USELIB_RPI = USE_BCM2835_LIB
USELIB_RPI = USE_WIRINGPI_LIB
# USELIB_RPI = USE_WIRINGPI_LIB
USELIB_RPI = USE_PIGPIO_LIB
# USELIB_RPI = USE_DEV_LIB
ifeq ($(USELIB_RPI), USE_BCM2835_LIB)
LIB_RPI = -lbcm2835 -lm
else ifeq ($(USELIB_RPI), USE_WIRINGPI_LIB)
LIB_RPI = -lwiringPi -lm
else ifeq ($(USELIB_RPI), USE_PIGPIO_LIB)
LIB_RPI = -lpigpio -lrt -lm
else ifeq ($(USELIB_RPI), USE_DEV_LIB)
LIB_RPI = -lm
endif

54
RaspberryPi&JetsonNano/c/lib/Config/DEV_Config.c
View file

@ -38,6 +38,14 @@ int EPD_DC_PIN;
int EPD_CS_PIN;
int EPD_BUSY_PIN;
#ifdef RPI
#ifdef USE_BCM2835_LIB
#elif USE_WIRINGPI_LIB
#elif USE_PIGPIO_LIB
int spiHandle = -1;
#endif
#endif
/**
* GPIO read and write
**/
@ -48,6 +56,8 @@ void DEV_Digital_Write(UWORD Pin, UBYTE Value)
bcm2835_gpio_write(Pin, Value);
#elif USE_WIRINGPI_LIB
digitalWrite(Pin, Value);
#elif USE_PIGPIO_LIB
gpioWrite(Pin, Value);
#elif USE_DEV_LIB
SYSFS_GPIO_Write(Pin, Value);
#endif
@ -70,6 +80,8 @@ UBYTE DEV_Digital_Read(UWORD Pin)
Read_value = bcm2835_gpio_lev(Pin);
#elif USE_WIRINGPI_LIB
Read_value = digitalRead(Pin);
#elif USE_PIGPIO_LIB
Read_value = gpioRead(Pin);
#elif USE_DEV_LIB
Read_value = SYSFS_GPIO_Read(Pin);
#endif
@ -95,6 +107,8 @@ void DEV_SPI_WriteByte(uint8_t Value)
bcm2835_spi_transfer(Value);
#elif USE_WIRINGPI_LIB
wiringPiSPIDataRW(0,&Value,1);
#elif USE_PIGPIO_LIB
spiWrite(spiHandle,&Value,1);
#elif USE_DEV_LIB
DEV_HARDWARE_SPI_TransferByte(Value);
#endif
@ -117,6 +131,8 @@ void DEV_SPI_Write_nByte(uint8_t *pData, uint32_t Len)
bcm2835_spi_transfernb(pData,rData,Len);
#elif USE_WIRINGPI_LIB
wiringPiSPIDataRW(0, pData, Len);
#elif USE_PIGPIO_LIB
spiWrite(spiHandle, pData, Len);
#elif USE_DEV_LIB
DEV_HARDWARE_SPI_Transfer(pData, Len);
#endif
@ -152,6 +168,14 @@ void DEV_GPIO_Mode(UWORD Pin, UWORD Mode)
pinMode(Pin, OUTPUT);
// Debug (" %d OUT \r\n",Pin);
}
#elif USE_PIGPIO_LIB
if(Mode == 0 || Mode == INPUT) {
gpioSetMode(Pin, PI_INPUT);
gpioSetPullUpDown(Pin, PI_PUD_UP);
} else {
gpioSetMode(Pin, PI_OUTPUT);
// Debug (" %d OUT \r\n",Pin);
}
#elif USE_DEV_LIB
SYSFS_GPIO_Export(Pin);
if(Mode == 0 || Mode == SYSFS_GPIO_IN) {
@ -184,6 +208,8 @@ void DEV_Delay_ms(UDOUBLE xms)
bcm2835_delay(xms);
#elif USE_WIRINGPI_LIB
delay(xms);
#elif USE_PIGPIO_LIB
gpioDelay(xms * 1000);
#elif USE_DEV_LIB
UDOUBLE i;
for(i=0; i < xms; i++) {
@ -229,14 +255,14 @@ static int DEV_Equipment_Testing(void)
if(i<5) {
printf("Unrecognizable\r\n");
} else {
char RPI_System[10] = {"Raspbian"};
for(i=0; i<6; i++) {
if(RPI_System[i]!= value_str[i]) {
// "/etc/issue" returns "Debian" on Raspberry Pi OS (64bit).
char RPI_System[][10] = {"Raspbian", "Debian"};
int f = 0;
if (memcmp(RPI_System[0], value_str, 6) && memcmp(RPI_System[1], value_str, 6)) {
printf("Please make JETSON !!!!!!!!!!\r\n");
return -1;
}
}
}
#endif
#ifdef JETSON
if(i<5) {
@ -320,6 +346,19 @@ UBYTE DEV_Module_Init(void)
DEV_GPIO_Init();
wiringPiSPISetup(0,10000000);
// wiringPiSPISetupMode(0, 32000000, 0);
#elif USE_PIGPIO_LIB
if(gpioInitialise() < 0) { //use BCM2835 Pin number table
printf("set pigpio lib failed !!! \r\n");
return 1;
} else {
printf("set pigpio lib success !!! \r\n");
}
// GPIO Config
DEV_GPIO_Init();
spiHandle = spiOpen(0,10000000,0);
#elif USE_DEV_LIB
printf("Write and read /dev/spidev0.0 \r\n");
DEV_GPIO_Init();
@ -365,6 +404,13 @@ void DEV_Module_Exit(void)
DEV_Digital_Write(EPD_CS_PIN, 0);
DEV_Digital_Write(EPD_DC_PIN, 0);
DEV_Digital_Write(EPD_RST_PIN, 0);
#elif USE_PIGPIO_LIB
spiClose(spiHandle);
spiHandle = -1;
DEV_Digital_Write(EPD_CS_PIN, 0);
DEV_Digital_Write(EPD_DC_PIN, 0);
DEV_Digital_Write(EPD_RST_PIN, 0);
gpioTerminate();
#elif USE_DEV_LIB
DEV_HARDWARE_SPI_end();
DEV_Digital_Write(EPD_CS_PIN, 0);

4
RaspberryPi&JetsonNano/c/lib/Config/DEV_Config.h
View file

@ -62,6 +62,10 @@
#elif USE_WIRINGPI_LIB
#include <wiringPi.h>
#include <wiringPiSPI.h>
#elif USE_PIGPIO_LIB
#include <pigpio.h>
#define INPUT (PI_INPUT)
#define OUTPUT (PI_OUTPUT)
#elif USE_DEV_LIB
#include "RPI_sysfs_gpio.h"
#include "dev_hardware_SPI.h"