Skip to content

Commit 5b7f1f5

Browse files
committed
Merge devt branch to move to 0.92.10 base
1 parent a1d7816 commit 5b7f1f5

File tree

50 files changed

+47552
-15179
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+47552
-15179
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,4 @@ Configuration_*.h
2525
Repetier.depend
2626
Repetier.layout
2727
activate*.bat
28+
~$Translate.xlsx

.travis.yml

Lines changed: 28 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -5,46 +5,40 @@ language: bash
55
os:
66
- linux
77

8-
before_install:
9-
- "/sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1280x1024x16"
10-
8+
env:
9+
matrix:
10+
- DAVINCI=0 MODEL=0
11+
- DAVINCI=1 MODEL=0
12+
- DAVINCI=2 MODEL=0
13+
- DAVINCI=3 MODEL=0
14+
- DAVINCI=1 MODEL=1
15+
- DAVINCI=2 MODEL=1
16+
- DAVINCI=4 MODEL=1
17+
1118
before_script:
12-
- "export DISPLAY=:99.0"
13-
- sleep 3 # give xvfb some time to start
14-
- wget http://downloads.arduino.cc/arduino-1.6.5-linux64.tar.xz
15-
- tar xf arduino-1.6.5-linux64.tar.xz
16-
- mv arduino-1.6.5 $HOME/arduino_ide
17-
- mkdir -p $HOME/.arduino15/packages/arduino/hardware/sam
18-
- cd $HOME/.arduino15/packages/arduino/hardware/sam
19-
- wget http://downloads.arduino.cc/cores/sam-1.6.4.tar.bz2
20-
- tar xf sam-1.6.4.tar.bz2
21-
- mkdir -p $HOME/.arduino15/packages/arduino/tools/arm-none-eabi-gcc
22-
- cd $HOME/.arduino15/packages/arduino/tools/arm-none-eabi-gcc
23-
- wget http://downloads.arduino.cc/gcc-arm-none-eabi-4.8.3-2014q1-linux64.tar.gz
24-
- tar xf gcc-arm-none-eabi-4.8.3-2014q1-linux64.tar.gz
25-
- mv gcc-arm-none-eabi-4.8.3-2014q1 4.8.3-2014q1
26-
- 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
19+
- "/sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_1.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :1 -ac -screen 0 1280x1024x16"
20+
- sleep 3
21+
- export DISPLAY=:1.0
22+
- wget http://downloads.arduino.cc/arduino-1.6.9-linux64.tar.xz
23+
- tar xf arduino-1.6.9-linux64.tar.xz
24+
- mv arduino-1.6.9 $HOME/arduino_ide
25+
- export PATH="$HOME/arduino_ide:$PATH"
26+
- arduino --install-boards arduino:sam:1.6.8
27+
- arduino --board arduino:sam:arduino_due_x --save-prefs
28+
- arduino --pref "compiler.warning_level=all" --save-prefs
29+
- 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
2730

2831

2932
script:
3033
- cd $TRAVIS_BUILD_DIR
3134
- source command.sh
32-
- export PATH="$HOME/arduino_ide:$PATH"
33-
- arduino --board arduino:sam:arduino_due_x --save-prefs
34-
- arduino --get-pref sketchbook.path
35-
- build_sketch ./src/ArduinoDUE/Repetier/Repetier.ino
36-
- sed -i 's/#define DAVINCI 1 /#define DAVINCI 2 /g' ./src/ArduinoDUE/Repetier/Configuration.h
37-
- build_sketch ./src/ArduinoDUE/Repetier/Repetier.ino
38-
- sed -i 's/#define DAVINCI 2 /#define DAVINCI 3 /g' ./src/ArduinoDUE/Repetier/Configuration.h
39-
- build_sketch ./src/ArduinoDUE/Repetier/Repetier.ino
40-
- sed -i 's/#define DAVINCI 3 /#define DAVINCI 0 /g' ./src/ArduinoDUE/Repetier/Configuration.h
41-
- build_sketch ./src/ArduinoDUE/Repetier/Repetier.ino
42-
- sed -i 's/#define DAVINCI 0 /#define DAVINCI 1 /g' ./src/ArduinoDUE/Repetier/Configuration.h
43-
- sed -i 's/#define MODEL 0/#define MODEL 1/g' ./src/ArduinoDUE/Repetier/Configuration.h
44-
- build_sketch ./src/ArduinoDUE/Repetier/Repetier.ino
45-
- sed -i 's/#define DAVINCI 1 /#define DAVINCI 3 /g' ./src/ArduinoDUE/Repetier/Configuration.h
46-
- build_sketch ./src/ArduinoDUE/Repetier/Repetier.ino
47-
- sed -i 's/#define DAVINCI 3 /#define DAVINCI 4 /g' ./src/ArduinoDUE/Repetier/Configuration.h
35+
- sed -i "s/#define DAVINCI 0 /#define DAVINCI $DAVINCI /g" ./src/ArduinoDUE/Repetier/Configuration.h
36+
- sed -i "s/#define DAVINCI 1 /#define DAVINCI $DAVINCI /g" ./src/ArduinoDUE/Repetier/Configuration.h
37+
- sed -i "s/#define DAVINCI 2 /#define DAVINCI $DAVINCI /g" ./src/ArduinoDUE/Repetier/Configuration.h
38+
- sed -i "s/#define DAVINCI 3 /#define DAVINCI $DAVINCI /g" ./src/ArduinoDUE/Repetier/Configuration.h
39+
- sed -i "s/#define DAVINCI 4 /#define DAVINCI $DAVINCI /g" ./src/ArduinoDUE/Repetier/Configuration.h
40+
- sed -i "s/#define MODEL 1/#define MODEL $MODEL/g" ./src/ArduinoDUE/Repetier/Configuration.h
41+
- sed -i "s/#define MODEL 0/#define MODEL $MODEL/g" ./src/ArduinoDUE/Repetier/Configuration.h
4842
- build_sketch ./src/ArduinoDUE/Repetier/Repetier.ino
4943

