Skip to content

Commit

Permalink
short yt links, delete [ \t]+$
Browse files Browse the repository at this point in the history
  • Loading branch information
thinkyhead committed Feb 20, 2023
1 parent d576b48 commit 5334ced
Show file tree
Hide file tree
Showing 56 changed files with 74 additions and 83 deletions.
2 changes: 1 addition & 1 deletion Marlin/Marlin.ino
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ Configuration
- https://github.com/MarlinFirmware/Configurations
Example configurations for several printer models.
- https://www.youtube.com/watch?v=3gwWVFtdg-4
- https://youtu.be/3gwWVFtdg-4
A good 20-minute overview of Marlin configuration by Tom Sanladerer.
(Applies to Marlin 1.0.x, so Jerk and Acceleration should be halved.)
Also... https://www.google.com/search?tbs=vid%3A1&q=configure+marlin
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/HAL/AVR/HAL_SPI_HW.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -583,4 +583,4 @@

#endif

#endif
#endif
10 changes: 5 additions & 5 deletions Marlin/src/HAL/AVR/fastio/fastio_1280.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@
#pragma once

/**
* Pin mapping for the 1280 and 2560y
* Pin mapping for the 1280 and 2560
*
* Hardware Pin : 02 03 06 07 01 05 15 16 17 18 23 24 25 26 64 63 13 12 46 45 44 43 78 77 76 75 74 73 72 71 60 59 58 57 56 55 54 53 50 70 52 51 42 41 40 39 38 37 36 35 22 21 20 19 97 96 95 94 93 92 91 90 89 88 87 86 85 84 83 82 | 04 08 09 10 11 14 27 28 29 30 31 32 33 34 47 48 49 61 62 65 66 67 68 69 79 80 81 98 99 100
* Port : E0 E1 E4 E5 G5 E3 H3 H4 H5 H6 B4 B5 B6 B7 J1 J0 H1 H0 D3 D2 D1 D0 A0 A1 A2 A3 A4 A5 A6 A7 C7 C6 C5 C4 C3 C2 C1 C0 D7 G2 G1 G0 L7 L6 L5 L4 L3 L2 L1 L0 B3 B2 B1 B0 F0 F1 F2 F3 F4 F5 F6 F7 K0 K1 K2 K3 K4 K5 K6 K7 | E2 E6 E7 xx xx H2 H7 G3 G4 xx xx xx xx xx D4 D5 D6 xx xx J2 J3 J4 J5 J6 J7 xx xx xx xx xx
* Logical Pin : 00 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 | 78 79 80 xx xx 84 85 71 70 xx xx xx xx xx 81 82 83 xx xx 72 73 75 76 77 74 xx xx xx xx xx
*
* Arduino Pin Layout video: https://www.youtube.com/watch?v=rIqeVCX09FA
* AVR alternate pin function overview video: https://www.youtube.com/watch?v=1yd8wuI5Plg
*
* Arduino Pin Layout video: https://youtu.be/rIqeVCX09FA
* AVR alternate pin function overview video: https://youtu.be/1yd8wuI5Plg
*/

#include "../fastio.h"
Expand Down Expand Up @@ -687,4 +687,4 @@
#define OC4C PinH5
#define OC5A PinL3
#define OC5B PinL4
#define OC5C PinL5
#define OC5C PinL5
8 changes: 4 additions & 4 deletions Marlin/src/HAL/AVR/fastio/fastio_1281.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@
*
* Logical Pin: 38 39 40 41 42 43 44 45 16 10 11 12 06 07 08 09 30 31 32 33 34 35 36 37 17 18 19 20 21 22 23 24 00 01 13 05 02 03 14 15 46 47 48 49 50 51 52 53 25 26 27 28 29 04
* Port: A0 A1 A2 A3 A4 A5 A6 A7 B0 B1 B2 B3 B4 B5 B6 B7 C0 C1 C2 C3 C4 C5 C6 C7 D0 D1 D2 D3 D4 D5 D6 D7 E0 E1 E2 E3 E4 E5 E6 E7 F0 F1 F2 F3 F4 F5 F6 F7 G0 G1 G2 G3 G4 G5
*
* Arduino Pin Layout video: https://www.youtube.com/watch?v=rIqeVCX09FA
* AVR alternate pin function overview video: https://www.youtube.com/watch?v=1yd8wuI5Plg
*
* Arduino Pin Layout video: https://youtu.be/rIqeVCX09FA
* AVR alternate pin function overview video: https://youtu.be/1yd8wuI5Plg
*/

