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
b657a184
Commit
b657a184
authored
May 4, 2012
by
MaikStohn
Browse files
Options
Downloads
Patches
Plain Diff
Revert "magic PROGMEM defines to avoid hundreds of wrong GCC warnings"
This reverts commit
3682d9bd
.
parent
d188ae4c
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
Marlin/Marlin.h
+0
-7
0 additions, 7 deletions
Marlin/Marlin.h
Marlin/thermistortables.h
+7
-7
7 additions, 7 deletions
Marlin/thermistortables.h
with
7 additions
and
14 deletions
Marlin/Marlin.h
+
0
−
7
View file @
b657a184
...
@@ -20,13 +20,6 @@
...
@@ -20,13 +20,6 @@
#include
<avr/wdt.h>
#include
<avr/wdt.h>
#include
<avr/interrupt.h>
#include
<avr/interrupt.h>
//do some magic defines in order to prevent hundreds of wrong warnings in gcc
//more info here: http://www.avrfreaks.net/index.php?name=PNphpBB2&file=viewtopic&p=646359
typedef
short
prog_short
PROGMEM
;
#undef PROGMEM
#define PROGMEM __attribute__(( section(".progmem.data") ))
#undef PSTR
#define PSTR(s) (__extension__({static prog_char __c[] PROGMEM = (s); &__c[0];}))
#include
"fastio.h"
#include
"fastio.h"
#include
"Configuration.h"
#include
"Configuration.h"
...
...
...
...
This diff is collapsed.
Click to expand it.
Marlin/thermistortables.h
+
7
−
7
View file @
b657a184
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
#if (THERMISTORHEATER_0 == 1) || (THERMISTORHEATER_1 == 1) || (THERMISTORHEATER_2 == 1) || (THERMISTORBED == 1) //100k bed thermistor
#if (THERMISTORHEATER_0 == 1) || (THERMISTORHEATER_1 == 1) || (THERMISTORHEATER_2 == 1) || (THERMISTORBED == 1) //100k bed thermistor
const
prog_
short
temptable_1
[][
2
]
=
{
const
short
temptable_1
[][
2
]
PROGMEM
=
{
{
23
*
OVERSAMPLENR
,
300
},
{
23
*
OVERSAMPLENR
,
300
},
{
25
*
OVERSAMPLENR
,
295
},
{
25
*
OVERSAMPLENR
,
295
},
{
27
*
OVERSAMPLENR
,
290
},
{
27
*
OVERSAMPLENR
,
290
},
...
@@ -72,7 +72,7 @@ const prog_short temptable_1[][2] = {
...
@@ -72,7 +72,7 @@ const prog_short temptable_1[][2] = {
};
};
#endif
#endif
#if (THERMISTORHEATER_0 == 2) || (THERMISTORHEATER_1 == 2) || (THERMISTORHEATER_2 == 2) || (THERMISTORBED == 2) //200k bed thermistor
#if (THERMISTORHEATER_0 == 2) || (THERMISTORHEATER_1 == 2) || (THERMISTORHEATER_2 == 2) || (THERMISTORBED == 2) //200k bed thermistor
const
prog_
short
temptable_2
[][
2
]
=
{
const
short
temptable_2
[][
2
]
PROGMEM
=
{
{
1
*
OVERSAMPLENR
,
848
},
{
1
*
OVERSAMPLENR
,
848
},
{
54
*
OVERSAMPLENR
,
275
},
{
54
*
OVERSAMPLENR
,
275
},
{
107
*
OVERSAMPLENR
,
228
},
{
107
*
OVERSAMPLENR
,
228
},
...
@@ -98,7 +98,7 @@ const prog_short temptable_2[][2] = {
...
@@ -98,7 +98,7 @@ const prog_short temptable_2[][2] = {
#endif
#endif
#if (THERMISTORHEATER_0 == 3) || (THERMISTORHEATER_1 == 3) || (THERMISTORHEATER_2 == 3) || (THERMISTORBED == 3) //mendel-parts
#if (THERMISTORHEATER_0 == 3) || (THERMISTORHEATER_1 == 3) || (THERMISTORHEATER_2 == 3) || (THERMISTORBED == 3) //mendel-parts
const
prog_
short
temptable_3
[][
2
]
=
{
const
short
temptable_3
[][
2
]
PROGMEM
=
{
{
1
*
OVERSAMPLENR
,
864
},
{
1
*
OVERSAMPLENR
,
864
},
{
21
*
OVERSAMPLENR
,
300
},
{
21
*
OVERSAMPLENR
,
300
},
{
25
*
OVERSAMPLENR
,
290
},
{
25
*
OVERSAMPLENR
,
290
},
...
@@ -131,7 +131,7 @@ const prog_short temptable_3[][2] = {
...
@@ -131,7 +131,7 @@ const prog_short temptable_3[][2] = {
#endif
#endif
#if (THERMISTORHEATER_0 == 4) || (THERMISTORHEATER_1 == 4) || (THERMISTORHEATER_2 == 4) || (THERMISTORBED == 4) //10k thermistor
#if (THERMISTORHEATER_0 == 4) || (THERMISTORHEATER_1 == 4) || (THERMISTORHEATER_2 == 4) || (THERMISTORBED == 4) //10k thermistor
const
prog_
short
temptable_4
[][
2
]
=
{
const
short
temptable_4
[][
2
]
PROGMEM
=
{
{
1
*
OVERSAMPLENR
,
430
},
{
1
*
OVERSAMPLENR
,
430
},
{
54
*
OVERSAMPLENR
,
137
},
{
54
*
OVERSAMPLENR
,
137
},
{
107
*
OVERSAMPLENR
,
107
},
{
107
*
OVERSAMPLENR
,
107
},
...
@@ -156,7 +156,7 @@ const prog_short temptable_4[][2] = {
...
@@ -156,7 +156,7 @@ const prog_short temptable_4[][2] = {
#endif
#endif
#if (THERMISTORHEATER_0 == 5) || (THERMISTORHEATER_1 == 5) || (THERMISTORHEATER_2 == 5) || (THERMISTORBED == 5) //100k ParCan thermistor (104GT-2)
#if (THERMISTORHEATER_0 == 5) || (THERMISTORHEATER_1 == 5) || (THERMISTORHEATER_2 == 5) || (THERMISTORBED == 5) //100k ParCan thermistor (104GT-2)
const
prog_
short
temptable_5
[][
2
]
=
{
const
short
temptable_5
[][
2
]
PROGMEM
=
{
{
1
*
OVERSAMPLENR
,
713
},
{
1
*
OVERSAMPLENR
,
713
},
{
18
*
OVERSAMPLENR
,
316
},
{
18
*
OVERSAMPLENR
,
316
},
{
35
*
OVERSAMPLENR
,
266
},
{
35
*
OVERSAMPLENR
,
266
},
...
@@ -222,7 +222,7 @@ const prog_short temptable_5[][2] = {
...
@@ -222,7 +222,7 @@ const prog_short temptable_5[][2] = {
#endif
#endif
#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
prog_
short
temptable_6
[][
2
]
=
{
const
short
temptable_6
[][
2
]
PROGMEM
=
{
{
28
*
OVERSAMPLENR
,
250
},
{
28
*
OVERSAMPLENR
,
250
},
{
31
*
OVERSAMPLENR
,
245
},
{
31
*
OVERSAMPLENR
,
245
},
{
35
*
OVERSAMPLENR
,
240
},
{
35
*
OVERSAMPLENR
,
240
},
...
@@ -263,7 +263,7 @@ const prog_short temptable_6[][2] = {
...
@@ -263,7 +263,7 @@ const prog_short temptable_6[][2] = {
#endif
#endif
#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
prog_
short
temptable_7
[][
2
]
=
{
const
short
temptable_7
[][
2
]
PROGMEM
=
{
{
46
*
OVERSAMPLENR
,
270
},
{
46
*
OVERSAMPLENR
,
270
},
{
50
*
OVERSAMPLENR
,
265
},
{
50
*
OVERSAMPLENR
,
265
},
{
54
*
OVERSAMPLENR
,
260
},
{
54
*
OVERSAMPLENR
,
260
},
...
...
...
...
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