Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
M
marlin-anet-a8
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Jonas Leder
marlin-anet-a8
Commits
2d0d8e52
Commit
2d0d8e52
authored
May 20, 2012
by
linagee
Browse files
Options
Downloads
Patches
Plain Diff
Small correction.
parent
9e9db65c
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
Marlin/thermistortables.h
+4
-4
4 additions, 4 deletions
Marlin/thermistortables.h
with
4 additions
and
4 deletions
Marlin/thermistortables.h
+
4
−
4
View file @
2d0d8e52
...
@@ -211,7 +211,7 @@ const short temptable_5[][2] PROGMEM = {
...
@@ -211,7 +211,7 @@ const short temptable_5[][2] PROGMEM = {
#if (THERMISTORHEATER_0 == 6) || (THERMISTORHEATER_1 == 6) || (THERMISTORHEATER_2 == 6) || (THERMISTORBED == 6) // 100k Epcos thermistor
#if (THERMISTORHEATER_0 == 6) || (THERMISTORHEATER_1 == 6) || (THERMISTORHEATER_2 == 6) || (THERMISTORBED == 6) // 100k Epcos thermistor
const
short
temptable_6
[][
2
]
PROGMEM
=
{
const
short
temptable_6
[][
2
]
PROGMEM
=
{
{
1
*
OVERSAMPLENR
,
350
}
{
1
*
OVERSAMPLENR
,
350
}
,
{
28
*
OVERSAMPLENR
,
250
},
//top rating 250C
{
28
*
OVERSAMPLENR
,
250
},
//top rating 250C
{
31
*
OVERSAMPLENR
,
245
},
{
31
*
OVERSAMPLENR
,
245
},
{
35
*
OVERSAMPLENR
,
240
},
{
35
*
OVERSAMPLENR
,
240
},
...
@@ -253,7 +253,7 @@ const short temptable_6[][2] PROGMEM = {
...
@@ -253,7 +253,7 @@ const short temptable_6[][2] PROGMEM = {
#if (THERMISTORHEATER_0 == 7) || (THERMISTORHEATER_1 == 7) || (THERMISTORHEATER_2 == 7) || (THERMISTORBED == 7) // 100k Honeywell 135-104LAG-J01
#if (THERMISTORHEATER_0 == 7) || (THERMISTORHEATER_1 == 7) || (THERMISTORHEATER_2 == 7) || (THERMISTORBED == 7) // 100k Honeywell 135-104LAG-J01
const
short
temptable_7
[][
2
]
PROGMEM
=
{
const
short
temptable_7
[][
2
]
PROGMEM
=
{
{
1
*
OVERSAMPLENR
,
500
}
{
1
*
OVERSAMPLENR
,
500
}
,
{
46
*
OVERSAMPLENR
,
270
},
//top rating 300C
{
46
*
OVERSAMPLENR
,
270
},
//top rating 300C
{
50
*
OVERSAMPLENR
,
265
},
{
50
*
OVERSAMPLENR
,
265
},
{
54
*
OVERSAMPLENR
,
260
},
{
54
*
OVERSAMPLENR
,
260
},
...
@@ -317,7 +317,7 @@ const short temptable_7[][2] PROGMEM = {
...
@@ -317,7 +317,7 @@ const short temptable_7[][2] PROGMEM = {
// Calculated using 1kohm pullup, voltage divider math, and manufacturer provided temp/resistance
// Calculated using 1kohm pullup, voltage divider math, and manufacturer provided temp/resistance
// Advantage: Twice the resolution and better linearity from 150C to 200C
// Advantage: Twice the resolution and better linearity from 150C to 200C
const
short
temptable_51
[][
2
]
PROGMEM
=
{
const
short
temptable_51
[][
2
]
PROGMEM
=
{
{
1
*
OVERSAMPLENR
,
350
}
{
1
*
OVERSAMPLENR
,
350
}
,
{
190
*
OVERSAMPLENR
,
250
},
//top rating 250C
{
190
*
OVERSAMPLENR
,
250
},
//top rating 250C
{
203
*
OVERSAMPLENR
,
245
},
{
203
*
OVERSAMPLENR
,
245
},
{
217
*
OVERSAMPLENR
,
240
},
{
217
*
OVERSAMPLENR
,
240
},
...
@@ -379,7 +379,7 @@ const short temptable_51[][2] PROGMEM = {
...
@@ -379,7 +379,7 @@ const short temptable_51[][2] PROGMEM = {
// Calculated using 1kohm pullup, voltage divider math, and manufacturer provided temp/resistance
// Calculated using 1kohm pullup, voltage divider math, and manufacturer provided temp/resistance
// Advantage: More resolution and better linearity from 150C to 200C
// Advantage: More resolution and better linearity from 150C to 200C
const
short
temptable_52
[][
2
]
PROGMEM
=
{
const
short
temptable_52
[][
2
]
PROGMEM
=
{
{
1
*
OVERSAMPLENR
,
500
}
{
1
*
OVERSAMPLENR
,
500
}
,
{
125
*
OVERSAMPLENR
,
300
},
//top rating 300C
{
125
*
OVERSAMPLENR
,
300
},
//top rating 300C
{
142
*
OVERSAMPLENR
,
290
},
{
142
*
OVERSAMPLENR
,
290
},
{
162
*
OVERSAMPLENR
,
280
},
{
162
*
OVERSAMPLENR
,
280
},
...
...
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment