Skip to content

Commit

Permalink
🎨 Detab some build files
Browse files Browse the repository at this point in the history
  • Loading branch information
thinkyhead committed May 17, 2023
1 parent cf28f48 commit 1e2de0e
Show file tree
Hide file tree
Showing 33 changed files with 26,834 additions and 26,819 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"dfu",
"jlink"
],
"offset_address": "0x8008000",
"offset_address": "0x8008000",
"require_upload_port": true,
"use_1200bps_touch": false,
"wait_for_upload_port": false
Expand Down
39 changes: 19 additions & 20 deletions buildroot/share/PlatformIO/variants/MARLIN_ARCHIM/variant.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@
*----------------------------------------------------------------------------*/

/** Frequency of the board main oscillator */
#define VARIANT_MAINOSC 12000000
#define VARIANT_MAINOSC 12000000

/** Master clock frequency */
#define VARIANT_MCK 84000000
#define VARIANT_MCK 84000000

/*----------------------------------------------------------------------------
* Headers
Expand Down Expand Up @@ -119,13 +119,13 @@ extern "C"{
#define BOARD_SPI_DEFAULT_SS BOARD_SPI_SS3

#define BOARD_PIN_TO_SPI_PIN(x) \
(x==BOARD_SPI_SS0 ? PIN_SPI_SS0 : \
(x==BOARD_SPI_SS1 ? PIN_SPI_SS1 : \
(x==BOARD_SPI_SS2 ? PIN_SPI_SS2 : PIN_SPI_SS3 )))
(x==BOARD_SPI_SS0 ? PIN_SPI_SS0 : \
(x==BOARD_SPI_SS1 ? PIN_SPI_SS1 : \
(x==BOARD_SPI_SS2 ? PIN_SPI_SS2 : PIN_SPI_SS3 )))
#define BOARD_PIN_TO_SPI_CHANNEL(x) \
(x==BOARD_SPI_SS0 ? 0 : \
(x==BOARD_SPI_SS1 ? 1 : \
(x==BOARD_SPI_SS2 ? 2 : 3)))
(x==BOARD_SPI_SS0 ? 0 : \
(x==BOARD_SPI_SS1 ? 1 : \
(x==BOARD_SPI_SS2 ? 2 : 3)))

static const uint8_t SS = BOARD_SPI_SS0;
static const uint8_t SS1 = BOARD_SPI_SS1;
Expand Down Expand Up @@ -195,7 +195,7 @@ static const uint8_t DAC0 = 66;
static const uint8_t DAC1 = 67;
static const uint8_t CANRX = 68;
static const uint8_t CANTX = 69;
#define ADC_RESOLUTION 12
#define ADC_RESOLUTION 12

/*
* Complementary CAN pins
Expand All @@ -212,21 +212,21 @@ static const uint8_t CAN1TX = 89;
/*
* DACC
*/
#define DACC_INTERFACE DACC
#define DACC_INTERFACE_ID ID_DACC
#define DACC_RESOLUTION 12
#define DACC_INTERFACE DACC
#define DACC_INTERFACE_ID ID_DACC
#define DACC_RESOLUTION 12
#define DACC_ISR_HANDLER DACC_Handler
#define DACC_ISR_ID DACC_IRQn

/*
* PWM
*/
#define PWM_INTERFACE PWM
#define PWM_INTERFACE_ID ID_PWM
#define PWM_FREQUENCY 31000
#define PWM_MAX_DUTY_CYCLE 255
#define PWM_MIN_DUTY_CYCLE 0
#define PWM_RESOLUTION 8
#define PWM_INTERFACE PWM
#define PWM_INTERFACE_ID ID_PWM
#define PWM_FREQUENCY 31000
#define PWM_MAX_DUTY_CYCLE 255
#define PWM_MIN_DUTY_CYCLE 0
#define PWM_RESOLUTION 8

