probonopd / RF100-Firmware

Conrad Electronic Renkforce RF100 Firmware
https://www.conrad.de/de/renkforce-rf100-3d-drucker-starter-kit-inkl-filament-1507428.html
GNU General Public License v3.0
7 stars 5 forks source link

Simplify this repository and update to latest Marlin #18

Open probonopd opened 6 years ago

probonopd commented 6 years ago

Turns out that we only need three files for the custom Marlin firmware. Why keep all of Marlin in this repository when these three files are sufficient?

We can build like this (tested):

git clone https://github.com/MarlinFirmware/Marlin
cd Marlin/
git checkout 1.1.6
cd Marlin/
rm Configuration.h Configuration_adv.h pins_RAMPS.h 
wget https://github.com/probonopd/RF100-Firmware/raw/community/RF-100/example_configurations/Renkforce/RF100/Configuration.h https://github.com/probonopd/RF100-Firmware/raw/community/RF-100/example_configurations/Renkforce/RF100/Configuration_adv.h https://github.com/probonopd/RF100-Firmware/raw/community/RF-100/example_configurations/Renkforce/RF100/pins_RAMPS.h
cd -
arduino-*/arduino --pref build.path=. --verify --verbose-build --board arduino:avr:mega:cpu=atmega2560 $(readlink -f Marlin/Marlin.ino)
ls

Now, it seems like we need to update (some of) these three files for it to work with newer versions of Marlin.

1.1.7 says

In file included from /home/me/Marlin/sketch/MarlinConfig.h:40:0,
                 from /home/me/Marlin/Marlin/Marlin.ino:31:
SanityCheck.h:46: error: #error "You are using an old Configuration.h file, update it before building Marlin."
   #error "You are using an old Configuration.h file, update it before building Marlin."
    ^
SanityCheck.h:50: error: #error "You are using an old Configuration_adv.h file, update it before building Marlin."
   #error "You are using an old Configuration_adv.h file, update it before building Marlin."
    ^
SanityCheck.h:117: error: #error "PAUSE_PARK_[XY]_POS is now set with NOZZLE_PARK_POINT. Please update your configuration."
   #error "PAUSE_PARK_[XY]_POS is now set with NOZZLE_PARK_POINT. Please update your configuration."
    ^
In file included from /home/me/Marlin/sketch/MarlinConfig.h:40:0,
                 from /home/me/Marlin/Marlin/Marlin.ino:31:
SanityCheck.h:306: error: #error "MIN_SOFTWARE_ENDSTOPS requires at least one of the MIN_SOFTWARE_ENDSTOP_[XYZ] options."
     #error "MIN_SOFTWARE_ENDSTOPS requires at least one of the MIN_SOFTWARE_ENDSTOP_[XYZ] options."
      ^
SanityCheck.h:314: error: #error "MAX_SOFTWARE_ENDSTOPS requires at least one of the MAX_SOFTWARE_ENDSTOP_[XYZ] options."
     #error "MAX_SOFTWARE_ENDSTOPS requires at least one of the MAX_SOFTWARE_ENDSTOP_[XYZ] options."
      ^
SanityCheck.h:418: error: #error "ADVANCED_PAUSE_FEATURE requires NOZZLE_PARK_FEATURE"
     #error "ADVANCED_PAUSE_FEATURE requires NOZZLE_PARK_FEATURE"
      ^

1.1.8 says

SanityCheck.h:46: error: #error "You are using an old Configuration.h file, update it before building Marlin."
   #error "You are using an old Configuration.h file, update it before building Marlin."
    ^
SanityCheck.h:50: error: #error "You are using an old Configuration_adv.h file, update it before building Marlin."
   #error "You are using an old Configuration_adv.h file, update it before building Marlin."
    ^
SanityCheck.h:117: error: #error "PAUSE_PARK_[XY]_POS is now set with NOZZLE_PARK_POINT. Please update your configuration."
   #error "PAUSE_PARK_[XY]_POS is now set with NOZZLE_PARK_POINT. Please update your configuration."
    ^
In file included from /home/me/Marlin/sketch/MarlinConfig.h:40:0,
                 from /home/me/Marlin/Marlin/Marlin.ino:31:
SanityCheck.h:306: error: #error "MIN_SOFTWARE_ENDSTOPS requires at least one of the MIN_SOFTWARE_ENDSTOP_[XYZ] options."
     #error "MIN_SOFTWARE_ENDSTOPS requires at least one of the MIN_SOFTWARE_ENDSTOP_[XYZ] options."
      ^
SanityCheck.h:314: error: #error "MAX_SOFTWARE_ENDSTOPS requires at least one of the MAX_SOFTWARE_ENDSTOP_[XYZ] options."
     #error "MAX_SOFTWARE_ENDSTOPS requires at least one of the MAX_SOFTWARE_ENDSTOP_[XYZ] options."
      ^
SanityCheck.h:418: error: #error "ADVANCED_PAUSE_FEATURE requires NOZZLE_PARK_FEATURE"
     #error "ADVANCED_PAUSE_FEATURE requires NOZZLE_PARK_FEATURE"
      ^

The needed changes seem to come from https://github.com/MarlinFirmware/Marlin/commit/59d047c1d7d4e39d0f4014eb2b44887935a444e2, https://github.com/MarlinFirmware/Marlin/commit/794f8f132966778c9c9395ff922ee5a3a5d81ef0, https://github.com/MarlinFirmware/Marlin/commit/e05af35678be10d6f3c483e1b321ba3d62bc6bb5

The attached zip has all the necessary changes applied.

Marlin.zip

probonopd commented 6 years ago

Taking the updated files from Marlin.zip above, possibly need

sed -i -e 's|^#define AUTO_REPORT_TEMPERATURES|//#define AUTO_REPORT_TEMPERATURES|g' Configuration_adv.h
sed -i -e 's|^#define EXTENDED_CAPABILITIES_REPORT|//#define EXTENDED_CAPABILITIES_REPORT|g' Configuration_adv.h

Certainly need

sed -i -e 's|^#define REVERSE_MENU_DIRECTION|//#define REVERSE_MENU_DIRECTION|g' Configuration.h