Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support for Pi5 and the latest Raspberry PI system, Arudino upper and lower case character issues fixed #314

Merged
merged 3 commits into from
Nov 28, 2023
Merged

Support for Pi5 and the latest Raspberry PI system, Arudino upper and lower case character issues fixed #314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9303f14
Support for Pi5 and the latest Raspberry PI system, Arudino upper and…
shhds Nov 28, 2023
dec61d3
Support for Pi5 and the latest Raspberry PI system, Arudino upper and…
shhds Nov 28, 2023
4e1fc3c
Merge branch 'Development' into master
shhds Nov 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Arduino/epd1in64g/epdif.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
*/

#include "epdif.h"
#include <spi.h>
#include <SPI.h>

EpdIf::EpdIf() {
};
Expand Down Expand Up @@ -61,4 +61,4 @@ int EpdIf::IfInit(void) {
SPI.begin();
SPI.beginTransaction(SPISettings(2000000, MSBFIRST, SPI_MODE0));
return 0;
}
}
2 changes: 1 addition & 1 deletion Arduino/epd1in64g/epdif.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#ifndef EPDIF_H
#define EPDIF_H

#include <arduino.h>
#include <Arduino.h>

// Pin definition
#define RST_PIN 8
Expand Down
2 changes: 1 addition & 1 deletion Arduino/epd2in13d/epd2in13d.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#
******************************************************************************/
#include "epd2in13d.h"
#include <arduino.h>
#include <Arduino.h>
/**
* full screen update LUT
**/
Expand Down
4 changes: 2 additions & 2 deletions Arduino/epd2in36g/epdif.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
*/

#include "epdif.h"
#include <spi.h>
#include <SPI.h>

EpdIf::EpdIf() {
};
Expand Down Expand Up @@ -61,4 +61,4 @@ int EpdIf::IfInit(void) {
SPI.begin();
SPI.beginTransaction(SPISettings(2000000, MSBFIRST, SPI_MODE0));
return 0;
}
}
2 changes: 1 addition & 1 deletion Arduino/epd2in36g/epdif.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#ifndef EPDIF_H
#define EPDIF_H

#include <arduino.h>
#include <Arduino.h>

// Pin definition
#define RST_PIN 8
Expand Down
4 changes: 2 additions & 2 deletions Arduino/epd3in0g/epdif.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
*/

#include "epdif.h"
#include <spi.h>
#include <SPI.h>

EpdIf::EpdIf() {
};
Expand Down Expand Up @@ -61,4 +61,4 @@ int EpdIf::IfInit(void) {
SPI.begin();
SPI.beginTransaction(SPISettings(2000000, MSBFIRST, SPI_MODE0));
return 0;
}
}
2 changes: 1 addition & 1 deletion Arduino/epd3in0g/epdif.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#ifndef EPDIF_H
#define EPDIF_H

#include <arduino.h>
#include <Arduino.h>

// Pin definition
#define RST_PIN 8
Expand Down
2 changes: 1 addition & 1 deletion Arduino/epd4in37g/epdif.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
*/

#include "epdif.h"
#include <spi.h>
#include <SPI.h>

EpdIf::EpdIf() {
};
Expand Down
2 changes: 1 addition & 1 deletion Arduino/epd4in37g/epdif.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#ifndef EPDIF_H
#define EPDIF_H

#include <arduino.h>
#include <Arduino.h>

// Pin definition
#define RST_PIN 8
Expand Down
2 changes: 1 addition & 1 deletion Arduino/epd5in83/epdif.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
*/

#include "epdif.h"
#include <spi.h>
#include <SPI.h>

EpdIf::EpdIf() {
};
Expand Down
2 changes: 1 addition & 1 deletion Arduino/epd5in83/epdif.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#ifndef EPDIF_H
#define EPDIF_H

#include <arduino.h>
#include <Arduino.h>

// Pin definition
#define RST_PIN 8
Expand Down
2 changes: 1 addition & 1 deletion Arduino/epd7in3f/epdif.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
*/

#include "epdif.h"
#include <spi.h>
#include <SPI.h>

EpdIf::EpdIf() {
};
Expand Down
2 changes: 1 addition & 1 deletion Arduino/epd7in3f/epdif.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#ifndef EPDIF_H
#define EPDIF_H

#include <arduino.h>
#include <Arduino.h>

// Pin definition
#define RST_PIN 8
Expand Down
4 changes: 2 additions & 2 deletions Arduino/epd7in3g/epdif.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
*/

#include "epdif.h"
#include <spi.h>
#include <SPI.h>

EpdIf::EpdIf() {
};
Expand Down Expand Up @@ -61,4 +61,4 @@ int EpdIf::IfInit(void) {
SPI.begin();
SPI.beginTransaction(SPISettings(2000000, MSBFIRST, SPI_MODE0));
return 0;
}
}
2 changes: 1 addition & 1 deletion Arduino/epd7in3g/epdif.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#ifndef EPDIF_H
#define EPDIF_H

