Skip to content

Commit

Permalink
Version 0.44
Browse files Browse the repository at this point in the history
  • Loading branch information
repetier committed Jan 24, 2012
1 parent b8eb21a commit 5b925be
Show file tree
Hide file tree
Showing 12 changed files with 383 additions and 11 deletions.
2 changes: 1 addition & 1 deletion README.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Repetier-Firmware - the fast and user friendly firmware
by repetier (repetierdev@googlemail.com)

Version 0.43 31.12.2011
Version 0.44 24.01.2012

1) Introduction

Expand Down
3 changes: 2 additions & 1 deletion Repetier/Commands.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,12 @@ void process_command(GCode *com)
queue_move(ALWAYS_CHECK_ENDSTOPS);
break;
case 4: // G4 dwell
wait_until_end_of_move();
codenum = 0;
if(GCODE_HAS_P(com)) codenum = com->P; // milliseconds to wait
if(GCODE_HAS_S(com)) codenum = (long)com->S * 1000; // seconds to wait
codenum += millis(); // keep track of when we started waiting
while(millis() < codenum ){
while((unsigned long)(codenum-millis()) < 2000000000 ){
gcode_read_serial();
check_periodical();
}
Expand Down
4 changes: 2 additions & 2 deletions Repetier/Configuration.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
// Sanguinololu up to 1.1 = 6
// Sanguinololu 1.2 and above = 62
// Gen7 1.1 and above = 7
#define MOTHERBOARD 5
#define MOTHERBOARD 5
#include <avr/io.h>
#include "pins.h"

Expand Down Expand Up @@ -612,7 +612,7 @@ IMPORTANT: With mode <>0 some changes in configuration.h are not set any more, a
*/
#define EEPROM_MODE 1
/** Comment out (using // at the start of the line) to disable SD support: */
//#define SDSUPPORT 1
#define SDSUPPORT 1
/** Show extended directory including file length. Don't use this with pronterface! */
#define SD_EXTENDED_DIR

Expand Down
10 changes: 7 additions & 3 deletions Repetier/Repetier.pde
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ Custom M Codes
or use S<seconds> to specify an inactivity timeout, after which the steppers will be disabled. S0 to disable the timeout.
- M85 - Set inactivity shutdown timer with parameter S<seconds>. To disable set zero (default)
- M92 - Set axis_steps_per_unit - same syntax as G92
- M112 - Emergency kill
- M115 - Capabilities string
- M140 - Set bed target temp
- M190 - Wait for bed current temp to reach target temp.
Expand Down Expand Up @@ -407,8 +408,11 @@ void loop()
}
//check heater every n milliseconds
check_periodical();
if(max_inactive_time!=0 && (millis()-previous_millis_cmd) > max_inactive_time ) kill(false);
if(stepper_inactive_time!=0 && (millis()-previous_millis_cmd) > stepper_inactive_time ) { kill(true); }
unsigned long curtime = millis();
if(lines_count)
previous_millis_cmd = curtime;
if(max_inactive_time!=0 && (curtime-previous_millis_cmd) > max_inactive_time ) kill(false);
if(stepper_inactive_time!=0 && (curtime-previous_millis_cmd) > stepper_inactive_time ) { kill(true); }
//void finishNextSegment();
#ifdef DEBUG_FREE_MEMORY
send_mem();
Expand Down Expand Up @@ -1737,8 +1741,8 @@ ISR(EXTRUDER_TIMER_VECTOR)
#if USE_OPS==1 || defined(USE_ADVANCE)
// The stepper signals are in strategical positions for optimal timing. If you
// still have timeing issues, add dummy commands between.
extruder_unstep();
if(printer_state.extruderStepsNeeded) {
extruder_unstep();
if(printer_state.extruderStepsNeeded<0) { // Backward step
extruder_set_direction(0);
if(extruder_wait_dirchange && extruder_last_dir==-1) {
Expand Down
16 changes: 12 additions & 4 deletions Repetier/gcode.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -296,10 +296,18 @@ void gcode_resend() {
If not, a resend and ok is send.
*/
void gcode_checkinsert(GCode *act) {
if(GCODE_HAS_M(act) && act->M==110) { // Reset line number
gcode_lastN = gcode_actN;
out.println_P(PSTR("ok"));
return;
if(GCODE_HAS_M(act)) {
if(act->M==110) { // Reset line number
gcode_lastN = gcode_actN;
out.println_P(PSTR("ok"));
return;
}
if(act->M==112) { // Emergency kill - freeze printer
cli(); // Don't allow interrupts to do their work
kill(false);
manage_temperatures();
while(1) {}
}
}
if(GCODE_HAS_N(act)) {
if((((gcode_lastN+1) & 0xffff)!=(gcode_actN&0xffff))) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
#include "WProgram.h"
#define COMPAT_PRE1
61 changes: 61 additions & 0 deletions boards/Sanguino 1.0+/Sanguino for 023/boards.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
##############################################################

atmega644.name=Sanguino W/ ATmega644P

atmega644.upload.protocol=arduino
atmega644.upload.maximum_size=63488
atmega644.upload.speed=38400

atmega644.bootloader.low_fuses=0xFF
atmega644.bootloader.high_fuses=0xDC
atmega644.bootloader.extended_fuses=0xFD
atmega644.bootloader.path=atmega644p
atmega644.bootloader.file=ATmegaBOOT_644P.hex
atmega644.bootloader.unlock_bits=0x3F
atmega644.bootloader.lock_bits=0x0F

atmega644.build.mcu=atmega644p
atmega644.build.f_cpu=16000000L
atmega644.build.core=arduino
atmega644.build.variant=standard

##############################################################

atmega12848m.name=Sanguino W/ ATmega1284p 8mhz

atmega12848m.upload.protocol=arduino
atmega12848m.upload.maximum_size=131072
atmega12848m.upload.speed=19200

atmega12848m.bootloader.low_fuses=0xFD
atmega12848m.bootloader.high_fuses=0x9A
atmega12848m.bootloader.extended_fuses=0xFF
atmega12848m.bootloader.path=atmega
atmega12848m.bootloader.file=ATmegaBOOT_168_atmega328_pro_8MHz.hex
atmega12848m.bootloader.unlock_bits=0x3F
atmega12848m.bootloader.lock_bits=0x0F

atmega12848m.build.mcu=atmega1284p
atmega12848m.build.f_cpu=8000000L
atmega12848m.build.core=arduino

##############################################################

atmega1284.name=Sanguino W/ ATmega1284p 16mhz

atmega1284.upload.protocol=arduino
atmega1284.upload.maximum_size=131072
atmega1284.upload.speed=57600

atmega1284.bootloader.low_fuses=0xFF
atmega1284.bootloader.high_fuses=0x99
atmega1284.bootloader.extended_fuses=0xFF
atmega1284.bootloader.path=atmega
atmega1284.bootloader.file=ATmegaBOOT_168_atmega1284p.hex
atmega1284.bootloader.unlock_bits=0x3F
atmega1284.bootloader.lock_bits=0x0F

#atmega1284.build.mcu=atmega1284p
#atmega1284.build.f_cpu=8000000L
#atmega1284.build.core=arduino
#
Loading

0 comments on commit 5b925be

Please sign in to comment.