From 442ade15a6e4e08f867339512709e96db8103d36 Mon Sep 17 00:00:00 2001 From: daid303 Date: Tue, 8 Jan 2013 12:31:28 +0100 Subject: [PATCH] Move Gen6 stuff into a proper location. --- .../Arduino_0.xx/Gen6}/boards.txt | 0 .../Gen6}/bootloaders/atmega644p/ATmegaBOOT.c | 0 .../atmega644p/ATmegaBOOT_324P.hex | 0 .../bootloaders/atmega644p/ATmegaBOOT_644.hex | 0 .../atmega644p/ATmegaBOOT_644P.hex | 0 .../Gen6}/bootloaders/atmega644p/Makefile | 0 .../Gen6}/bootloaders/atmega644p/README.txt | 0 .../Gen6}/cores/arduino/Arduino.h | 0 .../Gen6}/cores/arduino/HardwareSerial.cpp | 0 .../Gen6}/cores/arduino/HardwareSerial.h | 0 .../Gen6}/cores/arduino/Print.cpp | 0 .../Arduino_0.xx/Gen6}/cores/arduino/Print.h | 0 .../Arduino_0.xx/Gen6}/cores/arduino/Stream.h | 0 .../Arduino_0.xx/Gen6}/cores/arduino/Tone.cpp | 0 .../Gen6}/cores/arduino/WCharacter.h | 0 .../Gen6}/cores/arduino/WConstants.h | 0 .../Gen6}/cores/arduino/WInterrupts.c | 0 .../Gen6}/cores/arduino/WMath.cpp | 0 .../Gen6}/cores/arduino/WProgram.h | 0 .../Gen6}/cores/arduino/WString.cpp | 0 .../Gen6}/cores/arduino/WString.h | 0 .../Arduino_0.xx/Gen6}/cores/arduino/binary.h | 0 .../Arduino_0.xx/Gen6}/cores/arduino/main.cpp | 0 .../Gen6}/cores/arduino/pins_arduino.c | 0 .../Gen6}/cores/arduino/pins_arduino.h | 0 .../Arduino_0.xx/Gen6}/cores/arduino/wiring.c | 0 .../Arduino_0.xx/Gen6}/cores/arduino/wiring.h | 0 .../Gen6}/cores/arduino/wiring_analog.c | 0 .../Gen6}/cores/arduino/wiring_digital.c | 0 .../Gen6}/cores/arduino/wiring_private.h | 0 .../Gen6}/cores/arduino/wiring_pulse.c | 0 .../Gen6}/cores/arduino/wiring_shift.c | 0 Marlin/Boards/cores/arduino/Copy of wiring.h | 135 ------------------ 33 files changed, 135 deletions(-) rename {Marlin/Boards => ArduinoAddons/Arduino_0.xx/Gen6}/boards.txt (100%) rename {Marlin/Boards => ArduinoAddons/Arduino_0.xx/Gen6}/bootloaders/atmega644p/ATmegaBOOT.c (100%) rename {Marlin/Boards => ArduinoAddons/Arduino_0.xx/Gen6}/bootloaders/atmega644p/ATmegaBOOT_324P.hex (100%) rename {Marlin/Boards => ArduinoAddons/Arduino_0.xx/Gen6}/bootloaders/atmega644p/ATmegaBOOT_644.hex (100%) rename {Marlin/Boards => ArduinoAddons/Arduino_0.xx/Gen6}/bootloaders/atmega644p/ATmegaBOOT_644P.hex (100%) rename {Marlin/Boards => ArduinoAddons/Arduino_0.xx/Gen6}/bootloaders/atmega644p/Makefile (100%) rename {Marlin/Boards => ArduinoAddons/Arduino_0.xx/Gen6}/bootloaders/atmega644p/README.txt (100%) rename {Marlin/Boards => ArduinoAddons/Arduino_0.xx/Gen6}/cores/arduino/Arduino.h (100%) rename {Marlin/Boards => ArduinoAddons/Arduino_0.xx/Gen6}/cores/arduino/HardwareSerial.cpp (100%) rename {Marlin/Boards => ArduinoAddons/Arduino_0.xx/Gen6}/cores/arduino/HardwareSerial.h (100%) rename {Marlin/Boards => ArduinoAddons/Arduino_0.xx/Gen6}/cores/arduino/Print.cpp (100%) rename {Marlin/Boards => ArduinoAddons/Arduino_0.xx/Gen6}/cores/arduino/Print.h (100%) rename {Marlin/Boards => ArduinoAddons/Arduino_0.xx/Gen6}/cores/arduino/Stream.h (100%) rename {Marlin/Boards => ArduinoAddons/Arduino_0.xx/Gen6}/cores/arduino/Tone.cpp (100%) rename {Marlin/Boards => ArduinoAddons/Arduino_0.xx/Gen6}/cores/arduino/WCharacter.h (100%) rename {Marlin/Boards => ArduinoAddons/Arduino_0.xx/Gen6}/cores/arduino/WConstants.h (100%) rename {Marlin/Boards => ArduinoAddons/Arduino_0.xx/Gen6}/cores/arduino/WInterrupts.c (100%) rename {Marlin/Boards => ArduinoAddons/Arduino_0.xx/Gen6}/cores/arduino/WMath.cpp (100%) rename {Marlin/Boards => ArduinoAddons/Arduino_0.xx/Gen6}/cores/arduino/WProgram.h (100%) rename {Marlin/Boards => ArduinoAddons/Arduino_0.xx/Gen6}/cores/arduino/WString.cpp (100%) rename {Marlin/Boards => ArduinoAddons/Arduino_0.xx/Gen6}/cores/arduino/WString.h (100%) rename {Marlin/Boards => ArduinoAddons/Arduino_0.xx/Gen6}/cores/arduino/binary.h (100%) rename {Marlin/Boards => ArduinoAddons/Arduino_0.xx/Gen6}/cores/arduino/main.cpp (100%) rename {Marlin/Boards => ArduinoAddons/Arduino_0.xx/Gen6}/cores/arduino/pins_arduino.c (100%) rename {Marlin/Boards => ArduinoAddons/Arduino_0.xx/Gen6}/cores/arduino/pins_arduino.h (100%) rename {Marlin/Boards => ArduinoAddons/Arduino_0.xx/Gen6}/cores/arduino/wiring.c (100%) rename {Marlin/Boards => ArduinoAddons/Arduino_0.xx/Gen6}/cores/arduino/wiring.h (100%) rename {Marlin/Boards => ArduinoAddons/Arduino_0.xx/Gen6}/cores/arduino/wiring_analog.c (100%) rename {Marlin/Boards => ArduinoAddons/Arduino_0.xx/Gen6}/cores/arduino/wiring_digital.c (100%) rename {Marlin/Boards => ArduinoAddons/Arduino_0.xx/Gen6}/cores/arduino/wiring_private.h (100%) rename {Marlin/Boards => ArduinoAddons/Arduino_0.xx/Gen6}/cores/arduino/wiring_pulse.c (100%) rename {Marlin/Boards => ArduinoAddons/Arduino_0.xx/Gen6}/cores/arduino/wiring_shift.c (100%) delete mode 100644 Marlin/Boards/cores/arduino/Copy of wiring.h diff --git a/Marlin/Boards/boards.txt b/ArduinoAddons/Arduino_0.xx/Gen6/boards.txt similarity index 100% rename from Marlin/Boards/boards.txt rename to ArduinoAddons/Arduino_0.xx/Gen6/boards.txt diff --git a/Marlin/Boards/bootloaders/atmega644p/ATmegaBOOT.c b/ArduinoAddons/Arduino_0.xx/Gen6/bootloaders/atmega644p/ATmegaBOOT.c similarity index 100% rename from Marlin/Boards/bootloaders/atmega644p/ATmegaBOOT.c rename to ArduinoAddons/Arduino_0.xx/Gen6/bootloaders/atmega644p/ATmegaBOOT.c diff --git a/Marlin/Boards/bootloaders/atmega644p/ATmegaBOOT_324P.hex b/ArduinoAddons/Arduino_0.xx/Gen6/bootloaders/atmega644p/ATmegaBOOT_324P.hex similarity index 100% rename from Marlin/Boards/bootloaders/atmega644p/ATmegaBOOT_324P.hex rename to ArduinoAddons/Arduino_0.xx/Gen6/bootloaders/atmega644p/ATmegaBOOT_324P.hex diff --git a/Marlin/Boards/bootloaders/atmega644p/ATmegaBOOT_644.hex b/ArduinoAddons/Arduino_0.xx/Gen6/bootloaders/atmega644p/ATmegaBOOT_644.hex similarity index 100% rename from Marlin/Boards/bootloaders/atmega644p/ATmegaBOOT_644.hex rename to ArduinoAddons/Arduino_0.xx/Gen6/bootloaders/atmega644p/ATmegaBOOT_644.hex diff --git a/Marlin/Boards/bootloaders/atmega644p/ATmegaBOOT_644P.hex b/ArduinoAddons/Arduino_0.xx/Gen6/bootloaders/atmega644p/ATmegaBOOT_644P.hex similarity index 100% rename from Marlin/Boards/bootloaders/atmega644p/ATmegaBOOT_644P.hex rename to ArduinoAddons/Arduino_0.xx/Gen6/bootloaders/atmega644p/ATmegaBOOT_644P.hex diff --git a/Marlin/Boards/bootloaders/atmega644p/Makefile b/ArduinoAddons/Arduino_0.xx/Gen6/bootloaders/atmega644p/Makefile similarity index 100% rename from Marlin/Boards/bootloaders/atmega644p/Makefile rename to ArduinoAddons/Arduino_0.xx/Gen6/bootloaders/atmega644p/Makefile diff --git a/Marlin/Boards/bootloaders/atmega644p/README.txt b/ArduinoAddons/Arduino_0.xx/Gen6/bootloaders/atmega644p/README.txt similarity index 100% rename from Marlin/Boards/bootloaders/atmega644p/README.txt rename to ArduinoAddons/Arduino_0.xx/Gen6/bootloaders/atmega644p/README.txt diff --git a/Marlin/Boards/cores/arduino/Arduino.h b/ArduinoAddons/Arduino_0.xx/Gen6/cores/arduino/Arduino.h similarity index 100% rename from Marlin/Boards/cores/arduino/Arduino.h rename to ArduinoAddons/Arduino_0.xx/Gen6/cores/arduino/Arduino.h diff --git a/Marlin/Boards/cores/arduino/HardwareSerial.cpp b/ArduinoAddons/Arduino_0.xx/Gen6/cores/arduino/HardwareSerial.cpp similarity index 100% rename from Marlin/Boards/cores/arduino/HardwareSerial.cpp rename to ArduinoAddons/Arduino_0.xx/Gen6/cores/arduino/HardwareSerial.cpp diff --git a/Marlin/Boards/cores/arduino/HardwareSerial.h b/ArduinoAddons/Arduino_0.xx/Gen6/cores/arduino/HardwareSerial.h similarity index 100% rename from Marlin/Boards/cores/arduino/HardwareSerial.h rename to ArduinoAddons/Arduino_0.xx/Gen6/cores/arduino/HardwareSerial.h diff --git a/Marlin/Boards/cores/arduino/Print.cpp b/ArduinoAddons/Arduino_0.xx/Gen6/cores/arduino/Print.cpp similarity index 100% rename from Marlin/Boards/cores/arduino/Print.cpp rename to ArduinoAddons/Arduino_0.xx/Gen6/cores/arduino/Print.cpp diff --git a/Marlin/Boards/cores/arduino/Print.h b/ArduinoAddons/Arduino_0.xx/Gen6/cores/arduino/Print.h similarity index 100% rename from Marlin/Boards/cores/arduino/Print.h rename to ArduinoAddons/Arduino_0.xx/Gen6/cores/arduino/Print.h diff --git a/Marlin/Boards/cores/arduino/Stream.h b/ArduinoAddons/Arduino_0.xx/Gen6/cores/arduino/Stream.h similarity index 100% rename from Marlin/Boards/cores/arduino/Stream.h rename to ArduinoAddons/Arduino_0.xx/Gen6/cores/arduino/Stream.h diff --git a/Marlin/Boards/cores/arduino/Tone.cpp b/ArduinoAddons/Arduino_0.xx/Gen6/cores/arduino/Tone.cpp similarity index 100% rename from Marlin/Boards/cores/arduino/Tone.cpp rename to ArduinoAddons/Arduino_0.xx/Gen6/cores/arduino/Tone.cpp diff --git a/Marlin/Boards/cores/arduino/WCharacter.h b/ArduinoAddons/Arduino_0.xx/Gen6/cores/arduino/WCharacter.h similarity index 100% rename from Marlin/Boards/cores/arduino/WCharacter.h rename to ArduinoAddons/Arduino_0.xx/Gen6/cores/arduino/WCharacter.h diff --git a/Marlin/Boards/cores/arduino/WConstants.h b/ArduinoAddons/Arduino_0.xx/Gen6/cores/arduino/WConstants.h similarity index 100% rename from Marlin/Boards/cores/arduino/WConstants.h rename to ArduinoAddons/Arduino_0.xx/Gen6/cores/arduino/WConstants.h diff --git a/Marlin/Boards/cores/arduino/WInterrupts.c b/ArduinoAddons/Arduino_0.xx/Gen6/cores/arduino/WInterrupts.c similarity index 100% rename from Marlin/Boards/cores/arduino/WInterrupts.c rename to ArduinoAddons/Arduino_0.xx/Gen6/cores/arduino/WInterrupts.c diff --git a/Marlin/Boards/cores/arduino/WMath.cpp b/ArduinoAddons/Arduino_0.xx/Gen6/cores/arduino/WMath.cpp similarity index 100% rename from Marlin/Boards/cores/arduino/WMath.cpp rename to ArduinoAddons/Arduino_0.xx/Gen6/cores/arduino/WMath.cpp diff --git a/Marlin/Boards/cores/arduino/WProgram.h b/ArduinoAddons/Arduino_0.xx/Gen6/cores/arduino/WProgram.h similarity index 100% rename from Marlin/Boards/cores/arduino/WProgram.h rename to ArduinoAddons/Arduino_0.xx/Gen6/cores/arduino/WProgram.h diff --git a/Marlin/Boards/cores/arduino/WString.cpp b/ArduinoAddons/Arduino_0.xx/Gen6/cores/arduino/WString.cpp similarity index 100% rename from Marlin/Boards/cores/arduino/WString.cpp rename to ArduinoAddons/Arduino_0.xx/Gen6/cores/arduino/WString.cpp diff --git a/Marlin/Boards/cores/arduino/WString.h b/ArduinoAddons/Arduino_0.xx/Gen6/cores/arduino/WString.h similarity index 100% rename from Marlin/Boards/cores/arduino/WString.h rename to ArduinoAddons/Arduino_0.xx/Gen6/cores/arduino/WString.h diff --git a/Marlin/Boards/cores/arduino/binary.h b/ArduinoAddons/Arduino_0.xx/Gen6/cores/arduino/binary.h similarity index 100% rename from Marlin/Boards/cores/arduino/binary.h rename to ArduinoAddons/Arduino_0.xx/Gen6/cores/arduino/binary.h diff --git a/Marlin/Boards/cores/arduino/main.cpp b/ArduinoAddons/Arduino_0.xx/Gen6/cores/arduino/main.cpp similarity index 100% rename from Marlin/Boards/cores/arduino/main.cpp rename to ArduinoAddons/Arduino_0.xx/Gen6/cores/arduino/main.cpp diff --git a/Marlin/Boards/cores/arduino/pins_arduino.c b/ArduinoAddons/Arduino_0.xx/Gen6/cores/arduino/pins_arduino.c similarity index 100% rename from Marlin/Boards/cores/arduino/pins_arduino.c rename to ArduinoAddons/Arduino_0.xx/Gen6/cores/arduino/pins_arduino.c diff --git a/Marlin/Boards/cores/arduino/pins_arduino.h b/ArduinoAddons/Arduino_0.xx/Gen6/cores/arduino/pins_arduino.h similarity index 100% rename from Marlin/Boards/cores/arduino/pins_arduino.h rename to ArduinoAddons/Arduino_0.xx/Gen6/cores/arduino/pins_arduino.h diff --git a/Marlin/Boards/cores/arduino/wiring.c b/ArduinoAddons/Arduino_0.xx/Gen6/cores/arduino/wiring.c similarity index 100% rename from Marlin/Boards/cores/arduino/wiring.c rename to ArduinoAddons/Arduino_0.xx/Gen6/cores/arduino/wiring.c diff --git a/Marlin/Boards/cores/arduino/wiring.h b/ArduinoAddons/Arduino_0.xx/Gen6/cores/arduino/wiring.h similarity index 100% rename from Marlin/Boards/cores/arduino/wiring.h rename to ArduinoAddons/Arduino_0.xx/Gen6/cores/arduino/wiring.h diff --git a/Marlin/Boards/cores/arduino/wiring_analog.c b/ArduinoAddons/Arduino_0.xx/Gen6/cores/arduino/wiring_analog.c similarity index 100% rename from Marlin/Boards/cores/arduino/wiring_analog.c rename to ArduinoAddons/Arduino_0.xx/Gen6/cores/arduino/wiring_analog.c diff --git a/Marlin/Boards/cores/arduino/wiring_digital.c b/ArduinoAddons/Arduino_0.xx/Gen6/cores/arduino/wiring_digital.c similarity index 100% rename from Marlin/Boards/cores/arduino/wiring_digital.c rename to ArduinoAddons/Arduino_0.xx/Gen6/cores/arduino/wiring_digital.c diff --git a/Marlin/Boards/cores/arduino/wiring_private.h b/ArduinoAddons/Arduino_0.xx/Gen6/cores/arduino/wiring_private.h similarity index 100% rename from Marlin/Boards/cores/arduino/wiring_private.h rename to ArduinoAddons/Arduino_0.xx/Gen6/cores/arduino/wiring_private.h diff --git a/Marlin/Boards/cores/arduino/wiring_pulse.c b/ArduinoAddons/Arduino_0.xx/Gen6/cores/arduino/wiring_pulse.c similarity index 100% rename from Marlin/Boards/cores/arduino/wiring_pulse.c rename to ArduinoAddons/Arduino_0.xx/Gen6/cores/arduino/wiring_pulse.c diff --git a/Marlin/Boards/cores/arduino/wiring_shift.c b/ArduinoAddons/Arduino_0.xx/Gen6/cores/arduino/wiring_shift.c similarity index 100% rename from Marlin/Boards/cores/arduino/wiring_shift.c rename to ArduinoAddons/Arduino_0.xx/Gen6/cores/arduino/wiring_shift.c diff --git a/Marlin/Boards/cores/arduino/Copy of wiring.h b/Marlin/Boards/cores/arduino/Copy of wiring.h deleted file mode 100644 index e29959b86..000000000 --- a/Marlin/Boards/cores/arduino/Copy of wiring.h +++ /dev/null @@ -1,135 +0,0 @@ -/* - wiring.h - Partial implementation of the Wiring API for the ATmega8. - Part of Arduino - http://www.arduino.cc/ - - Copyright (c) 2005-2006 David A. Mellis - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General - Public License along with this library; if not, write to the - Free Software Foundation, Inc., 59 Temple Place, Suite 330, - Boston, MA 02111-1307 USA - - $Id$ -*/ - -#ifndef Wiring_h -#define Wiring_h - -#include -#include -#include "binary.h" - -#ifdef __cplusplus -extern "C"{ -#endif - -#define HIGH 0x1 -#define LOW 0x0 - -#define INPUT 0x0 -#define OUTPUT 0x1 - -#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_ATmega1280__) || defined(__AVR_ATmega2560__) -#define INTERNAL1V1 2 -#define INTERNAL2V56 3 -#else -#define INTERNAL 3 -#endif -#define DEFAULT 1 -#define EXTERNAL 0 - -// 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) * 1000L) / (F_CPU / 1000L) ) -#define microsecondsToClockCycles(a) ( ((a) * (F_CPU / 1000L)) / 1000L ) - -#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); - -#ifdef __cplusplus -} // extern "C" -#endif - -#endif