#include "../fastio.h"
Expand Down Expand Up @@ -455,4 +455,4 @@
#define OC2A PinB4
#define OC3A PinE3
#define OC3B PinE4
#define OC3C PinE5
#define OC3C PinE5
8 changes: 4 additions & 4 deletions Marlin/src/HAL/AVR/fastio/fastio_168.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@
*
* Logical Pin: 08 09 10 11 12 13 14 15 16 17 18 19 20 21 00 01 02 03 04 05 06 07
* Port: B0 B1 B2 B3 B4 B5 C0 C1 C2 C3 C4 C5 C6 C7 D0 D1 D2 D3 D4 D5 D6 D7
*
* Arduino Pin Layout video: https://www.youtube.com/watch?v=rIqeVCX09FA
* AVR alternate pin function overview video: https://www.youtube.com/watch?v=1yd8wuI5Plg
*
* Arduino Pin Layout video: https://youtu.be/rIqeVCX09FA
* AVR alternate pin function overview video: https://youtu.be/1yd8wuI5Plg
*/

#include "../fastio.h"
Expand Down Expand Up @@ -235,4 +235,4 @@
#define OC1A PinB1
#define OC1B PinB2
#define OC2A PinB3
#define OC2B PinD3
#define OC2B PinD3
8 changes: 4 additions & 4 deletions Marlin/src/HAL/AVR/fastio/fastio_644.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@
*
* Logical Pin: 00 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31
* Port: B0 B1 B2 B3 B4 B5 B6 B7 D0 D1 D2 D3 D4 D5 D6 D7 C0 C1 C2 C3 C4 C5 C6 C7 A7 A6 A5 A4 A3 A2 A1 A0
*
* Arduino Pin Layout video: https://www.youtube.com/watch?v=rIqeVCX09FA
* AVR alternate pin function overview video: https://www.youtube.com/watch?v=1yd8wuI5Plg
*
* Arduino Pin Layout video: https://youtu.be/rIqeVCX09FA
* AVR alternate pin function overview video: https://youtu.be/1yd8wuI5Plg
*/

/** ATMega644
Expand Down Expand Up @@ -337,4 +337,4 @@
#define OC1A PinD5
#define OC1B PinD4
#define OC2A PinD7
#define OC2B PinD6
#define OC2B PinD6
6 changes: 3 additions & 3 deletions Marlin/src/HAL/AVR/fastio/fastio_AT90USB.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
* Logical Pin: 28 29 30 31 32 33 34 35 20 21 22 23 24 25 26 27 10 11 12 13 14 15 16 17 00 01 02 03 04 05 06 07 08 09(46*47)36 37 18 19 38 39 40 41 42 43 44 45
* Port: A0 A1 A2 A3 A4 A5 A6 A7 B0 B1 B2 B3 B4 B5 B6 B7 C0 C1 C2 C3 C4 C5 C6 C7 D0 D1 D2 D3 D4 D5 D6 D7 E0 E1 E2 E3 E4 E5 E6 E7 F0 F1 F2 F3 F4 F5 F6 F7
* The logical pins 46 and 47 are not supported by Teensyduino, but are supported below as E2 and E3
*
* Arduino Pin Layout video: https://www.youtube.com/watch?v=rIqeVCX09FA
* AVR alternate pin function overview video: https://www.youtube.com/watch?v=1yd8wuI5Plg
*
* Arduino Pin Layout video: https://youtu.be/rIqeVCX09FA
* AVR alternate pin function overview video: https://youtu.be/1yd8wuI5Plg
*/

