reprap-commits Mailing List for The RepRap Project

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Revision: 4144
          http://reprap.svn.sourceforge.net/reprap/?rev=4144&view=rev
Author:   adrian-bowyer
Date:     2011-07-06 17:36:46 +0000 (Wed, 06 Jul 2011)

Log Message:
-----------
Added configuration.h.dist to stop files getting corrupted with each download.  Also some useful thermistor files.

Added Paths:
-----------
    trunk/software/firmware/Tonokip_Firmware/BedThermistorTable_10k_EPCOS_B57550G103J.h
    trunk/software/firmware/Tonokip_Firmware/ThermistorTable_100k_EPCOS_B57540G0104J.h
    trunk/software/firmware/Tonokip_Firmware/configuration.h.dist

Removed Paths:
-------------
    trunk/software/firmware/Tonokip_Firmware/configuration.h

Added: trunk/software/firmware/Tonokip_Firmware/BedThermistorTable_10k_EPCOS_B57550G103J.h
===================================================================

--- trunk/software/firmware/Tonokip_Firmware/BedThermistorTable_10k_EPCOS_B57550G103J.h	                        (rev 0)
+++ trunk/software/firmware/Tonokip_Firmware/BedThermistorTable_10k_EPCOS_B57550G103J.h	2011-07-06 17:36:46 UTC (rev 4144)
@@ -0,0 +1,46 @@
+#ifndef BEDTHERMISTORTABLE_10K_H_
+#define BEDTHERMISTORTABLE_10K_H_
+
+// Thermistor lookup table for RepRap Temperature Sensor Boards (http://make.rrrf.org/ts)
+// See this page:  
+// http://dev.www.reprap.org/bin/view/Main/Thermistor
+// for details of what goes in this table.
+// Made with createTemperatureLookup.py (http://svn.reprap.org/trunk/reprap/firmware/Arduino/utilities/createTemperatureLookup.py)
+
+
+
+// RS thermistor 484-0149; EPCOS B57550G103J
+// Made with createTemperatureLookup.py (http://svn.reprap.org/trunk/reprap/firmware/Arduino/utilities/createTemperatureLookup.py)
+// ./createTemperatureLookup.py --r0=10000 --t0=25 --r1=0 --r2=4700 --beta=3480 --max-adc=1023
+// r0: 10000
+// t0: 25
+// r1: 0
+// r2: 4700
+// beta: 3480
+// max adc: 1023
+#define BNUMTEMPS 20
+short bedtemptable[BNUMTEMPS][2] = {
+   {1, 599},
+   {54, 160},
+   {107, 123},
+   {160, 103},
+   {213, 90},
+   {266, 79},
+   {319, 70},
+   {372, 62},
+   {425, 55},
+   {478, 49},
+   {531, 43},
+   {584, 37},
+   {637, 31},
+   {690, 25},
+   {743, 19},
+   {796, 12},
+   {849, 5},
+   {902, -3},
+   {955, -16},
+   {1008, -42}
+};
+#endif
+
+

