598 Commits (ccd9fd0dc3fc1bbd88b1574be94aef97a79666e7)
 

Author SHA1 Message Date
daid ccd9fd0dc3 Merge pull request #292 from jothan/lcdfix
12 years ago
Jonathan Bastien-Filiatrault 46b9988e26 Search and replace failure.
12 years ago
Jonathan Bastien-Filiatrault 0f73afb0b0 Avoid defining overriding definitions for the RepRapDiscount Smart
12 years ago
Jonathan Bastien-Filiatrault 36b452c7ac Remove abbrs.
12 years ago
daid a394ac9f95 Merge pull request #294 from YanFM/patch-1
12 years ago
YanFM 332344bd43 Update Marlin/language.h
12 years ago
daid303 e6c1cadea0 Set the watchdog to a 4 second timeout, as with 1 second it can timeout during SD card init.
12 years ago
daid faea7d72b8 Merge pull request #290 from buildrob/Marlin_v1
12 years ago
daid303 12a4d60e18 Fix the EEPROM storage, no longer inline it at multiple locations, and remove the template.
12 years ago
Robert F-C 08337e01f7 Added change to feature list.
12 years ago
Jonathan Bastien-Filiatrault 9606f4d04f Include Marlin_main.cpp in source files.
12 years ago
Jonathan Bastien-Filiatrault 3cbaad9288 RepRapDiscount Smart Controller pin definitions.
12 years ago
Robert F-C 99692dc99e Clean up special serial port cases
12 years ago
daid303 5a998558a9 Update suggested by Robert F-C. #289
12 years ago
daid303 f6ff0ab767 signed/unsigned fixes.
12 years ago
daid303 5d471e0f34 Also reset the PID values to defaults. Fixes #281
12 years ago
daid303 d3ebc34958 Hopefully also support chips with a single UART in MarlinSerial now.
12 years ago
daid303 b6ff45254e Better explain the watchdog "problem" and rename the config define so it explains that the feature belongs to the watchdog.
12 years ago
daid303 7e348fcb5f By mistake enabled the watchdog by default. This should be off by default.
12 years ago
daid303 06b58a9c4f First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions.
12 years ago
daid 539f3b3fe4 Merge pull request #284 from brackendawson/Marlin_v1
12 years ago
daid 2f20df3f55 Merge pull request #289 from buildrob/Marlin_v1
12 years ago
Robert F-C 65c9a0728f Set default serial port back to 0.
12 years ago
Robert F-C ab9d183024 Make serial port configurable.
12 years ago
Bracken Dawson f5631a89e8 Add dummy Emergancy Pin to Gen7 1.4
12 years ago
Bracken Dawson a4f9e1ebf2 Merge git://github.com/ErikZalm/Marlin into Marlin_v1
12 years ago
Bracken Dawson 2873d67b17 Put bogus temp override back in Gen7 up to 1.3
12 years ago
ErikZalm a7e40b2903 Merge pull request #276 from setar/Marlin_v1
12 years ago
ErikZalm 23b0f8ed4b Merge pull request #279 from MaikStohn/Marlin_v1
12 years ago
MaikStohn 6ed02c86be Fixed wrong code (will not even compile when EXTRUDERS>2)
12 years ago
Sergey Taranenko 2a67363e27 Fix ‘prog_uchar’ definition in LiquidCrystalRus.cpp
12 years ago
Sergey Taranenko 205304ddee Merge git://github.com/ErikZalm/Marlin into Marlin_v1
12 years ago
Erik vd Zalm 58bca87c72 fix LCD temp bed artifacts on power up ' B022/0.) -> B022/000 '
12 years ago
Erik vd Zalm febeb43197 Revert "fix LCD temp bed artifacts on power up ' B022/0.) -> B022/000 '"
12 years ago
Sergey Taranenko 8178dec4c3 Fix num of digits on LCD for E and Z axis.
12 years ago
ErikZalm 70f57a6844 Merge pull request #273 from setar/Marlin_v1
12 years ago
ErikZalm ff14199e58 Merge pull request #270 from jothan/Marlin_v1
12 years ago
ErikZalm bfdf0932c1 Merge pull request #274 from DanieleSdei/Marlin_v1
12 years ago
Daniele Sdei 695938ba3f Italian language support
12 years ago
Sergey Taranenko cb02c2f9d8 fix LCD temp bed artifacts on power up ' B022/0.) -> B022/000 '
12 years ago
Jonathan Bastien-Filiatrault e4a5e333ef Generalize.
12 years ago
Jonathan Bastien-Filiatrault e10d3136c8 Create an explicit rule for building applet/Marlin.cpp.
12 years ago
ErikZalm 9f089756b7 Merge pull request #265 from setar/Marlin_v1
12 years ago
ErikZalm 654387297f Merge pull request #268 from brupje/Marlin_v1
12 years ago
brupje 326423719f Add support for Megatronics
12 years ago
brupje d07b6e93d5 Add support for Megatronics
12 years ago
Sergey Taranenko efcc28d347 Fix check for include LiquidCrystalRus.h
12 years ago
Sergey Taranenko cfc193cdac Enables support the Cyrillic alphabet for LCD
12 years ago
Sergey Taranenko 24bcc9647d Added Russian translation
12 years ago
ErikZalm bc27d809fb Merge pull request #262 from markfinn/bedpid-clean3
12 years ago