Pinned cbang, updated .gitignore, bumped version
This commit is contained in:
3
.gitignore
vendored
3
.gitignore
vendored
@@ -19,7 +19,10 @@ __pycache__
|
|||||||
*.deb
|
*.deb
|
||||||
*.zip
|
*.zip
|
||||||
/rpi-share
|
/rpi-share
|
||||||
|
/rpi-root
|
||||||
/package-lock.json
|
/package-lock.json
|
||||||
|
/src/bbserial/linux-rpi-raspberrypi-kernel*
|
||||||
|
/src/bbserial/raspberrypi-kernel*
|
||||||
|
|
||||||
*.elf
|
*.elf
|
||||||
*.hex
|
*.hex
|
||||||
|
|||||||
1
Makefile
1
Makefile
@@ -60,6 +60,7 @@ $(GPLAN_MOD): $(GPLAN_IMG)
|
|||||||
./scripts/gplan-init-build.sh
|
./scripts/gplan-init-build.sh
|
||||||
git -C rpi-share/cbang fetch
|
git -C rpi-share/cbang fetch
|
||||||
git -C rpi-share/cbang reset --hard FETCH_HEAD
|
git -C rpi-share/cbang reset --hard FETCH_HEAD
|
||||||
|
git -C rpi-share/cbang checkout 18f1e963107ef26abe750c023355a5c40dd07853
|
||||||
git -C rpi-share/camotics fetch
|
git -C rpi-share/camotics fetch
|
||||||
git -C rpi-share/camotics reset --hard FETCH_HEAD
|
git -C rpi-share/camotics reset --hard FETCH_HEAD
|
||||||
git -C rpi-share/camotics checkout ec876c80d20fc19837133087cef0c447df5a939d
|
git -C rpi-share/camotics checkout ec876c80d20fc19837133087cef0c447df5a939d
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "bbctrl",
|
"name": "bbctrl",
|
||||||
"version": "1.0.6",
|
"version": "1.0.7b0",
|
||||||
"homepage": "https://onefinitycnc.com/",
|
"homepage": "https://onefinitycnc.com/",
|
||||||
"repository": "https://github.com/OneFinityCNC/onefinity",
|
"repository": "https://github.com/OneFinityCNC/onefinity",
|
||||||
"license": "GPL-3.0+",
|
"license": "GPL-3.0+",
|
||||||
|
|||||||
@@ -137,7 +137,9 @@ class Config(object):
|
|||||||
|
|
||||||
|
|
||||||
def upgrade(self, config):
|
def upgrade(self, config):
|
||||||
version = tuple(map(int, config['version'].split('.')))
|
version = config['version']
|
||||||
|
version = version.split('b')[0] # Strip off any "beta" suffix
|
||||||
|
version = tuple(map(int, version.split('.'))) # Break it into a tuple of integers
|
||||||
|
|
||||||
if version < (0, 2, 4):
|
if version < (0, 2, 4):
|
||||||
for motor in config['motors']:
|
for motor in config['motors']:
|
||||||
@@ -177,7 +179,7 @@ class Config(object):
|
|||||||
self._update(config, False)
|
self._update(config, False)
|
||||||
|
|
||||||
with open(self.ctrl.get_path('config.json'), 'w') as f:
|
with open(self.ctrl.get_path('config.json'), 'w') as f:
|
||||||
json.dump(config, f)
|
json.dump(config, f, indent=2)
|
||||||
|
|
||||||
os.sync()
|
os.sync()
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user