Added: trunk/software/firmware/Tonokip_Firmware/ThermistorTable_100k_EPCOS_B57540G0104J.h
===================================================================
--- trunk/software/firmware/Tonokip_Firmware/ThermistorTable_100k_EPCOS_B57540G0104J.h	                        (rev 0)
+++ trunk/software/firmware/Tonokip_Firmware/ThermistorTable_100k_EPCOS_B57540G0104J.h	2011-07-06 17:36:46 UTC (rev 4144)
@@ -0,0 +1,77 @@
+#ifndef THERMISTORTABLE_100K_H_
+#define THERMISTORTABLE_100K_H_
+
+// "RS 100k thermistor" Rs Part: 528-8592; "EPCOS NTC G540" B57540G0104J
+// ./createTemperatureLookup.py --r0=100000 --t0=25 --r1=0 --r2=4700 --beta=4036 --max-adc=1023
+// r0: 100000
+// t0: 25
+// r1: 0
+// r2: 4700
+// beta: 4036
+// max adc: 1023
+
+#define NUMTEMPS 20
+short temptable[NUMTEMPS][2] = {
+   {1, 864},
+   {54, 258},
+   {107, 211},
+   {160, 185},
+   {213, 168},
+   {266, 154},
+   {319, 143},
+   {372, 133},
+   {425, 125},
+   {478, 116},
+   {531, 109},
+   {584, 101},
+   {637, 94},
+   {690, 87},
+   {743, 79},
+   {796, 70},
+   {849, 61},
+   {902, 50},
+   {955, 34},
+   {1008, 2}
+};
+
+
+// Thermistor lookup table for RepRap Temperature Sensor Boards (http://make.rrrf.org/ts)
+// See this page:  
+// http://dev.www.reprap.org/bin/view/Main/Thermistor
+// for details of what goes in this table.
+// Made with createTemperatureLookup.py (http://svn.reprap.org/trunk/reprap/firmware/Arduino/utilities/createTemperatureLookup.py)
+// ./createTemperatureLookup.py --r0=100000 --t0=25 --r1=0 --r2=4700 --beta=4066 --max-adc=1023
+// r0: 100000
+// t0: 25
+// r1: 0
+//// r2: 4700
+//// beta: 4066
+//// max adc: 1023
+//
+//#define NUMTEMPS 20
+//short temptable[NUMTEMPS][2] = {
+//   {1, 864},
+//   {54, 258},
+//   {107, 211},
+//   {160, 185},
+//   {213, 168},
+//   {266, 154},
+//   {319, 143},
+//   {372, 133},
+//   {425, 125},
+//   {478, 116},
+//   {531, 109},
+//   {584, 101},
+//   {637, 94},
+//   {690, 87},
+//   {743, 79},
+//   {796, 70},
+//   {849, 61},
+//   {902, 50},
+//   {955, 34},
+//   {1008, 2}
+//};
+
+
+#endif
+