/*
* TC
Expand All @@ -236,7 +236,7 @@ static const uint8_t CAN1TX = 89;
#define TC_FREQUENCY 100000
#define TC_MAX_DUTY_CYCLE 255
#define TC_MIN_DUTY_CYCLE 0
#define TC_RESOLUTION 8
#define TC_RESOLUTION 8

#ifdef __cplusplus
}
Expand Down Expand Up @@ -281,4 +281,3 @@ extern USARTClass Serial3;
#define SERIAL_PORT_HARDWARE3 Serial3

#endif /* _VARIANT_ARDUINO_DUE_X_ */

Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ extern "C" {
#ifdef __cplusplus
} // extern "C"
#endif

/*----------------------------------------------------------------------------
* Arduino objects - C++ only
*----------------------------------------------------------------------------*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,7 @@ extern "C" {
#ifdef __cplusplus
} // extern "C"
#endif

/*----------------------------------------------------------------------------
* Arduino objects - C++ only
*----------------------------------------------------------------------------*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -267,6 +267,7 @@ extern "C" {
#ifdef __cplusplus
} // extern "C"
#endif

/*----------------------------------------------------------------------------
* Arduino objects - C++ only
*----------------------------------------------------------------------------*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,7 @@ extern "C" {
#ifdef __cplusplus
} // extern "C"
#endif

/*----------------------------------------------------------------------------
* Arduino objects - C++ only
*----------------------------------------------------------------------------*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,7 @@ extern "C" {
#ifdef __cplusplus
} // extern "C"
#endif

/*----------------------------------------------------------------------------
* Arduino objects - C++ only
*----------------------------------------------------------------------------*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,7 @@ extern "C" {
#ifdef __cplusplus
} // extern "C"
#endif

/*----------------------------------------------------------------------------
* Arduino objects - C++ only
*----------------------------------------------------------------------------*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ extern "C" {
#ifdef __cplusplus
} // extern "C"
#endif

/*----------------------------------------------------------------------------
* Arduino objects - C++ only
*----------------------------------------------------------------------------*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@ extern "C" {
#ifdef __cplusplus
} // extern "C"
#endif

/*----------------------------------------------------------------------------
* Arduino objects - C++ only
*----------------------------------------------------------------------------*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@ extern "C" {
#ifdef __cplusplus
} // extern "C"
#endif

/*----------------------------------------------------------------------------
* Arduino objects - C++ only
*----------------------------------------------------------------------------*/
Expand Down
14 changes: 7 additions & 7 deletions buildroot/share/PlatformIO/variants/MARLIN_F103Vx/ldscript.ld
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

** File : LinkerScript.ld
**
** Author : Auto-generated by STM32CubeIDE
** Author : Auto-generated by STM32CubeIDE
**
** Abstract : Linker script for STM32F103V(8/B/C/E/F/GTx Device from STM32F1 series
** 64/128/256/512/768/1024Kbytes FLASH
Expand Down Expand Up @@ -54,15 +54,15 @@
ENTRY(Reset_Handler)

/* Highest address of the user mode stack */
_estack = 0x20000000 + LD_MAX_DATA_SIZE; /* end of "RAM" Ram type memory */
_estack = 0x20000000 + LD_MAX_DATA_SIZE; /* end of "RAM" Ram type memory */
_Min_Heap_Size = 0x200; /* required amount of heap */
_Min_Stack_Size = 0x400; /* required amount of stack */

/* Memories definition */
MEMORY
{
RAM (xrw) : ORIGIN = 0x20000000, LENGTH = LD_MAX_DATA_SIZE
FLASH (rx) : ORIGIN = 0x8000000 + LD_FLASH_OFFSET, LENGTH = LD_MAX_SIZE - LD_FLASH_OFFSET
RAM (xrw) : ORIGIN = 0x20000000, LENGTH = LD_MAX_DATA_SIZE
FLASH (rx) : ORIGIN = 0x8000000 + LD_FLASH_OFFSET, LENGTH = LD_MAX_SIZE - LD_FLASH_OFFSET
}

/* Sections */
Expand Down Expand Up @@ -103,9 +103,9 @@ SECTIONS
} >FLASH

