Skip to content

#11 Use JSON files for config storage #22

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

Open
robberwick wants to merge 3 commits into
base: master
Choose a base branch
from
Open

#11 Use JSON files for config storage #22

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
225619e
Use JSON files for config storage
robberwick Mar 22, 2017
55cfef3
we don' need no steeenkeeen python 3
robberwick Mar 24, 2017
aa9280e
Remove unused import
robberwick Mar 24, 2017
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
142 changes: 47 additions & 95 deletions Calibration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import core
import time
import cwiid
from lib_oled96 import ssd1306
import os.path
from ConfigParser import SafeConfigParser
import time
import json
from enum import Enum

import core
import cwiid


class CalibrationMode(Enum):
CM_NONE = 0
Expand All @@ -18,7 +18,7 @@ class CalibrationMode(Enum):
class Calibration:
def __init__(self, core_module, wm, oled):
"""Class Constructor"""
self.filename = "motors.ini"
self.filename = "config.json"
self.killed = False
self.core = core_module
self.wiimote = wm
Expand Down Expand Up @@ -142,99 +142,51 @@ def run(self):

def read_config(self):
""" Read the motor defaults from the config file. """
print("Looking for config")

print("Reading Config")

# Only bother reading if file exists
if os.path.isfile(self.filename):
# Get config file
config = SafeConfigParser()
config.read(self.filename)

# Read the motor min/mid/max servo ranges
if self.core is not None:
# Read Wheel motor ESC ranges
self.core.left_servo.servo_min =\
int(config.get('motors', 'LEFT_MIN'))
self.core.left_servo.servo_mid =\
int(config.get('motors', 'LEFT_MID'))
self.core.left_servo.servo_max =\
int(config.get('motors', 'LEFT_MAX'))

self.core.right_servo.servo_min =\
int(config.get('motors', 'RIGHT_MIN'))
self.core.right_servo.servo_mid =\
int(config.get('motors', 'RIGHT_MID'))
self.core.right_servo.servo_max =\
int(config.get('motors', 'RIGHT_MAX'))

# Read Auxilery ESC ranges
self.core.left_aux_1_servo.servo_min = \
int(config.get('motors', 'LEFT_AUX_1_MIN'))
self.core.left_aux_1_servo.servo_mid = \
int(config.get('motors', 'LEFT_AUX_1_MID'))
self.core.left_aux_1_servo.servo_max = \
int(config.get('motors', 'LEFT_AUX_1_MAX'))

self.core.right_aux_1_servo.servo_min = \
int(config.get('motors', 'RIGHT_AUX_1_MIN'))
self.core.right_aux_1_servo.servo_mid = \
int(config.get('motors', 'RIGHT_AUX_1_MID'))
self.core.right_aux_1_servo.servo_max = \
int(config.get('motors', 'RIGHT_AUX_1_MAX'))
print("Finished Reading Config")
if not self.core or not os.path.exists(self.filename):
print("No config found - skipping")

def write_config(self):
""" Read the motor defaults from the config file. """
self.filename = "motors.ini"
print("Config found - attempting to load")
try:
with open(self.filename, 'w') as f:
config = json.loads(f.read())

# Get config file
config = SafeConfigParser()
# Only bother reading if file exists
if os.path.isfile(self.filename):
config.read(self.filename)
for servo_attr, servo_values in config.iteritems():
servo = getattr(self.core, servo_attr)
servo.min = servo_values['min']
servo.mid = servo_values['mid']
servo.max = servo_values['max']

# *** Server Settings ***
try:
config.add_section('motors')
except:
print("Failed to add, could already exist")

# Write out the wheel motor ESC ranges
config.set('motors', 'LEFT_MIN', str(self.core.left_servo.servo_min))
config.set('motors', 'LEFT_MID', str(self.core.left_servo.servo_mid))
config.set('motors', 'LEFT_MAX', str(self.core.left_servo.servo_max))

config.set('motors', 'RIGHT_MIN', str(self.core.right_servo.servo_min))
config.set('motors', 'RIGHT_MID', str(self.core.right_servo.servo_mid))
config.set('motors', 'RIGHT_MAX', str(self.core.right_servo.servo_max))

# Write out the Auxilery ESC ranges
config.set(
'motors',
'LEFT_AUX_1_MIN',
str(self.core.left_aux_1_servo.servo_min))
config.set(
'motors',
'LEFT_AUX_1_MID',
str(self.core.left_aux_1_servo.servo_mid))
config.set(
'motors',
'LEFT_AUX_1_MAX',
str(self.core.left_aux_1_servo.servo_max))
# And now the right
config.set(
'motors',
'RIGHT_AUX_1_MIN',
str(self.core.right_aux_1_servo.servo_min))
config.set(
'motors',
'RIGHT_AUX_1_MID',
str(self.core.right_aux_1_servo.servo_mid))
config.set(
'motors',
'RIGHT_AUX_1_MAX',
str(self.core.right_aux_1_servo.servo_max))
print("Finished reading config")
except IOError as e:
print('Could not load config. An IO Error occurred:', e)
except json.JSONDecodeError as e:
print('There was an error decoding the config:', e)

def write_config(self):
"""Write out the motor defaults to the config file. """
self.filename = "motors.json"

config = {}

servo_attrs = [
'left_servo',
'right_servo',
'left_aux_1_servo',
'right_aux_1_servo'
]

for (servo_attr) in servo_attrs:
servo_instance = getattr(self.core, servo_attr)
config[servo_attr] = dict(
min=servo_instance.servo_min,
mid=servo_instance.servo_mid,
max=servo_instance.servo_max,
)

with open(self.filename, 'w') as f:
f.write(json.dumps(config))


if __name__ == "__main__":
Expand Down