CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,758 Commits 1 Branch 0 Tags 107 MiB
a57862e29f
Commit Graph

2758 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
daid
71bb3a8133 Add comments for Ultimainboard 2.0 configuration. 2014-02-13 10:53:46 +01:00
daid
9b7d87e885 Remove duplicate contrast define. 2014-02-13 10:50:17 +01:00
daid
816f0a678a Merge pull request #768 from whosawhatsis/Marlin_v1 
multiple FWretract fixes
 2014-02-13 09:14:57 +01:00
whosawhatsis
6e43398509 G10/G11 bugfixes 
Previous version was broken by using G92 E0 between retract and recover.
 2014-02-12 13:03:00 -08:00
whosawhatsis
d6c5c503d4 correct feedrate units in comments for M207/M208 2014-02-12 13:02:47 -08:00
nothinman
15d6116188 Merge pull request #689 from cajun-rat/tidy 
Use C++ initialization list
 2014-02-12 16:38:11 +00:00
Martin Lukasik
0b9ecf3824 Language cleanup, part 1. 2014-02-12 13:21:26 +00:00
whosawhatsis
b5ba5c1465 Merge branch 'Marlin_v1' of https://github.com/whosawhatsis/Marlin into Marlin_v1 2014-02-11 19:06:03 -08:00
whosawhatsis
78e7654601 Keep FWRETRACT values in terms of millimeters when using M200 
for volumetric E units
 2014-02-11 19:05:35 -08:00
whosawhatsis
3f6d44d40b Keep FWRETRACT values in terms of millimeters when using M200 for volumetric E units 2014-02-11 18:50:11 -08:00
Cylindric
363dc2f0e8 Merge branch 'Marlin_v1' into update_menu_plan 2014-02-12 00:51:16 +00:00
nothinman
5f797ca29f Updated Polish, changed default firmware URL to Marlin. 2014-02-11 22:38:01 +00:00
nothinman
1a6d21bb60 Merge pull request #761 from Cylindric3D/localisation 
Move strings in ultralcd.cpp into language.h.
 2014-02-11 15:39:18 +00:00
Mark Hanford
0778f5f028 Add missing entries to the new Aragonian language. 2014-02-11 14:40:53 +00:00
Mark Hanford
54bab3e0d0 Merge branch 'Marlin_v1' into localisation 
Conflicts:
	Marlin/language.h
 2014-02-11 14:35:28 +00:00
nothinman
b18b40feff Merge pull request #760 from danielmartinez/aragonese_trans 
Aragonese translation
 2014-02-11 14:28:03 +00:00
Mark Hanford
bdd0211aeb Move strings in ultralcd.cpp into language.h. 2014-02-11 13:54:43 +00:00
Daniel Martinez
c8e5a82d49 keep English as default lang. 2014-02-09 18:24:24 +01:00
Daniel Martinez
f64592e362 Add Aragonese translation 2014-02-09 18:19:37 +01:00
ErikZalm
ac74f45dc0 Merge pull request #752 from MatixYo/patch-3 
Update language.h
 2014-02-09 17:52:26 +01:00
ErikZalm
8ebcc9dc3a Merge pull request #748 from wolfmanjm/add/azteegx3pro 
Add/azteegx3pro
 2014-02-09 17:50:15 +01:00
nothinman
19530c9945 Revert "Merge pull request #756 from danielmartinez/aragones" 
This reverts commit 6f76066ab3, reversing
changes made to e1ae7952eb.
 2014-02-09 16:21:00 +00:00
nothinman
6f76066ab3 Merge pull request #756 from danielmartinez/aragones 
Add Aragonese translation
 2014-02-09 13:42:36 +00:00
Daniel Martinez
8b67f6f3e8 Add Aragonese translation 2014-02-09 12:54:05 +01:00
MatixYo
36086d3ca4 Update language.h 
Updated Polish translations.
 2014-02-07 19:15:51 +01:00
Cylindric
1781031f2d Update LCD Menu Tree with current options, based on ultralcd.cpp and language.h. 2014-02-07 01:52:44 +00:00
Jim Morris
d485988bec fix typo 2014-02-05 14:39:45 -08:00
Jim Morris
8a1fd25363 Default is to not define digipot_i2c 2014-02-05 14:28:23 -08:00
Jim Morris
5097c57d3a Added pins for Azteeg X3 Pro under motherboard 68 2014-02-05 14:25:42 -08:00
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
 2014-02-05 01:47:12 -08:00
ErikZalm
e1ae7952eb Merge pull request #743 from Opticalworm/Marlin_v1 
Improved support for panelolu2 encoder and buzzer
 2014-02-03 12:33:10 -08:00
ErikZalm
1cc9212c05 Merge pull request #744 from drf5n/watts 
Heater wattage reporting for M105 using EXTRUDER_WATTS and BED_WATTS
 2014-02-03 12:30:40 -08:00
David Forrest
a5f53f0cf3 Heater wattage reporting for M105 using EXTRUDER_WATTS and BED_WATTS 2014-02-03 14:50:28 -05:00
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
 2014-02-03 15:35:23 +00:00
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
 2014-02-03 07:45:03 +00:00
ErikZalm
430dcb65a7 Merge pull request #740 from whosawhatsis/M200 
Change diameter code to 'D'
 2014-02-02 12:22:01 -08:00
ErikZalm
3ec0d110bd Merge pull request #741 from Opticalworm/Marlin_v1 
Changed 1284p fuse setting for 8, 16 and 20 Mhz
 2014-02-02 12:17:22 -08:00
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
 2014-02-02 13:13:15 +00:00
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.
 2014-02-01 18:49:25 -08:00
ErikZalm
a864d9d4ab Merge pull request #738 from whosawhatsis/Marlin_v1 
Group hardware files for Arduino 1.x.x into hardware folder
 2014-02-01 13:03:00 -08:00
whosawhatsis
28aca76c4d Group hardware files for Arduino 1.x.x into hardware folder 2014-02-01 12:22:37 -08:00
ErikZalm
61059385a3 Merge pull request #737 from whosawhatsis/M200 
M200 implementation
 2014-02-01 10:37:49 -08:00
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.
 2014-01-31 08:43:11 -08:00
ErikZalm
0d81ae77bc Merge pull request #727 from drf5n/oversampling 
temperature.cpp: Actually use OVERSAMPLENR in the oversampling calculation.
 2014-01-31 07:09:10 -08:00
ErikZalm
84df13f7d1 Merge pull request #721 from drf5n/lcdOnly 
Enable basic ULTRA_LCD screen w/o encoders and menus.
 2014-01-31 07:07:12 -08:00
ErikZalm
4c7e9502ad Merge pull request #718 from drf5n/temptableRes 
createTemperatureLookupMarlin.py: Add resolution comments and format for...
 2014-01-31 07:06:02 -08:00
ErikZalm
652a0f6b5a Merge pull request #717 from drf5n/tpins2 
fastio.h: Add AT90USBxx_TEENSYPP_ASSIGNMENTS for teensyduino/Lincomatic/...
 2014-01-31 07:05:20 -08:00
ErikZalm
96a0cdc541 Merge pull request #716 from drf5n/maketeensy 
Makefile: Update for Arduino 1.0.5 and Teensyduino dependent boards (HAR...
 2014-01-31 07:04:29 -08:00
whosawhatsis
d24df7af2c M200 implementation 2014-01-31 00:54:19 -08:00
David Forrest
f0b8d5ba3d createTemperatureLookupMarlin.py: Change comment to refer to actual program name. 2014-01-29 23:34:22 -05:00