#include "../fastio.h"
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/HAL/ESP32/HAL_SPI_HW.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3039,7 +3039,7 @@ void spiWrite16(const uint16_t *buf, uint16_t cnt) {
esp32BitManager <const uint16_t> src_bitMan( buf, cnt );

MarlinESP32::SPIPrepareWriteBitManager( SPI, src_bitMan );

eir::BitManagerTemplates::SendFixed( &SPI.SPI_W_REG[start_num_idx], COUNT(SPI.SPI_W_REG) - start_num_idx, src_bitMan,
[&] ( const auto& iter ) LAINLINE
{
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/HAL/ESP32/HAL_SPI_HWgen.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -282,4 +282,4 @@ void spiWriteRepeat16(uint16_t val, uint16_t repcnt) {

#endif

#endif
#endif
2 changes: 1 addition & 1 deletion Marlin/src/HAL/ESP32/HAL_SPI_SW.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,4 @@

#endif

#endif
#endif
2 changes: 1 addition & 1 deletion Marlin/src/HAL/ESP32/sdk/Arith.h
Original file line number Diff line number Diff line change
Expand Up @@ -57,4 +57,4 @@ AINLINE constexpr auto SUB_SIGNP( LT left, RT right ) noexcept

} // namespace eir

#endif //_EIRSDK_ARITH_HEADER_
#endif //_EIRSDK_ARITH_HEADER_
2 changes: 1 addition & 1 deletion Marlin/src/HAL/ESP32/sdk/BitIteration.h
Original file line number Diff line number Diff line change
Expand Up @@ -435,4 +435,4 @@ AINLINE startIterType bit_iterator_advance_min_bytes( const startIterType& iter,
}
}

} // namespace eir
} // namespace eir
8 changes: 4 additions & 4 deletions Marlin/src/HAL/ESP32/sdk/BitManage.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#include "BitIteration.h"

// Feel the power of C++20 on the embedded side.
// Documentation Video: https://www.youtube.com/watch?v=L_o481OL0Xw (12th of January, 2023)
// Documentation Video: https://youtu.be/L_o481OL0Xw (12 Jan 2023)

