From 432f5251cf400d591476ec03a1435533e1e073cd Mon Sep 17 00:00:00 2001 From: David Carley Date: Mon, 15 Mar 2021 18:25:22 -0700 Subject: [PATCH] Enable downgrades to old firmware versions --- src/js/app.js | 3 ++- src/pug/index.pug | 2 +- src/py/bbctrl/Config.py | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/js/app.js b/src/js/app.js index b32ce2d..0665f56 100644 --- a/src/js/app.js +++ b/src/js/app.js @@ -112,7 +112,8 @@ module.exports = new Vue({ config: { settings: {units: 'METRIC'}, motors: [{}, {}, {}, {}], - version: '' + version: '', + full_version: '' }, state: { messages: [], diff --git a/src/pug/index.pug b/src/pug/index.pug index 177a5d1..239c1d6 100644 --- a/src/pug/index.pug +++ b/src/pug/index.pug @@ -109,7 +109,7 @@ html(lang="en") title="Raspberry Pi temperature too high.") .subtitle | CNC Controller #[b {{state.demo ? 'Demo ' : ''}}] - | v{{config.version}} + | v{{config.full_version}} a.upgrade-version(v-if="show_upgrade()", href="#admin-general") | Upgrade to v{{latestVersion}} .fa.fa-check(v-if="!show_upgrade() && latestVersion", diff --git a/src/py/bbctrl/Config.py b/src/py/bbctrl/Config.py index ab557a8..66af9c6 100644 --- a/src/py/bbctrl/Config.py +++ b/src/py/bbctrl/Config.py @@ -161,8 +161,8 @@ class Config(object): motor['max-jerk'] = 1000 motor['zero-backoff'] = 1 - config['version'] = self.version - + config['version'] = self.version.split('b')[0] + config['full_version'] = self.version def save(self, config): self.upgrade(config)