[Upstream] Merged epsilon 15.5

build/config.mak

@@ -4,7 +4,7 @@ PLATFORM ?= device
 DEBUG ?= 0
 
 HOME_DISPLAY_EXTERNALS ?= 1
-EPSILON_VERSION ?= 15.3.1
+EPSILON_VERSION ?= 15.5.0
 OMEGA_VERSION ?= 1.22.0
 # OMEGA_USERNAME ?= N/A
 OMEGA_STATE ?= dev
@@ -13,7 +13,6 @@ SUBMODULES_APPS = atomic rpn
 EPSILON_I18N ?= en fr nl pt it de es hu
 EPSILON_COUNTRIES ?= WW CA DE ES FR GB IT NL PT US
 EPSILON_GETOPT ?= 0
-EPSILON_TELEMETRY ?= 0
 ESCHER_LOG_EVENTS_BINARY ?= 0
 THEME_NAME ?= omega_light
 THEME_REPO ?= local

build/platform.blackbox.mak

@@ -1,4 +1,6 @@
 TOOLCHAIN ?= host-gcc
 USE_LIBA ?= 0
 ION_KEYBOARD_LAYOUT = layout_B2
-EXE = bin
+EXE = bin
+
+EPSILON_TELEMETRY ?= 0

build/platform.device.mak

@@ -2,6 +2,8 @@ MODEL ?= n0110
 USE_LIBA = 1
 EXE = elf
 
+EPSILON_TELEMETRY ?= 0
+
 BUILD_DIR := $(BUILD_DIR)/$(MODEL)
 
 $(BUILD_DIR)/python/port/port.o: CXXFLAGS += -DMP_PORT_USE_STACK_SYMBOLS=1

build/platform.device.n0100.mak

@@ -1,2 +1,3 @@
 TOOLCHAIN ?= arm-gcc-m4f
 ION_KEYBOARD_LAYOUT = layout_B2
+PCB_LATEST = 0

build/platform.device.n0110.mak

@@ -1,2 +1,3 @@
 TOOLCHAIN ?= arm-gcc-m7f
 ION_KEYBOARD_LAYOUT = layout_B3
+PCB_LATEST = 343 # PCB version 3.43

build/platform.simulator.linux.mak

@@ -1,4 +1,4 @@
 TOOLCHAIN = host-gcc
 EXE = bin
 
-EPSILON_SIMULATOR_HAS_LIBPNG = 1
+EPSILON_TELEMETRY ?= 0

build/platform.simulator.macos.mak

@@ -3,11 +3,10 @@ EXE = bin
 
 APPLE_PLATFORM = macos
 APPLE_PLATFORM_MIN_VERSION = 10.10
+EPSILON_TELEMETRY ?= 0
 
 ARCHS = x86_64
 
-EPSILON_SIMULATOR_HAS_LIBPNG = 1
-
 ifdef ARCH
 BUILD_DIR := $(BUILD_DIR)/$(ARCH)
 else

build/platform.simulator.mak

@@ -8,13 +8,4 @@ TARGET ?= $(HOST)
 
 BUILD_DIR := $(BUILD_DIR)/$(TARGET)
 
-EPSILON_SIMULATOR_HAS_LIBPNG ?= 0
-
 include build/platform.simulator.$(TARGET).mak
-
-SFLAGS += -DEPSILON_SIMULATOR_HAS_LIBPNG=$(EPSILON_SIMULATOR_HAS_LIBPNG)
-
-ifeq ($(EPSILON_SIMULATOR_HAS_LIBPNG),1)
-SFLAGS += `libpng-config --cflags`
-LDFLAGS += `libpng-config --ldflags`
-endif

build/platform.simulator.web.mak

@@ -1,4 +1,4 @@
 TOOLCHAIN = emscripten
 EXE = js
 
-HANDY_TARGETS_EXTENSIONS += zip
+EPSILON_TELEMETRY ?= 0

build/platform.simulator.windows.mak

