Merge devt branch to move to 0.92.10 base

.gitignore

@@ -25,3 +25,4 @@ Configuration_*.h
 Repetier.depend
 Repetier.layout
 activate*.bat
+~$Translate.xlsx

.travis.yml

@@ -5,46 +5,40 @@ language: bash
 os:
   - linux
 
-before_install:
-  - "/sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1280x1024x16"
-
+env:
+ matrix:
+  - DAVINCI=0 MODEL=0
+  - DAVINCI=1 MODEL=0
+  - DAVINCI=2 MODEL=0
+  - DAVINCI=3 MODEL=0
+  - DAVINCI=1 MODEL=1
+  - DAVINCI=2 MODEL=1
+  - DAVINCI=4 MODEL=1
+
 before_script:
-  - "export DISPLAY=:99.0"
-  - sleep 3 # give xvfb some time to start
-  - wget http://downloads.arduino.cc/arduino-1.6.5-linux64.tar.xz
-  - tar xf arduino-1.6.5-linux64.tar.xz
-  - mv arduino-1.6.5 $HOME/arduino_ide
-  - mkdir -p $HOME/.arduino15/packages/arduino/hardware/sam
-  - cd $HOME/.arduino15/packages/arduino/hardware/sam
-  - wget http://downloads.arduino.cc/cores/sam-1.6.4.tar.bz2
-  - tar xf sam-1.6.4.tar.bz2
-  - mkdir -p $HOME/.arduino15/packages/arduino/tools/arm-none-eabi-gcc
-  - cd $HOME/.arduino15/packages/arduino/tools/arm-none-eabi-gcc
-  - wget http://downloads.arduino.cc/gcc-arm-none-eabi-4.8.3-2014q1-linux64.tar.gz
-  - tar xf gcc-arm-none-eabi-4.8.3-2014q1-linux64.tar.gz
-  - mv gcc-arm-none-eabi-4.8.3-2014q1 4.8.3-2014q1
-  - cp -f "$TRAVIS_BUILD_DIR/src/ArduinoDUE/AdditionalArduinoFiles/Arduino - 1.6.5 -Due 1.6.4/Arduino15/packages/hardware/sam/1.6.4/variants/arduino_due_x/variant.cpp" $HOME/.arduino15/packages/arduino/hardware/sam/1.6.4/variants/arduino_due_x/variant.cpp 
+  - "/sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_1.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :1 -ac -screen 0 1280x1024x16"
+  - sleep 3
+  - export DISPLAY=:1.0
+  - wget http://downloads.arduino.cc/arduino-1.6.9-linux64.tar.xz
+  - tar xf arduino-1.6.9-linux64.tar.xz
+  - mv arduino-1.6.9 $HOME/arduino_ide
+  - export PATH="$HOME/arduino_ide:$PATH"
+  - arduino --install-boards arduino:sam:1.6.8
+  - arduino --board arduino:sam:arduino_due_x --save-prefs
+  - arduino --pref "compiler.warning_level=all" --save-prefs
+  - cp -f "$TRAVIS_BUILD_DIR/src/ArduinoDUE/AdditionalArduinoFiles/Arduino - 1.6.9 -Due 1.6.8/Arduino15/packages/arduino/hardware/sam/1.6.8/variants/arduino_due_x/variant.cpp" $HOME/.arduino15/packages/arduino/hardware/sam/1.6.8/variants/arduino_due_x/variant.cpp 
 
 
 script:
   - cd $TRAVIS_BUILD_DIR
   - source command.sh
