josh
/
Teacup_Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename ThermistorTable.h to thermistortable.h. 

This is purely cosmetics to match naming conventions of other
files. No functional change.
This commit is contained in:
Markus Hitter 2015-04-26 20:26:44 +02:00
parent 6f85f625cc
commit f734b225eb
20 changed files with 56 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -6,7 +6,7 @@ build
temporal.png temporal.png
temporal_data temporal_data
config.h config.h
ThermistorTable.h thermistortable.h
Makefile Makefile
sim sim
doc doc

6
config/board.3drag.h
View File

@ -134,9 +134,9 @@
TT_PT100, TT_INTERCOM. See list in temp.c. TT_PT100, TT_INTERCOM. See list in temp.c.
The "additional" field is used for TT_THERMISTOR only. It defines the The "additional" field is used for TT_THERMISTOR only. It defines the
name of the table(s) in ThermistorTable.h to use. Typically, this is name of the table(s) in thermistortable.h to use. This name is arbitrary,
THERMISTOR_EXTRUDER for the first or only table, or THERMISTOR_BED for often used names include THERMISTOR_EXTRUDER and THERMISTOR_BED. Also,
the second table. several sensors can share the same table, which saves binary size.
For a GEN3 set temp_type to TT_INTERCOM and temp_pin to AIO0. The pin For a GEN3 set temp_type to TT_INTERCOM and temp_pin to AIO0. The pin
won't be used in this case. won't be used in this case.

6
config/board.gen3.h
View File

@ -133,9 +133,9 @@
TT_PT100, TT_INTERCOM. See list in temp.c. TT_PT100, TT_INTERCOM. See list in temp.c.
The "additional" field is used for TT_THERMISTOR only. It defines the The "additional" field is used for TT_THERMISTOR only. It defines the
name of the table(s) in ThermistorTable.h to use. Typically, this is name of the table(s) in thermistortable.h to use. This name is arbitrary,
THERMISTOR_EXTRUDER for the first or only table, or THERMISTOR_BED for often used names include THERMISTOR_EXTRUDER and THERMISTOR_BED. Also,
the second table. several sensors can share the same table, which saves binary size.
For a GEN3 set temp_type to TT_INTERCOM and temp_pin to AIO0. The pin For a GEN3 set temp_type to TT_INTERCOM and temp_pin to AIO0. The pin
won't be used in this case. won't be used in this case.

6
config/board.gen6.h
View File

@ -133,9 +133,9 @@
TT_PT100, TT_INTERCOM. See list in temp.c. TT_PT100, TT_INTERCOM. See list in temp.c.
The "additional" field is used for TT_THERMISTOR only. It defines the The "additional" field is used for TT_THERMISTOR only. It defines the
name of the table(s) in ThermistorTable.h to use. Typically, this is name of the table(s) in thermistortable.h to use. This name is arbitrary,
THERMISTOR_EXTRUDER for the first or only table, or THERMISTOR_BED for often used names include THERMISTOR_EXTRUDER and THERMISTOR_BED. Also,
the second table. several sensors can share the same table, which saves binary size.
For a GEN3 set temp_type to TT_INTERCOM and temp_pin to AIO0. The pin For a GEN3 set temp_type to TT_INTERCOM and temp_pin to AIO0. The pin
won't be used in this case. won't be used in this case.

6
config/board.gen7-v1.1-v1.3.h
View File

@ -138,9 +138,9 @@
TT_PT100, TT_INTERCOM. See list in temp.c. TT_PT100, TT_INTERCOM. See list in temp.c.
The "additional" field is used for TT_THERMISTOR only. It defines the The "additional" field is used for TT_THERMISTOR only. It defines the
name of the table(s) in ThermistorTable.h to use. Typically, this is name of the table(s) in thermistortable.h to use. This name is arbitrary,
THERMISTOR_EXTRUDER for the first or only table, or THERMISTOR_BED for often used names include THERMISTOR_EXTRUDER and THERMISTOR_BED. Also,
the second table. several sensors can share the same table, which saves binary size.
For a GEN3 set temp_type to TT_INTERCOM and temp_pin to AIO0. The pin For a GEN3 set temp_type to TT_INTERCOM and temp_pin to AIO0. The pin
won't be used in this case. won't be used in this case.

6
config/board.gen7-v1.4.h
View File

