Prepared the script to release the firmware files

Author: casainho

firmware/display/Makefile

@@ -1,6 +1,46 @@
 PROJECT_NAME     := display_firmware
 TARGETS          := display_firmware
 
+APP_VER_MAJOR = 1
+APP_VER_MINOR = 0
+APP_VER_BUG = 0
+
+ifdef DISPLAY_OLED_1.3_SPI
+$(warning )
+$(warning DISPLAY OLED 1.3 SPI)
+$(warning )
+DISPLAY = OLED_1.3_SPI
+CFLAGS += -DDISPLAY_SH1106
+CFLAGS += -DDISPLAY_SPI
+endif
+
+ifdef DISPLAY_OLED_1.3_I2C
+$(warning )
+$(warning DISPLAY OLED 1.3 I2C)
+$(warning )
+DISPLAY = OLED_1.3_I2C
+CFLAGS += -DDISPLAY_SH1106
+CFLAGS += -DDISPLAY_I2C
+endif
+
+ifdef DISPLAY_OLED_0.96_SPI
+$(warning )
+$(warning DISPLAY OLED 0.96 SPI)
+$(warning )
+DISPLAY = OLED_0.96_SPI
+CFLAGS += -DDISPLAY_SSD1306
+CFLAGS += -DDISPLAY_SPI
+endif
+
+ifdef DISPLAY_OLED_0.96_I2C
+$(warning )
+$(warning DISPLAY_OLED_0.96_I2C)
+$(warning )
+DISPLAY = OLED_0.96_I2C
+CFLAGS += -DDISPLAY_SSD1306
+CFLAGS += -DDISPLAY_I2C
+endif
+
 # This is the expected version of the motor firmware. Display will stop to work with correct TSDZ2 firmware version
 MOTOR_FIRMWARE_MAJOR := 1
 MOTOR_FIRMWARE_MINOR := 1
@@ -16,9 +56,6 @@ $(OUTPUT_DIRECTORY)/display_firmware.out: \
 BOOTLOADER_DIR = $(PROJ_DIR)/../EBike_wireless_bootloader/firmware
 BOOTLOADER_HEX = $(BOOTLOADER_DIR)/_build/TSDZ2_bootloader_with_sd.hex
 
-APP_VER_MAJOR = 0
-APP_VER_MINOR = 1
-
 # The integer build number for this release, MUST BE INCREMENTED FOR EACH RELEASE SO BOOTLOADER WILL INSTALL
 # it is not user visible, but we must ensure it is monotonically increasing
 VERSION_NUM := 1
@@ -335,7 +372,7 @@ bl_settings:
 	$(SREC_PATH)nrfutil settings generate --family NRF52840 --application $(OUTPUT_DIRECTORY)/display_firmware.hex --application-version-string $(APP_VER_MAJOR).$(APP_VER_MINOR).0 --bootloader-version 1 --bl-settings-version 2 $(OUTPUT_DIRECTORY)/bl_settings.hex
 
 OTA:
-	$(SREC_PATH)nrfutil pkg generate --hw-version 52 --sd-req 0xB9 --application-version-string $(APP_VER_MAJOR).$(APP_VER_MINOR).0 --application $(OUTPUT_DIRECTORY)/display_firmware.hex --key-file private.key --app-boot-validation VALIDATE_ECDSA_P256_SHA256 $(OUTPUT_DIRECTORY)/display_firmware_ota_update.zip
+	$(SREC_PATH)nrfutil pkg generate --hw-version 52 --sd-req 0xB9 --application-version-string $(APP_VER_MAJOR).$(APP_VER_MINOR).$(APP_VER_BUG) --application $(OUTPUT_DIRECTORY)/display_firmware.hex --key-file private.key --app-boot-validation VALIDATE_ECDSA_P256_SHA256 $(OUTPUT_DIRECTORY)/firmware_ota-$(DISPLAY)-$(APP_VER_MAJOR).$(APP_VER_MINOR).$(APP_VER_BUG).zip
 
 
 TEMPLATE_PATH := $(SDK_ROOT)/components/toolchain/gcc

firmware/display/include/main.h

@@ -2,19 +2,17 @@
 
 #include <stdio.h>
 #include "common.h"
-// #include "button.h"
 
-#define DEVELOPMENT
+//#define DEVELOPMENT
 
-#define DISPLAY_SSD1306  // 0.96 inches OLED
-// #define DISPLAY_SH1106 // 1.3 inches OLED
-
-#define DISPLAY_SPI
-// #define DISPLAY_I2C
+#ifdef DEVELOPMENT
+  #define DISPLAY_SSD1306
+  #define DISPLAY_SPI
+#endif
 
 #ifdef DISPLAY_SPI
-#define DISPLAY_USE_RESET_PIN
-// #define DISPLAY_USE_SELECT_PIN
+  #define DISPLAY_USE_RESET_PIN
+  // #define DISPLAY_USE_SELECT_PIN
 #endif
 
 

firmware/display/make_release.sh

@@ -0,0 +1,25 @@
+#!/bin/bash
+echo " "
+echo "Start building the release files"
+echo " "
+mkdir release
+make clean
+sleep 1
+make default DISPLAY_OLED_1.3_SPI=1
+cp _build/firmware_ota* release
+make clean
+sleep 1
+make default DISPLAY_OLED_1.3_I2C=1
+cp _build/firmware_ota* release
+make clean
+sleep 1
+make default DISPLAY_OLED_0.96_SPI=1
+cp _build/firmware_ota* release
+make clean
+sleep 1
+make default DISPLAY_OLED_0.96_I2C=1
+cp _build/firmware_ota* release
+echo " "
+echo "Done! - find files on 'release' folder"
+echo " "
+