-  - export PATH="$HOME/arduino_ide:$PATH"
-  - arduino --board arduino:sam:arduino_due_x --save-prefs
-  - arduino --get-pref sketchbook.path
-  - build_sketch ./src/ArduinoDUE/Repetier/Repetier.ino
-  - sed -i 's/#define DAVINCI 1 /#define DAVINCI 2 /g' ./src/ArduinoDUE/Repetier/Configuration.h
-  - build_sketch ./src/ArduinoDUE/Repetier/Repetier.ino
-  - sed -i 's/#define DAVINCI 2 /#define DAVINCI 3 /g' ./src/ArduinoDUE/Repetier/Configuration.h
-  - build_sketch ./src/ArduinoDUE/Repetier/Repetier.ino
-  - sed -i 's/#define DAVINCI 3 /#define DAVINCI 0 /g' ./src/ArduinoDUE/Repetier/Configuration.h
-  - build_sketch ./src/ArduinoDUE/Repetier/Repetier.ino
-  - sed -i 's/#define DAVINCI 0 /#define DAVINCI 1 /g' ./src/ArduinoDUE/Repetier/Configuration.h
-  - sed -i 's/#define MODEL  0/#define MODEL  1/g' ./src/ArduinoDUE/Repetier/Configuration.h
-  - build_sketch ./src/ArduinoDUE/Repetier/Repetier.ino
-  - sed -i 's/#define DAVINCI 1 /#define DAVINCI 3 /g' ./src/ArduinoDUE/Repetier/Configuration.h
-  - build_sketch ./src/ArduinoDUE/Repetier/Repetier.ino
-  - sed -i 's/#define DAVINCI 3 /#define DAVINCI 4 /g' ./src/ArduinoDUE/Repetier/Configuration.h
+  - sed -i "s/#define DAVINCI 0 /#define DAVINCI $DAVINCI /g" ./src/ArduinoDUE/Repetier/Configuration.h
+  - sed -i "s/#define DAVINCI 1 /#define DAVINCI $DAVINCI /g" ./src/ArduinoDUE/Repetier/Configuration.h
+  - sed -i "s/#define DAVINCI 2 /#define DAVINCI $DAVINCI /g" ./src/ArduinoDUE/Repetier/Configuration.h
+  - sed -i "s/#define DAVINCI 3 /#define DAVINCI $DAVINCI /g" ./src/ArduinoDUE/Repetier/Configuration.h
+  - sed -i "s/#define DAVINCI 4 /#define DAVINCI $DAVINCI /g" ./src/ArduinoDUE/Repetier/Configuration.h
+  - sed -i "s/#define MODEL  1/#define MODEL  $MODEL/g" ./src/ArduinoDUE/Repetier/Configuration.h
+  - sed -i "s/#define MODEL  0/#define MODEL  $MODEL/g" ./src/ArduinoDUE/Repetier/Configuration.h
   - build_sketch ./src/ArduinoDUE/Repetier/Repetier.ino
 
 notifications:

README.md

@@ -1,27 +1,24 @@
-##Da Vinci Firmware based on Repetier (0.92.3)
+##Da Vinci Firmware based on Repetier (0.92.10) Alpha   
 ============================
 
