From 8accc3b8b67bf3c251f977106b2109133d77526f Mon Sep 17 00:00:00 2001
From: Silvano Seva <silseva@fastwebnet.it>
Date: Fri, 17 Jun 2022 12:44:38 +0200
Subject: [PATCH] Replaced bin2sgl linux binary with a version statically
 linked with the libc, added missing wrap and flash commands for DM-1801

---
 meson.build                      |  88 +++++++++++++++++++------------
 scripts/bin2sgl.Linux.bin        | Bin 54552 -> 59152 bytes
 scripts/gd-77_firmware_loader.py |   0
 3 files changed, 55 insertions(+), 33 deletions(-)
 mode change 100644 => 100755 scripts/gd-77_firmware_loader.py

diff --git a/meson.build b/meson.build
index e46c4e9e..31165a75 100644
--- a/meson.build
+++ b/meson.build
@@ -556,60 +556,82 @@ dfu_util    = find_program('dfu-util',                         required:false, d
 foreach t : targets
 
   name = 'openrtx_'+t['name']
-  exe = executable(name, kwargs:t['opts'])
+  exe  = executable(name, kwargs:t['opts'])
 
   if t['flashable']
 
     bin = custom_target(name+'_bin',
-      output : name+'_bin',
-      input : exe,
-      command : [objcopy, '-O', 'binary', '@INPUT@', '@OUTPUT@'])
+                        output  : name+'_bin',
+                        input   : exe,
+                        command : [objcopy, '-O', 'binary', '@INPUT@', '@OUTPUT@'])
 
     # Handle GD77 custom wrapping and flashing tools
     if name == 'openrtx_gd77'
 
-if build_machine.system() == 'linux'
-      wrap = custom_target(name+'_wrap',
-        output : name+'_wrap.sgl',
-        input : bin,
-        command : [bin2sgl,
-                   '-f', '@INPUT@',
-                   '&&', 'mv', '@INPUT@.sgl', '@OUTPUT@'])
-elif build_machine.system() == 'windows'
-      wrap = custom_target(name+'_wrap',
-        output : name+'_bin.sgl',
-        input : bin,
-        command : [bin2sgl, '@INPUT@'])
-endif
+      if build_machine.system() == 'linux'
+            wrap = custom_target(name+'_wrap',
+                                 output  : name+'_wrap.sgl',
+                                 input   : bin,
+                                 command : [bin2sgl, '-f', '@INPUT@', '&&',
+                                            'mv', '@INPUT@.sgl', '@OUTPUT@'])
+      elif build_machine.system() == 'windows'
+            wrap = custom_target(name+'_wrap',
+                                 output  : name+'_bin.sgl',
+                                 input   : bin,
+                                 command : [bin2sgl, '@INPUT@'])
+      endif
 
       custom_target(name+'_flash',
-        input : wrap,
-        output : name+'_flash',
-        command : [gd77_loader, '-f', '@INPUT@'])
+                    input   : wrap,
+                    output  : name+'_flash',
+                    command : [gd77_loader, '-f', '@INPUT@'])
+
+     # Handle DM1801 custom wrapping and flashing tools
+    elif name == 'openrtx_dm1801'
+
+      if build_machine.system() == 'linux'
+            wrap = custom_target(name+'_wrap',
+                                 output  : name+'_wrap.sgl',
+                                 input   : bin,
+                                 command : [bin2sgl, '-f', '@INPUT@',
+                                            '-m', 'DM-1801', '&&', 'mv',
+                                            '@INPUT@.sgl', '@OUTPUT@'])
+      elif build_machine.system() == 'windows'
+            wrap = custom_target(name+'_wrap',
+                                 output  : name+'_bin.sgl',
+                                 input   : bin,
+                                 command : [bin2sgl, '@INPUT@', '-m DM-1801'])
+      endif
+
+      custom_target(name+'_flash',
+                    input   : wrap,
+                    output  : name+'_flash',
+                    command : [gd77_loader, '-f', '@INPUT@', '-m', 'DM-1801',])
 
     # Module17 also uses dfu-tool for flashing
     elif name == 'openrtx_mod17'
 
       custom_target(name+'_flash',
-        input : bin,
-        output : name+'_flash',
-        command : [dfu_util, '-d', '0483:df11', '-a', '0', '-D', '@INPUT@', '-s', '0x08000000'])
+                    input   : bin,
+                    output  : name+'_flash',
+                    command : [dfu_util, '-d', '0483:df11', '-a', '0',
+                               '-D', '@INPUT@', '-s', '0x08000000'])
 
     else
 
       wrap = custom_target(name+'_wrap',
-        output : name+'_wrap',
-        input : bin,
-        command : [radio_tool,
-                   '--wrap',
-                   '-o', '@OUTPUT@',
-                   '-r', t['wrap'],
-                   '-s', t['load_addr']+':@INPUT@'])
+                           output  : name+'_wrap',
+                           input   : bin,
+                           command : [radio_tool,
+                                      '--wrap',
+                                      '-o', '@OUTPUT@',
+                                      '-r', t['wrap'],
+                                      '-s', t['load_addr']+':@INPUT@'])
 
       custom_target(name+'_flash',
-        input : wrap,
-        output : name+'_flash',
-        command : [radio_tool, '-d', '0', '-f', '-i', '@INPUT@'])
+                    input   : wrap,
+                    output  : name+'_flash',
+                    command : [radio_tool, '-d', '0', '-f', '-i', '@INPUT@'])
 
     endif
 
diff --git a/scripts/bin2sgl.Linux.bin b/scripts/bin2sgl.Linux.bin
index ee5cb18af7fb3ca0c320b85f377af5de740b5632..2b9f2130f6b6141b199946a55644188c8b978228 100755
GIT binary patch
delta 4432
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
H3$ywUYJys3

delta 136
zcmbPmj(Nr^<_Q|&GtM%=fdhjD122OEgB*kGMte_Yk;%v7eINci<EygEc>P<8s5R&I
z#V^=AhxzS3Rzp1_J%h;`nWQ#1Tzbzn`4N}nW`TPRY!f%IOb&S_A~@j?#7qM=2rV<Y
Z@|ix<ffJKgJ+tF%JOdFFo4oP9JOK5LEouM&

diff --git a/scripts/gd-77_firmware_loader.py b/scripts/gd-77_firmware_loader.py
old mode 100644
new mode 100755