muehe/onefinity-firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2 from dacarley/dependency-versions

Browse Source 
Pinned cbang, updated .gitignore, bumped version
This commit is contained in:
OneFinityCNC
2021-03-02 23:09:59 -05:00
committed by GitHub
parent a0ae0a4e30 353cbb0eea
commit 6d33b2cf3d
4 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@@ -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
View File

@@ -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

2
package.json
View File

@@ -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+",

6
src/py/bbctrl/Config.py
View File

@@ -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()