@@ -1,2 +1,4 @@
 TOOLCHAIN = windows
 EXE = exe
+
+EPSILON_TELEMETRY ?= 0

build/rules.mk

@@ -14,7 +14,7 @@ $(eval $(call rule_for, \
 
 $(eval $(call rule_for, \
   CPP, %, %.inc, \
-  $$(CPP) -P $$< $$@, \
+  $$(CPP) $$(addprefix -I,$$(dir $$^)) -P $$< $$@, \
   global \
 ))
 
@@ -60,6 +60,12 @@ $(eval $(call rule_for, \
   global \
 ))
 
+$(eval $(call rule_for, \
+  ZIP, %.zip, , \
+  rm -rf $$(basename $$@) && mkdir -p $$(basename $$@) && cp $$^ $$(basename $$@) && zip -r -9 -j $$@ $$(basename $$@) > /dev/null && rm -rf $$(basename $$@), \
+  global \
+))
+
 ifdef EXE
 ifeq ($(OS),Windows_NT)
 # Work around command-line length limit

build/targets.device.mak

@@ -54,21 +54,3 @@ $(BUILD_DIR)/bench.ram.$(EXE): LDFLAGS += -Lion/src/$(PLATFORM)/bench
 $(BUILD_DIR)/bench.ram.$(EXE): LDSCRIPT = ion/src/$(PLATFORM)/shared/ram.ld
 $(BUILD_DIR)/bench.flash.$(EXE): $(call flavored_object_for,$(bench_src),consoleuart usbxip)
 $(BUILD_DIR)/bench.flash.$(EXE): LDSCRIPT = ion/src/$(PLATFORM)/$(MODEL)/internal_flash.ld
-
-.PHONY: %.two_binaries
-%.two_binaries: %.elf
-	@echo "Building an internal and an external binary for     $<"
-	$(Q) $(OBJCOPY) -O binary -j .text.external -j .rodata.external -j .exam_mode_buffer $< $(basename $<).external.bin
-	$(Q) $(OBJCOPY) -O binary -R .text.external -R .rodata.external -R .exam_mode_buffer $< $(basename $<).internal.bin
-	@echo "Padding $(basename $<).external.bin and $(basename $<).internal.bin"
-	$(Q) printf "\xFF\xFF\xFF\xFF" >> $(basename $<).external.bin
-	$(Q) printf "\xFF\xFF\xFF\xFF" >> $(basename $<).internal.bin
-
-.PHONY: binpack
-binpack: $(BUILD_DIR)/flasher.light.bin $(BUILD_DIR)/epsilon.onboarding.two_binaries
-	rm -rf $(BUILD_DIR)/binpack
-	mkdir -p $(BUILD_DIR)/binpack
-	cp $(BUILD_DIR)/flasher.light.bin $(BUILD_DIR)/binpack
-	cp $(BUILD_DIR)/epsilon.onboarding.internal.bin $(BUILD_DIR)/epsilon.onboarding.external.bin $(BUILD_DIR)/binpack
-	cd $(BUILD_DIR) && for binary in flasher.light.bin epsilon.onboarding.internal.bin epsilon.onboarding.external.bin; do shasum -a 256 -b binpack/$${binary} > binpack/$${binary}.sha256;done
-	cd $(BUILD_DIR) && tar cvfz binpack-$(MODEL)-`git rev-parse HEAD | head -c 7`.tgz binpack/*

build/targets.device.n0110.mak

@@ -20,3 +20,38 @@ $(BUILD_DIR)/test.external_flash.write.$(EXE): $(BUILD_DIR)/quiz/src/test_ion_ex
 	fi
 	$(Q) $(PYTHON) build/device/dfu.py -u $(word 1,$^)
 
+.PHONY: %.two_binaries
+%.two_binaries: %.elf
+	@echo "Building an internal and an external binary for     $<"
+	$(Q) $(OBJCOPY) -O binary -j .text.external -j .rodata.external -j .exam_mode_buffer $(BUILD_DIR)/$< $(BUILD_DIR)/$(basename $<).external.bin
+	$(Q) $(OBJCOPY) -O binary -R .text.external -R .rodata.external -R .exam_mode_buffer $(BUILD_DIR)/$< $(BUILD_DIR)/$(basename $<).internal.bin
+	@echo "Padding $(basename $<).external.bin and $(basename $<).internal.bin"
+	$(Q) printf "\xFF\xFF\xFF\xFF" >> $(BUILD_DIR)/$(basename $<).external.bin
+	$(Q) printf "\xFF\xFF\xFF\xFF" >> $(BUILD_DIR)/$(basename $<).internal.bin
+
+USE_IN_FACTORY := 1
+
+.PHONY: binpack
+binpack:
+ifndef USE_IN_FACTORY
+	@echo "CAUTION: You are building a binpack."
+	@echo "You must specify where this binpack will be used."
+	@echo "Please set the USE_IN_FACTORY environment variable to either:"
+	@echo "  - 0 for use in diagnostic"
+	@echo "  - 1 for use in production"
+	@exit -1
+endif
+	rm -rf output/binpack
+	mkdir -p output/binpack
+	$(MAKE) clean
+	$(MAKE) IN_FACTORY=$(USE_IN_FACTORY) $(BUILD_DIR)/flasher.light.bin
+	cp $(BUILD_DIR)/flasher.light.bin output/binpack
+	$(MAKE) IN_FACTORY=$(USE_IN_FACTORY) $(BUILD_DIR)/bench.flash.bin
+	$(MAKE) IN_FACTORY=$(USE_IN_FACTORY) $(BUILD_DIR)/bench.ram.bin
+	cp $(BUILD_DIR)/bench.ram.bin $(BUILD_DIR)/bench.flash.bin output/binpack
+	$(MAKE) IN_FACTORY=$(USE_IN_FACTORY) epsilon.official.onboarding.update.two_binaries
+	cp $(BUILD_DIR)/epsilon.official.onboarding.update.internal.bin $(BUILD_DIR)/epsilon.official.onboarding.update.external.bin output/binpack
+	$(MAKE) clean
+	cd output && for binary in flasher.light.bin bench.flash.bin bench.ram.bin epsilon.official.onboarding.update.internal.bin epsilon.official.onboarding.update.external.bin; do shasum -a 256 -b binpack/$${binary} > binpack/$${binary}.sha256;done
+	cd output && tar cvfz binpack-`git rev-parse HEAD | head -c 7`.tgz binpack
+	rm -rf output/binpack

build/targets.simulator.mak

@@ -1,8 +1 @@
-# Headless targets
-$(eval $(call rule_for_epsilon_flavor,headless))
-HANDY_TARGETS += epsilon.headless
-
-$(BUILD_DIR)/test.headless.$(EXE): $(call flavored_object_for,$(test_runner_src),headless)
-HANDY_TARGETS += test.headless
-
 -include build/targets.simulator.$(TARGET).mak

build/targets.simulator.web.mak

@@ -1 +1,13 @@
-$(BUILD_DIR)/test.headless.js: EMSCRIPTEN_MODULARIZE = 0
+$(BUILD_DIR)/test.js: EMSCRIPTEN_MODULARIZE = 0
+
+HANDY_TARGETS += htmlpack htmlpack.official
+HANDY_TARGETS_EXTENSIONS += zip
+
+htmlpack_targets = .\
+  .official. \
+
+define rule_htmlpack
+$$(BUILD_DIR)/htmlpack$(1)zip: $$(addprefix $$(BUILD_DIR)/ion/src/simulator/web/,calculator.html calculator.css) $$(BUILD_DIR)/epsilon$(1)js ion/src/simulator/web/calculator.js
+endef
+
+$(foreach target,$(htmlpack_targets),$(eval $(call rule_htmlpack,$(target))))