Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

new version support, skip hardcoded changes, dos2unix #36

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

new version support, skip hardcoded changes, dos2unix #36

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
153 changes: 129 additions & 24 deletions FC_patch_sequence_for_dummy_verify.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,17 @@
# By @Matioupi
# provided under dbad licence http://dbad-license.org/
#
# Version 1.0
# Version 1.1
#
# Made possible thanks to all OG's work and especially ideas from @jan2642 and
# patience of @jezzab in explaining me some stuff
#
#
# RTFM before asking for support
#

# Version 1.1 update by digdat0, kudos to Matioupi for the great tool
# Adding new version support and setting to bypass hardcoded patches
# If HARDCODEDCHANGES=TRUE it will run the patch_*.py file, if false bypass

# Modify the following variable to point to your install of
# Mefisto firmware tools https://github.com/o-gs/dji-firmware-tools
Expand All @@ -26,95 +28,191 @@ if [ "$#" -eq 2 ]; then
VERSION="$2"
else
echo "################################################################################"
echo " FC_patch_sequence_for_dummy_verify.sh 1.0 by @Matioupi"
echo " FC_patch_sequence_for_dummy_verify.sh 1.1 by @Matioupi"
echo " usage :"
echo " FC_patch_sequence_for_dummy_verify.sh birdname aa.bb.cc.dd"
echo " FC_patch_sequence_for_dummy_verify.sh birdname_version aa.bb.cc.dd"
echo " birdname is one of Spark, Mavic, P4P, P4std, P4adv, I2"
echo " version is the version with no periods. 01.01.0500 = 01010500"
echo " aa.bb.cc.dd is the new FC 0306 module version number"
echo ""
echo " exemple : ./FC_patch_sequence_for_dummy_verify.sh Spark 03.02.43.21"
echo " exemple : ./FC_patch_sequence_for_dummy_verify.sh Mavic 03.02.44.08"
echo " exemple : ./FC_patch_sequence_for_dummy_verify.sh P4P 03.02.44.08"
echo " exemple : ./FC_patch_sequence_for_dummy_verify.sh P4std 03.02.44.08"
echo " exemple : ./FC_patch_sequence_for_dummy_verify.sh P4adv 03.02.35.06"
echo " exemple : ./FC_patch_sequence_for_dummy_verify.sh I2 03.03.10.10"
echo " exemple : ./FC_patch_sequence_for_dummy_verify.sh P4PV2 03.03.04.14"
echo " older version support"
echo " exemple : ./FC_patch_sequence_for_dummy_verify.sh Spark_01000900 03.02.43.21"
echo " exemple : ./FC_patch_sequence_for_dummy_verify.sh Mavic_0104300 03.02.44.08"
echo " exemple : ./FC_patch_sequence_for_dummy_verify.sh P4P_01050600 03.02.44.08"
echo " exemple : ./FC_patch_sequence_for_dummy_verify.sh P4std_02000700 03.02.44.08"
echo " exemple : ./FC_patch_sequence_for_dummy_verify.sh P4adv_01000128 03.02.35.06"
echo " exemple : ./FC_patch_sequence_for_dummy_verify.sh I2_01020200 03.03.10.10"
echo " exemple : ./FC_patch_sequence_for_dummy_verify.sh P4PV2_01001500 03.03.04.14"
echo ""
echo " newer version support"
echo " exemple : ./FC_patch_sequence_for_dummy_verify.sh Spark_01001000 03.02.43.21"
echo " exemple : ./FC_patch_sequence_for_dummy_verify.sh Mavic_01040500 03.02.44.08"
echo " exemple : ./FC_patch_sequence_for_dummy_verify.sh P4std_02000810 03.02.44.08"
echo " exemple : ./FC_patch_sequence_for_dummy_verify.sh I2_01020300 03.03.10.10"
echo " exemple : ./FC_patch_sequence_for_dummy_verify.sh P4PV2_01002200 03.03.04.14"
echo " exemple : ./FC_patch_sequence_for_dummy_verify.sh P4PV2_01005000 03.03.13.13"
echo " exemple : ./FC_patch_sequence_for_dummy_verify.sh I2_01020400 03.03.09.33"
echo "################################################################################"
exit 0
fi

MODULE=0306