#include <arduino.h>
#include <Arduino.h>

// Pin definition
#define RST_PIN 8
Expand Down
16 changes: 10 additions & 6 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# e-Paper
waveshare electronics
# 说明 explain
Development 分支用于存放用户的提交的修改代码，经验证后，我们将移植到主分支中；非常感谢您对我们的支持</br>
The Development branch is used to store the modified code submitted by users. After verification, we will migrate it to the main branch. Thank you very much for your support

# e-Paper
waveshare electronics</br>
![waveshare_logo.png](waveshare_logo.png)

# 说明 explain
Expand All @@ -8,7 +12,7 @@ waveshare electronics
This development branch is used to store the changes committed by users. After verification, we will migrate them to the main branch. Thank you very much for your support

## 中文:
Jetson Nano、Raspberry Pi、Arduino、STM32例程
Jetson Nano、Raspberry Pi、Arduino、STM32例程</br>
* RaspberryPi_JetsonNano
> C
> Python
Expand All @@ -17,12 +21,12 @@ Jetson Nano、Raspberry Pi、Arduino、STM32例程
* STM32:
> STM32F103ZET6

更多资料请在官网上搜索:
更多资料请在官网上搜索: </br>
http://www.waveshare.net


## English:
Jetson Nano、Raspberry Pi、Arduino、STM32 Demo:
Jetson Nano、Raspberry Pi、Arduino、STM32 Demo: </br>
* RaspberryPi_JetsonNano:
> C
> Python
Expand All @@ -31,7 +35,7 @@ Jetson Nano、Raspberry Pi、Arduino、STM32 Demo:
* STM32:
> STM32F103ZET6

For more information, please search on the official website:
For more information, please search on the official website: </br>
https://www.waveshare.com


Expand Down
10 changes: 5 additions & 5 deletions RaspberryPi_JetsonNano/c/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,23 +184,23 @@ endif

OBJ_C = $(wildcard ${OBJ_C_EPD} ${DIR_GUI}/*.c ${OBJ_C_Examples} ${DIR_Examples}/main.c ${DIR_Examples}/ImageData2.c ${DIR_Examples}/ImageData.c ${DIR_FONTS}/*.c )
OBJ_O = $(patsubst %.c,${DIR_BIN}/%.o,$(notdir ${OBJ_C}))
RPI_DEV_C = $(wildcard $(DIR_BIN)/dev_hardware_SPI.o $(DIR_BIN)/RPI_sysfs_gpio.o $(DIR_BIN)/DEV_Config.o )
RPI_DEV_C = $(wildcard $(DIR_BIN)/dev_hardware_SPI.o $(DIR_BIN)/RPI_gpiod.o $(DIR_BIN)/DEV_Config.o )
JETSON_DEV_C = $(wildcard $(DIR_BIN)/sysfs_software_spi.o $(DIR_BIN)/sysfs_gpio.o $(DIR_BIN)/DEV_Config.o )


DEBUG = -D DEBUG

USELIB_RPI = USE_BCM2835_LIB
# USELIB_RPI = USE_BCM2835_LIB
# USELIB_RPI = USE_WIRINGPI_LIB
# USELIB_RPI = USE_DEV_LIB
USELIB_RPI = USE_DEV_LIB

LIB_RPI=-Wl,--gc-sections
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_DEV_LIB)
LIB_RPI += -lm
LIB_RPI += -lgpiod -lm
endif
DEBUG_RPI = -D $(USELIB_RPI) -D RPI

Expand Down Expand Up @@ -247,7 +247,7 @@ ${DIR_BIN}/%.o:$(DIR_GUI)/%.c

RPI_DEV:
$(CC) $(CFLAGS) $(DEBUG_RPI) -c $(DIR_Config)/dev_hardware_SPI.c -o $(DIR_BIN)/dev_hardware_SPI.o $(LIB_RPI) $(DEBUG)
$(CC) $(CFLAGS) $(DEBUG_RPI) -c $(DIR_Config)/RPI_sysfs_gpio.c -o $(DIR_BIN)/RPI_sysfs_gpio.o $(LIB_RPI) $(DEBUG)
$(CC) $(CFLAGS) $(DEBUG_RPI) -c $(DIR_Config)/RPI_gpiod.c -o $(DIR_BIN)/RPI_gpiod.o $(LIB_RPI) $(DEBUG)
$(CC) $(CFLAGS) $(DEBUG_RPI) -c $(DIR_Config)/DEV_Config.c -o $(DIR_BIN)/DEV_Config.o $(LIB_RPI) $(DEBUG)

JETSON_DEV:
Expand Down
Loading