2.35.2

2023-07-04 00:01:00 +02:00 · 2023-07-04 00:01:00 +02:00 · 2f8ec014e4
parent 0f02f3bc55
commit 2f8ec014e4
4 changed files with 149 additions and 3 deletions
--- a/sys/arduino/u8g2_page_buffer/FlipMode/FlipMode.ino
+++ b/sys/arduino/u8g2_page_buffer/FlipMode/FlipMode.ino
@ -248,7 +248,7 @@
 //U8G2_ST7586S_JLX384160_1_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8);             // Uno: Enable U8g2 16 bit mode for this display
 //U8G2_ST7586S_ERC240160_1_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8);
 //U8G2_ST7586S_YMC240160_1_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8);
-U8G2_ST7586S_JLX320160_1_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8);             // Uno: Enable U8g2 16 bit mode for this display
+//U8G2_ST7586S_JLX320160_1_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8);             // Uno: Enable U8g2 16 bit mode for this display
 //U8G2_ST75160_JM16096_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8);
 //U8G2_ST75160_JM16096_1_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8);
 //U8G2_ST75256_JLX172104_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8);
--- a/sys/arduino/u8g2_page_buffer/U8g2Logo/Makefile.184.uno
+++ b/sys/arduino/u8g2_page_buffer/U8g2Logo/Makefile.184.uno
@ -0,0 +1,146 @@
+#
+# Makefile.180 for Arduino/AVR 
+#
+#  Note:
+#  	Display list make database: make -p -f/dev/null | less
+
+
+# Install path of the arduino software. Requires a '/' at the end.
+ARDUINO_PATH:=/home/kraus/prg/arduino-1.8.4/
+
+# Board (and prozessor) information: see $(ARDUINO_PATH)hardware/arduino/avr/boards.txt
+# Some examples:
+#	BOARD		DESCRIPTION
+#	uno			Arduino Uno
+#	atmega328	Arduino Duemilanove or Nano w/ ATmega328
+#	diecimila		Arduino Diecimila, Duemilanove, or Nano w/ ATmega168
+#	mega		Arduino Mega
+#	mega2560	Arduino Mega2560
+#	mini			Arduino Mini
+#	lilypad328	LilyPad Arduino w/ ATmega328  
+BOARD:=uno
+
+# The unix device where we can reach the arduino board
+# Uno: /dev/ttyACM0
+# Duemilanove: /dev/ttyUSB0
+AVRDUDE_PORT:=/dev/ttyACM0
+
+
+
+SRC_DIRS=$(ARDUINO_PATH)hardware/arduino/avr/cores/arduino/
+SRC_DIRS+=$(ARDUINO_PATH)hardware/arduino/avr/libraries/SPI/src/
+SRC_DIRS+=$(ARDUINO_PATH)hardware/arduino/avr/libraries/SPI/src/utility/
+SRC_DIRS+=$(ARDUINO_PATH)hardware/arduino/avr/libraries/Wire/src/
+SRC_DIRS+=$(ARDUINO_PATH)hardware/arduino/avr/libraries/Wire/src/utility/
+SRC_DIRS+=../../../../csrc/
+SRC_DIRS+=../../../../cppsrc/
+
+#=== suffixes ===
+.SUFFIXES: .elf .hex .ino
+
+#=== identify user files ===
+INOSRC:=$(shell ls *.ino)
+TARGETNAME=$(basename $(INOSRC))
+
+#=== internal names ===
+LIBNAME:=$(TARGETNAME).a
+ELFNAME:=$(TARGETNAME).elf
+HEXNAME:=$(TARGETNAME).hex
+BINNAME:=$(TARGETNAME).bin
+DISNAME:=$(TARGETNAME).dis
+MAPNAME:=$(TARGETNAME).map
+
+#=== replace standard tools ===
+CC:=$(ARDUINO_PATH)hardware/tools/avr/bin/avr-gcc
+CXX:=$(ARDUINO_PATH)hardware/tools/avr/bin/avr-g++
+AR:=$(ARDUINO_PATH)hardware/tools/avr/bin/avr-gcc-ar
+OBJCOPY:=$(ARDUINO_PATH)hardware/tools/avr/bin/avr-objcopy
+OBJDUMP:=$(ARDUINO_PATH)hardware/tools/avr/bin/avr-objdump
+SIZE:=$(ARDUINO_PATH)hardware/tools/avr/bin/avr-size
+
+AVRDUDE = $(ARDUINO_PATH)hardware/tools/avr/bin/avrdude
+
+
+#=== get values from boards.txt ===
+BOARDS_TXT:=$(ARDUINO_PATH)hardware/arduino/avr/boards.txt
+
+# get the MCU value from the $(BOARD).build.mcu variable. For the atmega328 board this is atmega328p
+MCU:=$(shell sed -n -e "s/$(BOARD).build.mcu=\(.*\)/\1/p" $(BOARDS_TXT))
+# get the F_CPU value from the $(BOARD).build.f_cpu variable. For the atmega328 board this is 16000000
+F_CPU:=$(shell sed -n -e "s/$(BOARD).build.f_cpu=\(.*\)/\1/p" $(BOARDS_TXT))
+# get variant subfolder
+VARIANT:=$(shell sed -n -e "s/$(BOARD).build.variant=\(.*\)/\1/p" $(BOARDS_TXT))
+UPLOAD_SPEED:=$(shell sed -n -e "s/$(BOARD).upload.speed=\(.*\)/\1/p" $(BOARDS_TXT))
+# get the AVRDUDE_PROGRAMMER value from the $(BOARD).upload.protocol variable. For the atmega328 board this is stk500
+UPLOAD_PROTOCOL:=$(shell sed -n -e "s/$(BOARD).upload.protocol=\(.*\)/\1/p" $(BOARDS_TXT))
+# use stk500v1, because stk500 will default to stk500v2
+#UPLOAD_PROTOCOL:=stk500v1
+
+AVRDUDE_FLAGS = -V -F
+AVRDUDE_FLAGS += -C $(ARDUINO_PATH)/hardware/tools/avr/etc/avrdude.conf
+AVRDUDE_FLAGS += -p $(MCU)
+AVRDUDE_FLAGS += -P $(AVRDUDE_PORT)
+AVRDUDE_FLAGS += -c $(UPLOAD_PROTOCOL) 
+AVRDUDE_FLAGS += -b $(UPLOAD_SPEED)
+AVRDUDE_FLAGS += -U flash:w:$(HEXNAME)
+
+#=== get all include dirs ===
+INC_DIRS:=. $(SRC_DIRS) $(ARDUINO_PATH)hardware/arduino/avr/variants/$(VARIANT)
+INC_OPTS:=$(addprefix -I,$(INC_DIRS))
+
+#=== get all source files ===
+CSRC:=$(shell ls $(addsuffix *.c,$(SRC_DIRS)) 2>/dev/null) 
+CPPSRC:=$(shell ls $(addsuffix *.cpp,$(SRC_DIRS)) 2>/dev/null)
+
+#=== get all obj files ===
+COBJ:=$(CSRC:.c=.o)
+CPPOBJ:=$(CPPSRC:.cpp=.o)
+OBJ:=$(COBJ) $(CPPOBJ) $(TARGETNAME).o
+
+
+#=== options ===
+
+COMMON_FLAGS = -g -Os -DF_CPU=$(F_CPU) -mmcu=$(MCU)
+COMMON_FLAGS +=-DARDUINO=10800 -DARDUINO_AVR_UNO -DARDUINO_ARCH_AVR
+COMMON_FLAGS +=-ffunction-sections -fdata-sections -MMD -flto -fno-fat-lto-objects
+COMMON_FLAGS +=$(INC_OPTS)
+CFLAGS:=$(COMMON_FLAGS) -std=gnu99 -Wstrict-prototypes  -Wall -Wextra
+CXXFLAGS:=$(COMMON_FLAGS) -std=gnu++11 -fpermissive -fno-exceptions
+LDFLAGS:=-g -Os  -flto -fuse-linker-plugin -Wl,--gc-sections -mmcu=$(MCU)
+LDLIBS:=-lm
+
+all: $(HEXNAME) $(DISNAME)
+	$(SIZE) $(ELFNAME)
+
+.PHONY: debug
+debug: 
+	@echo $(MCU) $(F_CPU) $(VARIANT) $(UPLOAD_SPEED) $(UPLOAD_PROTOCOL)
+	@echo $(SRC_DIRS)
+	@echo $(CSRC)
+	@echo $(CPPSRC)
+	@echo $(INC_OPTS)
+
+.PHONY: clean
+clean:
+	$(RM) $(OBJ) $(HEXNAME) $(ELFNAME) $(LIBNAME) $(DISNAME) $(MAPNAME) $(BINNAME)
+
+.PHONY: upload
+upload: $(HEXNAME)
+	stty -F $(AVRDUDE_PORT) hupcl
+	$(AVRDUDE) $(AVRDUDE_FLAGS)
+
+# implicit rules
+.ino.cpp:
+	@cp $< $@
+	
+.elf.hex:
+	@$(OBJCOPY) -O ihex -R .eeprom $< $@
+
+# explicit rules
+$(ELFNAME): $(LIBNAME)($(OBJ)) 
+	$(LINK.o) $(LFLAGS) $(LIBNAME) $(LDLIBS) -o $@
+
+$(DISNAME): $(ELFNAME)
+	$(OBJDUMP) -D -S $< > $@
+
+	
--- a/sys/arduino/u8g2_page_buffer/U8g2Logo/U8g2Logo.ino
+++ b/sys/arduino/u8g2_page_buffer/U8g2Logo/U8g2Logo.ino
@ -252,7 +252,7 @@
 //U8G2_ST7586S_JLX384160_1_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8);             // Uno: Enable U8g2 16 bit mode for this display
 //U8G2_ST7586S_ERC240160_1_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8);
 //U8G2_ST7586S_YMC240160_1_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8);
-//U8G2_ST7586S_JLX320160_1_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8);             // Uno: Enable U8g2 16 bit mode for this display
+U8G2_ST7586S_JLX320160_1_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8);             // Uno: Enable U8g2 16 bit mode for this display
 //U8G2_ST75160_JM16096_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8);
 //U8G2_ST75160_JM16096_1_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8);
 //U8G2_ST75256_JLX172104_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8);
--- a/tools/release/print_release.sh
+++ b/tools/release/print_release.sh
@ -1,2 +1,2 @@
 # without 'v' prefix
-echo -n "2.35.1"
+echo -n "2.35.2"