namespace eir
{
Expand Down Expand Up @@ -570,7 +570,7 @@ inline constexpr eBitIdentityStorageIdentStrategy get_default_bit_identity_stora
#ifdef _PLATFORM_FIXED_ENDIANNESS
endianness = endian::get_current_endianness();
#endif

if (endianness == endian::eSpecificEndian::LITTLE_ENDIAN)
return eBitIdentityStorageIdentStrategy::BITFIELD;
#if !defined(_PLATFORM_HAS_FAST_BYTESWAP)
Expand Down Expand Up @@ -940,7 +940,7 @@ struct BitManager
platformLocalBitcountType bitOff = iter.getLocalBitOffset();

platformBitCountType avail_bitCnt = ( end_iter - iter ).getTotalBitOffset();

if ( avail_bitCnt == 0 ) break;

platformLocalBitcountType src_bitOff = srcIter.getLocalBitOffset();
Expand Down Expand Up @@ -1106,7 +1106,7 @@ struct BitManager
platformLocalBitcountType bitOff = iter.getLocalBitOffset();

platformBitCountType avail_bitCnt = ( end_iter - iter ).getTotalBitOffset();

if ( avail_bitCnt == 0 ) break;

platformLocalBitcountType bitCnt;
Expand Down
4 changes: 2 additions & 2 deletions Marlin/src/HAL/ESP32/sdk/BitManip.h
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@ struct BitIncrementalAccessor
{
private:
using fastNumberType = typename nospecmod_type <numberType>::type;

public:
AINLINE BitIncrementalAccessor( void ) noexcept
: data( 0u ), bitoff( 0u )
Expand Down Expand Up @@ -510,4 +510,4 @@ struct BitIncrementalAccessor

} // namespace eir

#endif //_EIR_BITMANIP_HEADER_
#endif //_EIR_BITMANIP_HEADER_
4 changes: 2 additions & 2 deletions Marlin/src/HAL/ESP32/sdk/Compare.h
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ AINLINE auto Minimum( numberTypes&&... values )
{
typename types_find_conversion_target <typelist <typename base_type <numberTypes>::type...>>::type result =
select_from <0> ( castforward <numberTypes> ( values )... );

auto metalamb = [&] <size_t... IDX> ( index_sequence <IDX...> ) LAINLINE
{
auto lamb = [&] <size_t N, typename T> ( T&& val ) LAINLINE
Expand Down Expand Up @@ -226,4 +226,4 @@ AINLINE auto Maximum( numberTypes&&... values )

} // namespace eir

#endif //_EIRSDK_COMPARE_HEADER_
#endif //_EIRSDK_COMPARE_HEADER_
2 changes: 1 addition & 1 deletion Marlin/src/HAL/ESP32/sdk/Tuple.h
Original file line number Diff line number Diff line change
Expand Up @@ -138,4 +138,4 @@ AINLINE T construct_from_tuple( Tuple <Ts...>&& tuple ) noexcept(nothrow_constru

} // namespace eir

#endif //_EIRSDK_TUPLE_HEADER_
#endif //_EIRSDK_TUPLE_HEADER_
4 changes: 2 additions & 2 deletions Marlin/src/HAL/ESP32/sdk/Union.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

namespace eir
{

// Union data storage model.
template <typename... Ts>
struct Union
Expand Down Expand Up @@ -135,4 +135,4 @@ struct Union <CustomTypeSelector <idschema, Ts...>> : public Union <Ts...> {};

} // namespace eir

#endif //_EIR_UNION_HEADER_
#endif //_EIR_UNION_HEADER_
1 change: 0 additions & 1 deletion Marlin/src/HAL/NATIVE_SIM/u8g/LCD_I2C_routines.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,3 @@ void u8g_i2c_stop();
#ifdef __cplusplus
}
#endif

2 changes: 0 additions & 2 deletions Marlin/src/HAL/NATIVE_SIM/u8g/LCD_defines.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,5 +40,3 @@ uint8_t u8g_com_ST7920_sw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void
#define U8G_COM_T6963 u8g_com_null_fn
#define U8G_COM_FAST_PARALLEL u8g_com_null_fn
#define U8G_COM_UC_I2C u8g_com_null_fn


1 change: 0 additions & 1 deletion Marlin/src/HAL/SAMD21/fastio.h
Original file line number Diff line number Diff line change
Expand Up @@ -213,4 +213,3 @@
#define DIO53_PIN PIN_PA21
#define DIO54_PIN PIN_PA06
#define DIO55_PIN PIN_PA07

2 changes: 1 addition & 1 deletion Marlin/src/HAL/STM32/platdefs/MARLIN_ARTILLERY_RUBY.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

#ifndef NUM_ANALOG_FIRST
#define NUM_ANALOG_FIRST 50
#endif
#endif
2 changes: 1 addition & 1 deletion Marlin/src/HAL/STM32/platdefs/MARLIN_BIGTREE_BTT002.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

#ifndef NUM_ANALOG_FIRST
#define NUM_ANALOG_FIRST 35
#endif
#endif
2 changes: 1 addition & 1 deletion Marlin/src/HAL/STM32/platdefs/MARLIN_BIGTREE_E3_RRF.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

#ifndef NUM_ANALOG_FIRST
#define NUM_ANALOG_FIRST 35
#endif
#endif
2 changes: 1 addition & 1 deletion Marlin/src/HAL/STM32/platdefs/MARLIN_BIGTREE_GTR_V1.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

#ifndef NUM_ANALOG_FIRST
#define NUM_ANALOG_FIRST 35
#endif
#endif
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

#ifndef NUM_ANALOG_FIRST
#define NUM_ANALOG_FIRST NUM_DIGITAL_PINS
#endif
#endif
2 changes: 1 addition & 1 deletion Marlin/src/HAL/STM32/platdefs/MARLIN_BIGTREE_OCTOPUS_V1.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

#ifndef NUM_ANALOG_FIRST
#define NUM_ANALOG_FIRST NUM_DIGITAL_PINS
#endif
#endif
2 changes: 1 addition & 1 deletion Marlin/src/HAL/STM32/platdefs/MARLIN_BIGTREE_SKR_PRO_11.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

#ifndef NUM_ANALOG_FIRST
#define NUM_ANALOG_FIRST 35
#endif
#endif
2 changes: 1 addition & 1 deletion Marlin/src/HAL/STM32/platdefs/MARLIN_BTT_SKR_SE_BX.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

#ifndef NUM_ANALOG_FIRST
#define NUM_ANALOG_FIRST 108
#endif
#endif
1 change: 0 additions & 1 deletion Marlin/src/HAL/STM32/platdefs/MARLIN_F103Rx.h
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
#pragma once

2 changes: 1 addition & 1 deletion Marlin/src/HAL/STM32/platdefs/MARLIN_F401RC.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

#ifndef NUM_ANALOG_FIRST
#define NUM_ANALOG_FIRST 192
#endif
#endif
2 changes: 1 addition & 1 deletion Marlin/src/HAL/STM32/platdefs/MARLIN_F407VE.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@
#define NUM_ANALOG_FIRST 75
#endif

#endif
#endif
2 changes: 1 addition & 1 deletion Marlin/src/HAL/STM32/platdefs/MARLIN_F407ZE.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

#ifndef NUM_ANALOG_FIRST
#define NUM_ANALOG_FIRST NUM_DIGITAL_PINS
#endif
#endif
2 changes: 1 addition & 1 deletion Marlin/src/HAL/STM32/platdefs/MARLIN_F446Zx_TRONXY.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

#ifndef NUM_ANALOG_FIRST
#define NUM_ANALOG_FIRST 128
#endif
#endif
2 changes: 1 addition & 1 deletion Marlin/src/HAL/STM32/platdefs/MARLIN_FLY_F407ZG.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

#ifndef NUM_ANALOG_FIRST
#define NUM_ANALOG_FIRST 107
#endif
#endif
2 changes: 1 addition & 1 deletion Marlin/src/HAL/STM32/platdefs/MARLIN_FYSETC_S6.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

#ifndef NUM_ANALOG_FIRST
#define NUM_ANALOG_FIRST 80
#endif
#endif
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

#ifndef NUM_ANALOG_FIRST
#define NUM_ANALOG_FIRST 107
#endif
#endif
2 changes: 1 addition & 1 deletion Marlin/src/HAL/STM32/platdefs/MARLIN_G0B1RE.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

#ifndef NUM_ANALOG_FIRST
#define NUM_ANALOG_FIRST PA0
#endif
#endif
2 changes: 1 addition & 1 deletion Marlin/src/HAL/STM32/platdefs/MARLIN_LERDGE.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

#ifndef NUM_ANALOG_FIRST
#define NUM_ANALOG_FIRST 75
#endif
#endif
2 changes: 1 addition & 1 deletion Marlin/src/HAL/shared/ARM/HAL_NVIC.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ void nvicResetHandler(uint32_t idx);
void nvicResetIRQHandler(IRQn_Type irqn);
uint32_t nvicGetMaxHandlerCount(); // for exception_arm.cpp
void nvicInstallRedirect();
void nvicUninstallRedirect();
void nvicUninstallRedirect();
2 changes: 1 addition & 1 deletion Marlin/src/HAL/shared/HAL_SPI.h
Original file line number Diff line number Diff line change
Expand Up @@ -159,4 +159,4 @@ void spiAsyncJoin();
// Returns true if the DMA transfer is still running.
bool spiAsyncIsRunning();

#endif // async support
#endif // async support
Loading

0 comments on commit 5334ced

Please sign in to comment.