if [ "$1" == "Mavic" ]
if [ "$1" == "Mavic_0104300" ]
then
# Mavic Pro
AC_PREFIX=wm220
FULL_ORIGINAL_FIRMWARE_VERSION="v01.04.0300"
ORI_VERSION="03.02.44.07"
ORI_FILEDATE=20171116
ORI_MODULE_TIMESTAMP="2017-11-16 10:30:27"
HARDCODEDCHANGES=TRUE
#escape the / from <\module> after copy/pasting the original data here
ORI_MODULE_INFO='<module id="0306" version="03.02.44.07" type="" group="ac" size="1484064" md5="cd6bb6a75a38d4933315dafc2007c49c">wm220_0306_v03.02.44.07_20171116.pro.fw.sig<\/module>'
elif [ "$1" == "Spark" ]
elif [ "$1" == "Spark_01000900" ]
then
# Spark
AC_PREFIX=wm100
FULL_ORIGINAL_FIRMWARE_VERSION="v01.00.0900"
ORI_VERSION="03.02.43.20"
ORI_FILEDATE=20170920
ORI_MODULE_TIMESTAMP="2017-09-20 22:05:01"
HARDCODEDCHANGES=TRUE
#escape the / from <\module> after copy/pasting the original data here
ORI_MODULE_INFO='<module id="0306" version="03.02.43.20" type="" group="ac" size="1493792" md5="bb7d7c31f49616565e19c50663d7d2ba">wm100_0306_v03.02.43.20_20170920.pro.fw.sig<\/module>'
elif [ "$1" == "P4P" ]
elif [ "$1" == "P4P_01050600" ]
then
# P4P = Phantom 4 Pro
AC_PREFIX=wm331
FULL_ORIGINAL_FIRMWARE_VERSION="v01.05.0600"
ORI_VERSION="03.02.44.07"
ORI_FILEDATE=20171116
ORI_MODULE_TIMESTAMP="2017-11-16 10:38:19"
HARDCODEDCHANGES=TRUE
#escape the / from <\module> after copy/pasting the original data here
ORI_MODULE_INFO='<module id="0306" version="03.02.44.07" type="" group="" size="1505056" md5="0e64692bc4911c3a3a27ce937318da1a">wm331_0306_v03.02.44.07_20171116.pro.fw.sig<\/module>'
elif [ "$1" == "P4std" ]
elif [ "$1" == "P4std_02000700" ]
then
# P4P = Phantom 4 Standard
AC_PREFIX=wm330
FULL_ORIGINAL_FIRMWARE_VERSION="v02.00.0700"
ORI_VERSION="03.02.44.07"
ORI_FILEDATE=20171116
ORI_MODULE_TIMESTAMP="2017-11-16 10:32:06"
HARDCODEDCHANGES=TRUE
#escape the / from <\module> after copy/pasting the original data here
ORI_MODULE_INFO='<module id="0306" version="03.02.44.07" type="" group="" size="1504800" md5="b146c251760f3a32208d06cbc931ae8f">wm330_0306_v03.02.44.07_20171116.pro.fw.sig<\/module>'
elif [ "$1" == "P4adv" ]
elif [ "$1" == "P4adv_01000128" ]
then
# P4P = Phantom 4 Advanced
AC_PREFIX=wm332
FULL_ORIGINAL_FIRMWARE_VERSION="v01.00.0128"
ORI_VERSION="03.02.35.05"
ORI_FILEDATE=20170525
ORI_MODULE_TIMESTAMP="2017-05-25 22:08:15"
HARDCODEDCHANGES=TRUE
#escape the / from <\module> after copy/pasting the original data here
ORI_MODULE_INFO='<module id="0306" version="03.02.35.05" type="" group="" size="1560864" md5="a4cea467d134f9c26f4dba76a0984fe2">wm332_0306_v03.02.35.05_20170525.pro.fw.sig<\/module>'
elif [ "$1" == "I2" ]
elif [ "$1" == "I2_01020200" ]
then
# I2 = Inspire2
AC_PREFIX=wm620
FULL_ORIGINAL_FIRMWARE_VERSION="v01.02.0200"
ORI_VERSION="03.03.09.09"
ORI_FILEDATE=20180704
ORI_MODULE_TIMESTAMP="2018-07-04 19:05:21"
HARDCODEDCHANGES=TRUE
#escape the / from <\module> after copy/pasting the original data here
ORI_MODULE_INFO='<module id="0306" version="03.03.09.09" type="" group="" size="1463072" md5="a71c9b796c9f9877ae28dabc448b4394">wm620_0306_v03.03.09.09_20180704.pro.fw.sig<\/module>'
elif [ "$1" == "P4PV2" ]
elif [ "$1" == "P4PV2_01001500" ]
then
# P4PV2 = Phantom 4 Pro/Pro+ V2
AC_PREFIX=wm335
FULL_ORIGINAL_FIRMWARE_VERSION="v01.00.1500"
ORI_VERSION="03.03.04.13"
ORI_FILEDATE=20180525
ORI_MODULE_TIMESTAMP="2018-05-25 15:27:34"
HARDCODEDCHANGES=TRUE
#escape the / from <\module> after copy/pasting the original data here
ORI_MODULE_INFO='<module id="0306" version="03.03.04.13" type="" group="ac" size="1437728" md5="4d60509ca1a7565766d425372b262eab">wm335_0306_v03.03.04.13_20180525.pro.fw.sig<\/module>'
#newer versions
elif [ "$1" == "Mavic_01040500" ]
then
# Mavic Pro
AC_PREFIX=wm220
FULL_ORIGINAL_FIRMWARE_VERSION="v01.04.500"
ORI_VERSION="03.02.44.07"
ORI_FILEDATE=20171116
ORI_MODULE_TIMESTAMP="2017-11-16 10:30:27"
HARDCODEDCHANGES=FALSE
#escape the / from <\module> after copy/pasting the original data here
ORI_MODULE_INFO='<module id="0306" version="03.02.44.07" type="" group="ac" size="1484064" md5="cd6bb6a75a38d4933315dafc2007c49c">wm220_0306_v03.02.44.07_20171116.pro.fw.sig<\/module>'
elif [ "$1" == "Spark_01001000" ]
then
# Spark
AC_PREFIX=wm100
FULL_ORIGINAL_FIRMWARE_VERSION="v01.00.1000"
ORI_VERSION="03.02.43.20"
ORI_FILEDATE=20170920
ORI_MODULE_TIMESTAMP="2017-09-20 22:05:01"
HARDCODEDCHANGES=FALSE
#escape the / from <\module> after copy/pasting the original data here
ORI_MODULE_INFO='<module id="0306" version="03.02.43.20" type="" group="ac" size="1493792" md5="bb7d7c31f49616565e19c50663d7d2ba">wm100_0306_v03.02.43.20_20170920.pro.fw.sig<\/module>'
elif [ "$1" == "P4std_02000810" ]
then
# P4P = Phantom 4 Standard
AC_PREFIX=wm330
FULL_ORIGINAL_FIRMWARE_VERSION="v02.00.0810"
ORI_VERSION="03.02.44.07"
ORI_FILEDATE=20171116
ORI_MODULE_TIMESTAMP="2017-11-16 10:32:06"
HARDCODEDCHANGES=FALSE
#escape the / from <\module> after copy/pasting the original data here
ORI_MODULE_INFO='<module id="0306" version="03.02.44.07" type="" group="" size="1504800" md5="b146c251760f3a32208d06cbc931ae8f">wm330_0306_v03.02.44.07_20171116.pro.fw.sig<\/module>'
elif [ "$1" == "I2_01020300" ]
then
# I2 = Inspire2 1020300
AC_PREFIX=wm620
FULL_ORIGINAL_FIRMWARE_VERSION="v01.02.0300"
ORI_VERSION="03.03.09.18"
ORI_FILEDATE=20180921
ORI_MODULE_TIMESTAMP="2018-11-22 04:22:05"
HARDCODEDCHANGES=FALSE
#escape the / from <\module> after copy/pasting the original data here
ORI_MODULE_INFO='<module id="0306" version="03.03.09.18" type="" group="" size="1462816" md5="5843f9a803e91d615ac47d057779b978">wm620_0306_v03.03.09.18_20180921.pro.fw.sig<\/module>'
elif [ "$1" == "I2_01020400" ]
then
# I2 = Inspire2 1020400
AC_PREFIX=wm620
FULL_ORIGINAL_FIRMWARE_VERSION="v01.02.0400"
ORI_VERSION="03.03.09.20"
ORI_FILEDATE=20181204
ORI_MODULE_TIMESTAMP="2019-09-14 18:50:00"
HARDCODEDCHANGES=FALSE
#escape the / from <\module> after copy/pasting the original data here
ORI_MODULE_INFO='<module id="0306" version="03.03.09.20" type="" group="" size="1462816" md5="69abbd60925ad890f3e59fa214a2ee92">wm620_0306_v03.03.09.20_20181204.pro.fw.sig<\/module>'
elif [ "$1" == "P4PV2_01002200" ]
then
# P4PV2 = Phantom 4 Pro/Pro+ V2
AC_PREFIX=wm335
FULL_ORIGINAL_FIRMWARE_VERSION="v1.00.2200"
ORI_VERSION="03.03.13.05"
ORI_FILEDATE=20180904
ORI_MODULE_TIMESTAMP="2018-10-28 01:00:47"
HARDCODEDCHANGES=FALSE
#escape the / from <\module> after copy/pasting the original data here
ORI_MODULE_INFO='<module id="0306" version="03.03.13.05" type="" group="ac" size="1473312" md5="20752867a1f8c7cb18537e6df3fa689f">wm335_0306_v03.03.13.05_20180904.pro.fw.sig<\/module>'
elif [ "$1" == "P4PV2_01005000" ]
then
# P4PV2 = Phantom 4 Pro/Pro+ V2
AC_PREFIX=wm335
FULL_ORIGINAL_FIRMWARE_VERSION="v1.00.5000"
ORI_VERSION="03.03.13.06"
ORI_FILEDATE=20191011
ORI_MODULE_TIMESTAMP="2018-10-28 01:00:47" #todo
HARDCODEDCHANGES=FALSE
#escape the / from <\module> after copy/pasting the original data here
ORI_MODULE_INFO='<module id="0306" version="03.03.13.06" type="" group="ac" size="1474848" md5="1f6b4173e4a2899589c7785d303ec6c1">wm335_0306_v03.03.13.06_20191011.pro.fw.sig<\/module>'
fi

