Simpler build, less dependencies (#827)

* Simpler build, less dependencies
* Follow ugly python linter
* Introduce Brewfile & Update Readme
* Make dist.sh target-specific
* Tidy up make output
* Get rid of cat and truncate (I still love cats tho)
* Suppress dd output
* Long live the cat

scripts/bin2dfu.py

@@ -0,0 +1,70 @@
+#!/usr/bin/env python3
+
+import os
+import struct
+from zlib import crc32
+
+from flipper.app import App
+
+
+class Main(App):
+    def init(self):
+        self.parser.add_argument("-i", "--input", help=".bin input path", required=True)
+        self.parser.add_argument(
+            "-o", "--output", help=".dfu output path", required=True
+        )
+        self.parser.add_argument(
+            "-a",
+            "--address",
+            help="Flash address",
+            type=lambda x: int(x, 0),
+            required=True,
+        )
+        self.parser.add_argument(
+            "-l", "--label", help="DFU Target label", required=True
+        )
+        self.parser.add_argument(
+            "--vid", help="USB Vendor ID", default=0x0483, type=lambda x: int(x, 0)
+        )
+        self.parser.add_argument(
+            "--pid", help="USB Product ID", default=0xDF11, type=lambda x: int(x, 0)
+        )
+
+        self.parser.set_defaults(func=self.convert)
+
+    def convert(self):
+        if not os.path.exists(self.args.input):
+            self.logger.error(f'"{self.args.input}" does not exist')
+            return 1
+
+        with open(self.args.input, mode="rb") as file:
+            bin = file.read()
+
+        data = struct.pack("<II", self.args.address, len(bin)) + bin
+
+        # Target prefix
+        szTargetName = self.args.label.encode("ascii")
+
+        data = (
+            struct.pack("<6sBI255sII", b"Target", 0, 1, szTargetName, len(data), 1)
+            + data
+        )
+
+        # Prefix
+        data = struct.pack("<5sBIB", b"DfuSe", 0x01, len(data) + 11, 1) + data
+
+        # Suffix
+        data += struct.pack(
+            "<HHHH3sB", 0xFFFF, self.args.pid, self.args.vid, 0x011A, b"UFD", 16
+        )
+
+        dwCRC = ~crc32(data) & 0xFFFFFFFF
+
+        data += struct.pack("<I", dwCRC)
+
+        open(self.args.output, "wb").write(data)
+        return 0
+
+
+if __name__ == "__main__":
+    Main()()

scripts/dist.sh

@@ -0,0 +1,52 @@
+#!/usr/bin/env bash
+
+set -e
+
+suffix="${DIST_SUFFIX:=local}"
+
+rm -rf "dist/${TARGET}"
+mkdir -p "dist/${TARGET}"
+
+# copy build outputs
+cp bootloader/.obj/${TARGET}/bootloader.elf \
+    dist/${TARGET}/flipper-z-${TARGET}-bootloader-${suffix}.elf
+cp bootloader/.obj/${TARGET}/bootloader.bin \
+    dist/${TARGET}/flipper-z-${TARGET}-bootloader-${suffix}.bin
+cp bootloader/.obj/${TARGET}/bootloader.dfu \
+    dist/${TARGET}/flipper-z-${TARGET}-bootloader-${suffix}.dfu
+cp bootloader/.obj/${TARGET}/bootloader.json \
+    dist/${TARGET}/flipper-z-${TARGET}-bootloader-${suffix}.json
+cp firmware/.obj/${TARGET}/firmware.elf \
+    dist/${TARGET}/flipper-z-${TARGET}-firmware-${suffix}.elf
+cp firmware/.obj/${TARGET}/firmware.bin \
+    dist/${TARGET}/flipper-z-${TARGET}-firmware-${suffix}.bin
+cp firmware/.obj/${TARGET}/firmware.dfu \
+    dist/${TARGET}/flipper-z-${TARGET}-firmware-${suffix}.dfu
+cp firmware/.obj/${TARGET}/firmware.json \
+    dist/${TARGET}/flipper-z-${TARGET}-firmware-${suffix}.json
+
+# generate full.bin
+cp dist/${TARGET}/flipper-z-${TARGET}-bootloader-${suffix}.bin \
+    dist/${TARGET}/flipper-z-${TARGET}-full-${suffix}.bin
+dd if=/dev/null of=dist/${TARGET}/flipper-z-${TARGET}-full-${suffix}.bin bs=1 count=0 seek=32768 2> /dev/null
+cat dist/${TARGET}/flipper-z-${TARGET}-firmware-${suffix}.bin \
+    >>dist/${TARGET}/flipper-z-${TARGET}-full-${suffix}.bin \
+    2> /dev/null
+
+# generate full.dfu
+./scripts/bin2dfu.py \
+    -i dist/${TARGET}/flipper-z-${TARGET}-full-${suffix}.bin \
+    -o dist/${TARGET}/flipper-z-${TARGET}-full-${suffix}.dfu \
+    -a 0x08000000 \
+    -l "Flipper Zero $(echo ${TARGET} | tr a-z A-Z)"
+
+# generate full.json
+./scripts/meta.py merge \
+    -i dist/${TARGET}/flipper-z-${TARGET}-bootloader-${suffix}.json \
+    dist/${TARGET}/flipper-z-${TARGET}-firmware-${suffix}.json \
+    >dist/${TARGET}/flipper-z-${TARGET}-full-${suffix}.json
+
+echo "Firmware binaries can be found at:"
+echo -e "\t$(pwd)/dist/${TARGET}"
+echo "Use this file to flash your Flipper:"
+echo -e "\tflipper-z-${TARGET}-full-${suffix}.dfu"

scripts/flipper/app.py

@@ -15,7 +15,7 @@ class App:
         self.init()
 
     def __call__(self):
-        self.args = self.parser.parse_args()
+        self.args, _ = self.parser.parse_known_args()
         if "func" not in self.args:
             self.parser.error("Choose something to do")
         # configure log output

scripts/meta.py

@@ -1,31 +1,58 @@
 #!/usr/bin/env python3
 
-import argparse
+from flipper.app import App
 import json
 
 
-class Main:
-    def __init__(self):
-        # parse CFLAGS
-        self.parser = argparse.ArgumentParser(allow_abbrev=False)
-        self.parser.add_argument("-p", dest="project", required=True)
-        self.parser.add_argument("-DBUILD_DATE", dest="build_date", required=True)
-        self.parser.add_argument("-DGIT_COMMIT", dest="commit", required=True)
-        self.parser.add_argument("-DGIT_BRANCH", dest="branch", required=True)
-        self.parser.add_argument("-DTARGET", dest="target", type=int, required=True)
+class Main(App):
+    def init(self):
+        self.subparsers = self.parser.add_subparsers(help="sub-command help")
 
-    def __call__(self):
-        self.args, _ = self.parser.parse_known_args()
+        # generate
+        self.parser_generate = self.subparsers.add_parser(
+            "generate", help="Generate JSON meta file"
+        )
+        self.parser_generate.add_argument("-p", dest="project", required=True)
+        self.parser_generate.add_argument(
+            "-DBUILD_DATE", dest="build_date", required=True
+        )
+        self.parser_generate.add_argument("-DGIT_COMMIT", dest="commit", required=True)
+        self.parser_generate.add_argument("-DGIT_BRANCH", dest="branch", required=True)
+        self.parser_generate.add_argument(
+            "-DTARGET", dest="target", type=int, required=True
+        )
+        self.parser_generate.set_defaults(func=self.generate)
 
+        # merge
+        self.parser_merge = self.subparsers.add_parser(
+            "merge", help="Merge JSON meta files"
+        )
+        self.parser_merge.add_argument(
+            "-i", dest="input", action="append", nargs="+", required=True
+        )
+        self.parser_merge.set_defaults(func=self.merge)
+
+    def generate(self):
         meta = {}
         for k, v in vars(self.args).items():
-            if k == "project":
+            if k == "project" or k == "func":
                 continue
             if isinstance(v, str):
                 v = v.strip('"')
             meta[self.args.project + "_" + k] = v
 
         print(json.dumps(meta, indent=4))
+        return 0
+
+    def merge(self):
+        full = {}
+        for path in self.args.input[0]:
+            with open(path, mode="r") as file:
+                dict = json.loads(file.read())
+                full |= dict
+
+        print(json.dumps(full, indent=4))
+        return 0
 
 
 if __name__ == "__main__":