From 3cc530864bb4cb1aef38efad2df92eb29f98d075 Mon Sep 17 00:00:00 2001 From: Dejvino Date: Sat, 22 Apr 2023 20:58:50 +0200 Subject: [PATCH] Makefile for images. Cleanup. --- .gitignore | 1 + Makefile | 27 ++++++++++--- gallery/convert_image.sh => convert_image.sh | 0 main.py | 2 +- palette.bmp | Bin 0 -> 194 bytes sdcard_test.py | 38 +++++++++++++++++++ 6 files changed, 61 insertions(+), 7 deletions(-) rename gallery/convert_image.sh => convert_image.sh (100%) create mode 100644 palette.bmp create mode 100644 sdcard_test.py diff --git a/.gitignore b/.gitignore index 591dceb..1eaed54 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +build/ gallery/*.bmp gallery/*.jpg gallery/*.png diff --git a/Makefile b/Makefile index 7bf37fc..741b1c9 100644 --- a/Makefile +++ b/Makefile @@ -1,11 +1,26 @@ +.DEFAULT_GOAL := build -all: images download +SRC_IMAGES := $(wildcard gallery/*.jpg) +DST_IMAGES := $(sort $(addprefix build/,$(addsuffix .bmp,$(notdir $(basename $(SRC_IMAGES)))))) + +all: clean build -images: - cd gallery && for F in *.jpg; do ./convert_image.sh $F $F.bmp - download: jokes.json -jokes.json: - curl -o jokes.json https://github.com/wiz64/superfun/raw/main/database/ichd/jokes-file.json +jokes.json: build-dir + curl -o build/jokes.json https://github.com/wiz64/superfun/raw/main/database/ichd/jokes-file.json + +build: build-dir images download + +build-dir: + mkdir -p build + +images: $(DST_IMAGES) + +$(DST_IMAGES): build/%.bmp: gallery/%.jpg + ./convert_image.sh $< $@ + +.PHONY: clean +clean: + rm -rf build/ diff --git a/gallery/convert_image.sh b/convert_image.sh similarity index 100% rename from gallery/convert_image.sh rename to convert_image.sh diff --git a/main.py b/main.py index a41c3d5..f053ed6 100644 --- a/main.py +++ b/main.py @@ -48,5 +48,5 @@ while True: print("") gc.collect() - epd.delay_ms(10000 * 1) + epd.delay_ms(60000 * 10) diff --git a/palette.bmp b/palette.bmp new file mode 100644 index 0000000000000000000000000000000000000000..a91925981714cd6425e624f3d87aa6bf1b308b06 GIT binary patch literal 194 zcmZ?rJ;VS3%Yal35VJ!uBLfRqLIy~F;DTV790S9D7y_$tat|s7Ge{tqu&Dk2|38E9 b1O|rJydcR33=FqEGcc4sU|=x{6TpQ5`8O5N literal 0 HcmV?d00001 diff --git a/sdcard_test.py b/sdcard_test.py new file mode 100644 index 0000000..e557d85 --- /dev/null +++ b/sdcard_test.py @@ -0,0 +1,38 @@ +import machine +import sdcard +import uos + +# Assign chip select (CS) pin (and start it high) +cs = machine.Pin(17, machine.Pin.OUT) + +# Intialize SPI peripheral (start with 1 MHz) +spi = machine.SPI(0, + baudrate=1000000, + polarity=0, + phase=0, + bits=8, + firstbit=machine.SPI.MSB, + sck=machine.Pin(18), + mosi=machine.Pin(19), + miso=machine.Pin(16)) + +# Initialize SD card +sd = sdcard.SDCard(spi, cs) + +sd_path = "/sd" + +# Mount filesystem +vfs = uos.VfsFat(sd) +uos.mount(vfs, sd_path) + +# Create a file and write something to it +with open(sd_path + "/test01.txt", "w") as file: + file.write("Hello, SD World!\r\n") + file.write("This is a test\r\n") + +# Open the file we just created and read from it +with open(sd_path + "/test01.txt", "r") as file: + data = file.read() + print(data) + +uos.mount(sd_path)