@ -139,9 +139,9 @@
TT_PT100, TT_INTERCOM. See list in temp.c. TT_PT100, TT_INTERCOM. See list in temp.c.
The "additional" field is used for TT_THERMISTOR only. It defines the The "additional" field is used for TT_THERMISTOR only. It defines the
name of the table(s) in ThermistorTable.h to use. Typically, this is name of the table(s) in thermistortable.h to use. This name is arbitrary,
THERMISTOR_EXTRUDER for the first or only table, or THERMISTOR_BED for often used names include THERMISTOR_EXTRUDER and THERMISTOR_BED. Also,
the second table. several sensors can share the same table, which saves binary size.
For a GEN3 set temp_type to TT_INTERCOM and temp_pin to AIO0. The pin For a GEN3 set temp_type to TT_INTERCOM and temp_pin to AIO0. The pin
won't be used in this case. won't be used in this case.

6
config/board.ramps-v1.2.h
View File

@ -135,9 +135,9 @@
TT_PT100, TT_INTERCOM. See list in temp.c. TT_PT100, TT_INTERCOM. See list in temp.c.
The "additional" field is used for TT_THERMISTOR only. It defines the The "additional" field is used for TT_THERMISTOR only. It defines the
name of the table(s) in ThermistorTable.h to use. Typically, this is name of the table(s) in thermistortable.h to use. This name is arbitrary,
THERMISTOR_EXTRUDER for the first or only table, or THERMISTOR_BED for often used names include THERMISTOR_EXTRUDER and THERMISTOR_BED. Also,
the second table. several sensors can share the same table, which saves binary size.
For a GEN3 set temp_type to TT_INTERCOM and temp_pin to AIO0. The pin For a GEN3 set temp_type to TT_INTERCOM and temp_pin to AIO0. The pin
won't be used in this case. won't be used in this case.

6
config/board.ramps-v1.3.h
View File

@ -136,9 +136,9 @@
TT_PT100, TT_INTERCOM. See list in temp.c. TT_PT100, TT_INTERCOM. See list in temp.c.
The "additional" field is used for TT_THERMISTOR only. It defines the The "additional" field is used for TT_THERMISTOR only. It defines the
name of the table(s) in ThermistorTable.h to use. Typically, this is name of the table(s) in thermistortable.h to use. This name is arbitrary,
THERMISTOR_EXTRUDER for the first or only table, or THERMISTOR_BED for often used names include THERMISTOR_EXTRUDER and THERMISTOR_BED. Also,
the second table. several sensors can share the same table, which saves binary size.
For a GEN3 set temp_type to TT_INTERCOM and temp_pin to AIO0. The pin For a GEN3 set temp_type to TT_INTERCOM and temp_pin to AIO0. The pin
won't be used in this case. won't be used in this case.

6
config/board.rumba.h
View File

@ -137,9 +137,9 @@
TT_PT100, TT_INTERCOM. See list in temp.c. TT_PT100, TT_INTERCOM. See list in temp.c.
The "additional" field is used for TT_THERMISTOR only. It defines the The "additional" field is used for TT_THERMISTOR only. It defines the
name of the table(s) in ThermistorTable.h to use. Typically, this is name of the table(s) in thermistortable.h to use. This name is arbitrary,
THERMISTOR_EXTRUDER for the first or only table, or THERMISTOR_BED for often used names include THERMISTOR_EXTRUDER and THERMISTOR_BED. Also,
the second table. several sensors can share the same table, which saves binary size.
For a GEN3 set temp_type to TT_INTERCOM and temp_pin to AIO0. The pin For a GEN3 set temp_type to TT_INTERCOM and temp_pin to AIO0. The pin
won't be used in this case. won't be used in this case.

6
config/board.sanguinololu-v1.1.h
View File

@ -137,9 +137,9 @@
TT_PT100, TT_INTERCOM. See list in temp.c. TT_PT100, TT_INTERCOM. See list in temp.c.
The "additional" field is used for TT_THERMISTOR only. It defines the The "additional" field is used for TT_THERMISTOR only. It defines the
name of the table(s) in ThermistorTable.h to use. Typically, this is name of the table(s) in thermistortable.h to use. This name is arbitrary,
THERMISTOR_EXTRUDER for the first or only table, or THERMISTOR_BED for often used names include THERMISTOR_EXTRUDER and THERMISTOR_BED. Also,
the second table. several sensors can share the same table, which saves binary size.
For a GEN3 set temp_type to TT_INTERCOM and temp_pin to AIO0. The pin For a GEN3 set temp_type to TT_INTERCOM and temp_pin to AIO0. The pin
won't be used in this case. won't be used in this case.