.ARM.extab : {
. = ALIGN(4);
*(.ARM.extab* .gnu.linkonce.armextab.*)
. = ALIGN(4);
. = ALIGN(4);
*(.ARM.extab* .gnu.linkonce.armextab.*)
. = ALIGN(4);
} >FLASH
.ARM : {
. = ALIGN(4);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,7 @@ extern "C" {
#ifdef __cplusplus
} // extern "C"
#endif

/*----------------------------------------------------------------------------
* Arduino objects - C++ only
*----------------------------------------------------------------------------*/
Expand Down
13 changes: 6 additions & 7 deletions buildroot/share/PlatformIO/variants/MARLIN_F103Zx/ldscript.ld
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
/*
******************************************************************************
**

** File : LinkerScript.ld
**
** Author : Auto-generated by STM32CubeIDE
** Author : Auto-generated by STM32CubeIDE
**
** Abstract : Linker script for STM32F103Z(C/D/E/G/GTx Device from STM32F1 series
** 256/386/512K/786/1024bytes FLASH
Expand Down Expand Up @@ -54,15 +53,15 @@
ENTRY(Reset_Handler)

/* Highest address of the user mode stack */
_estack = 0x20000000 + LD_MAX_DATA_SIZE; /* end of "RAM" Ram type memory */
_estack = 0x20000000 + LD_MAX_DATA_SIZE; /* end of "RAM" Ram type memory */
_Min_Heap_Size = 0x200; /* required amount of heap */
_Min_Stack_Size = 0x400; /* required amount of stack */

/* Memories definition */
MEMORY
{
RAM (xrw) : ORIGIN = 0x20000000, LENGTH = LD_MAX_DATA_SIZE
FLASH (rx) : ORIGIN = 0x8000000 + LD_FLASH_OFFSET, LENGTH = LD_MAX_SIZE - LD_FLASH_OFFSET
FLASH (rx) : ORIGIN = 0x8000000 + LD_FLASH_OFFSET, LENGTH = LD_MAX_SIZE - LD_FLASH_OFFSET
}

/* Sections */
Expand Down Expand Up @@ -103,9 +102,9 @@ SECTIONS
} >FLASH

.ARM.extab : {
. = ALIGN(4);
*(.ARM.extab* .gnu.linkonce.armextab.*)
. = ALIGN(4);
. = ALIGN(4);
*(.ARM.extab* .gnu.linkonce.armextab.*)
. = ALIGN(4);
} >FLASH
.ARM : {
. = ALIGN(4);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,7 @@ extern "C" {
#ifdef __cplusplus
} // extern "C"
#endif

/*----------------------------------------------------------------------------
* Arduino objects - C++ only
*----------------------------------------------------------------------------*/
Expand Down
6 changes: 3 additions & 3 deletions buildroot/share/PlatformIO/variants/MARLIN_F401RC/ldscript.ld
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@
ENTRY(Reset_Handler)

/* Highest address of the user mode stack */
_estack = ORIGIN(RAM) + LENGTH(RAM); /* end of "RAM" Ram type memory */
_estack = ORIGIN(RAM) + LENGTH(RAM); /* end of "RAM" Ram type memory */

_Min_Heap_Size = 0x200; /* required amount of heap */
_Min_Stack_Size = 0x400; /* required amount of stack */
_Min_Heap_Size = 0x200; /* required amount of heap */
_Min_Stack_Size = 0x400; /* required amount of stack */

/* Memories definition */
MEMORY
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,7 @@ extern "C" {
#ifdef __cplusplus
} // extern "C"
#endif

/*----------------------------------------------------------------------------
* Arduino objects - C++ only
*----------------------------------------------------------------------------*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,7 @@ extern "C" {
#ifdef __cplusplus
} // extern "C"
#endif

/*----------------------------------------------------------------------------
* Arduino objects - C++ only
*----------------------------------------------------------------------------*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,7 @@ extern "C" {
#ifdef __cplusplus
} // extern "C"
#endif

/*----------------------------------------------------------------------------
* Arduino objects - C++ only
*----------------------------------------------------------------------------*/
Expand Down
Loading

0 comments on commit 1e2de0e

Please sign in to comment.