Permalink
Browse files

Merged recent improvements from Marlin_v1 into deltabot branch.

  • Loading branch information...
jcrocholl committed Aug 8, 2013
1 parent 818c8f3 commit e7b85985b5da6af654373e907a3d1050a34f0272
Showing with 11,781 additions and 1,791 deletions.
  1. +1 −0 .gitignore
  2. 0 ArduinoAddons/Arduino_1.x.x/{sanguino → Sanguino}/boards.txt
  3. 0 ArduinoAddons/Arduino_1.x.x/{sanguino → Sanguino}/bootloaders/atmega/ATmegaBOOT_168.c
  4. 0 ArduinoAddons/Arduino_1.x.x/{sanguino → Sanguino}/bootloaders/atmega/ATmegaBOOT_168_atmega1284p.hex
  5. 0 ...noAddons/Arduino_1.x.x/{sanguino → Sanguino}/bootloaders/atmega/ATmegaBOOT_168_atmega1284p_8m.hex
  6. 0 ArduinoAddons/Arduino_1.x.x/{sanguino → Sanguino}/bootloaders/atmega/ATmegaBOOT_168_atmega644p.hex
  7. 0 ArduinoAddons/Arduino_1.x.x/{sanguino → Sanguino}/bootloaders/atmega/Makefile
  8. 0 ArduinoAddons/Arduino_1.x.x/{sanguino → Sanguino}/bootloaders/atmega644p/ATmegaBOOT.c
  9. 0 ArduinoAddons/Arduino_1.x.x/{sanguino → Sanguino}/bootloaders/atmega644p/ATmegaBOOT.c.tst
  10. BIN ArduinoAddons/Arduino_1.x.x/{sanguino → Sanguino}/bootloaders/atmega644p/ATmegaBOOT_644P.elf
  11. 0 ArduinoAddons/Arduino_1.x.x/{sanguino → Sanguino}/bootloaders/atmega644p/ATmegaBOOT_644P.hex
  12. 0 ArduinoAddons/Arduino_1.x.x/{sanguino → Sanguino}/bootloaders/atmega644p/Makefile
  13. 0 ArduinoAddons/Arduino_1.x.x/{sanguino → Sanguino}/bootloaders/atmega644p/README.txt
  14. 0 ArduinoAddons/Arduino_1.x.x/{sanguino → Sanguino}/cores/arduino/Arduino.h
  15. 0 ArduinoAddons/Arduino_1.x.x/{sanguino → Sanguino}/cores/arduino/CDC.cpp
  16. 0 ArduinoAddons/Arduino_1.x.x/{sanguino → Sanguino}/cores/arduino/Client.h
  17. 0 ArduinoAddons/Arduino_1.x.x/{sanguino → Sanguino}/cores/arduino/HID.cpp
  18. 0 ArduinoAddons/Arduino_1.x.x/{sanguino → Sanguino}/cores/arduino/HardwareSerial.cpp
  19. 0 ArduinoAddons/Arduino_1.x.x/{sanguino → Sanguino}/cores/arduino/HardwareSerial.h
  20. 0 ArduinoAddons/Arduino_1.x.x/{sanguino → Sanguino}/cores/arduino/IPAddress.cpp
  21. 0 ArduinoAddons/Arduino_1.x.x/{sanguino → Sanguino}/cores/arduino/IPAddress.h
  22. 0 ArduinoAddons/Arduino_1.x.x/{sanguino → Sanguino}/cores/arduino/Platform.h
  23. 0 ArduinoAddons/Arduino_1.x.x/{sanguino → Sanguino}/cores/arduino/Print.cpp
  24. 0 ArduinoAddons/Arduino_1.x.x/{sanguino → Sanguino}/cores/arduino/Print.h
  25. 0 ArduinoAddons/Arduino_1.x.x/{sanguino → Sanguino}/cores/arduino/Printable.h
  26. 0 ArduinoAddons/Arduino_1.x.x/{sanguino → Sanguino}/cores/arduino/Server.h
  27. 0 ArduinoAddons/Arduino_1.x.x/{sanguino → Sanguino}/cores/arduino/Stream.cpp
  28. 0 ArduinoAddons/Arduino_1.x.x/{sanguino → Sanguino}/cores/arduino/Stream.h
  29. 0 ArduinoAddons/Arduino_1.x.x/{sanguino → Sanguino}/cores/arduino/Tone.cpp
  30. 0 ArduinoAddons/Arduino_1.x.x/{sanguino → Sanguino}/cores/arduino/USBAPI.h
  31. 0 ArduinoAddons/Arduino_1.x.x/{sanguino → Sanguino}/cores/arduino/USBCore.cpp
  32. 0 ArduinoAddons/Arduino_1.x.x/{sanguino → Sanguino}/cores/arduino/USBCore.h
  33. 0 ArduinoAddons/Arduino_1.x.x/{sanguino → Sanguino}/cores/arduino/USBDesc.h
  34. 0 ArduinoAddons/Arduino_1.x.x/{sanguino → Sanguino}/cores/arduino/Udp.h
  35. 0 ArduinoAddons/Arduino_1.x.x/{sanguino → Sanguino}/cores/arduino/WCharacter.h
  36. 0 ArduinoAddons/Arduino_1.x.x/{sanguino → Sanguino}/cores/arduino/WInterrupts.c
  37. 0 ArduinoAddons/Arduino_1.x.x/{sanguino → Sanguino}/cores/arduino/WMath.cpp
  38. 0 ArduinoAddons/Arduino_1.x.x/{sanguino → Sanguino}/cores/arduino/WString.cpp
  39. 0 ArduinoAddons/Arduino_1.x.x/{sanguino → Sanguino}/cores/arduino/WString.h
  40. 0 ArduinoAddons/Arduino_1.x.x/{sanguino → Sanguino}/cores/arduino/binary.h
  41. 0 ArduinoAddons/Arduino_1.x.x/{sanguino → Sanguino}/cores/arduino/main.cpp
  42. 0 ArduinoAddons/Arduino_1.x.x/{sanguino → Sanguino}/cores/arduino/new.cpp
  43. 0 ArduinoAddons/Arduino_1.x.x/{sanguino → Sanguino}/cores/arduino/new.h
  44. 0 ArduinoAddons/Arduino_1.x.x/{sanguino → Sanguino}/cores/arduino/wiring.c
  45. 0 ArduinoAddons/Arduino_1.x.x/{sanguino → Sanguino}/cores/arduino/wiring_analog.c
  46. 0 ArduinoAddons/Arduino_1.x.x/{sanguino → Sanguino}/cores/arduino/wiring_digital.c
  47. 0 ArduinoAddons/Arduino_1.x.x/{sanguino → Sanguino}/cores/arduino/wiring_private.h
  48. 0 ArduinoAddons/Arduino_1.x.x/{sanguino → Sanguino}/cores/arduino/wiring_pulse.c
  49. 0 ArduinoAddons/Arduino_1.x.x/{sanguino → Sanguino}/cores/arduino/wiring_shift.c
  50. 0 ArduinoAddons/Arduino_1.x.x/{sanguino → Sanguino}/variants/standard/pins_arduino.h
  51. +22 −0 ArduinoAddons/Arduino_1.x.x/rambo/boards.txt
  52. +215 −0 ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/Arduino.h
  53. +239 −0 ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/CDC.cpp
  54. +26 −0 ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/Client.h
  55. +520 −0 ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/HID.cpp
  56. +519 −0 ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/HardwareSerial.cpp
  57. +115 −0 ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/HardwareSerial.h
  58. +56 −0 ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/IPAddress.cpp
  59. +76 −0 ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/IPAddress.h
  60. +23 −0 ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/Platform.h
  61. +268 −0 ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/Print.cpp
  62. +81 −0 ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/Print.h
  63. +40 −0 ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/Printable.h
  64. +9 −0 ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/Server.h
  65. +270 −0 ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/Stream.cpp
  66. +96 −0 ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/Stream.h
  67. +616 −0 ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/Tone.cpp
  68. +196 −0 ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/USBAPI.h
  69. +684 −0 ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/USBCore.cpp
  70. +303 −0 ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/USBCore.h
  71. +63 −0 ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/USBDesc.h
  72. +88 −0 ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/Udp.h
  73. +168 −0 ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/WCharacter.h
  74. +322 −0 ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/WInterrupts.c
  75. +60 −0 ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/WMath.cpp
  76. +645 −0 ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/WString.cpp
  77. +205 −0 ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/WString.h
  78. +515 −0 ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/binary.h
  79. +20 −0 ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/main.cpp
  80. +18 −0 ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/new.cpp
  81. +22 −0 ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/new.h
  82. +324 −0 ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/wiring.c
  83. +282 −0 ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/wiring_analog.c
  84. +178 −0 ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/wiring_digital.c
  85. +71 −0 ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/wiring_private.h
  86. +69 −0 ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/wiring_pulse.c
  87. +55 −0 ArduinoAddons/Arduino_1.x.x/rambo/cores/arduino/wiring_shift.c
  88. +411 −0 ArduinoAddons/Arduino_1.x.x/rambo/variants/standard/pins_arduino.h
  89. +47 −19 Marlin/Configuration.h
  90. +12 −1 Marlin/ConfigurationStore.cpp
  91. +52 −6 Marlin/Configuration_adv.h
  92. +33 −3 Marlin/Makefile
  93. +13 −8 Marlin/Marlin.h
  94. +402 −56 Marlin/Marlin_main.cpp
  95. +0 −1 Marlin/cardreader.cpp
  96. +14 −2 Marlin/dogm_lcd_implementation.h
  97. +588 −0 Marlin/example_configurations/delta/Configuration.h
  98. +401 −0 Marlin/example_configurations/delta/Configuration_adv.h
  99. +95 −1 Marlin/fastio.h
  100. +1,519 −1,479 Marlin/language.h
  101. +123 −14 Marlin/pins.h
  102. +206 −128 Marlin/stepper.cpp
  103. +10 −3 Marlin/stepper.h
  104. +2 −3 Marlin/temperature.cpp
  105. +152 −0 Marlin/thermistortables.h
  106. +160 −56 Marlin/ultralcd.cpp
  107. +49 −1 Marlin/ultralcd.h
  108. +12 −10 README.md
