From f734b225ebadb7d03ce77e4d4778012d2960db7f Mon Sep 17 00:00:00 2001 From: Markus Hitter Date: Sun, 26 Apr 2015 20:26:44 +0200 Subject: [PATCH] Rename ThermistorTable.h to thermistortable.h. This is purely cosmetics to match naming conventions of other files. No functional change. --- .gitignore | 2 +- config/board.3drag.h | 6 +++--- config/board.gen3.h | 6 +++--- config/board.gen6.h | 6 +++--- config/board.gen7-v1.1-v1.3.h | 6 +++--- config/board.gen7-v1.4.h | 6 +++--- config/board.ramps-v1.2.h | 6 +++--- config/board.ramps-v1.3.h | 6 +++--- config/board.rumba.h | 6 +++--- config/board.sanguinololu-v1.1.h | 6 +++--- config/board.sanguinololu-v1.2.h | 6 +++--- config/board.sanguish.h | 6 +++--- config/board.teensy++-v2.0.h | 6 +++--- config/board.teensy-v2.0.h | 6 +++--- configtool/boardpanel.py | 4 ++-- configtool/thermistortablefile.py | 2 +- extruder/temp.c | 7 +++++-- extruder/{ThermistorTable.h => thermistortable.h} | 0 temp.c | 7 +++++-- testcases/config.h.Profiling | 6 +++--- 20 files changed, 56 insertions(+), 50 deletions(-) rename extruder/{ThermistorTable.h => thermistortable.h} (100%) diff --git a/.gitignore b/.gitignore index ed2d45a..0a4ae8c 100644 --- a/.gitignore +++ b/.gitignore @@ -6,7 +6,7 @@ build temporal.png temporal_data config.h -ThermistorTable.h +thermistortable.h Makefile sim doc diff --git a/config/board.3drag.h b/config/board.3drag.h index fa56603..e8ed026 100644 --- a/config/board.3drag.h +++ b/config/board.3drag.h @@ -134,9 +134,9 @@ TT_PT100, TT_INTERCOM. See list in temp.c. 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 - THERMISTOR_EXTRUDER for the first or only table, or THERMISTOR_BED for - the second table. + name of the table(s) in thermistortable.h to use. This name is arbitrary, + often used names include THERMISTOR_EXTRUDER and THERMISTOR_BED. Also, + 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 won't be used in this case. diff --git a/config/board.gen3.h b/config/board.gen3.h index 024d5e7..225320e 100644 --- a/config/board.gen3.h +++ b/config/board.gen3.h @@ -133,9 +133,9 @@ TT_PT100, TT_INTERCOM. See list in temp.c. 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 - THERMISTOR_EXTRUDER for the first or only table, or THERMISTOR_BED for - the second table. + name of the table(s) in thermistortable.h to use. This name is arbitrary, + often used names include THERMISTOR_EXTRUDER and THERMISTOR_BED. Also, + 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 won't be used in this case. diff --git a/config/board.gen6.h b/config/board.gen6.h index c658521..5eda77a 100644 --- a/config/board.gen6.h +++ b/config/board.gen6.h @@ -133,9 +133,9 @@ TT_PT100, TT_INTERCOM. See list in temp.c. 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 - THERMISTOR_EXTRUDER for the first or only table, or THERMISTOR_BED for - the second table. + name of the table(s) in thermistortable.h to use. This name is arbitrary, + often used names include THERMISTOR_EXTRUDER and THERMISTOR_BED. Also, + 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 won't be used in this case. diff --git a/config/board.gen7-v1.1-v1.3.h b/config/board.gen7-v1.1-v1.3.h index 6218793..5e4297b 100644 --- a/config/board.gen7-v1.1-v1.3.h +++ b/config/board.gen7-v1.1-v1.3.h @@ -138,9 +138,9 @@ TT_PT100, TT_INTERCOM. See list in temp.c. 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 - THERMISTOR_EXTRUDER for the first or only table, or THERMISTOR_BED for - the second table. + name of the table(s) in thermistortable.h to use. This name is arbitrary, + often used names include THERMISTOR_EXTRUDER and THERMISTOR_BED. Also, + 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 won't be used in this case. diff --git a/config/board.gen7-v1.4.h b/config/board.gen7-v1.4.h index a225176..7b60825 100644 --- a/config/board.gen7-v1.4.h +++ b/config/board.gen7-v1.4.h @@ -139,9 +139,9 @@ TT_PT100, TT_INTERCOM. See list in temp.c. 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 - THERMISTOR_EXTRUDER for the first or only table, or THERMISTOR_BED for - the second table. + name of the table(s) in thermistortable.h to use. This name is arbitrary, + often used names include THERMISTOR_EXTRUDER and THERMISTOR_BED. Also, + 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 won't be used in this case. diff --git a/config/board.ramps-v1.2.h b/config/board.ramps-v1.2.h index 0739342..3d628a8 100644 --- a/config/board.ramps-v1.2.h +++ b/config/board.ramps-v1.2.h @@ -135,9 +135,9 @@ TT_PT100, TT_INTERCOM. See list in temp.c. 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 - THERMISTOR_EXTRUDER for the first or only table, or THERMISTOR_BED for - the second table. + name of the table(s) in thermistortable.h to use. This name is arbitrary, + often used names include THERMISTOR_EXTRUDER and THERMISTOR_BED. Also, + 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 won't be used in this case. diff --git a/config/board.ramps-v1.3.h b/config/board.ramps-v1.3.h index 34463e5..1ea3c36 100644 --- a/config/board.ramps-v1.3.h +++ b/config/board.ramps-v1.3.h @@ -136,9 +136,9 @@ TT_PT100, TT_INTERCOM. See list in temp.c. 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 - THERMISTOR_EXTRUDER for the first or only table, or THERMISTOR_BED for - the second table. + name of the table(s) in thermistortable.h to use. This name is arbitrary, + often used names include THERMISTOR_EXTRUDER and THERMISTOR_BED. Also, + 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 won't be used in this case. diff --git a/config/board.rumba.h b/config/board.rumba.h index c901d41..942991e 100644 --- a/config/board.rumba.h +++ b/config/board.rumba.h @@ -137,9 +137,9 @@ TT_PT100, TT_INTERCOM. See list in temp.c. 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 - THERMISTOR_EXTRUDER for the first or only table, or THERMISTOR_BED for - the second table. + name of the table(s) in thermistortable.h to use. This name is arbitrary, + often used names include THERMISTOR_EXTRUDER and THERMISTOR_BED. Also, + 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 won't be used in this case. diff --git a/config/board.sanguinololu-v1.1.h b/config/board.sanguinololu-v1.1.h index 2b3c998..2e11438 100644 --- a/config/board.sanguinololu-v1.1.h +++ b/config/board.sanguinololu-v1.1.h @@ -137,9 +137,9 @@ TT_PT100, TT_INTERCOM. See list in temp.c. 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 - THERMISTOR_EXTRUDER for the first or only table, or THERMISTOR_BED for - the second table. + name of the table(s) in thermistortable.h to use. This name is arbitrary, + often used names include THERMISTOR_EXTRUDER and THERMISTOR_BED. Also, + 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 won't be used in this case. diff --git a/config/board.sanguinololu-v1.2.h b/config/board.sanguinololu-v1.2.h index 12650a0..aa757db 100644 --- a/config/board.sanguinololu-v1.2.h +++ b/config/board.sanguinololu-v1.2.h @@ -137,9 +137,9 @@ TT_PT100, TT_INTERCOM. See list in temp.c. 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 - THERMISTOR_EXTRUDER for the first or only table, or THERMISTOR_BED for - the second table. + name of the table(s) in thermistortable.h to use. This name is arbitrary, + often used names include THERMISTOR_EXTRUDER and THERMISTOR_BED. Also, + 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 won't be used in this case. diff --git a/config/board.sanguish.h b/config/board.sanguish.h index 805a770..a090c66 100644 --- a/config/board.sanguish.h +++ b/config/board.sanguish.h @@ -137,9 +137,9 @@ TT_PT100, TT_INTERCOM. See list in temp.c. 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 - THERMISTOR_EXTRUDER for the first or only table, or THERMISTOR_BED for - the second table. + name of the table(s) in thermistortable.h to use. This name is arbitrary, + often used names include THERMISTOR_EXTRUDER and THERMISTOR_BED. Also, + 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 won't be used in this case. diff --git a/config/board.teensy++-v2.0.h b/config/board.teensy++-v2.0.h index d845310..f606373 100644 --- a/config/board.teensy++-v2.0.h +++ b/config/board.teensy++-v2.0.h @@ -134,9 +134,9 @@ TT_PT100, TT_INTERCOM. See list in temp.c. 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 - THERMISTOR_EXTRUDER for the first or only table, or THERMISTOR_BED for - the second table. + name of the table(s) in thermistortable.h to use. This name is arbitrary, + often used names include THERMISTOR_EXTRUDER and THERMISTOR_BED. Also, + 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 won't be used in this case. diff --git a/config/board.teensy-v2.0.h b/config/board.teensy-v2.0.h index 2d9e752..1f2766e 100644 --- a/config/board.teensy-v2.0.h +++ b/config/board.teensy-v2.0.h @@ -134,9 +134,9 @@ TT_PT100, TT_INTERCOM. See list in temp.c. 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 - THERMISTOR_EXTRUDER for the first or only table, or THERMISTOR_BED for - the second table. + name of the table(s) in thermistortable.h to use. This name is arbitrary, + often used names include THERMISTOR_EXTRUDER and THERMISTOR_BED. Also, + 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 won't be used in this case. diff --git a/configtool/boardpanel.py b/configtool/boardpanel.py index ed6b818..57142ee 100644 --- a/configtool/boardpanel.py +++ b/configtool/boardpanel.py @@ -621,12 +621,12 @@ class BoardPanel(wx.Panel): if generateTempTables(self.sensors, self.settings): dlg = wx.MessageDialog(self, - "File ThermistorTable.h successfully written.", + "File thermistortable.h successfully written.", "Save successful", wx.OK + wx.ICON_INFORMATION) dlg.ShowModal() dlg.Destroy() 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) dlg.ShowModal() dlg.Destroy() diff --git a/configtool/thermistortablefile.py b/configtool/thermistortablefile.py index 1b3e9b9..78f3225 100644 --- a/configtool/thermistortablefile.py +++ b/configtool/thermistortablefile.py @@ -6,7 +6,7 @@ from createTemperatureLookup import Thermistor class ThermistorTableFile: def __init__(self, folder): self.error = False - fn = os.path.join(folder, "ThermistorTable.h") + fn = os.path.join(folder, "thermistortable.h") try: self.fp = open(fn, 'wb') except: diff --git a/extruder/temp.c b/extruder/temp.c index 395e835..5c2b673 100644 --- a/extruder/temp.c +++ b/extruder/temp.c @@ -3,7 +3,10 @@ /** \file \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 @@ -26,7 +29,7 @@ #ifdef TEMP_THERMISTOR #include "analog.h" -#include "ThermistorTable.h" +#include "thermistortable.h" #endif #ifdef TEMP_AD595 diff --git a/extruder/ThermistorTable.h b/extruder/thermistortable.h similarity index 100% rename from extruder/ThermistorTable.h rename to extruder/thermistortable.h diff --git a/temp.c b/temp.c index 1f6d147..b7a9ced 100644 --- a/temp.c +++ b/temp.c @@ -3,7 +3,10 @@ /** \file \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 @@ -28,7 +31,7 @@ #ifdef TEMP_THERMISTOR #include "analog.h" -#include "ThermistorTable.h" +#include "thermistortable.h" #endif #ifdef TEMP_AD595 diff --git a/testcases/config.h.Profiling b/testcases/config.h.Profiling index 2b7de31..edcbb0e 100644 --- a/testcases/config.h.Profiling +++ b/testcases/config.h.Profiling @@ -383,9 +383,9 @@ * TT_PT100, TT_INTERCOM. See list in temp.c. * * * * 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 * -* THERMISTOR_EXTRUDER for the first or only table, or THERMISTOR_BED for * -* the second table. * +* name of the table(s) in thermistortable.h to use. This name is arbitrary, * +* often used names include THERMISTOR_EXTRUDER and THERMISTOR_BED. Also, * +* 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 * * won't be used in this case. *