From c870a5be492742dd4021b6e785481fd451836969 Mon Sep 17 00:00:00 2001 From: Ted Hess Date: Wed, 20 Dec 2017 19:27:19 -0500 Subject: [PATCH] Corrected release URL. Travis release setup --- .travis.yml | 9 +++++++-- Firmware/Configuration.h | 13 +++++++------ README.md | 2 +- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index d835afc92..741f27fca 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,11 +40,16 @@ script: - 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 +after_success: | + if [ -n "${TRAVIS_TAG}" ]; then + mv prusa3d_fw_${GIT_BUILD}.zip prusa3d_fw_${TRAVIS_TAG}.zip + done + 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 + secure: SX3D+HdZDm3SnXs2AYi23e0TjmAt4YblVrIFtuquIzbvBIi+yKr7QYzLrdyb8VhQsnG7m3Li9REcYFxX7GeEOMqW0CP3zgV9iIpoYged6oIgsiyKZxj6d5rwisksruW3Na1Tz3hO11dY2nI1E7IH4lGd5os7m/OkmXJYxHZloZE+VYPBNLpgBpzOUJkijgNs+2vqfdh6Rz1CNnaHyJJTi0KxXGOFa4aWwcgn0CYtJyUoqu6CGVwlLa8IPIClw6VEbnF+hvBD7EV0DPD0sTzINq+WZvFIze1SQ1GD6X4lz5iSDFlYYD5SEpL3bNvHXUD/hviceglIrRNQxT9xrDyW2J1nkatOlUERYxXmXmVRaY6VSGjL6DV9I31GoElkw5e2Z7AiO20QI+1yPAnEmLVFLDNoxXL4IC30E/j61Wqkps4HDOFvQgm9t9k0dYSmV3vJEhFjhuRWRvIZ37KUadjD919041pCbCn425QREpqyunZTwMjhrmCXFCgBmV6qgkAujLKoaiKL2kL5BvNk7wgrkYMibjTUbVcuEyhttB/V47UTUqXs7PptOCyCR7hinw9DITWULKkWqavumVBqNAek9iGhhfp7Dg0ByjH+f12xBajmQI2rZq67FKCIUmKmNDG7TtbFd5iB4kmt5v1mUtdYPkbB4qQYh6eGF+oACZWLJjg= + file: prusa3d_fw_${TRAVIS_TAG}.zip skip_cleanup: true on: tags: true diff --git a/Firmware/Configuration.h b/Firmware/Configuration.h index 267c58424..0b6d0deea 100644 --- a/Firmware/Configuration.h +++ b/Firmware/Configuration.h @@ -41,13 +41,13 @@ // Bed correction is valid if set to 1. If set to zero or 255, // the BED_CORRECTION_OFFSETS bytes are invalid. -#define EEPROM_BED_CORRECTION_VALID (EEPROM_FARM_NUMBER-1) #ifdef MBC_8POINT -// 4 Unused bytes (available for future options) -#define EEPROM_UNUSED (EEPROM_BED_CORRECTION_VALID-1) -#define EEPROM_TOSHIBA_FLASH_AIR_COMPATIBLITY (EEPROM_UNUSED-4) +// 5 Unused bytes (available for future options) +#define EEPROM_UNUSED (EEPROM_FARM_NUMBER-1) +#define EEPROM_TOSHIBA_FLASH_AIR_COMPATIBLITY (EEPROM_UNUSED-5) #else // Old style MBC offsets +#define EEPROM_BED_CORRECTION_VALID (EEPROM_FARM_NUMBER-1) #define EEPROM_BED_CORRECTION_LEFT (EEPROM_BED_CORRECTION_VALID-1) #define EEPROM_BED_CORRECTION_RIGHT (EEPROM_BED_CORRECTION_LEFT-1) #define EEPROM_BED_CORRECTION_FRONT (EEPROM_BED_CORRECTION_RIGHT-1) @@ -65,8 +65,9 @@ // E^2 address of custom MBC offsets array. // Correction of the bed leveling, in micrometers. -// Current Range is: +/- 500um (stored as int16. -#define EEPROM_BED_CORRECTION_OFFSETS (EEPROM_WIZARD_ACTIVE - 16) +// Current Range is: +/- 500um (stored as int16). +#define EEPROM_BED_CORRECTION_VALID 999 +#define EEPROM_BED_CORRECTION_OFFSETS (EEPROM_BED_CORRECTION_VALID - 16) // Currently running firmware, each digit stored as uint16_t. // The flavor differentiates a dev, alpha, beta, release candidate or a release version. diff --git a/README.md b/README.md index bc7c62787..fa5902e1b 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ If you want to have some feature added to this customized firmware version and d ## Download of precompiled .hex files -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) +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-Firmware/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.