Alfonso C. Alvarez cf0e667668 Merge branch 'master' of https://github.com/alcar21/NerdMiner_v2 into feature/add_platformio_support_and_improvements ...

# Conflicts:
#	.gitignore
#	Lib/Free_Fonts.h
#	Lib/images.h
#	Lib/myFonts.h
#	NerdMinerV2.ino
#	README.md
#	TFT_setup/User_Setup.h
#	lib/TFT_eSPI/User_Setup.h
#	platformio.ini
#	src/Lib/Free_Fonts.h
#	src/Lib/images.h
#	src/Lib/myFonts.h
#	src/NerdMinerV2.ino
#	src/NerdMinerV2.ino.cpp
#	src/TFT_setup/User_Setup.h
#	src/media/Free_Fonts.h
#	src/media/images.h
#	src/media/myFonts.h
#	src/mining.cpp
#	src/mining.h
#	src/wManager.h

2023-04-17 15:04:42 +02:00

1.2 MiB

Raw History

View Raw