Skip to content

Commit

Permalink
Tested generic firmware with ToM, works.
Browse files Browse the repository at this point in the history
  • Loading branch information
Christopher Jansen committed Aug 7, 2011
1 parent 0d61120 commit d692452
Show file tree
Hide file tree
Showing 10 changed files with 13,097 additions and 62 deletions.
4 changes: 2 additions & 2 deletions Axis.h
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ class Axis
{
position += (float)(steps_to_take-steps_remaining) / steps_per_unit;
steps_remaining = 0;
HOST.write("AES\n");
//HOST.write("AES\n");
return;
}
}
Expand All @@ -87,7 +87,7 @@ class Axis
{
position -= (float)(steps_to_take-steps_remaining) / steps_per_unit;
steps_remaining = 0;
HOST.write("IES\n");
//HOST.write("IES\n");
return;
}
}
Expand Down
20 changes: 10 additions & 10 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ USE_LCD = 1
USE_KEYPAD = 1

# EC for Gen3/4 only. Others default to 100k Thermistors.
#USE_EXTRUDERCONTROLLER = 1
USE_EXTRUDERCONTROLLER = 1

#CONFIG_PATH = ramps12
#CONFIG_PATH = ramps13
Expand All @@ -23,16 +23,16 @@ CONFIG_PATH = generic
AVR_TOOLS_PATH = /usr/bin

#Reasonable settings for Atmega1280 (regardless of board)
#UPLOAD_RATE = 57600
#AVRDUDE_PROGRAMMER = stk500v1
#PORT = /dev/ttyUSB0
#MCU = atmega1280
UPLOAD_RATE = 57600
AVRDUDE_PROGRAMMER = stk500v1
PORT = /dev/ttyUSB0
MCU = atmega1280

# Reasonable settings for Atmega2560 (regardless of board)
UPLOAD_RATE = 115200
AVRDUDE_PROGRAMMER = stk500v2
PORT = /dev/ttyACM0
MCU = atmega2560
#UPLOAD_RATE = 115200
#AVRDUDE_PROGRAMMER = stk500v2
#PORT = /dev/ttyACM0
#MCU = atmega2560



Expand All @@ -54,7 +54,7 @@ ifeq ($(USE_SD),1)
endif
ifeq ($(USE_EXTRUDERCONTROLLER),1)
BOARD_FILES = temperature/MBIEC.cpp
BOARD_DEFINES = -I./temperature/
BOARD_DEFINES = -I./temperature/ -DUSE_MBIEC
else
BOARD_FILES = temperature/Thermistor.cpp temperature/ThermistorTable.cpp avr/AnalogPin.cpp
BOARD_DEFINES = -I./temperature/
Expand Down
3 changes: 3 additions & 0 deletions Temperature.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,14 @@
*/

#include "config.h"

#ifdef USE_MBIEC
#include "MBIEC.h"
#else
#include "Thermistor.h"
#endif


#include <stdint.h>
#include "AvrPort.h"

Expand Down
50 changes: 0 additions & 50 deletions gen4/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
#include "config-common.h"

// MBI Extruder Controller comm settings.
#define USE_MBIEC
#define RS485_TX_ENABLE Pin(PortC,5)
#define RS485_RX_ENABLE Pin(PortC,7)

Expand All @@ -26,13 +25,11 @@
#define X_MIN_PIN Pin(PortB,6)
#define X_MAX_PIN Pin(PortB,5)
#define X_INVERT_DIR true
#define X_HOME_DIR -1
#define X_STEPS_PER_UNIT 47.069852
#define X_MAX_FEED 12000
#define X_AVG_FEED 6000
#define X_START_FEED 2000
#define X_ACCEL_RATE 400
#define X_LENGTH 110
#define X_DISABLE false

