diff --git a/.travis.yml b/.travis.yml index b241e10c2..d835afc92 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,3 +39,14 @@ script: - mv *_MK2-RAMBo* prusa3d_fw_${GIT_BUILD}/MK2 - zip -r prusa3d_fw_${GIT_BUILD}.zip prusa3d_fw_* *.pdf - curl --upload-file prusa3d_fw_${GIT_BUILD}.zip https://transfer.sh/prusa3d_fw_${GIT_BUILD}.zip + +deploy: + provider: releases + api_key: + secure: fViiNU342ZKF0ZQQ6LS/11j3B1NpMZaHqPmoikDWgssRc3G0iHjWxPtr9dvt3G2l3BHTPcnhg5u7Al0u+UmmeP2yKT6f7sSVCpW7fY/wxVzXgDNbczY21TI3D18XiOBeYL2bosCYKdl6JkFZzvqCkFYcqB1WI9wSfg2D7NuWNjpEV8b3p65ge6Th5r5mPfskvjnhtpl229jJ5ewl8NDDMV+WyChkCrTKWHtZatTPcRr23hNy7sSafbmdbWw43C/fkU4iDVdNbeUd7A3JZflFnF1oSH3QqgucVl8PENPc2LsyXeXWzZ90QR9KfeSDzaKmJdZWg5horMOFWo4jr/MqLhZKFntsEFqnPpVqyWlT3xzP8f3U05jErS7ZetT5+PhvOhYINx6Frn7Y21aMTyih33AM9JstBZuK086os5wY488TGWBcSFQnV9mM3Ku9ff0L/rT99sTuc9+sftzWR65udUtPe0XhlCfbpGcotph3ydgy3htLC3+0pDEIOaQqkWTN7kc05ygp9zUbd8jfmbk1wYdmOlXu/IWiPh/lS0/MpNuKI3E2nH6DzirZILxDv8C31/S6FyUBBP7GgrM0xYaWJ1vAHd99QsuWZ2ZwOdg7XKJd2Gl9Bqob/Br8eknLhLC/nCyILnueTxRnBvOHSjudMk7EqSw3fXiUQPUB4Q3tRjY= + file: prusa3d_fw_${GIT_BUILD}.zip + skip_cleanup: true + on: + tags: true + repo: thess/Prusa-Firmware + branch: private-build2 diff --git a/CUSTOM.md b/CUSTOM.md index a76aa3085..2c9a05ec1 100644 --- a/CUSTOM.md +++ b/CUSTOM.md @@ -1,5 +1,17 @@ # Changelog of local customizations +## Version 20-Dec-2017 (v3.1.0 r4) +### Updates and mods +- Allow BAUDRATE override by build opts (default 115200). +- Remove unused source files (qr_solve, vector_3). +- Use SDK version of LiquidCrystal library (faster draw). +- Adjust extra filament load extrusion to 15mm. +- Add private build variant configuration version number. + +## Bug fixes +- Init serial before lcd to elminate random garbage output. +- Remove redundant splash screen init. + ## Version 22-Nov-2017 ### Updates and mods - Add extra 25mm to manual (LCD) filament load extrusion. diff --git a/Firmware/Configuration.h b/Firmware/Configuration.h index 3c0bd4c68..267c58424 100644 --- a/Firmware/Configuration.h +++ b/Firmware/Configuration.h @@ -10,7 +10,7 @@ // Firmware version #define FW_version "3.1.0" -#define FW_local_variant 3 +#define FW_local_variant 4 #define FW_report_version FW_version " r" STR(FW_local_variant) #define FW_PRUSA3D_MAGIC "PRUSA3DFW" diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 1b7454ad8..7213c8dbb 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -1494,7 +1494,7 @@ static void lcd_support_menu() } else { MENU_ITEM(back, PSTR("FW - " FW_version), lcd_main_menu); } -#endif +#endif MENU_ITEM(back, MSG_PRUSA3D, lcd_main_menu); MENU_ITEM(back, MSG_PRUSA3D_FORUM, lcd_main_menu); MENU_ITEM(back, MSG_PRUSA3D_HOWTO, lcd_main_menu); diff --git a/Firmware/util.cpp b/Firmware/util.cpp index 8c575ca84..b4ff7da34 100644 --- a/Firmware/util.cpp +++ b/Firmware/util.cpp @@ -26,7 +26,7 @@ const char STR_REVISION_RC [] PROGMEM = "rc"; inline bool is_whitespace_or_nl(char c) { - return c == ' ' || c == '\t' || c == '\n' || c == 'r'; + return c == ' ' || c == '\t' || c == '\n' || c == '\r'; } inline bool is_whitespace_or_nl_or_eol(char c) diff --git a/README.md b/README.md index 6f106f3ba..bc7c62787 100644 --- a/README.md +++ b/README.md @@ -24,8 +24,10 @@ If you want to have some feature added to this customized firmware version and d ## Download of precompiled .hex files -The URL of a _.zip_ file containing precompiled firmware can be found toward the end of the Travis build log. Click on the button in the right-hand corner of the log to move to the end. -[Travis CI output](https://travis-ci.org/thess/Prusa-Firmware) +A _.zip_ file containing pre-built versions of each private firmware release can be found in the Github reposiotory [here](https://github.com/thess/Prusa-Firware/releases) + +Intermediate firmware versions of individual checkins are provided by the Travis CI builds. The URL of a _.zip_ file containing the firmware can be found toward the end of the Travis build log. Click on the button in the right-hand corner of the log to move to the end. [Travis CI output](https://travis-ci.org/thess/Prusa-Firmware) **Note:** The Travis CI build results are only kept for 14-days. + Just download, unzip and choose the version for your configuation, then flash it to the printer.