daid
9b7d87e885
Remove duplicate contrast define.
11 years ago
daid
816f0a678a
Merge pull request #768 from whosawhatsis/Marlin_v1
multiple FWretract fixes
11 years ago
whosawhatsis
6e43398509
G10/G11 bugfixes
Previous version was broken by using G92 E0 between retract and recover.
11 years ago
whosawhatsis
d6c5c503d4
correct feedrate units in comments for M207/M208
11 years ago
nothinman
15d6116188
Merge pull request #689 from cajun-rat/tidy
Use C++ initialization list
11 years ago
Martin Lukasik
0b9ecf3824
Language cleanup, part 1.
11 years ago
whosawhatsis
b5ba5c1465
Merge branch 'Marlin_v1' of https://github.com/whosawhatsis/Marlin into Marlin_v1
11 years ago
whosawhatsis
78e7654601
Keep FWRETRACT values in terms of millimeters when using M200
for volumetric E units
11 years ago
whosawhatsis
3f6d44d40b
Keep FWRETRACT values in terms of millimeters when using M200 for volumetric E units
11 years ago
Cylindric
363dc2f0e8
Merge branch 'Marlin_v1' into update_menu_plan
11 years ago
nothinman
5f797ca29f
Updated Polish, changed default firmware URL to Marlin.
11 years ago
nothinman
1a6d21bb60
Merge pull request #761 from Cylindric3D/localisation
Move strings in ultralcd.cpp into language.h.
11 years ago
Mark Hanford
0778f5f028
Add missing entries to the new Aragonian language.
11 years ago
Mark Hanford
54bab3e0d0
Merge branch 'Marlin_v1' into localisation
Conflicts:
Marlin/language.h
11 years ago
nothinman
b18b40feff
Merge pull request #760 from danielmartinez/aragonese_trans
Aragonese translation
11 years ago
Mark Hanford
bdd0211aeb
Move strings in ultralcd.cpp into language.h.
11 years ago
Daniel Martinez
c8e5a82d49
keep English as default lang.
11 years ago
Daniel Martinez
f64592e362
Add Aragonese translation
11 years ago
ErikZalm
ac74f45dc0
Merge pull request #752 from MatixYo/patch-3
Update language.h
11 years ago
ErikZalm
8ebcc9dc3a
Merge pull request #748 from wolfmanjm/add/azteegx3pro
Add/azteegx3pro
11 years ago
nothinman
19530c9945
Revert "Merge pull request #756 from danielmartinez/aragones"
This reverts commit 6f76066ab3 , reversing
changes made to e1ae7952eb .
11 years ago
nothinman
6f76066ab3
Merge pull request #756 from danielmartinez/aragones
Add Aragonese translation
11 years ago
Daniel Martinez
8b67f6f3e8
Add Aragonese translation
11 years ago
MatixYo
36086d3ca4
Update language.h
Updated Polish translations.
11 years ago
Cylindric
1781031f2d
Update LCD Menu Tree with current options, based on ultralcd.cpp and language.h.
11 years ago
Jim Morris
d485988bec
fix typo
11 years ago
Jim Morris
8a1fd25363
Default is to not define digipot_i2c
11 years ago
Jim Morris
5097c57d3a
Added pins for Azteeg X3 Pro under motherboard 68
11 years ago
Jim Morris
b819fc53ca
Add Azteeg X3 Pro as motherboard 68
Add digipot i2c control for MCP4451
Allow M907 to set i2c digipot currents in amps
Fix Makefile to allow Azteeg motherboards
Fix Makefile to allow Wire libraries only
Add beeper pin for Azteeg X3 Pro
11 years ago
ErikZalm
e1ae7952eb
Merge pull request #743 from Opticalworm/Marlin_v1
Improved support for panelolu2 encoder and buzzer
11 years ago
ErikZalm
1cc9212c05
Merge pull request #744 from drf5n/watts
Heater wattage reporting for M105 using EXTRUDER_WATTS and BED_WATTS
11 years ago
David Forrest
a5f53f0cf3
Heater wattage reporting for M105 using EXTRUDER_WATTS and BED_WATTS
11 years ago
Ronald
c2b3e88787
Changed 1284p fuse setting for Arduino_1.x.x
- Remove the two version of 16mHz. Crystal and resonator use the same
fuse setting. Also, Arduino IDE only showed the first one 16Mhz as a
board option.
- Added 20Mhz board option.
Symptoms for incorrect fuse setting:
- X axis move in one direction
- limit switches fail to trigger
- unable to reprogram the device via bootloader
- stops working when the reset switch is pressed.
- device fails to bootup when power by a slow raise power supply.
Solution:
- Disabled the jtag
- set the correct clock selection bit
- set the correct bootloader memory size
- enable brown-out setting
- enable clock power up delay
11 years ago
Ronald
8d162e5bd7
Improved support for panelolu2 encoder and buzzer
I added #define for LCD_FEEDBACK_FREQUENCY_HZ and
LCD_FEEDBACK_FREQUENCY_DURATION_MS which is used to alter the default
buzzer sound.
When selecting Panelolu2 in configuration.h:
- it automatically sets the correct ENCODER_PULSES_PER_STEP and
ENCODER_STEPS_PER_MENU_ITEM.
- if LCD_USE_I2C_BUZZER is defined it will also set the default
LCD_FEEDBACK_FREQUENCY_HZ and LCD_FEEDBACK_FREQUENCY_DURATION_MS
When selecting the sanguinololu 1284p the following is true:
- its now enables LARGE_FLASH
- It enables the gcode M300 when the panelolu2 LCD_USE_I2C_BUZZER is
defined
11 years ago
ErikZalm
430dcb65a7
Merge pull request #740 from whosawhatsis/M200
Change diameter code to 'D'
11 years ago
ErikZalm
3ec0d110bd
Merge pull request #741 from Opticalworm/Marlin_v1
Changed 1284p fuse setting for 8, 16 and 20 Mhz
11 years ago
Ronald
f303129fb6
Changed 1284p fuse setting for 8, 16 and 20 Mhz
Symtopns:
- X axis move in one direction
- limit switches fail to trigger
- unable to reprogram the device via bootloader
- stops working when the reset switch is pressed.
- device fails to bootup when power by a slow raise power supply.
Solution:
- Disabled the jtag
- set the correct clock selection bit
- set the correct bootloader memory size
- enable brown-out setting
- enable clock power up delay
11 years ago
whosawhatsis
b2c11ba980
Change diameter code to 'D'
For some reason that I can’t figure out, the decimal is dropped when
using ’S’ for the code.
Also some minor code improvements to M200.
11 years ago
ErikZalm
a864d9d4ab
Merge pull request #738 from whosawhatsis/Marlin_v1
Group hardware files for Arduino 1.x.x into hardware folder
11 years ago
whosawhatsis
28aca76c4d
Group hardware files for Arduino 1.x.x into hardware folder
11 years ago
ErikZalm
61059385a3
Merge pull request #737 from whosawhatsis/M200
M200 implementation
11 years ago
whosawhatsis
856edfcc0d
Fixed math
This is why I wanted to sleep on the code I wrote while falling asleep
rather than immediately submitting a pull request.
11 years ago
ErikZalm
0d81ae77bc
Merge pull request #727 from drf5n/oversampling
temperature.cpp: Actually use OVERSAMPLENR in the oversampling calculation.
11 years ago
ErikZalm
84df13f7d1
Merge pull request #721 from drf5n/lcdOnly
Enable basic ULTRA_LCD screen w/o encoders and menus.
11 years ago
ErikZalm
4c7e9502ad
Merge pull request #718 from drf5n/temptableRes
createTemperatureLookupMarlin.py: Add resolution comments and format for...
11 years ago
ErikZalm
652a0f6b5a
Merge pull request #717 from drf5n/tpins2
fastio.h: Add AT90USBxx_TEENSYPP_ASSIGNMENTS for teensyduino/Lincomatic/...
11 years ago
ErikZalm
96a0cdc541
Merge pull request #716 from drf5n/maketeensy
Makefile: Update for Arduino 1.0.5 and Teensyduino dependent boards (HAR...
11 years ago
whosawhatsis
d24df7af2c
M200 implementation
11 years ago
David Forrest
f0b8d5ba3d
createTemperatureLookupMarlin.py: Change comment to refer to actual program name.
11 years ago
David Forrest
50f44d9249
createTemperatureLookupMarlin.py: Truncate to short after application of OVERSAMPLENR for improved resolution.
11 years ago