Merge branch 'release-candidate' into release

.github/CODEOWNERS

@@ -25,6 +25,7 @@ applications/sd-filesystem/** @skotopes @DrZlo13
 applications/subghz/** @skotopes @DrZlo13
 applications/template/** @skotopes @DrZlo13
 applications/tests/** @skotopes @DrZlo13
+applications/updater/** @skotopes @DrZlo13 @hedger
 
 # Assets and asset generator
 assets/** @skotopes @DrZlo13

.github/workflows/build.yml

@@ -42,7 +42,7 @@ jobs:
         run: |
           test -d artifacts && rm -rf artifacts || true
           mkdir artifacts
-      
+
       - name: 'Generate suffix and folder name'
         id: names
         run: |
@@ -52,13 +52,13 @@ jobs:
           fi
           BRANCH_OR_TAG=${REF#refs/*/}
           SHA=$(git rev-parse --short HEAD)
-          
+
           if [[ "${{ github.ref }}" == "refs/tags/"* ]]; then
             SUFFIX=${BRANCH_OR_TAG//\//_}
           else
             SUFFIX=${BRANCH_OR_TAG//\//_}-$(date +'%d%m%Y')-${SHA}
           fi
-          
+
           echo "WORKFLOW_BRANCH_OR_TAG=${BRANCH_OR_TAG}" >> $GITHUB_ENV
           echo "DIST_SUFFIX=${SUFFIX}" >> $GITHUB_ENV
           echo "::set-output name=artifacts-path::${BRANCH_OR_TAG}"
@@ -86,7 +86,7 @@ jobs:
             set -e
             for TARGET in ${TARGETS}
             do
-              make TARGET=${TARGET} ${{ startsWith(github.ref, 'refs/tags') && 'DEBUG=0 COMPACT=1' || '' }}
+              make updater_package TARGET=${TARGET} ${{ startsWith(github.ref, 'refs/tags') && 'DEBUG=0 COMPACT=1' || '' }}
             done
 
       - name: 'Move upload files'
@@ -100,6 +100,20 @@ jobs:
               mv dist/${TARGET}/* artifacts/
             done
 
+      - name: 'Bundle self-update package'
+        if: ${{ !github.event.pull_request.head.repo.fork }}
+        uses: ./.github/actions/docker
+        with:
+          run: |
+            set -e
+            for UPDATEBUNDLE in artifacts/*/
+            do
+              BUNDLE_NAME=`echo $UPDATEBUNDLE | cut -d'/' -f2`
+              echo Packaging ${BUNDLE_NAME}
+              tar czpf artifacts/flipper-z-${BUNDLE_NAME}.tgz -C artifacts ${BUNDLE_NAME}
+              rm -rf artifacts/${BUNDLE_NAME}
+            done
+
       - name: 'Bundle resources'
         if: ${{ !github.event.pull_request.head.repo.fork }}
         run: |
@@ -175,7 +189,7 @@ jobs:
 
       - name: 'Build docker image'
         uses: ./.github/actions/docker
-      
+
       - name: 'Generate suffix and folder name'
         id: names
         run: |
@@ -185,13 +199,13 @@ jobs:
           fi
           BRANCH_OR_TAG=${REF#refs/*/}
           SHA=$(git rev-parse --short HEAD)
-          
+
           if [[ "${{ github.ref }}" == "refs/tags/"* ]]; then
             SUFFIX=${BRANCH_OR_TAG//\//_}
           else
             SUFFIX=${BRANCH_OR_TAG//\//_}-$(date +'%d%m%Y')-${SHA}
           fi
-          
+
           echo "WORKFLOW_BRANCH_OR_TAG=${BRANCH_OR_TAG}" >> $GITHUB_ENV
           echo "DIST_SUFFIX=${SUFFIX}" >> $GITHUB_ENV
 

.gitignore

@@ -36,3 +36,6 @@ CMakeLists.txt
 
 # bundle output
 dist
+
+# kde
+.directory

.gitmodules

@@ -19,3 +19,6 @@
 [submodule "lib/FreeRTOS-Kernel"]
 	path = lib/FreeRTOS-Kernel
 	url = https://github.com/FreeRTOS/FreeRTOS-Kernel.git
+[submodule "lib/microtar"]
+	path = lib/microtar
+	url = https://github.com/amachronic/microtar.git

Makefile

@@ -1,16 +1,16 @@
 PROJECT_ROOT := $(abspath $(dir $(abspath $(firstword $(MAKEFILE_LIST)))))
+
+include			$(PROJECT_ROOT)/make/git.mk
+
 COPRO_DIR := $(PROJECT_ROOT)/lib/STM32CubeWB/Projects/STM32WB_Copro_Wireless_Binaries/STM32WB5x
 
 PROJECT_SOURCE_DIRECTORIES := \
 	$(PROJECT_ROOT)/applications \
-	$(PROJECT_ROOT)/bootloader/src \
-	$(PROJECT_ROOT)/bootloader/targets \
 	$(PROJECT_ROOT)/core \
 	$(PROJECT_ROOT)/firmware/targets \
 	$(PROJECT_ROOT)/lib/app-template \
 	$(PROJECT_ROOT)/lib/app-scened-template \
 	$(PROJECT_ROOT)/lib/common-api \
-	$(PROJECT_ROOT)/lib/cyfral \
 	$(PROJECT_ROOT)/lib/drivers \
 	$(PROJECT_ROOT)/lib/flipper_file \
 	$(PROJECT_ROOT)/lib/infrared \
@@ -34,18 +34,18 @@ endif
 include	$(PROJECT_ROOT)/make/defaults.mk
 
 .PHONY: all
-all: bootloader_all firmware_all
-	@$(PROJECT_ROOT)/scripts/dist.sh
+all: firmware_all
+	@$(PROJECT_ROOT)/scripts/dist.py copy -t $(TARGET) -p firmware -s $(DIST_SUFFIX)
 
 .PHONY: whole
-whole: flash_radio bootloader_flash firmware_flash
+whole: flash_radio firmware_flash
 
 .PHONY: clean
-clean: bootloader_clean firmware_clean
+clean: firmware_clean updater_clean
 	@rm -rf $(PROJECT_ROOT)/dist/$(TARGET)
 
 .PHONY: flash
-flash: bootloader_flash firmware_flash
+flash: firmware_flash
 
 .PHONY: debug
 debug:
@@ -60,36 +60,38 @@ wipe:
 	@$(PROJECT_ROOT)/scripts/flash.py wipe
 	@$(PROJECT_ROOT)/scripts/ob.py set
 
-.PHONY: bootloader_all
-bootloader_all:
-	@$(MAKE) -C $(PROJECT_ROOT)/bootloader -j$(NPROCS) all
-
 .PHONY: firmware_all
 firmware_all:
 	@$(MAKE) -C $(PROJECT_ROOT)/firmware -j$(NPROCS) all
 
-.PHONY: bootloader_clean
-bootloader_clean:
-	@$(MAKE) -C $(PROJECT_ROOT)/bootloader -j$(NPROCS) clean
-
 .PHONY: firmware_clean
 firmware_clean:
 	@$(MAKE) -C $(PROJECT_ROOT)/firmware -j$(NPROCS) clean
 
-.PHONY: bootloader_flash
-bootloader_flash:
-ifeq ($(FORCE), 1)
-	@rm $(PROJECT_ROOT)/bootloader/.obj/f*/flash || true
-endif
-	@$(MAKE) -C $(PROJECT_ROOT)/bootloader -j$(NPROCS) flash
-
 .PHONY: firmware_flash
 firmware_flash:
 ifeq ($(FORCE), 1)
-	@rm $(PROJECT_ROOT)/firmware/.obj/f*/flash || true
+	@rm $(PROJECT_ROOT)/firmware/.obj/f*-firmware/flash || true
 endif
 	@$(MAKE) -C $(PROJECT_ROOT)/firmware -j$(NPROCS) flash
 
+
+.PHONY: updater
+updater:
+	@$(MAKE) -C $(PROJECT_ROOT)/firmware -j$(NPROCS) RAM_EXEC=1 all
+
+.PHONY: updater_clean
+updater_clean:
+	@$(MAKE) -C $(PROJECT_ROOT)/firmware -j$(NPROCS) RAM_EXEC=1 clean
+
+.PHONY: updater_debug
+updater_debug:
+	@$(MAKE) -C $(PROJECT_ROOT)/firmware -j$(NPROCS) RAM_EXEC=1 debug
+
+.PHONY: updater_package
+updater_package: firmware_all updater
+	@$(PROJECT_ROOT)/scripts/dist.py copy -t $(TARGET) -p firmware updater -s $(DIST_SUFFIX) --bundlever "$(VERSION_STRING)"
+
 .PHONY: flash_radio
 flash_radio:
 	@$(PROJECT_ROOT)/scripts/flash.py core2radio 0x080D7000 $(COPRO_DIR)/stm32wb5x_BLE_Stack_light_fw.bin
@@ -100,7 +102,7 @@ flash_radio_fus:
 	@echo
 	@echo "================   DON'T DO IT    ================"
 	@echo "= Flashing FUS is going to erase secure enclave  ="
-	@echo "= You will loose ability to use encrypted assets ="
+	@echo "= You will lose ability to use encrypted assets  ="
 	@echo "=       type 'find / -exec rm -rf {} \;'         ="
 	@echo "=     In case if you still want to continue      ="
 	@echo "================    JUST DON'T    ================"

ReadMe.md

@@ -11,17 +11,16 @@ Our goal is to create nice and clean code with good documentation, to make it a
 
 [Get Latest Firmware from Update Server](https://update.flipperzero.one/)
 
-Flipper Zero's firmware consists of three components:
+Flipper Zero's firmware consists of two components:
 
 - Core2 firmware set - proprietary components by ST: FUS + radio stack. FUS is flashed at factory and you should never update it.
-- Core1 Bootloader - controls basic hardware initialization and loads firmware.
 - Core1 Firmware - HAL + OS + Drivers + Applications.
 
-All 3 of them must be flashed in order described.
+They both must be flashed in order described.
 
 ## With STLink
 
-### Core1 Bootloader + Firmware
+### Core1 Firmware
 
 Prerequisites:
 
@@ -144,7 +143,6 @@ make whole
 
 - `applications`    - Applications and services used in firmware
 - `assets`          - Assets used by applications and services
-- `bootloader`      - Bootloader source code
 - `core`            - Furi Core: os level primitives and helpers
 - `debug`           - Debug tool: GDB-plugins, SVD-file and etc
 - `docker`          - Docker image sources (used for firmware build automation)

RoadMap.md

@@ -35,7 +35,6 @@ Main goal for 1.0.0 is to provide first stable version for both Users and Develo
 
 ## What we're planning to implement in 1.0.0
 
-- Updating firmware from SD (work in progress, almost done)
 - Loading applications from SD (tested as PoC, work scheduled for Q2)
 - More protocols (gathering feedback)
 - User documentation (work in progress)

applications/ReadMe.md

@@ -34,6 +34,7 @@
 - `system`              - System settings, tools and API
 - `tests`               - Unit tests and etc
 - `u2f`                 - U2F Application
+- `updater`             - Update service & application
 
 - `application.c`       - Firmware application list source
 - `application.h`       - Firmware application list header

applications/about/about.c

@@ -82,11 +82,12 @@ static DialogMessageButton hw_version_screen(DialogsApp* dialogs, DialogMessage*
 
     string_cat_printf(
         buffer,
-        "%d.F%dB%dC%d %s\n",
+        "%d.F%dB%dC%d %s %s\n",
         furi_hal_version_get_hw_version(),
         furi_hal_version_get_hw_target(),
         furi_hal_version_get_hw_body(),
         furi_hal_version_get_hw_connect(),
+        furi_hal_version_get_hw_region_name(),
         my_name ? my_name : "Unknown");
 
     string_cat_printf(buffer, "Serial number:\n");
@@ -116,9 +117,10 @@ static DialogMessageButton fw_version_screen(DialogsApp* dialogs, DialogMessage*
     } else {
         string_cat_printf(
             buffer,
-            "%s [%s]\n%s [%s]\n[%d] %s",
+            "%s [%s]\n%s%s [%s]\n[%d] %s",
             version_get_version(ver),
             version_get_builddate(ver),
+            version_get_dirty_flag(ver) ? "[!] " : "",
             version_get_githash(ver),
             version_get_gitbranchnum(ver),
             version_get_target(ver),
@@ -135,45 +137,14 @@ static DialogMessageButton fw_version_screen(DialogsApp* dialogs, DialogMessage*
     return result;
 }
 
-static DialogMessageButton bootloader_version_screen(DialogsApp* dialogs, DialogMessage* message) {
-    DialogMessageButton result;
-    string_t buffer;
-    string_init(buffer);
-    const Version* ver = furi_hal_version_get_bootloader_version();
-
-    if(!ver) {
-        string_cat_printf(buffer, "No info\n");
-    } else {
-        string_cat_printf(
-            buffer,
-            "%s [%s]\n%s [%s]\n[%d] %s",
-            version_get_version(ver),
-            version_get_builddate(ver),
-            version_get_githash(ver),
-            version_get_gitbranchnum(ver),
-            version_get_target(ver),
-            version_get_gitbranch(ver));
-    }
-
-    dialog_message_set_header(message, "Boot Version info:", 0, 0, AlignLeft, AlignTop);
-    dialog_message_set_text(message, string_get_cstr(buffer), 0, 13, AlignLeft, AlignTop);
-    result = dialog_message_show(dialogs, message);
-    dialog_message_set_text(message, NULL, 0, 0, AlignLeft, AlignTop);
-    dialog_message_set_header(message, NULL, 0, 0, AlignLeft, AlignTop);
-    string_clear(buffer);
-
-    return result;
-}
-
 const AboutDialogScreen about_screens[] = {
     product_screen,
     compliance_screen,
     address_screen,
     icon1_screen,
     icon2_screen,
     hw_version_screen,
-    fw_version_screen,
-    bootloader_version_screen};
+    fw_version_screen};
 
 const size_t about_screens_count = sizeof(about_screens) / sizeof(AboutDialogScreen);