5044
notifications:

README.md

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,24 @@
1-
##Da Vinci Firmware based on Repetier (0.92.3)
1+
##Da Vinci Firmware based on Repetier (0.92.10) Alpha
22
============================
33

4-
[![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)
5-
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)
4+
[![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)
5+
6+
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)
67

78

9+
810
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)
911
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.
1012

1113
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.
1214

1315
***
14-
###Support for 1.0A/2.0A/AiO(no scanner) is implemented and need feedback.
15-
16-
###: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)
17-
* Multilangue :globe_with_meridians:
18-
* AiO support for scanner :camera:
19-
* Better auto leveling :tractor:
16+
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)
2017

2118
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).
2219
***
2320

24-
Here are just a few of the benifits of using this firmware:
21+
Here are just a few of the benefits of using this firmware:
2522

2623
* It works with host software such as [repetier host](http://repetier.com) and [OctoPrint](http://octoprint.org/) giving you full control of your hardware.
2724
* 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
3532

3633
***
3734
##Current Status
38-
####Beta - so far so good
35+
####Alpha - so far so good
3936

4037
***
4138
##Installation
4239
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.
43-
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.
44-
Note : points 1 and 2 are only needed to wipe the stock fw or a corrupted fw, for update they are not necessary.
45-
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.
46-
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
47-
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.
40+
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.
41+
Note : points 1 and 2 are only needed to wipe the stock fw or a corrupted fw, for update they are not necessary.
42+
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.
43+
4. Update variants.cpp arduino file with the one present in src\ArduinoDUE\AdditionalArduinoFile according your IDE version
44+
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).
4845
5. Open the project file named repetier.ino located in src\ArduinoDUE\Repetier directory in the arduino IDE.
4946
6. Modify the DAVINCI define in Configuration.h file to match your targeted Da Vinci. See below.
5047
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
5855
For information on upgrading from or reverting to stock FW and other procedures please check [Da Vinci Voltivo forum](http://voltivo.com/forum/davinci).
5956
<h4>:warning:There is no known way to revert to stock FW on 1.0A/2.0A/AiO until today.</h4>
6057

61-
Do not forget to modify the Configuration.h to match your targeted Da Vinci: 1.0, 2.0 SF or 2.0.
58+
Do not forget to modify the configuration.h to match your targeted Da Vinci: 1.0, 2.0 SF or 2.0.
6259
for basic installation just change :
6360
'<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>'
6461
0 for not Davinci board (like DUE/RADDS)
6562
1 for DaVinci 1.0 (1Fan, 1 Extruder)
6663
2 for DaVinci 2.0 SF (1Fan, 2 Extruders)
6764
3 for DaVinci 2.0 (2Fans, 2 Extruders)
68-
4 for DaVinci AiO (no scanner)
65+
4 for DaVinci AiO
6966

7067
Support for 1.0A and 2.0A: need to change <CODE>#define MODEL 0</CODE> to <CODE>#define MODEL 1</CODE>
7168

@@ -78,13 +75,18 @@ Or a great video done by Daniel Gonos: https://www.youtube.com/watch?v=rjuCvlnpB
7875

7976
***
8077
##TODO or Questions ?
81-
[Check issue list](https://github.com/luc-github/Repetier-Firmware-0.92/issues)
82-
[FAQ](https://github.com/luc-github/Repetier-Firmware-0.92/issues?utf8=%E2%9C%93&q=is%3Aclosed+label%3AFAQ+)
78+
* [Check issue list](https://github.com/luc-github/Repetier-Firmware-0.92/issues)
79+
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)
80+
81+
* [FAQ](https://github.com/luc-github/Repetier-Firmware-0.92/issues?utf8=%E2%9C%93&q=is%3Aclosed+label%3AFAQ+)
82+
83+
* [Documentation](https://github.com/luc-github/Repetier-Firmware-0.92/wiki) TBD - feel free to help
8384

8485
***
8586
##Implemented
86-
* Standard GCODE commands
87-
* Single/Dual extruders support (DaVinci 1.0(a)/2.0(a) and AiO without scanner)
87+
* 0.92.10 [Repetier](https://github.com/repetier/Repetier-Firmware) based
88+
* Standard GCODE commands
89+
* Single/Dual extruders support (DaVinci 1.0/2.0 all generations but AiO)
8890
* Single Fan / Dual fans support according printer configuration
8991
* Repurpose of second fan usage to be controlled by M106/M107 commands on Da Vinci 2.0
9092
* 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
104106
* Several fixes from original FW
105107
* Watchdog
106108
* Basic Wifi support for module ESP8266 (https://github.com/luc-github/ESP8266/blob/master/README.md#result-of-esp12e-on-davinci)
107-
* 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)
109+
* 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)
110+
* 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)
108111
* More to come ....
109112

110113
***
@@ -119,7 +122,4 @@ If not, you should have "Watchdog feature was not compiled into this version!" i
119122
##Current menu (not up to date):
120123
Easy: <img src='https://cloud.githubusercontent.com/assets/8822552/4748170/bfa0b7e8-5a69-11e4-80b7-02b9c99fe122.png'>
121124
Advanced : <img src='https://cloud.githubusercontent.com/assets/8822552/4748932/bebab9e2-5a7c-11e4-8fea-cdbe3d70820c.png'>
122-
***
123-
##Donation:
124-
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)
125-
Especially if need to buy new printer to add FW support.
125+

Translate.xlsx

477 KB
Binary file not shown.

pinout.xlsx

-165 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)