From c399187edd3085732422bf05d74a3461ec43a5d9 Mon Sep 17 00:00:00 2001 From: Oskar Weigl Date: Mon, 18 Mar 2019 18:36:35 -0700 Subject: [PATCH] Revert "update default OTP in makefile" This reverts commit 2b6626a76d85c2bce06cf55e0c0d07630171d478. --- Firmware/Makefile | 4 ++-- tools/odrive/version.py | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/Firmware/Makefile b/Firmware/Makefile index 263ba433..82ae758c 100644 --- a/Firmware/Makefile +++ b/Firmware/Makefile @@ -70,8 +70,8 @@ ifeq ($(OTP_CONFIRM),TRUE) -c 'mwb 0x1fff7801 0x01' -c 'sleep 10' \ -c 'mwb 0x1fff7802 0x01' -c 'sleep 10' \ -c 'mwb 0x1fff7803 3' -c 'sleep 10' \ - -c 'mwb 0x1fff7804 6' -c 'sleep 10' \ - -c 'mwb 0x1fff7805 56' -c 'sleep 10' \ + -c 'mwb 0x1fff7804 5' -c 'sleep 10' \ + -c 'mwb 0x1fff7805 48' -c 'sleep 10' \ -c 'reset run' \ -c exit @echo "OK" diff --git a/tools/odrive/version.py b/tools/odrive/version.py index 64742ff0..5a2827a3 100644 --- a/tools/odrive/version.py +++ b/tools/odrive/version.py @@ -70,10 +70,6 @@ if __name__ == '__main__': args = parser.parse_args() git_name, major, minor, revision, unreleased = get_version_from_git() - - #TODO temporary override to get around makefile editing for OTP - unreleased = False - print('Firmware version {}.{}.{}{} ({})'.format( major, minor, revision, '-dev' if unreleased else '', git_name))