diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 00427d5ff..916ecbb09 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -10,7 +10,7 @@ // build by the user have been successfully uploaded into firmware. #define STRING_VERSION_CONFIG_H __DATE__ " " __TIME__ // build date and time #ifndef STRING_CONFIG_H_AUTHOR -#define STRING_CONFIG_H_AUTHOR "Tinker_15.02-RC1" // Who made the changes. +#define STRING_CONFIG_H_AUTHOR "Tinker_15.02-RC2" // Who made the changes. #endif // SERIAL_PORT selects which serial port should be used for communication with the host. diff --git a/Marlin/StackList.h b/Marlin/StackList.h deleted file mode 100644 index c349d4408..000000000 --- a/Marlin/StackList.h +++ /dev/null @@ -1,165 +0,0 @@ -/* - * StackList.h - * - * Library implementing a generic, dynamic stack (linked list version). - * - * --- - * - * Copyright (C) 2010 Efstathios Chatzikyriakidis (contact@efxa.org) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * - * --- - * - * Version 1.0 - * - * 2010-09-23 Efstathios Chatzikyriakidis - * - * - added exit(), blink(): error reporting and handling methods. - * - * 2010-09-20 Alexander Brevig - * - * - added setPrinter(): indirectly reference a Serial object. - * - * 2010-09-15 Efstathios Chatzikyriakidis - * - * - initial release of the library. - * - * --- - * - * For the latest version see: http://www.arduino.cc/ - */ - -// header defining the interface of the source. -#ifndef _STACKLIST_H -#define _STACKLIST_H - -// the definition of the stack class. -template -class StackList { - public: - // init the stack (constructor). - StackList (); - - // clear the stack (destructor). - ~StackList (); - - // push an item to the stack. - void push (const T i); - - // pop an item from the stack. - T pop (); - - // get an item from the stack. - T & peek (); - - // get an item from the stack. - const T & peek () const; - - // check if the stack is empty. - bool isEmpty () const; - - // get the number of items in the stack. - int count () const; - - private: - // the structure of each node in the list. - typedef struct node { - T item; // the item in the node. - node * next; // the next node in the list. - node(node *_next, T _item) : item(_item), next(_next) {} - } node; - - typedef node * link; // synonym for pointer to a node. - - int size; // the size of the stack. - link head; // the head of the list. -}; - -// init the stack (constructor). -template -StackList::StackList () { - size = 0; // set the size of stack to zero. - head = NULL; // set the head of the list to point nowhere. -} - -// clear the stack (destructor). -template -StackList::~StackList () { - // deallocate memory space of each node in the list. - for (link t = head; t != NULL; head = t) { - t = head->next; delete head; - } - - size = 0; // set the size of stack to zero. -} - -// push an item to the stack. -template -void StackList::push (const T i) { - // create a new node. - link t = (link) new node(head, i); - - // new node should be the head of the list. - head = t; - - // increase the items. - ++size; -} - -// pop an item from the stack. -template -T StackList::pop () { - - // get the item of the head node. - T item = head->item; - - // remove only the head node. - link t = head->next; delete head; head = t; - - // decrease the items. - --size; - - // return the item. - return item; -} - -// get an item from the stack. -template -const T & StackList::peek () const { - // return the item of the head node. - return head->item; -} - -// get an item from the stack. -template -T & StackList::peek () { - // return the item of the head node. - return head->item; -} - -// check if the stack is empty. -template -bool StackList::isEmpty () const { - return head == NULL; -} - -// get the number of items in the stack. -template -int StackList::count () const { - return size; -} - - -#endif // _STACKLIST_H diff --git a/Marlin/UltiLCD2_menu_first_run.cpp b/Marlin/UltiLCD2_menu_first_run.cpp index 33bab8cca..61f1a6d3e 100644 --- a/Marlin/UltiLCD2_menu_first_run.cpp +++ b/Marlin/UltiLCD2_menu_first_run.cpp @@ -438,12 +438,11 @@ static void lcd_menu_first_run_material_select_1() if (eeprom_read_byte(EEPROM_MATERIAL_COUNT_OFFSET()) == 1) { digipot_current(2, motor_current_setting[2]);//Set E motor power to default. - + for(uint8_t e=0; e