Deleted: trunk/software/firmware/Tonokip_Firmware/configuration.h
===================================================================
--- trunk/software/firmware/Tonokip_Firmware/configuration.h	2011-06-28 17:08:09 UTC (rev 4143)
+++ trunk/software/firmware/Tonokip_Firmware/configuration.h	2011-07-06 17:36:46 UTC (rev 4144)
@@ -1,139 +0,0 @@
-#ifndef PARAMETERS_H
-#define PARAMETERS_H
-
-// NO RS485/EXTRUDER CONTROLLER SUPPORT
-// PLEASE VERIFY PIN ASSIGNMENTS FOR YOUR CONFIGURATION!!!!!!!
-#define MOTHERBOARD 3 // ATMEGA168 = 0, SANGUINO = 1, MOTHERBOARD = 2, MEGA/RAMPS = 3, ATMEGA328 = 4, Gen6 = 5, Sanguinololu = 6
-
-//Comment out to disable SD support
-//#define SDSUPPORT 1
-
-//Min step delay in microseconds. If you are experiencing missing steps, try to raise the delay microseconds, but be aware this
-// If you enable this, make sure STEP_DELAY_RATIO is disabled.
-#define STEP_DELAY_MICROS 1
-
-// Do RepRap-style accelerations
-// See: http://reprap.org/wiki/GCodes#G1:_Controlled_move
-// Comment out to get Ordinary G-code F-value behaviour
-#define REPRAP_ACC
-
-//Step delay over interval ratio. If you are still experiencing missing steps, try to uncomment the following line, but be aware this
-//If you enable this, make sure STEP_DELAY_MICROS is disabled.
-//#define STEP_DELAY_RATIO 0.25
-
-//Acceleration settings
-float full_velocity_units = 10; // the units between minimum and G1 move feedrate
-float travel_move_full_velocity_units = 10; // used for travel moves
-float min_units_per_second = 35.0; // the minimum feedrate
-float min_constant_speed_units = 2; // the minimum units of an accelerated move that must be done at constant speed
-                                    // Note that if the move is shorter than this value, acceleration won't be perfomed,
-                                    // but will be done at the minimum between min_units_per_seconds and move feedrate speeds.
-
-// AD595 THERMOCOUPLE SUPPORT UNTESTED... USE WITH CAUTION!!!!
-
-//PID settings:
-//Uncomment the following line to enable PID support. This is untested and could be disastrous. Be careful.
-//#define PIDTEMP 1
-#ifdef PIDTEMP
-#define PID_MAX 255 // limits current to nozzle
-#define PID_INTEGRAL_DRIVE_MAX 220
-#define PID_PGAIN 180 //100 is 1.0
-#define PID_IGAIN 2 //100 is 1.0
-#define PID_DGAIN 100 //100 is 1.0
-#endif
-
-//Experimental temperature smoothing - only uncomment this if your temp readings are noisy
-//#define SMOOTHING 1
-//#define SMOOTHFACTOR 16 //best to use a power of two here - determines how many values are averaged together by the smoothing algorithm
-
-//Experimental watchdog and minimal temp
-//The watchdog waits for the watchperiod in milliseconds whenever an M104 or M109 increases the target temperature
-//If the temperature has not increased at the end of that period, the target temperature is set to zero. It can be reset with another M104/M109
-//#define WATCHPERIOD 5000 //5 seconds
-//The minimal temperature defines the temperature below which the heater will not be enabled
-//#define MINTEMP 
-
-// Select one of these only to define how the nozzle temp is read.
-#define HEATER_USES_THERMISTOR
-//#define HEATER_USES_AD595
-//#define HEATER_USES_MAX6675
-
-// Select one of these only to define how the bed temp is read.
-#define BED_USES_THERMISTOR
-//#define BED_USES_AD595
-
-// Calibration formulas
-// e_extruded_steps_per_mm = e_feedstock_steps_per_mm * (desired_extrusion_diameter^2 / feedstock_diameter^2)
-// new_axis_steps_per_mm = previous_axis_steps_per_mm * (test_distance_instructed/test_distance_traveled)
-// units are in millimeters or whatever length unit you prefer: inches,football-fields,parsecs etc
-
-//Calibration variables
-float x_steps_per_unit = 80;
-float y_steps_per_unit = 80;
-float z_steps_per_unit = 6667.184;
-float e_steps_per_unit = 48;
-
-#ifdef REPRAP_ACC
-float f_steps_per_unit = 1;
-float max_feedrate = 12000;
-#else
-float max_feedrate = 200000; //mmm, acceleration!
-#endif
-
-//float x_steps_per_unit = 10.047;
-//float y_steps_per_unit = 10.047;
-//float z_steps_per_unit = 833.398;
-//float e_steps_per_unit = 0.706;
-//float max_feedrate = 3000;
-
-//For Inverting Stepper Enable Pins (Active Low) use 0, Non Inverting (Active High) use 1
-const bool X_ENABLE_ON = 0;
-const bool Y_ENABLE_ON = 0;
-const bool Z_ENABLE_ON = 0;
-const bool E_ENABLE_ON = 0;
-
-//Disables axis when it's not being used.
-const bool DISABLE_X = false;
-const bool DISABLE_Y = false;
-const bool DISABLE_Z = false;
-const bool DISABLE_E = false;
-
-const bool INVERT_X_DIR = false;
-const bool INVERT_Y_DIR = false;
-const bool INVERT_Z_DIR = true;
-const bool INVERT_E_DIR = false;
-
-//Thermistor settings:
-//Uncomment for 10k thermistor
-#include "BedThermistorTable_10k.h"
-
-//Thermistor settings:
-//Uncomment for 100k thermistor
-#include "ThermistorTable_100k.h"
-//#include "BedThermistorTable_100k.h"
-
-//Uncomment for 200k thermistor
-//#include "ThermistorTable_200k.h"
-//#include "BedThermistorTable_200k.h"
-
-//Identical thermistors on heater and bed - use this if you have no heated bed or if the thermistors are the same on both:
-//#include "ThermistorTable_200k.h"
-//#include "ThermistorTable_100k.h"
-//#include "ThermistorTable_mendelparts.h"
-//#define BNUMTEMPS NUMTEMPS
-//#define bedtemptable temptable
-
-//Endstop Settings
-#define ENDSTOPPULLUPS 1
-const bool ENDSTOPS_INVERTING = false;
-const bool min_software_endstops = false; //If true, axis won't move to coordinates less than zero.  N.B. If true this prevents G28 homing axes.
-const bool max_software_endstops = true;  //If true, axis won't move to coordinates greater than the defined lengths below.
-const int X_MAX_LENGTH = 220;
-const int Y_MAX_LENGTH = 220;
-const int Z_MAX_LENGTH = 100;
-
-#define BAUDRATE 115200
-
-
-
-#endif