#define Y_STEP_PIN Pin(PortA,3)
Expand All @@ -41,13 +38,11 @@
#define Y_MIN_PIN Pin(PortB,4)
#define Y_MAX_PIN Pin(PortH,6)
#define Y_INVERT_DIR true
#define Y_HOME_DIR -1
#define Y_STEPS_PER_UNIT 47.069852
#define Y_MAX_FEED 12000
#define Y_AVG_FEED 6000
#define Y_START_FEED 2000
#define Y_ACCEL_RATE 400
#define Y_LENGTH 110
#define Y_DISABLE false

#define Z_STEP_PIN Pin(PortA,0)
Expand All @@ -56,67 +51,22 @@
#define Z_MIN_PIN Pin(PortH,5)
#define Z_MAX_PIN Pin(PortH,4)
#define Z_INVERT_DIR false
#define Z_HOME_DIR 1
#define Z_STEPS_PER_UNIT 200
#define Z_MAX_FEED 1000
#define Z_AVG_FEED 100
#define Z_START_FEED 100
#define Z_ACCEL_RATE 100
#define Z_LENGTH 110
#define Z_DISABLE false

#define A_STEP_PIN Pin(PortJ,0)
#define A_DIR_PIN Pin(PortJ,1)
#define A_ENABLE_PIN Pin(PortE,5)
#define A_INVERT_DIR true
#define A_HOME_DIR 0
#define A_STEPS_PER_UNIT 44.169
#define A_MAX_FEED 24000
#define A_AVG_FEED 12000
#define A_START_FEED 4000
#define A_ACCEL_RATE 1000
#define A_LENGTH 110
#define A_DISABLE false

#define B_STEP_PIN Pin(PortG,5)
#define B_DIR_PIN Pin(PortE,3)
#define B_ENABLE_PIN Pin(PortH,3)
#define B_INVERT_DIR false
#define B_HOME_DIR 0
#define B_STEPS_PER_UNIT 700
#define B_MAX_FEED 6000
#define B_AVG_FEED 3000
#define B_START_FEED 1200
#define B_ACCEL_DIST 5
#define B_LENGTH 110
#define B_DISABLE true


// LCD SETTINGS FROM MY LCD HACK, NOT OFFICIAL MBI
// But I would sure love osmeone to change them to work for official MBI and
// let me know. :)
#define LCD_RS_PIN Pin(PortC,3)
#define LCD_RW_PIN Pin(PortC,2)
#define LCD_E_PIN Pin(PortC,0)
#define LCD_0_PIN Pin(PortG,2)
#define LCD_1_PIN Pin(PortG,0)
#define LCD_2_PIN Pin(PortL,6)
#define LCD_3_PIN Pin(PortC,1)
#define LCD_4_PIN Pin(PortD,7)
#define LCD_5_PIN Pin(PortG,1)
#define LCD_6_PIN Pin(PortL,7)
#define LCD_7_PIN Pin(PortL,5)

#define LCD_X 16
#define LCD_Y 2

#define LCD_LINESTARTS {0x0, 0x40}

#define LCD_REFRESH_MILLIS 1000






#endif // CONFIG_H
File renamed without changes.
File renamed without changes.
14 changes: 14 additions & 0 deletions generic/README
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
For more details on this system, please see:
http://reprap.org/wiki/Sjfw

"EC" firmwares for Thing-O-Matic/Gen4 require the Makerbot Extruder Controller Firmware on your EC.

config.h - Configuration used in precompiled .hex files for reference.
ramps13.gcode - Runtime configuration for RAMPS13. Commented.
ramps13.gcd - Same but uncommented, to use as sjfwauto.gcd on sdcard.
tom.gcd - Runtime configuration for ToM.
100k-thermistor-1280.hex - Firmware suitable for any 1280-based system using 100k Thermistors.
100k-thermistor-2560.hex - Same, for 2560.
ec-1280.hex - Firmware suitable for any 1280-based system using an RS485 Extruder Controller.
ec-2560.hex - Same, for 2560.

Loading

0 comments on commit d692452

Please sign in to comment.