Configtool: remove Analog Reference user choice.

This was previously made obsolete in the firmware code already.
See previous commits.

This should solve issue #138.

In case it ever turns out this was a poor decision, it's likely
a good idea to re-add this to the board configuration instead of
the printer configuration.
This commit is contained in:
jbernardis 2015-04-28 20:12:14 -04:00 committed by Markus Hitter
parent 881629b74c
commit ae8a2a2b59
4 changed files with 2 additions and 31 deletions

View File

@ -262,11 +262,6 @@
*/ */
//#define USE_WATCHDOG //#define USE_WATCHDOG
/** \def REFERENCE
Which analog reference to use. See analog.h for choices.
*/
#define REFERENCE REFERENCE_AVCC
/** \def TH_COUNT /** \def TH_COUNT
Temperature history count. This is how many temperature readings to keep in Temperature history count. This is how many temperature readings to keep in
order to calculate derivative in PID loop higher values make PID derivative order to calculate derivative in PID loop higher values make PID derivative

View File

@ -262,11 +262,6 @@
*/ */
//#define USE_WATCHDOG //#define USE_WATCHDOG
/** \def REFERENCE
Which analog reference to use. See analog.h for choices.
*/
#define REFERENCE REFERENCE_AVCC
/** \def TH_COUNT /** \def TH_COUNT
Temperature history count. This is how many temperature readings to keep in Temperature history count. This is how many temperature readings to keep in
order to calculate derivative in PID loop higher values make PID derivative order to calculate derivative in PID loop higher values make PID derivative

View File

@ -21,7 +21,6 @@ class MiscellaneousPage(wx.Panel, Page):
'MOVEBUFFER_SIZE': "Movebuffer Size:", 'MOVEBUFFER_SIZE': "Movebuffer Size:",
'DC_EXTRUDER': "Heater:", 'DC_EXTRUDER_PWM': "PWM:", 'DC_EXTRUDER': "Heater:", 'DC_EXTRUDER_PWM': "PWM:",
'USE_WATCHDOG': "Use the Watchdog Timer", 'USE_WATCHDOG': "Use the Watchdog Timer",
'REFERENCE': "Analog Reference:",
'TH_COUNT': "Temperature History Size:", 'TH_COUNT': "Temperature History Size:",
'FAST_PWM': "Fast PWM", 'FAST_PWM': "Fast PWM",
'ENDSTOP_STEPS': "Endstop Steps:", 'ENDSTOP_STEPS': "Endstop Steps:",
@ -36,10 +35,6 @@ class MiscellaneousPage(wx.Panel, Page):
self.boardHeaters = [] self.boardHeaters = []
self.processors = [] self.processors = []
self.defaultRef = 'REFERENCE_AVCC'
self.references = [self.defaultRef, 'REFERENCE_AREF',
'REFERENCE_1V1', 'REFERENCE_2V56']
sz = wx.GridBagSizer() sz = wx.GridBagSizer()
sz.AddSpacer((20, 40), pos = (0, 0)) sz.AddSpacer((20, 40), pos = (0, 0))
sz.AddSpacer((40, 40), pos = (0, 2)) sz.AddSpacer((40, 40), pos = (0, 2))
@ -79,12 +74,6 @@ class MiscellaneousPage(wx.Panel, Page):
cb = self.addCheckBox(k, self.onCheckBox) cb = self.addCheckBox(k, self.onCheckBox)
sz.Add(cb, pos = (6, 1)) sz.Add(cb, pos = (6, 1))
k = 'REFERENCE'
ch = self.addChoice(k, self.references,
self.references.index(self.defaultRef),
labelWidth, self.onChoice)
sz.Add(ch, pos = (1, 3))
b = wx.StaticBox(self, wx.ID_ANY, "BANG BANG Bed Control") b = wx.StaticBox(self, wx.ID_ANY, "BANG BANG Bed Control")
b.SetFont(font) b.SetFont(font)
sbox = wx.StaticBoxSizer(b, wx.VERTICAL) sbox = wx.StaticBoxSizer(b, wx.VERTICAL)
@ -105,7 +94,7 @@ class MiscellaneousPage(wx.Panel, Page):
sbox.Add(tc) sbox.Add(tc)
sbox.AddSpacer((5, 5)) sbox.AddSpacer((5, 5))
sz.Add(sbox, pos = (3, 3), span = (4, 1), flag = wx.ALIGN_CENTER_HORIZONTAL) sz.Add(sbox, pos = (1, 3), span = (5, 1), flag = wx.ALIGN_CENTER_HORIZONTAL)
b = wx.StaticBox(self, wx.ID_ANY, "DC Motor Extruder") b = wx.StaticBox(self, wx.ID_ANY, "DC Motor Extruder")
b.SetFont(font) b.SetFont(font)
@ -122,7 +111,7 @@ class MiscellaneousPage(wx.Panel, Page):
sbox.Add(tc) sbox.Add(tc)
sbox.AddSpacer((5, 5)) sbox.AddSpacer((5, 5))
sz.Add(sbox, pos = (8, 3), flag = wx.ALIGN_CENTER_HORIZONTAL) sz.Add(sbox, pos = (6, 3), span=(3, 1), flag = wx.ALIGN_CENTER_HORIZONTAL)
labelWidth = 190; labelWidth = 190;
@ -261,8 +250,6 @@ class MiscellaneousPage(wx.Panel, Page):
else: else:
self.textControls[k].SetValue("") self.textControls[k].SetValue("")
self.setChoice('REFERENCE', cfgValues, self.defaultRef)
self.assertModified(False) self.assertModified(False)
self.enableAll(True) self.enableAll(True)

View File

@ -542,12 +542,6 @@ PWM value for 'off'
*/ */
// #define USE_WATCHDOG // #define USE_WATCHDOG
/**
analog subsystem stuff
REFERENCE - which analog reference to use. see analog.h for choices
*/
#define REFERENCE REFERENCE_AVCC
/** /**
temperature history count. This is how many temperature readings to keep in order to calculate derivative in PID loop temperature history count. This is how many temperature readings to keep in order to calculate derivative in PID loop
higher values make PID derivative term more stable at the expense of reaction time higher values make PID derivative term more stable at the expense of reaction time