Added: trunk/software/firmware/Tonokip_Firmware/configuration.h.dist
===================================================================
--- trunk/software/firmware/Tonokip_Firmware/configuration.h.dist	                        (rev 0)
+++ trunk/software/firmware/Tonokip_Firmware/configuration.h.dist	2011-07-06 17:36:46 UTC (rev 4144)
@@ -0,0 +1,138 @@
+#ifndef PARAMETERS_H
+#define PARAMETERS_H
+
+// NO RS485/EXTRUDER CONTROLLER SUPPORT
+// PLEASE VERIFY PIN ASSIGNMENTS FOR YOUR CONFIGURATION!!!!!!!
+#define MOTHERBOARD 6 // ATMEGA168 = 0, SANGUINO = 1, MOTHERBOARD = 2, MEGA/RAMPS = 3, ATMEGA328 = 4, Gen6 = 5, Sanguinololu = 6
+
+//Comment out to disable SD support
+//#define SDSUPPORT 1
+
+//Min step delay in microseconds. If you are experiencing missing steps, try to raise the delay microseconds, but be aware this
+// If you enable this, make sure STEP_DELAY_RATIO is disabled.
+#define STEP_DELAY_MICROS 1
+
+// Do RepRap-style accelerations
+// See: http://reprap.org/wiki/GCodes#G1:_Controlled_move
+// Comment out to get Ordinary G-code F-value behaviour
+#define REPRAP_ACC
+
+//Step delay over interval ratio. If you are still experiencing missing steps, try to uncomment the following line, but be aware this
+//If you enable this, make sure STEP_DELAY_MICROS is disabled.
+//#define STEP_DELAY_RATIO 0.25
+
+//Acceleration settings
+float full_velocity_units = 10; // the units between minimum and G1 move feedrate
+float travel_move_full_velocity_units = 10; // used for travel moves
+float min_units_per_second = 35.0; // the minimum feedrate
+float min_constant_speed_units = 2; // the minimum units of an accelerated move that must be done at constant speed
+                                    // Note that if the move is shorter than this value, acceleration won't be perfomed,
+                                    // but will be done at the minimum between min_units_per_seconds and move feedrate speeds.
+
+// AD595 THERMOCOUPLE SUPPORT UNTESTED... USE WITH CAUTION!!!!
+
+//PID settings:
+//Uncomment the following line to enable PID support. This is untested and could be disastrous. Be careful.
+//#define PIDTEMP 1
+#ifdef PIDTEMP
+#define PID_MAX 255 // limits current to nozzle
+#define PID_INTEGRAL_DRIVE_MAX 220
+#define PID_PGAIN 180 //100 is 1.0
+#define PID_IGAIN 2 //100 is 1.0
+#define PID_DGAIN 100 //100 is 1.0
+#endif
+
+//Experimental temperature smoothing - only uncomment this if your temp readings are noisy
+//#define SMOOTHING 1
+//#define SMOOTHFACTOR 16 //best to use a power of two here - determines how many values are averaged together by the smoothing algorithm
+
+//Experimental watchdog and minimal temp
+//The watchdog waits for the watchperiod in milliseconds whenever an M104 or M109 increases the target temperature
+//If the temperature has not increased at the end of that period, the target temperature is set to zero. It can be reset with another M104/M109
+//#define WATCHPERIOD 5000 //5 seconds
+//The minimal temperature defines the temperature below which the heater will not be enabled
+//#define MINTEMP 
+
+// Select one of these only to define how the nozzle temp is read.
+#define HEATER_USES_THERMISTOR
+//#define HEATER_USES_AD595
+//#define HEATER_USES_MAX6675
+
+// Select one of these only to define how the bed temp is read.
+#define BED_USES_THERMISTOR
+//#define BED_USES_AD595
+
+// Calibration formulas
+// e_extruded_steps_per_mm = e_feedstock_steps_per_mm * (desired_extrusion_diameter^2 / feedstock_diameter^2)
+// new_axis_steps_per_mm = previous_axis_steps_per_mm * (test_distance_instructed/test_distance_traveled)
+// units are in millimeters or whatever length unit you prefer: inches,football-fields,parsecs etc
+
+//Calibration variables
+float x_steps_per_unit = 80;
+float y_steps_per_unit = 80;
+float z_steps_per_unit = 2560;
+float e_steps_per_unit = 30;
+
+#ifdef REPRAP_ACC
+float f_steps_per_unit = 1;
+float max_feedrate = 12000;
+#else
+float max_feedrate = 200000; //mmm, acceleration!
+#endif
+
+//float x_steps_per_unit = 10.047;
+//float y_steps_per_unit = 10.047;
+//float z_steps_per_unit = 833.398;
+//float e_steps_per_unit = 0.706;
+//float max_feedrate = 3000;
+
+//For Inverting Stepper Enable Pins (Active Low) use 0, Non Inverting (Active High) use 1
+const bool X_ENABLE_ON = 0;
+const bool Y_ENABLE_ON = 0;
+const bool Z_ENABLE_ON = 0;
+const bool E_ENABLE_ON = 0;
+
+//Disables axis when it's not being used.
+const bool DISABLE_X = false;
+const bool DISABLE_Y = false;
+const bool DISABLE_Z = false;
+const bool DISABLE_E = false;
+
+const bool INVERT_X_DIR = false;
+const bool INVERT_Y_DIR = false;
+const bool INVERT_Z_DIR = false;
+const bool INVERT_E_DIR = false;
+
+//Thermistor settings:
+//Uncomment for 10k thermistor
+#include "BedThermistorTable_10k_EPCOS_B57550G103J.h"
+
+//Thermistor settings:
+//Uncomment for 100k thermistor
+#include "ThermistorTable_100k_EPCOS_B57540G0104J.h"
+
+//Uncomment for 200k thermistor
+//#include "ThermistorTable_200k.h"
+//#include "BedThermistorTable_200k.h"
+
+//Identical thermistors on heater and bed - use this if you have no heated bed or if the thermistors are the same on both:
+//#include "ThermistorTable_200k.h"
+//#include "ThermistorTable_100k.h"
+//#include "ThermistorTable_mendelparts.h"
+//#define BNUMTEMPS NUMTEMPS
+//#define bedtemptable temptable
+
+//Endstop Settings
+#define ENDSTOPPULLUPS 1
+const bool ENDSTOPS_INVERTING = false;
+const bool min_software_endstops = false; //If true, axis won't move to coordinates less than zero.  N.B. If true this prevents G28 homing axes.
+const bool max_software_endstops = true;  //If true, axis won't move to coordinates greater than the defined lengths below.
+const int X_MAX_LENGTH = 220;
+const int Y_MAX_LENGTH = 220;
+const int Z_MAX_LENGTH = 100;
+
+#define BAUDRATE 115200
+
+
+
+#endif


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




2009	Jan (9)	Feb (137)	Mar (123)	Apr (60)	May (305)	Jun (49)	Jul (39)	Aug (44)	Sep (23)	Oct (42)	Nov (39)	Dec (30)
2010	Jan (61)	Feb (50)	Mar (33)	Apr (10)	May (17)	Jun (19)	Jul (48)	Aug (71)	Sep (69)	Oct (59)	Nov (21)	Dec (74)
2011	Jan (38)	Feb (29)	Mar (19)	Apr (43)	May (16)	Jun (8)	Jul (1)	Aug	Sep	Oct	Nov	Dec

reprap-commits Mailing List for The RepRap Project

reprap-commits — Notification of source code repository commits