6
config/board.sanguinololu-v1.2.h
View File

@ -137,9 +137,9 @@
TT_PT100, TT_INTERCOM. See list in temp.c. TT_PT100, TT_INTERCOM. See list in temp.c.
The "additional" field is used for TT_THERMISTOR only. It defines the The "additional" field is used for TT_THERMISTOR only. It defines the
name of the table(s) in ThermistorTable.h to use. Typically, this is name of the table(s) in thermistortable.h to use. This name is arbitrary,
THERMISTOR_EXTRUDER for the first or only table, or THERMISTOR_BED for often used names include THERMISTOR_EXTRUDER and THERMISTOR_BED. Also,
the second table. several sensors can share the same table, which saves binary size.
For a GEN3 set temp_type to TT_INTERCOM and temp_pin to AIO0. The pin For a GEN3 set temp_type to TT_INTERCOM and temp_pin to AIO0. The pin
won't be used in this case. won't be used in this case.

6
config/board.sanguish.h
View File

@ -137,9 +137,9 @@
TT_PT100, TT_INTERCOM. See list in temp.c. TT_PT100, TT_INTERCOM. See list in temp.c.
The "additional" field is used for TT_THERMISTOR only. It defines the The "additional" field is used for TT_THERMISTOR only. It defines the
name of the table(s) in ThermistorTable.h to use. Typically, this is name of the table(s) in thermistortable.h to use. This name is arbitrary,
THERMISTOR_EXTRUDER for the first or only table, or THERMISTOR_BED for often used names include THERMISTOR_EXTRUDER and THERMISTOR_BED. Also,
the second table. several sensors can share the same table, which saves binary size.
For a GEN3 set temp_type to TT_INTERCOM and temp_pin to AIO0. The pin For a GEN3 set temp_type to TT_INTERCOM and temp_pin to AIO0. The pin
won't be used in this case. won't be used in this case.

6
config/board.teensy++-v2.0.h
View File

@ -134,9 +134,9 @@
TT_PT100, TT_INTERCOM. See list in temp.c. TT_PT100, TT_INTERCOM. See list in temp.c.
The "additional" field is used for TT_THERMISTOR only. It defines the The "additional" field is used for TT_THERMISTOR only. It defines the
name of the table(s) in ThermistorTable.h to use. Typically, this is name of the table(s) in thermistortable.h to use. This name is arbitrary,
THERMISTOR_EXTRUDER for the first or only table, or THERMISTOR_BED for often used names include THERMISTOR_EXTRUDER and THERMISTOR_BED. Also,
the second table. several sensors can share the same table, which saves binary size.
For a GEN3 set temp_type to TT_INTERCOM and temp_pin to AIO0. The pin For a GEN3 set temp_type to TT_INTERCOM and temp_pin to AIO0. The pin
won't be used in this case. won't be used in this case.

6
config/board.teensy-v2.0.h
View File

@ -134,9 +134,9 @@
TT_PT100, TT_INTERCOM. See list in temp.c. TT_PT100, TT_INTERCOM. See list in temp.c.
The "additional" field is used for TT_THERMISTOR only. It defines the The "additional" field is used for TT_THERMISTOR only. It defines the
name of the table(s) in ThermistorTable.h to use. Typically, this is name of the table(s) in thermistortable.h to use. This name is arbitrary,
THERMISTOR_EXTRUDER for the first or only table, or THERMISTOR_BED for often used names include THERMISTOR_EXTRUDER and THERMISTOR_BED. Also,
the second table. several sensors can share the same table, which saves binary size.
For a GEN3 set temp_type to TT_INTERCOM and temp_pin to AIO0. The pin For a GEN3 set temp_type to TT_INTERCOM and temp_pin to AIO0. The pin
won't be used in this case. won't be used in this case.

4
configtool/boardpanel.py
View File