View
@@ -3,3 +3,4 @@ applet/
*~
*.orig
*.rej
+*.bak
@@ -0,0 +1,22 @@
+# See: http://code.google.com/p/arduino/wiki/Platforms
+
+##############################################################
+
+mega2560.name=RAMBo
+
+mega2560.upload.protocol=wiring
+mega2560.upload.maximum_size=258048
+mega2560.upload.speed=115200
+
+mega2560.bootloader.low_fuses=0xFF
+mega2560.bootloader.high_fuses=0xD8
+mega2560.bootloader.extended_fuses=0xFD
+mega2560.bootloader.path=stk500v2
+mega2560.bootloader.file=stk500boot_v2_mega2560.hex
+mega2560.bootloader.unlock_bits=0x3F
+mega2560.bootloader.lock_bits=0x0F
+
+mega2560.build.mcu=atmega2560
+mega2560.build.f_cpu=16000000L
+mega2560.build.core=arduino
+mega2560.build.variant=standard
@@ -0,0 +1,215 @@
+#ifndef Arduino_h
+#define Arduino_h
+
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
+
+#include <avr/pgmspace.h>
+#include <avr/io.h>
+#include <avr/interrupt.h>
+
+#include "binary.h"
+
+#ifdef __cplusplus
+extern "C"{
+#endif
+
+#define HIGH 0x1
+#define LOW 0x0
+
+#define INPUT 0x0
+#define OUTPUT 0x1
+#define INPUT_PULLUP 0x2
+
+#define true 0x1
+#define false 0x0
+
+#define PI 3.1415926535897932384626433832795
+#define HALF_PI 1.5707963267948966192313216916398
+#define TWO_PI 6.283185307179586476925286766559
+#define DEG_TO_RAD 0.017453292519943295769236907684886
+#define RAD_TO_DEG 57.295779513082320876798154814105
+
+#define SERIAL 0x0
+#define DISPLAY 0x1
+
+#define LSBFIRST 0
+#define MSBFIRST 1
+
+#define CHANGE 1
+#define FALLING 2
+#define RISING 3
+
+#if defined(__AVR_ATtiny24__) || defined(__AVR_ATtiny44__) || defined(__AVR_ATtiny84__) || defined(__AVR_ATtiny25__) || defined(__AVR_ATtiny45__) || defined(__AVR_ATtiny85__)
+#define DEFAULT 0
+#define EXTERNAL 1
+#define INTERNAL 2
+#else
+#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__) || defined(__AVR_ATmega1284P__) || defined(__AVR_ATmega644P__)
+#define INTERNAL1V1 2
+#define INTERNAL2V56 3
+#else
+#define INTERNAL 3
+#endif
+#define DEFAULT 1
+#define EXTERNAL 0
+#endif
+
+// undefine stdlib's abs if encountered
+#ifdef abs
+#undef abs
+#endif
+
+#define min(a,b) ((a)<(b)?(a):(b))
+#define max(a,b) ((a)>(b)?(a):(b))
+#define abs(x) ((x)>0?(x):-(x))
+#define constrain(amt,low,high) ((amt)<(low)?(low):((amt)>(high)?(high):(amt)))
+#define round(x) ((x)>=0?(long)((x)+0.5):(long)((x)-0.5))
+#define radians(deg) ((deg)*DEG_TO_RAD)
+#define degrees(rad) ((rad)*RAD_TO_DEG)
+#define sq(x) ((x)*(x))
+
+#define interrupts() sei()
+#define noInterrupts() cli()
+
+#define clockCyclesPerMicrosecond() ( F_CPU / 1000000L )
+#define clockCyclesToMicroseconds(a) ( (a) / clockCyclesPerMicrosecond() )
+#define microsecondsToClockCycles(a) ( (a) * clockCyclesPerMicrosecond() )
+
+#define lowByte(w) ((uint8_t) ((w) & 0xff))
+#define highByte(w) ((uint8_t) ((w) >> 8))
+
+#define bitRead(value, bit) (((value) >> (bit)) & 0x01)
+#define bitSet(value, bit) ((value) |= (1UL << (bit)))
+#define bitClear(value, bit) ((value) &= ~(1UL << (bit)))
+#define bitWrite(value, bit, bitvalue) (bitvalue ? bitSet(value, bit) : bitClear(value, bit))
+
+
+typedef unsigned int word;
+
+#define bit(b) (1UL << (b))
+
+typedef uint8_t boolean;
+typedef uint8_t byte;
+
+void init(void);
+
+void pinMode(uint8_t, uint8_t);
+void digitalWrite(uint8_t, uint8_t);
+int digitalRead(uint8_t);
+int analogRead(uint8_t);
+void analogReference(uint8_t mode);
+void analogWrite(uint8_t, int);
+
+unsigned long millis(void);
+unsigned long micros(void);
+void delay(unsigned long);
+void delayMicroseconds(unsigned int us);
+unsigned long pulseIn(uint8_t pin, uint8_t state, unsigned long timeout);
+
+void shiftOut(uint8_t dataPin, uint8_t clockPin, uint8_t bitOrder, uint8_t val);
+uint8_t shiftIn(uint8_t dataPin, uint8_t clockPin, uint8_t bitOrder);
+
+void attachInterrupt(uint8_t, void (*)(void), int mode);
+void detachInterrupt(uint8_t);
+
+void setup(void);
+void loop(void);
+
+// Get the bit location within the hardware port of the given virtual pin.
+// This comes from the pins_*.c file for the active board configuration.
+
+#define analogInPinToBit(P) (P)
+
+// On the ATmega1280, the addresses of some of the port registers are
+// greater than 255, so we can't store them in uint8_t's.
+extern const uint16_t PROGMEM port_to_mode_PGM[];
+extern const uint16_t PROGMEM port_to_input_PGM[];
+extern const uint16_t PROGMEM port_to_output_PGM[];
+
+extern const uint8_t PROGMEM digital_pin_to_port_PGM[];
+// extern const uint8_t PROGMEM digital_pin_to_bit_PGM[];
+extern const uint8_t PROGMEM digital_pin_to_bit_mask_PGM[];
+extern const uint8_t PROGMEM digital_pin_to_timer_PGM[];
+
+// Get the bit location within the hardware port of the given virtual pin.
+// This comes from the pins_*.c file for the active board configuration.
+//
+// These perform slightly better as macros compared to inline functions
+//
+#define digitalPinToPort(P) ( pgm_read_byte( digital_pin_to_port_PGM + (P) ) )
+#define digitalPinToBitMask(P) ( pgm_read_byte( digital_pin_to_bit_mask_PGM + (P) ) )
+#define digitalPinToTimer(P) ( pgm_read_byte( digital_pin_to_timer_PGM + (P) ) )
+#define analogInPinToBit(P) (P)
+#define portOutputRegister(P) ( (volatile uint8_t *)( pgm_read_word( port_to_output_PGM + (P))) )
+#define portInputRegister(P) ( (volatile uint8_t *)( pgm_read_word( port_to_input_PGM + (P))) )
+#define portModeRegister(P) ( (volatile uint8_t *)( pgm_read_word( port_to_mode_PGM + (P))) )
+
+#define NOT_A_PIN 0
+#define NOT_A_PORT 0
+
+#ifdef ARDUINO_MAIN
+#define PA 1
+#define PB 2
+#define PC 3
+#define PD 4
+#define PE 5
+#define PF 6
+#define PG 7
+#define PH 8
+#define PJ 10
+#define PK 11
+#define PL 12
+#endif
+
+#define NOT_ON_TIMER 0
+#define TIMER0A 1
+#define TIMER0B 2
+#define TIMER1A 3
+#define TIMER1B 4
+#define TIMER2 5
+#define TIMER2A 6
+#define TIMER2B 7
+
+#define TIMER3A 8
+#define TIMER3B 9
+#define TIMER3C 10
+#define TIMER4A 11
+#define TIMER4B 12
+#define TIMER4C 13
+#define TIMER4D 14
+#define TIMER5A 15
+#define TIMER5B 16
+#define TIMER5C 17
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
+#ifdef __cplusplus
+#include "WCharacter.h"
+#include "WString.h"
+#include "HardwareSerial.h"
+
+uint16_t makeWord(uint16_t w);
+uint16_t makeWord(byte h, byte l);
+
+#define word(...) makeWord(__VA_ARGS__)
+
+unsigned long pulseIn(uint8_t pin, uint8_t state, unsigned long timeout = 1000000L);
+
+void tone(uint8_t _pin, unsigned int frequency, unsigned long duration = 0);
+void noTone(uint8_t _pin);
+
+// WMath prototypes
+long random(long);
+long random(long, long);
+void randomSeed(unsigned int);
+long map(long, long, long, long, long);
+
+#endif
+
+#include "pins_arduino.h"
+
+#endif
Oops, something went wrong.

0 comments on commit e7b8598

Please sign in to comment.