VERSIONSTR="v$VERSION"
Expand All @@ -132,8 +230,8 @@ echo "##########################################################################
echo " Updating flight parameters"
echo "################################################################################"

"$PATH_TO_TOOLS"/dji-firmware-tools/dji_flyc_param_ed.py -vv -u -b 0x420000 -m $TMP_FILENAME1

"$PATH_TO_TOOLS"/dji-firmware-tools/dji_flyc_param_ed.py -vv -u -b 0x420000 -m $TMP_FILENAME1
# python dji_flyc_param_ed.py -vv -u -b 0x420000 -m $TMP_FILENAME1 # can use this instead of path
if [ $? != 0 ]
then
echo "#### Issue while updating flight parameters ####"
Expand All @@ -146,18 +244,25 @@ echo "##########################################################################
echo " Patching flight parameters hardcoded values"
echo " Adding U-Blox custom configuration"
echo "################################################################################"

# look at HARDCODEDCHANGES=TRUE/FALSE; this allows patching 306 on new fw without hard coded changes
if [ HARDCODEDCHANGES = TRUE ]
then
echo "#### Attempting to patch ####"
# call it using python version 2
python2 "$PATH_TO_TOOLS"/DJI_FC_Patcher/patch_"$AC_PREFIX"_"$MODULE".py $TMP_FILENAME1 $VERSION
# python2 patch_"$AC_PREFIX"_"$MODULE".py $TMP_FILENAME1 $VERSION # incase path doesnt want to be used run local folder
if [ $? != 0 ]
then
echo "#### Issue while patching module ####"
echo "#### Issue while patching module, set path properly ####"
exit 1
else
echo "#### Success patching module ####"
mv $TMP_FILENAME1.patched "$DST_FILENAME"
fi
else
echo "#### Not attempting to patch, HARDCODEDCHANGES=FALSE ####"
mv $TMP_FILENAME1 "$DST_FILENAME"
fi

mv $TMP_FILENAME1.patched "$DST_FILENAME"

echo "################################################################################"
echo " Modifying $AC_PREFIX.cfg"
Expand Down