@ -621,12 +621,12 @@ class BoardPanel(wx.Panel):
if generateTempTables(self.sensors, self.settings): if generateTempTables(self.sensors, self.settings):
dlg = wx.MessageDialog(self, dlg = wx.MessageDialog(self,
"File ThermistorTable.h successfully written.", "File thermistortable.h successfully written.",
"Save successful", wx.OK + wx.ICON_INFORMATION) "Save successful", wx.OK + wx.ICON_INFORMATION)
dlg.ShowModal() dlg.ShowModal()
dlg.Destroy() dlg.Destroy()
else: else:
dlg = wx.MessageDialog(self, "Error writing to file ThermistorTable.h.", dlg = wx.MessageDialog(self, "Error writing to file thermistortable.h.",
"File error", wx.OK + wx.ICON_ERROR) "File error", wx.OK + wx.ICON_ERROR)
dlg.ShowModal() dlg.ShowModal()
dlg.Destroy() dlg.Destroy()

2
configtool/thermistortablefile.py
View File

@ -6,7 +6,7 @@ from createTemperatureLookup import Thermistor
class ThermistorTableFile: class ThermistorTableFile:
def __init__(self, folder): def __init__(self, folder):
self.error = False self.error = False
fn = os.path.join(folder, "ThermistorTable.h") fn = os.path.join(folder, "thermistortable.h")
try: try:
self.fp = open(fn, 'wb') self.fp = open(fn, 'wb')
except: except:

7
extruder/temp.c
View File

@ -3,7 +3,10 @@
/** \file /** \file
\brief Manage temperature sensors \brief Manage temperature sensors
\note \b ALL temperatures are stored as 14.2 fixed point in teacup, so we have a range of 0 - 16383.75 celsius and a precision of 0.25 celsius. That includes the ThermistorTable, which is why you can't copy and paste one from other firmwares which don't do this. \note All temperatures are stored as 14.2 fixed point in Teacup, so we have
a range of 0 - 16383.75 deg Celsius at a precision of 0.25 deg. That includes
the thermistor table, which is why you can't copy and paste one from other
firmwares which don't do this.
*/ */
#include <stdlib.h> #include <stdlib.h>
@ -26,7 +29,7 @@
#ifdef TEMP_THERMISTOR #ifdef TEMP_THERMISTOR
#include "analog.h" #include "analog.h"
#include "ThermistorTable.h" #include "thermistortable.h"
#endif #endif
#ifdef TEMP_AD595 #ifdef TEMP_AD595

0
extruder/ThermistorTable.h → extruder/thermistortable.h
View File

7
temp.c
View File

@ -3,7 +3,10 @@
/** \file /** \file
\brief Manage temperature sensors \brief Manage temperature sensors
\note \b ALL temperatures are stored as 14.2 fixed point in teacup, so we have a range of 0 - 16383.75 celsius and a precision of 0.25 celsius. That includes the ThermistorTable, which is why you can't copy and paste one from other firmwares which don't do this. \note All temperatures are stored as 14.2 fixed point in Teacup, so we have
a range of 0 - 16383.75 deg Celsius at a precision of 0.25 deg. That includes
the thermistor table, which is why you can't copy and paste one from other
firmwares which don't do this.
*/ */
#include <stdlib.h> #include <stdlib.h>
@ -28,7 +31,7 @@
#ifdef TEMP_THERMISTOR #ifdef TEMP_THERMISTOR
#include "analog.h" #include "analog.h"
#include "ThermistorTable.h" #include "thermistortable.h"
#endif #endif
#ifdef TEMP_AD595 #ifdef TEMP_AD595

6
testcases/config.h.Profiling
View File

@ -383,9 +383,9 @@
* TT_PT100, TT_INTERCOM. See list in temp.c. * * TT_PT100, TT_INTERCOM. See list in temp.c. *
* * * *
* The "additional" field is used for TT_THERMISTOR only. It defines the * * The "additional" field is used for TT_THERMISTOR only. It defines the *
* name of the table(s) in ThermistorTable.h to use. Typically, this is * * name of the table(s) in thermistortable.h to use. This name is arbitrary, *
* THERMISTOR_EXTRUDER for the first or only table, or THERMISTOR_BED for * * often used names include THERMISTOR_EXTRUDER and THERMISTOR_BED. Also, *
* the second table. * * several sensors can share the same table, which saves binary size. *
* * * *
* For a GEN3 set temp_type to TT_INTERCOM and temp_pin to AIO0. The pin * * For a GEN3 set temp_type to TT_INTERCOM and temp_pin to AIO0. The pin *
* won't be used in this case. * * won't be used in this case. *