-[![Join the chat at https://gitter.im/luc-github/Repetier-Firmware-0.92](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/luc-github/Repetier-Firmware-0.92?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)     
-Ide 1.6.5 and module Due 1.6.4 : [![Build Status](https://travis-ci.org/luc-github/Repetier-Firmware-0.92.svg?branch=master)](https://travis-ci.org/luc-github/Repetier-Firmware-0.92)   
+[![Join the chat at https://gitter.im/luc-github/Repetier-Firmware-0.92](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/luc-github/Repetier-Firmware-0.92?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)    
+
+Build Status: [![Build Status](https://travis-ci.org/luc-github/Repetier-Firmware-0.92.svg?branch=master)](https://travis-ci.org/luc-github/Repetier-Firmware-0.92)    
 
 
+
 This firmware is based on the popular repetier firmware and modified to work with first generation Da Vinci 1.0, 2.0 single fan, 2.0 dual fans and also AiO (NB:scanner function is not supported so AiO will work like an 1.0A)   
 If you change the board, currently DUE based are supported with RADDS, as well as Graphical screen and LCD with encoder, there are some sample configuration files provided for RADDS/DUE/GLCD using 1/128 step drivers.
 
 YOU MIGHT DAMAGE YOUR PRINTER OR VOID YOUR WARRANTY, DO IT ON YOUR OWN RISK. When it is possible on 1.0/2.0, currently on 1.0A/2.0A and AiO there is no way to revert to stock fw so be sure of what you are doing.
 
 ***
-###Support for 1.0A/2.0A/AiO(no scanner) is implemented and need feedback.
-
-###:boom:New alpha version based on 0.92.10 is ready for test [here](https://github.com/luc-github/Repetier-Firmware-0.92/tree/devt)
-* Multilangue :globe_with_meridians:
-* AiO support for scanner :camera:
-* Better auto leveling :tractor:
+AiO scanner support is present in FW but scanner software support is currently basic, [horus](https://github.com/bqlabs/horus) is a good candidat, feel free to help [here](https://github.com/luc-github/Repetier-Firmware-0.92/issues/156)  
 
 The board can be easily exposed by removing the back panel of the printer secured by two torx screws.  Supported boards have a jumper labeled JP1, second generation boards have a jumper labeled J37. More info can be found on the [Voltivo forum](http://voltivo.com/forum/davinci-peersupport/340-new-kind-of-mainboard-no-j1-erase-jumper).
 ***
 
-Here are just a few of the benifits of using this firmware:
+Here are just a few of the benefits of using this firmware:
 
 * It works with host software such as [repetier host](http://repetier.com) and [OctoPrint](http://octoprint.org/) giving you full control of your hardware.
 * It works stand alone if you use a WIFI SD Card. 
@@ -35,16 +32,16 @@ The previous version (based on repetier v0.91) can be found [here](https://githu
 
 ***
 ##Current Status
-####Beta - so far so good
+####Alpha - so far so good
 
 ***
 ##Installation
 1. With the machine off remove the back panel and short the jumper JP1 or J37 depending on model.  Some Boards do not have jumper pins exposed but can still be shorted with a conductive wire.
-2. Turn the machine on and wait a few seconds then turn it off again.  The machine will have been flashed removing the current stock firmware and allowing it to be detected as a normal arduino DUE. NOTE: Windows users may need to install drivers to detect the board.  Consult the Voltivo forums.    
-Note : points 1 and 2 are only needed to wipe the stock fw or a corrupted fw, for update they are not necessary.   
-3. Use an arduino IDE supporting arduino DUE, [version 1.5.8+ or  1.6.5](http://arduino.cc/en/Main/OldSoftwareReleases), 1.6.0+ bring several issues, but 1.6.5 seems working well with Due 1.6.4 module for board manager.
-4. Update arduino files (variants.cpp and USBCore.cpp) with the one(s) present in src\ArduinoDUE\AdditionalArduinoFiles\1.5.8. or in src\ArduinoDUE\AdditionalArduinoFiles\1.6.5 according your IDE version   
-NOTE: You do not need to compile arduino from source these files are in the arduino directory structure.  On Mac you will need to right click on the Arduino.app to Show Package Contents.    
+2. Turn the machine on and wait a few seconds then turn it off again.  The machine will have been flashed removing the current stock firmware and allowing it to be detected as a normal arduino DUE. NOTE: Windows users may need to install drivers to detect the board.  Consult the Voltivo forums.   
+Note : points 1 and 2 are only needed to wipe the stock fw or a corrupted fw, for update they are not necessary.
+3. Use an arduino IDE supporting arduino DUE, [1.6.9](http://arduino.cc/en/Main/OldSoftwareReleases) with Due 1.6.8 module from board manager.
+4. Update variants.cpp arduino file with the one present in src\ArduinoDUE\AdditionalArduinoFile according your IDE version   
+NOTE: You do not need to compile arduino from source these files are in the arduino directory structure (click on preferences.txt in Files/Preferences dialog box).    
 5. Open the project file named repetier.ino located in src\ArduinoDUE\Repetier directory in the arduino IDE. 
 6. Modify the DAVINCI define in Configuration.h file to match your targeted Da Vinci.  See below.
 7. Under the tools menu select the board type as Arduino DUE (Native USB Port) and the proper port you have connected to the printer.  NOTE: You can usually find this out by looking at the tools -> port menu both before and after plugging in the printer to your computer's USB.
@@ -58,14 +55,14 @@ If done correctly you will see the arduino sketch compile successfully and outpu
 For information on upgrading from or reverting to stock FW and other procedures please check [Da Vinci Voltivo forum](http://voltivo.com/forum/davinci).    
 <h4>:warning:There is no known way to revert to stock FW on 1.0A/2.0A/AiO until today.</h4>     
 
-Do not forget to modify the Configuration.h to match your targeted Da Vinci: 1.0, 2.0 SF or 2.0.   
+Do not forget to modify the configuration.h to match your targeted Da Vinci: 1.0, 2.0 SF or 2.0.   
 for basic installation just change :   
 '<code>#define DAVINCI 1 // "1" For DAVINCI 1.0, "2" For DAVINCI 2.0 with 1 FAN, "3" For DAVINCI 2.0 with 2 FANS, 4 For AiO （no scanner)</code>'    
   0 for not Davinci board (like DUE/RADDS)    
   1 for DaVinci 1.0 (1Fan, 1 Extruder)   
   2 for DaVinci 2.0 SF (1Fan, 2 Extruders)   
   3 for DaVinci 2.0  (2Fans, 2 Extruders)    
-  4 for DaVinci AiO (no scanner)
+  4 for DaVinci AiO 
 
 Support for 1.0A and 2.0A:  need to change <CODE>#define MODEL 0</CODE>  to  <CODE>#define MODEL 1</CODE>
 
@@ -78,13 +75,18 @@ Or a great video done by Daniel Gonos: https://www.youtube.com/watch?v=rjuCvlnpB
 
 ***
 ##TODO or Questions ?
-[Check issue list](https://github.com/luc-github/Repetier-Firmware-0.92/issues)    
-[FAQ](https://github.com/luc-github/Repetier-Firmware-0.92/issues?utf8=%E2%9C%93&q=is%3Aclosed+label%3AFAQ+)    
+* [Check issue list](https://github.com/luc-github/Repetier-Firmware-0.92/issues)   
+Do not ask help on repetier github they do not support this FW / printer - please use this [github for issues](https://github.com/luc-github/Repetier-Firmware-0.92/issues)
+
+* [FAQ](https://github.com/luc-github/Repetier-Firmware-0.92/issues?utf8=%E2%9C%93&q=is%3Aclosed+label%3AFAQ+)    
+
+* [Documentation](https://github.com/luc-github/Repetier-Firmware-0.92/wiki) TBD - feel free to help 
 
 ***
 ##Implemented
-* Standard GCODE commands
-* Single/Dual extruders support (DaVinci 1.0(a)/2.0(a) and AiO without scanner)
+* 0.92.10 [Repetier](https://github.com/repetier/Repetier-Firmware) based   
+* Standard GCODE commands   
+* Single/Dual extruders support (DaVinci 1.0/2.0 all generations but AiO)
 * Single Fan / Dual fans support according printer configuration
 * Repurpose of second fan usage to be controlled by M106/M107 commands on Da Vinci 2.0
 * Sound and Lights management, including powersaving function (light can be managed remotely by GCODE)
@@ -104,7 +106,8 @@ Or a great video done by Daniel Gonos: https://www.youtube.com/watch?v=rjuCvlnpB
 * Several fixes from original FW   
 * Watchdog   
 * Basic Wifi support for module ESP8266 (https://github.com/luc-github/ESP8266/blob/master/README.md#result-of-esp12e-on-davinci) 
-* Customized thermistor tables for bed and extruder(s) as Davinci board do not follow design of others 3D printer boards so standard tables do not work properly [check here](http://voltivo.com/forum/davinci-firmware/438-repetier-91-e3d-v6-extruder#3631)
+* Customized thermistor tables for bed and extruder(s) as Davinci boards do not follow design of others 3D printer boards so standard tables do not work properly [check here](http://voltivo.com/forum/davinci-firmware/438-repetier-91-e3d-v6-extruder#3631)  
+* Multilanguage at runtime (EN/FR/GE/NL/SW) more to come if get help : check [here](https://github.com/luc-github/Repetier-Firmware-0.92/issues/123)   
 * More to come ....
 
 ***
@@ -119,7 +122,4 @@ If not, you should have "Watchdog feature was not compiled into this version!" i
 ##Current menu (not up to date):
 Easy: <img src='https://cloud.githubusercontent.com/assets/8822552/4748170/bfa0b7e8-5a69-11e4-80b7-02b9c99fe122.png'>   
 Advanced :  <img src='https://cloud.githubusercontent.com/assets/8822552/4748932/bebab9e2-5a7c-11e4-8fea-cdbe3d70820c.png'>   
-***
-##Donation:
-Every support is welcome: [<img src="https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG_global.gif" border="0" alt="PayPal – The safer, easier way to pay online.">](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=VT5LV38N4U3VQ)    
-Especially if need to buy new printer to add FW support.
+