build: Add Configuration_var.h as a configuration wrapper

Instead of including Configuration_prusa.h directly, include
Configuration_var which then includes the proper variant file though a
preprocessor macro.

This allows to keep the existing build system intact, but also redefine
at compile time the final header without having to make copies on the
file system.
This commit is contained in:
Yuri D'Elia 2022-10-05 01:21:19 +02:00
parent 5237365ff7
commit 1d3ee1caba
14 changed files with 24 additions and 14 deletions

View File

@ -1,5 +1,5 @@
#include "Configuration.h"
#include "Configuration_prusa.h"
#include "Configuration_var.h"
const uint16_t _nPrinterType PROGMEM=PRINTER_TYPE;
const char _sPrinterName[] PROGMEM=PRINTER_NAME;

View File

@ -70,7 +70,7 @@ extern PGM_P sPrinterName;
#define SOURCE_TIME_EPOCH __TIME__
#endif
#include "Configuration_prusa.h"
#include "Configuration_var.h"
#define FW_PRUSA3D_MAGIC "PRUSA3DFW"
#define FW_PRUSA3D_MAGIC_LEN 10

View File

@ -5,7 +5,7 @@
#include "temperature.h"
#include "ultralcd.h"
#include "ConfigurationStore.h"
#include "Configuration_prusa.h"
#include "Configuration_var.h"
#ifdef MESH_BED_LEVELING
#include "mesh_bed_leveling.h"

View File

@ -0,0 +1,10 @@
// Include the printer's variant configuration header
#pragma once
// This is set by the cmake build to be able to take control of
// the variant header without breaking existing build mechanisms.
#ifndef CMAKE_CONTROL
#include "Configuration_prusa.h"
#else
#include FW_VARIANT
#endif

View File

@ -2,7 +2,7 @@
#define _CONFIG_H
#include "Configuration_prusa.h"
#include "Configuration_var.h"
#include "pins.h"
#if (defined(VOLT_IR_PIN) && defined(IR_SENSOR))

View File

@ -4,7 +4,7 @@
//! @brief First layer (Z offset) calibration
#include "first_lay_cal.h"
#include "Configuration_prusa.h"
#include "Configuration_var.h"
#include "language.h"
#include "Marlin.h"
#include "cmdqueue.h"

View File

@ -1,8 +1,8 @@
//messages.c
#include "language.h"
//this is because we need include Configuration_prusa.h (CUSTOM_MENDEL_NAME)
#include "Configuration_prusa.h"
//this is because we need CUSTOM_MENDEL_NAME
#include "Configuration_var.h"
//internationalized messages
const char MSG_ALWAYS[] PROGMEM_I1 = ISTR("Always"); ////MSG_ALWAYS c=6

View File

@ -1,5 +1,5 @@
#include "mmu2_power.h"
#include "Configuration_prusa.h"
#include "Configuration_var.h"
#include "pins.h"
#include "fastio.h"
#include <util/delay.h>

View File

@ -4,7 +4,7 @@
#include <avr/pgmspace.h>
#include "config.h"
#include <stdio.h>
#include "Configuration_prusa.h"
#include "Configuration_var.h"
#if defined(FILAMENT_SENSOR) && (FILAMENT_SENSOR_TYPE == FSENSOR_PAT9125)

View File

@ -9,7 +9,7 @@
#include "boards.h"
#define false 0
#define true 1
#include "Configuration_prusa.h"
#include "Configuration_var.h"
#ifdef NEW_XYZCAL

View File

@ -4,7 +4,7 @@
#include <util/delay.h>
#include <avr/pgmspace.h>
#include "stdbool.h"
#include "Configuration_prusa.h"
#include "Configuration_var.h"
#include "pins.h"
#include "fastio.h"

View File

@ -44,7 +44,7 @@
#include "adc.h"
#include "ConfigurationStore.h"
#include "Timer.h"
#include "Configuration_prusa.h"
#include "Configuration_var.h"
#include "Prusa_farm.h"
#if (ADC_OVRSAMPL != OVERSAMPLENR)

View File

@ -3,7 +3,7 @@
// timer2 is used for System timer.
#include "system_timer.h"
#include "Configuration_prusa.h"
#include "Configuration_var.h"
#ifdef SYSTEM_TIMER_2

View File

@ -1,6 +1,6 @@
//xyzcal.cpp - xyz calibration with image processing
#include "Configuration_prusa.h"
#include "Configuration_var.h"
#ifdef NEW_XYZCAL
#include "xyzcal.h"