0
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2025-03-13 09:49:56 +00:00

🎨 Detab some build files

This commit is contained in:
Scott Lahteine 2023-04-07 01:49:27 -05:00
parent 27b828891d
commit 836c8ce5e5
33 changed files with 23496 additions and 23481 deletions
buildroot
share
PlatformIO
boards
variants
MARLIN_ARCHIM
MARLIN_ARTILLERY_RUBY
MARLIN_BIGTREE_BTT002
MARLIN_BIGTREE_E3_RRF
MARLIN_BIGTREE_GTR_V1
MARLIN_BIGTREE_SKR_PRO_11
MARLIN_BTT_SKR_SE_BX
MARLIN_CREALITY_STM32F401RC
MARLIN_F103Rx
MARLIN_F103VE_LONGER
MARLIN_F103Vx
MARLIN_F103Zx
MARLIN_F401RC
MARLIN_F407VE
MARLIN_F446VE
MARLIN_F4x7Vx
MARLIN_FLY_F407ZG
MARLIN_FYSETC_CHEETAH_V20
MARLIN_FYSETC_SPIDER_KING407
MARLIN_LERDGE
MARLIN_MEGA_EXTENDED
MARLIN_MKS_SKIPR_V1
MARLIN_TH3D_EZBOARD_V2
cmake
dwin/bin
vscode
tests
web-ui/data/www

View file

@ -55,7 +55,7 @@
"dfu", "dfu",
"jlink" "jlink"
], ],
"offset_address": "0x8008000", "offset_address": "0x8008000",
"require_upload_port": true, "require_upload_port": true,
"use_1200bps_touch": false, "use_1200bps_touch": false,
"wait_for_upload_port": false "wait_for_upload_port": false

View file

@ -24,10 +24,10 @@
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/
/** Frequency of the board main oscillator */ /** Frequency of the board main oscillator */
#define VARIANT_MAINOSC 12000000 #define VARIANT_MAINOSC 12000000
/** Master clock frequency */ /** Master clock frequency */
#define VARIANT_MCK 84000000 #define VARIANT_MCK 84000000
/*---------------------------------------------------------------------------- /*----------------------------------------------------------------------------
* Headers * Headers
@ -119,13 +119,13 @@ extern "C"{
#define BOARD_SPI_DEFAULT_SS BOARD_SPI_SS3 #define BOARD_SPI_DEFAULT_SS BOARD_SPI_SS3
#define BOARD_PIN_TO_SPI_PIN(x) \ #define BOARD_PIN_TO_SPI_PIN(x) \
(x==BOARD_SPI_SS0 ? PIN_SPI_SS0 : \ (x==BOARD_SPI_SS0 ? PIN_SPI_SS0 : \
(x==BOARD_SPI_SS1 ? PIN_SPI_SS1 : \ (x==BOARD_SPI_SS1 ? PIN_SPI_SS1 : \
(x==BOARD_SPI_SS2 ? PIN_SPI_SS2 : PIN_SPI_SS3 ))) (x==BOARD_SPI_SS2 ? PIN_SPI_SS2 : PIN_SPI_SS3 )))
#define BOARD_PIN_TO_SPI_CHANNEL(x) \ #define BOARD_PIN_TO_SPI_CHANNEL(x) \
(x==BOARD_SPI_SS0 ? 0 : \ (x==BOARD_SPI_SS0 ? 0 : \
(x==BOARD_SPI_SS1 ? 1 : \ (x==BOARD_SPI_SS1 ? 1 : \
(x==BOARD_SPI_SS2 ? 2 : 3))) (x==BOARD_SPI_SS2 ? 2 : 3)))
static const uint8_t SS = BOARD_SPI_SS0; static const uint8_t SS = BOARD_SPI_SS0;
static const uint8_t SS1 = BOARD_SPI_SS1; static const uint8_t SS1 = BOARD_SPI_SS1;
@ -195,7 +195,7 @@ static const uint8_t DAC0 = 66;
static const uint8_t DAC1 = 67; static const uint8_t DAC1 = 67;
static const uint8_t CANRX = 68; static const uint8_t CANRX = 68;
static const uint8_t CANTX = 69; static const uint8_t CANTX = 69;
#define ADC_RESOLUTION 12 #define ADC_RESOLUTION 12
/* /*
* Complementary CAN pins * Complementary CAN pins
@ -212,21 +212,21 @@ static const uint8_t CAN1TX = 89;
/* /*
* DACC * DACC
*/ */
#define DACC_INTERFACE DACC #define DACC_INTERFACE DACC
#define DACC_INTERFACE_ID ID_DACC #define DACC_INTERFACE_ID ID_DACC
#define DACC_RESOLUTION 12 #define DACC_RESOLUTION 12
#define DACC_ISR_HANDLER DACC_Handler #define DACC_ISR_HANDLER DACC_Handler
#define DACC_ISR_ID DACC_IRQn #define DACC_ISR_ID DACC_IRQn
/* /*
* PWM * PWM
*/ */
#define PWM_INTERFACE PWM #define PWM_INTERFACE PWM
#define PWM_INTERFACE_ID ID_PWM #define PWM_INTERFACE_ID ID_PWM
#define PWM_FREQUENCY 31000 #define PWM_FREQUENCY 31000
#define PWM_MAX_DUTY_CYCLE 255 #define PWM_MAX_DUTY_CYCLE 255
#define PWM_MIN_DUTY_CYCLE 0 #define PWM_MIN_DUTY_CYCLE 0
#define PWM_RESOLUTION 8 #define PWM_RESOLUTION 8
/* /*
* TC * TC
@ -236,7 +236,7 @@ static const uint8_t CAN1TX = 89;
#define TC_FREQUENCY 100000 #define TC_FREQUENCY 100000
#define TC_MAX_DUTY_CYCLE 255 #define TC_MAX_DUTY_CYCLE 255
#define TC_MIN_DUTY_CYCLE 0 #define TC_MIN_DUTY_CYCLE 0
#define TC_RESOLUTION 8 #define TC_RESOLUTION 8
#ifdef __cplusplus #ifdef __cplusplus
} }
@ -281,4 +281,3 @@ extern USARTClass Serial3;
#define SERIAL_PORT_HARDWARE3 Serial3 #define SERIAL_PORT_HARDWARE3 Serial3
#endif /* _VARIANT_ARDUINO_DUE_X_ */ #endif /* _VARIANT_ARDUINO_DUE_X_ */

View file

@ -121,6 +121,7 @@ extern "C" {
#ifdef __cplusplus #ifdef __cplusplus
} // extern "C" } // extern "C"
#endif #endif
/*---------------------------------------------------------------------------- /*----------------------------------------------------------------------------
* Arduino objects - C++ only * Arduino objects - C++ only
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/

View file

@ -272,6 +272,7 @@ extern "C" {
#ifdef __cplusplus #ifdef __cplusplus
} // extern "C" } // extern "C"
#endif #endif
/*---------------------------------------------------------------------------- /*----------------------------------------------------------------------------
* Arduino objects - C++ only * Arduino objects - C++ only
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/

View file

@ -267,6 +267,7 @@ extern "C" {
#ifdef __cplusplus #ifdef __cplusplus
} // extern "C" } // extern "C"
#endif #endif
/*---------------------------------------------------------------------------- /*----------------------------------------------------------------------------
* Arduino objects - C++ only * Arduino objects - C++ only
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/

View file

@ -295,6 +295,7 @@ extern "C" {
#ifdef __cplusplus #ifdef __cplusplus
} // extern "C" } // extern "C"
#endif #endif
/*---------------------------------------------------------------------------- /*----------------------------------------------------------------------------
* Arduino objects - C++ only * Arduino objects - C++ only
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/

View file

@ -295,6 +295,7 @@ extern "C" {
#ifdef __cplusplus #ifdef __cplusplus
} // extern "C" } // extern "C"
#endif #endif
/*---------------------------------------------------------------------------- /*----------------------------------------------------------------------------
* Arduino objects - C++ only * Arduino objects - C++ only
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/

View file

@ -195,6 +195,7 @@ extern "C" {
#ifdef __cplusplus #ifdef __cplusplus
} // extern "C" } // extern "C"
#endif #endif
/*---------------------------------------------------------------------------- /*----------------------------------------------------------------------------
* Arduino objects - C++ only * Arduino objects - C++ only
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/

View file

@ -123,6 +123,7 @@ extern "C" {
#ifdef __cplusplus #ifdef __cplusplus
} // extern "C" } // extern "C"
#endif #endif
/*---------------------------------------------------------------------------- /*----------------------------------------------------------------------------
* Arduino objects - C++ only * Arduino objects - C++ only
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/

View file

@ -148,6 +148,7 @@ extern "C" {
#ifdef __cplusplus #ifdef __cplusplus
} // extern "C" } // extern "C"
#endif #endif
/*---------------------------------------------------------------------------- /*----------------------------------------------------------------------------
* Arduino objects - C++ only * Arduino objects - C++ only
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/

View file

@ -148,6 +148,7 @@ extern "C" {
#ifdef __cplusplus #ifdef __cplusplus
} // extern "C" } // extern "C"
#endif #endif
/*---------------------------------------------------------------------------- /*----------------------------------------------------------------------------
* Arduino objects - C++ only * Arduino objects - C++ only
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/

View file

@ -4,7 +4,7 @@
** File : LinkerScript.ld ** 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 ** Abstract : Linker script for STM32F103V(8/B/C/E/F/GTx Device from STM32F1 series
** 64/128/256/512/768/1024Kbytes FLASH ** 64/128/256/512/768/1024Kbytes FLASH
@ -54,15 +54,15 @@
ENTRY(Reset_Handler) ENTRY(Reset_Handler)
/* Highest address of the user mode stack */ /* 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_Heap_Size = 0x200; /* required amount of heap */
_Min_Stack_Size = 0x400; /* required amount of stack */ _Min_Stack_Size = 0x400; /* required amount of stack */
/* Memories definition */ /* Memories definition */
MEMORY MEMORY
{ {
RAM (xrw) : ORIGIN = 0x20000000, LENGTH = LD_MAX_DATA_SIZE 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 */ /* Sections */
@ -103,9 +103,9 @@ SECTIONS
} >FLASH } >FLASH
.ARM.extab : { .ARM.extab : {
. = ALIGN(4); . = ALIGN(4);
*(.ARM.extab* .gnu.linkonce.armextab.*) *(.ARM.extab* .gnu.linkonce.armextab.*)
. = ALIGN(4); . = ALIGN(4);
} >FLASH } >FLASH
.ARM : { .ARM : {
. = ALIGN(4); . = ALIGN(4);

View file

@ -158,6 +158,7 @@ extern "C" {
#ifdef __cplusplus #ifdef __cplusplus
} // extern "C" } // extern "C"
#endif #endif
/*---------------------------------------------------------------------------- /*----------------------------------------------------------------------------
* Arduino objects - C++ only * Arduino objects - C++ only
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/

View file

@ -1,10 +1,9 @@
/* /*
****************************************************************************** ******************************************************************************
** **
** File : LinkerScript.ld ** 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 ** Abstract : Linker script for STM32F103Z(C/D/E/G/GTx Device from STM32F1 series
** 256/386/512K/786/1024bytes FLASH ** 256/386/512K/786/1024bytes FLASH
@ -54,7 +53,7 @@
ENTRY(Reset_Handler) ENTRY(Reset_Handler)
/* Highest address of the user mode stack */ /* 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_Heap_Size = 0x200; /* required amount of heap */
_Min_Stack_Size = 0x400; /* required amount of stack */ _Min_Stack_Size = 0x400; /* required amount of stack */
@ -62,7 +61,7 @@ _Min_Stack_Size = 0x400; /* required amount of stack */
MEMORY MEMORY
{ {
RAM (xrw) : ORIGIN = 0x20000000, LENGTH = LD_MAX_DATA_SIZE 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 */ /* Sections */
@ -103,9 +102,9 @@ SECTIONS
} >FLASH } >FLASH
.ARM.extab : { .ARM.extab : {
. = ALIGN(4); . = ALIGN(4);
*(.ARM.extab* .gnu.linkonce.armextab.*) *(.ARM.extab* .gnu.linkonce.armextab.*)
. = ALIGN(4); . = ALIGN(4);
} >FLASH } >FLASH
.ARM : { .ARM : {
. = ALIGN(4); . = ALIGN(4);

View file

@ -205,6 +205,7 @@ extern "C" {
#ifdef __cplusplus #ifdef __cplusplus
} // extern "C" } // extern "C"
#endif #endif
/*---------------------------------------------------------------------------- /*----------------------------------------------------------------------------
* Arduino objects - C++ only * Arduino objects - C++ only
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/

View file

@ -28,10 +28,10 @@
ENTRY(Reset_Handler) ENTRY(Reset_Handler)
/* Highest address of the user mode stack */ /* 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_Heap_Size = 0x200; /* required amount of heap */
_Min_Stack_Size = 0x400; /* required amount of stack */ _Min_Stack_Size = 0x400; /* required amount of stack */
/* Memories definition */ /* Memories definition */
MEMORY MEMORY

View file

@ -326,6 +326,7 @@ extern "C" {
#ifdef __cplusplus #ifdef __cplusplus
} // extern "C" } // extern "C"
#endif #endif
/*---------------------------------------------------------------------------- /*----------------------------------------------------------------------------
* Arduino objects - C++ only * Arduino objects - C++ only
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/

View file

@ -159,6 +159,7 @@ extern "C" {
#ifdef __cplusplus #ifdef __cplusplus
} // extern "C" } // extern "C"
#endif #endif
/*---------------------------------------------------------------------------- /*----------------------------------------------------------------------------
* Arduino objects - C++ only * Arduino objects - C++ only
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/

View file

@ -176,6 +176,7 @@ extern "C" {
#ifdef __cplusplus #ifdef __cplusplus
} // extern "C" } // extern "C"
#endif #endif
/*---------------------------------------------------------------------------- /*----------------------------------------------------------------------------
* Arduino objects - C++ only * Arduino objects - C++ only
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/

View file

@ -37,121 +37,120 @@ extern "C" {
* Pins * Pins
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/
#define PA1 0
#define PA1 0 #define PA2 1
#define PA2 1 #define PA3 2
#define PA3 2 #define PA4 3
#define PA4 3 #define PA5 4
#define PA5 4 #define PA6 5
#define PA6 5 #define PA7 6
#define PA7 6 #define PA8 7
#define PA8 7 #define PA9 8
#define PA9 8 #define PA10 9
#define PA10 9 #define PA11 10
#define PA11 10 #define PA12 11
#define PA12 11 #define PA13 12
#define PA13 12 #define PA14 13
#define PA14 13 #define PA15 14
#define PA15 14 #define PB0 15
#define PB0 15 #define PB1 16
#define PB1 16 #define PB2 17
#define PB2 17 #define PB3 18
#define PB3 18 #define PB4 19
#define PB4 19 #define PB5 20
#define PB5 20 #define PB6 21
#define PB6 21 #define PB7 22
#define PB7 22 #define PB8 23
#define PB8 23 #define PB9 24
#define PB9 24 #define PB10 25
#define PB10 25 #define PB11 26
#define PB11 26 #define PB12 27
#define PB12 27 #define PB13 28
#define PB13 28 #define PB14 29
#define PB14 29 #define PB15 30
#define PB15 30 #define PC2 31
#define PC2 31 #define PC3 32
#define PC3 32 #define PC4 33
#define PC4 33 #define PC5 34
#define PC5 34 #define PC6 35
#define PC6 35 #define PC7 36
#define PC7 36 #define PC8 37
#define PC8 37 #define PC9 38
#define PC9 38 #define PC10 39
#define PC10 39 #define PC11 40
#define PC11 40 #define PC12 41
#define PC12 41 #define PC13 42
#define PC13 42 #define PC14 43
#define PC14 43 #define PC15 44
#define PC15 44 #define PD0 45
#define PD0 45 #define PD1 46
#define PD1 46 #define PD2 47
#define PD2 47 #define PD3 48
#define PD3 48 #define PD4 49
#define PD4 49 #define PD5 50
#define PD5 50 #define PD6 51
#define PD6 51 #define PD7 52
#define PD7 52 #define PD8 53
#define PD8 53 #define PD9 54
#define PD9 54 #define PD10 55
#define PD10 55 #define PD11 56
#define PD11 56 #define PD12 57
#define PD12 57 #define PD13 58
#define PD13 58 #define PD14 59
#define PD14 59 #define PD15 60
#define PD15 60 #define PE0 61
#define PE0 61 #define PE1 62
#define PE1 62 #define PE11 63
#define PE11 63 #define PE3 64
#define PE3 64 #define PE4 65
#define PE4 65 #define PE5 66
#define PE5 66 #define PE6 67
#define PE6 67 #define PE7 68
#define PE7 68 #define PE8 69
#define PE8 69 #define PE9 70
#define PE9 70 #define PE10 71
#define PE10 71
#define PE2 72 #define PE2 72
#define PE12 73 #define PE12 73
#define PE13 74 #define PE13 74
#define PE14 75 #define PE14 75
#define PE15 76 #define PE15 76
#define PF0 77 #define PF0 77
#define PF1 78 #define PF1 78
#define PF2 79 #define PF2 79
#define PF6 80 #define PF6 80
#define PF7 81 #define PF7 81
#define PF8 82 #define PF8 82
#define PF9 83 #define PF9 83
#define PF11 84 #define PF11 84
#define PF12 85 #define PF12 85
#define PF13 86 #define PF13 86
#define PF14 87 #define PF14 87
#define PF15 88 #define PF15 88
#define PG0 89 #define PG0 89
#define PG1 90 #define PG1 90
#define PG2 91 #define PG2 91
#define PG3 92 #define PG3 92
#define PG4 93 #define PG4 93
#define PG5 94 #define PG5 94
#define PG6 95 #define PG6 95
#define PG7 96 #define PG7 96
#define PG8 97 #define PG8 97
#define PG9 98 #define PG9 98
#define PG10 99 #define PG10 99
#define PG11 100 #define PG11 100
#define PG12 101 #define PG12 101
#define PG13 102 #define PG13 102
#define PG14 103 #define PG14 103
#define PG15 104 #define PG15 104
#define PH0 105 #define PH0 105
#define PH1 106 #define PH1 106
#define PA0 107 #define PA0 107
#define PC1 108 #define PC1 108
#define PC0 109 #define PC0 109
#define PF10 110 #define PF10 110
#define PF5 111 #define PF5 111
#define PF4 112 #define PF4 112
#define PF3 113 #define PF3 113
// This must be a literal // This must be a literal
#define NUM_DIGITAL_PINS 114 #define NUM_DIGITAL_PINS 114
@ -212,6 +211,7 @@ extern "C" {
#ifdef __cplusplus #ifdef __cplusplus
} // extern "C" } // extern "C"
#endif #endif
/*---------------------------------------------------------------------------- /*----------------------------------------------------------------------------
* Arduino objects - C++ only * Arduino objects - C++ only
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/
@ -234,5 +234,5 @@ extern "C" {
// pins are NOT connected to anything by default. // pins are NOT connected to anything by default.
#define SERIAL_PORT_MONITOR Serial #define SERIAL_PORT_MONITOR Serial
#define SERIAL_PORT_HARDWARE Serial1 #define SERIAL_PORT_HARDWARE Serial1
#endif
#endif

View file

@ -121,6 +121,7 @@ extern "C" {
#ifdef __cplusplus #ifdef __cplusplus
} // extern "C" } // extern "C"
#endif #endif
/*---------------------------------------------------------------------------- /*----------------------------------------------------------------------------
* Arduino objects - C++ only * Arduino objects - C++ only
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/

View file

@ -47,10 +47,10 @@ WEAK const PinMap PinMap_ADC[] = {
//{PA_1, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // ADC1_IN1 //{PA_1, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // ADC1_IN1
//{PA_1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // ADC2_IN1 //{PA_1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // ADC2_IN1
//{PA_1, ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // ADC3_IN1 //{PA_1, ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // ADC3_IN1
{PA_2, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // ADC1_IN2 LCD RX {PA_2, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // ADC1_IN2 LCD RX
//{PA_2, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // ADC2_IN2 //{PA_2, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // ADC2_IN2
//{PA_2, ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // ADC3_IN2 //{PA_2, ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // ADC3_IN2
{PA_3, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 3, 0)}, // ADC1_IN3 LCD TX {PA_3, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 3, 0)}, // ADC1_IN3 LCD TX
//{PA_3, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 3, 0)}, // ADC2_IN3 //{PA_3, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 3, 0)}, // ADC2_IN3
//{PA_3, ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 3, 0)}, // ADC3_IN3 //{PA_3, ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 3, 0)}, // ADC3_IN3
//{PA_4, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 4, 0)}, // ADC1_IN4 //{PA_4, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 4, 0)}, // ADC1_IN4

View file

@ -37,121 +37,120 @@ extern "C" {
* Pins * Pins
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/
#define PA1 0
#define PA1 0 #define PA2 1
#define PA2 1 #define PA3 2
#define PA3 2 #define PA4 3
#define PA4 3 #define PA5 4
#define PA5 4 #define PA6 5
#define PA6 5 #define PA7 6
#define PA7 6 #define PA8 7
#define PA8 7 #define PA9 8
#define PA9 8 #define PA10 9
#define PA10 9 #define PA11 10
#define PA11 10 #define PA12 11
#define PA12 11 #define PA13 12
#define PA13 12 #define PA14 13
#define PA14 13 #define PA15 14
#define PA15 14 #define PB0 15
#define PB0 15 #define PB1 16
#define PB1 16 #define PB2 17
#define PB2 17 #define PB3 18
#define PB3 18 #define PB4 19
#define PB4 19 #define PB5 20
#define PB5 20 #define PB6 21
#define PB6 21 #define PB7 22
#define PB7 22 #define PB8 23
#define PB8 23 #define PB9 24
#define PB9 24 #define PB10 25
#define PB10 25 #define PB11 26
#define PB11 26 #define PB12 27
#define PB12 27 #define PB13 28
#define PB13 28 #define PB14 29
#define PB14 29 #define PB15 30
#define PB15 30 #define PC2 31
#define PC2 31 #define PC3 32
#define PC3 32 #define PC4 33
#define PC4 33 #define PC5 34
#define PC5 34 #define PC6 35
#define PC6 35 #define PC7 36
#define PC7 36 #define PC8 37
#define PC8 37 #define PC9 38
#define PC9 38 #define PC10 39
#define PC10 39 #define PC11 40
#define PC11 40 #define PC12 41
#define PC12 41 #define PC13 42
#define PC13 42 #define PC14 43
#define PC14 43 #define PC15 44
#define PC15 44 #define PD0 45
#define PD0 45 #define PD1 46
#define PD1 46 #define PD2 47
#define PD2 47 #define PD3 48
#define PD3 48 #define PD4 49
#define PD4 49 #define PD5 50
#define PD5 50 #define PD6 51
#define PD6 51 #define PD7 52
#define PD7 52 #define PD8 53
#define PD8 53 #define PD9 54
#define PD9 54 #define PD10 55
#define PD10 55 #define PD11 56
#define PD11 56 #define PD12 57
#define PD12 57 #define PD13 58
#define PD13 58 #define PD14 59
#define PD14 59 #define PD15 60
#define PD15 60 #define PE0 61
#define PE0 61 #define PE1 62
#define PE1 62 #define PE11 63
#define PE11 63 #define PE3 64
#define PE3 64 #define PE4 65
#define PE4 65 #define PE5 66
#define PE5 66 #define PE6 67
#define PE6 67 #define PE7 68
#define PE7 68 #define PE8 69
#define PE8 69 #define PE9 70
#define PE9 70 #define PE10 71
#define PE10 71
#define PE2 72 #define PE2 72
#define PE12 73 #define PE12 73
#define PE13 74 #define PE13 74
#define PE14 75 #define PE14 75
#define PE15 76 #define PE15 76
#define PF0 77 #define PF0 77
#define PF1 78 #define PF1 78
#define PF2 79 #define PF2 79
#define PF6 80 #define PF6 80
#define PF7 81 #define PF7 81
#define PF8 82 #define PF8 82
#define PF9 83 #define PF9 83
#define PF11 84 #define PF11 84
#define PF12 85 #define PF12 85
#define PF13 86 #define PF13 86
#define PF14 87 #define PF14 87
#define PF15 88 #define PF15 88
#define PG0 89 #define PG0 89
#define PG1 90 #define PG1 90
#define PG2 91 #define PG2 91
#define PG3 92 #define PG3 92
#define PG4 93 #define PG4 93
#define PG5 94 #define PG5 94
#define PG6 95 #define PG6 95
#define PG7 96 #define PG7 96
#define PG8 97 #define PG8 97
#define PG9 98 #define PG9 98
#define PG10 99 #define PG10 99
#define PG11 100 #define PG11 100
#define PG12 101 #define PG12 101
#define PG13 102 #define PG13 102
#define PG14 103 #define PG14 103
#define PG15 104 #define PG15 104
#define PH0 105 #define PH0 105
#define PH1 106 #define PH1 106
#define PA0 107 #define PA0 107
#define PC1 108 #define PC1 108
#define PC0 109 #define PC0 109
#define PF10 110 #define PF10 110
#define PF5 111 #define PF5 111
#define PF4 112 #define PF4 112
#define PF3 113 #define PF3 113
// This must be a literal // This must be a literal
#define NUM_DIGITAL_PINS 114 #define NUM_DIGITAL_PINS 114
@ -210,6 +209,7 @@ extern "C" {
#ifdef __cplusplus #ifdef __cplusplus
} // extern "C" } // extern "C"
#endif #endif
/*---------------------------------------------------------------------------- /*----------------------------------------------------------------------------
* Arduino objects - C++ only * Arduino objects - C++ only
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/
@ -230,8 +230,7 @@ extern "C" {
// //
// SERIAL_PORT_HARDWARE_OPEN Hardware serial ports which are open for use. Their RX & TX // SERIAL_PORT_HARDWARE_OPEN Hardware serial ports which are open for use. Their RX & TX
// pins are NOT connected to anything by default. // pins are NOT connected to anything by default.
#define SERIAL_PORT_MONITOR Serial #define SERIAL_PORT_MONITOR Serial
#define SERIAL_PORT_HARDWARE Serial1 #define SERIAL_PORT_HARDWARE Serial1
#define SERIAL_PORT_HARDWARE_OPEN Serial2 #define SERIAL_PORT_HARDWARE_OPEN Serial2
#endif #endif

View file

@ -218,6 +218,7 @@ extern "C" {
#ifdef __cplusplus #ifdef __cplusplus
} // extern "C" } // extern "C"
#endif #endif
/*---------------------------------------------------------------------------- /*----------------------------------------------------------------------------
* Arduino objects - C++ only * Arduino objects - C++ only
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/

View file

@ -118,324 +118,324 @@ static const uint8_t A15 = PIN_A15;
#ifdef ARDUINO_MAIN #ifdef ARDUINO_MAIN
const uint16_t PROGMEM port_to_mode_PGM[] = { const uint16_t PROGMEM port_to_mode_PGM[] = {
NOT_A_PORT, NOT_A_PORT,
(uint16_t) &DDRA, (uint16_t) &DDRA,
(uint16_t) &DDRB, (uint16_t) &DDRB,
(uint16_t) &DDRC, (uint16_t) &DDRC,
(uint16_t) &DDRD, (uint16_t) &DDRD,
(uint16_t) &DDRE, (uint16_t) &DDRE,
(uint16_t) &DDRF, (uint16_t) &DDRF,
(uint16_t) &DDRG, (uint16_t) &DDRG,
(uint16_t) &DDRH, (uint16_t) &DDRH,
NOT_A_PORT, NOT_A_PORT,
(uint16_t) &DDRJ, (uint16_t) &DDRJ,
(uint16_t) &DDRK, (uint16_t) &DDRK,
(uint16_t) &DDRL, (uint16_t) &DDRL,
}; };
const uint16_t PROGMEM port_to_output_PGM[] = { const uint16_t PROGMEM port_to_output_PGM[] = {
NOT_A_PORT, NOT_A_PORT,
(uint16_t) &PORTA, (uint16_t) &PORTA,
(uint16_t) &PORTB, (uint16_t) &PORTB,
(uint16_t) &PORTC, (uint16_t) &PORTC,
(uint16_t) &PORTD, (uint16_t) &PORTD,
(uint16_t) &PORTE, (uint16_t) &PORTE,
(uint16_t) &PORTF, (uint16_t) &PORTF,
(uint16_t) &PORTG, (uint16_t) &PORTG,
(uint16_t) &PORTH, (uint16_t) &PORTH,
NOT_A_PORT, NOT_A_PORT,
(uint16_t) &PORTJ, (uint16_t) &PORTJ,
(uint16_t) &PORTK, (uint16_t) &PORTK,
(uint16_t) &PORTL, (uint16_t) &PORTL,
}; };
const uint16_t PROGMEM port_to_input_PGM[] = { const uint16_t PROGMEM port_to_input_PGM[] = {
NOT_A_PIN, NOT_A_PIN,
(uint16_t) &PINA, (uint16_t) &PINA,
(uint16_t) &PINB, (uint16_t) &PINB,
(uint16_t) &PINC, (uint16_t) &PINC,
(uint16_t) &PIND, (uint16_t) &PIND,
(uint16_t) &PINE, (uint16_t) &PINE,
(uint16_t) &PINF, (uint16_t) &PINF,
(uint16_t) &PING, (uint16_t) &PING,
(uint16_t) &PINH, (uint16_t) &PINH,
NOT_A_PIN, NOT_A_PIN,
(uint16_t) &PINJ, (uint16_t) &PINJ,
(uint16_t) &PINK, (uint16_t) &PINK,
(uint16_t) &PINL, (uint16_t) &PINL,
}; };
const uint8_t PROGMEM digital_pin_to_port_PGM[] = { const uint8_t PROGMEM digital_pin_to_port_PGM[] = {
// PORTLIST // PORTLIST
// ------------------------------------------- // -------------------------------------------
PE , // PE 0 ** 0 ** USART0_RX PE , // PE 0 ** 0 ** USART0_RX
PE , // PE 1 ** 1 ** USART0_TX PE , // PE 1 ** 1 ** USART0_TX
PE , // PE 4 ** 2 ** PWM2 PE , // PE 4 ** 2 ** PWM2
PE , // PE 5 ** 3 ** PWM3 PE , // PE 5 ** 3 ** PWM3
PG , // PG 5 ** 4 ** PWM4 PG , // PG 5 ** 4 ** PWM4
PE , // PE 3 ** 5 ** PWM5 PE , // PE 3 ** 5 ** PWM5
PH , // PH 3 ** 6 ** PWM6 PH , // PH 3 ** 6 ** PWM6
PH , // PH 4 ** 7 ** PWM7 PH , // PH 4 ** 7 ** PWM7
PH , // PH 5 ** 8 ** PWM8 PH , // PH 5 ** 8 ** PWM8
PH , // PH 6 ** 9 ** PWM9 PH , // PH 6 ** 9 ** PWM9
PB , // PB 4 ** 10 ** PWM10 PB , // PB 4 ** 10 ** PWM10
PB , // PB 5 ** 11 ** PWM11 PB , // PB 5 ** 11 ** PWM11
PB , // PB 6 ** 12 ** PWM12 PB , // PB 6 ** 12 ** PWM12
PB , // PB 7 ** 13 ** PWM13 PB , // PB 7 ** 13 ** PWM13
PJ , // PJ 1 ** 14 ** USART3_TX PJ , // PJ 1 ** 14 ** USART3_TX
PJ , // PJ 0 ** 15 ** USART3_RX PJ , // PJ 0 ** 15 ** USART3_RX
PH , // PH 1 ** 16 ** USART2_TX PH , // PH 1 ** 16 ** USART2_TX
PH , // PH 0 ** 17 ** USART2_RX PH , // PH 0 ** 17 ** USART2_RX
PD , // PD 3 ** 18 ** USART1_TX PD , // PD 3 ** 18 ** USART1_TX
PD , // PD 2 ** 19 ** USART1_RX PD , // PD 2 ** 19 ** USART1_RX
PD , // PD 1 ** 20 ** I2C_SDA PD , // PD 1 ** 20 ** I2C_SDA
PD , // PD 0 ** 21 ** I2C_SCL PD , // PD 0 ** 21 ** I2C_SCL
PA , // PA 0 ** 22 ** D22 PA , // PA 0 ** 22 ** D22
PA , // PA 1 ** 23 ** D23 PA , // PA 1 ** 23 ** D23
PA , // PA 2 ** 24 ** D24 PA , // PA 2 ** 24 ** D24
PA , // PA 3 ** 25 ** D25 PA , // PA 3 ** 25 ** D25
PA , // PA 4 ** 26 ** D26 PA , // PA 4 ** 26 ** D26
PA , // PA 5 ** 27 ** D27 PA , // PA 5 ** 27 ** D27
PA , // PA 6 ** 28 ** D28 PA , // PA 6 ** 28 ** D28
PA , // PA 7 ** 29 ** D29 PA , // PA 7 ** 29 ** D29
PC , // PC 7 ** 30 ** D30 PC , // PC 7 ** 30 ** D30
PC , // PC 6 ** 31 ** D31 PC , // PC 6 ** 31 ** D31
PC , // PC 5 ** 32 ** D32 PC , // PC 5 ** 32 ** D32
PC , // PC 4 ** 33 ** D33 PC , // PC 4 ** 33 ** D33
PC , // PC 3 ** 34 ** D34 PC , // PC 3 ** 34 ** D34
PC , // PC 2 ** 35 ** D35 PC , // PC 2 ** 35 ** D35
PC , // PC 1 ** 36 ** D36 PC , // PC 1 ** 36 ** D36
PC , // PC 0 ** 37 ** D37 PC , // PC 0 ** 37 ** D37
PD , // PD 7 ** 38 ** D38 PD , // PD 7 ** 38 ** D38
PG , // PG 2 ** 39 ** D39 PG , // PG 2 ** 39 ** D39
PG , // PG 1 ** 40 ** D40 PG , // PG 1 ** 40 ** D40
PG , // PG 0 ** 41 ** D41 PG , // PG 0 ** 41 ** D41
PL , // PL 7 ** 42 ** D42 PL , // PL 7 ** 42 ** D42
PL , // PL 6 ** 43 ** D43 PL , // PL 6 ** 43 ** D43
PL , // PL 5 ** 44 ** D44 PL , // PL 5 ** 44 ** D44
PL , // PL 4 ** 45 ** D45 PL , // PL 4 ** 45 ** D45
PL , // PL 3 ** 46 ** D46 PL , // PL 3 ** 46 ** D46
PL , // PL 2 ** 47 ** D47 PL , // PL 2 ** 47 ** D47
PL , // PL 1 ** 48 ** D48 PL , // PL 1 ** 48 ** D48
PL , // PL 0 ** 49 ** D49 PL , // PL 0 ** 49 ** D49
PB , // PB 3 ** 50 ** SPI_MISO PB , // PB 3 ** 50 ** SPI_MISO
PB , // PB 2 ** 51 ** SPI_MOSI PB , // PB 2 ** 51 ** SPI_MOSI
PB , // PB 1 ** 52 ** SPI_SCK PB , // PB 1 ** 52 ** SPI_SCK
PB , // PB 0 ** 53 ** SPI_SS PB , // PB 0 ** 53 ** SPI_SS
PF , // PF 0 ** 54 ** A0 PF , // PF 0 ** 54 ** A0
PF , // PF 1 ** 55 ** A1 PF , // PF 1 ** 55 ** A1
PF , // PF 2 ** 56 ** A2 PF , // PF 2 ** 56 ** A2
PF , // PF 3 ** 57 ** A3 PF , // PF 3 ** 57 ** A3
PF , // PF 4 ** 58 ** A4 PF , // PF 4 ** 58 ** A4
PF , // PF 5 ** 59 ** A5 PF , // PF 5 ** 59 ** A5
PF , // PF 6 ** 60 ** A6 PF , // PF 6 ** 60 ** A6
PF , // PF 7 ** 61 ** A7 PF , // PF 7 ** 61 ** A7
PK , // PK 0 ** 62 ** A8 PK , // PK 0 ** 62 ** A8
PK , // PK 1 ** 63 ** A9 PK , // PK 1 ** 63 ** A9
PK , // PK 2 ** 64 ** A10 PK , // PK 2 ** 64 ** A10
PK , // PK 3 ** 65 ** A11 PK , // PK 3 ** 65 ** A11
PK , // PK 4 ** 66 ** A12 PK , // PK 4 ** 66 ** A12
PK , // PK 5 ** 67 ** A13 PK , // PK 5 ** 67 ** A13
PK , // PK 6 ** 68 ** A14 PK , // PK 6 ** 68 ** A14
PK , // PK 7 ** 69 ** A15 PK , // PK 7 ** 69 ** A15
PG , // PG 4 ** 70 ** D70 PG , // PG 4 ** 70 ** D70
PG , // PG 3 ** 71 ** D71 PG , // PG 3 ** 71 ** D71
PJ , // PJ 2 ** 72 ** D72 PJ , // PJ 2 ** 72 ** D72
PJ , // PJ 3 ** 73 ** D73 PJ , // PJ 3 ** 73 ** D73
PJ , // PJ 7 ** 74 ** D74 PJ , // PJ 7 ** 74 ** D74
PJ , // PJ 4 ** 75 ** D75 PJ , // PJ 4 ** 75 ** D75
PJ , // PJ 5 ** 76 ** D76 PJ , // PJ 5 ** 76 ** D76
PJ , // PJ 6 ** 77 ** D77 PJ , // PJ 6 ** 77 ** D77
PE , // PE 2 ** 78 ** D78 PE , // PE 2 ** 78 ** D78
PE , // PE 6 ** 79 ** D79 PE , // PE 6 ** 79 ** D79
PE , // PE 7 ** 80 ** D80 PE , // PE 7 ** 80 ** D80
PD , // PD 4 ** 81 ** D81 PD , // PD 4 ** 81 ** D81
PD , // PD 5 ** 82 ** D82 PD , // PD 5 ** 82 ** D82
PD , // PD 6 ** 83 ** D83 PD , // PD 6 ** 83 ** D83
PH , // PH 2 ** 84 ** D84 PH , // PH 2 ** 84 ** D84
PH , // PH 7 ** 85 ** D85 PH , // PH 7 ** 85 ** D85
}; };
const uint8_t PROGMEM digital_pin_to_bit_mask_PGM[] = { const uint8_t PROGMEM digital_pin_to_bit_mask_PGM[] = {
// PIN IN PORT // PIN IN PORT
// ------------------------------------------- // -------------------------------------------
_BV( 0 ) , // PE 0 ** 0 ** USART0_RX _BV( 0 ) , // PE 0 ** 0 ** USART0_RX
_BV( 1 ) , // PE 1 ** 1 ** USART0_TX _BV( 1 ) , // PE 1 ** 1 ** USART0_TX
_BV( 4 ) , // PE 4 ** 2 ** PWM2 _BV( 4 ) , // PE 4 ** 2 ** PWM2
_BV( 5 ) , // PE 5 ** 3 ** PWM3 _BV( 5 ) , // PE 5 ** 3 ** PWM3
_BV( 5 ) , // PG 5 ** 4 ** PWM4 _BV( 5 ) , // PG 5 ** 4 ** PWM4
_BV( 3 ) , // PE 3 ** 5 ** PWM5 _BV( 3 ) , // PE 3 ** 5 ** PWM5
_BV( 3 ) , // PH 3 ** 6 ** PWM6 _BV( 3 ) , // PH 3 ** 6 ** PWM6
_BV( 4 ) , // PH 4 ** 7 ** PWM7 _BV( 4 ) , // PH 4 ** 7 ** PWM7
_BV( 5 ) , // PH 5 ** 8 ** PWM8 _BV( 5 ) , // PH 5 ** 8 ** PWM8
_BV( 6 ) , // PH 6 ** 9 ** PWM9 _BV( 6 ) , // PH 6 ** 9 ** PWM9
_BV( 4 ) , // PB 4 ** 10 ** PWM10 _BV( 4 ) , // PB 4 ** 10 ** PWM10
_BV( 5 ) , // PB 5 ** 11 ** PWM11 _BV( 5 ) , // PB 5 ** 11 ** PWM11
_BV( 6 ) , // PB 6 ** 12 ** PWM12 _BV( 6 ) , // PB 6 ** 12 ** PWM12
_BV( 7 ) , // PB 7 ** 13 ** PWM13 _BV( 7 ) , // PB 7 ** 13 ** PWM13
_BV( 1 ) , // PJ 1 ** 14 ** USART3_TX _BV( 1 ) , // PJ 1 ** 14 ** USART3_TX
_BV( 0 ) , // PJ 0 ** 15 ** USART3_RX _BV( 0 ) , // PJ 0 ** 15 ** USART3_RX
_BV( 1 ) , // PH 1 ** 16 ** USART2_TX _BV( 1 ) , // PH 1 ** 16 ** USART2_TX
_BV( 0 ) , // PH 0 ** 17 ** USART2_RX _BV( 0 ) , // PH 0 ** 17 ** USART2_RX
_BV( 3 ) , // PD 3 ** 18 ** USART1_TX _BV( 3 ) , // PD 3 ** 18 ** USART1_TX
_BV( 2 ) , // PD 2 ** 19 ** USART1_RX _BV( 2 ) , // PD 2 ** 19 ** USART1_RX
_BV( 1 ) , // PD 1 ** 20 ** I2C_SDA _BV( 1 ) , // PD 1 ** 20 ** I2C_SDA
_BV( 0 ) , // PD 0 ** 21 ** I2C_SCL _BV( 0 ) , // PD 0 ** 21 ** I2C_SCL
_BV( 0 ) , // PA 0 ** 22 ** D22 _BV( 0 ) , // PA 0 ** 22 ** D22
_BV( 1 ) , // PA 1 ** 23 ** D23 _BV( 1 ) , // PA 1 ** 23 ** D23
_BV( 2 ) , // PA 2 ** 24 ** D24 _BV( 2 ) , // PA 2 ** 24 ** D24
_BV( 3 ) , // PA 3 ** 25 ** D25 _BV( 3 ) , // PA 3 ** 25 ** D25
_BV( 4 ) , // PA 4 ** 26 ** D26 _BV( 4 ) , // PA 4 ** 26 ** D26
_BV( 5 ) , // PA 5 ** 27 ** D27 _BV( 5 ) , // PA 5 ** 27 ** D27
_BV( 6 ) , // PA 6 ** 28 ** D28 _BV( 6 ) , // PA 6 ** 28 ** D28
_BV( 7 ) , // PA 7 ** 29 ** D29 _BV( 7 ) , // PA 7 ** 29 ** D29
_BV( 7 ) , // PC 7 ** 30 ** D30 _BV( 7 ) , // PC 7 ** 30 ** D30
_BV( 6 ) , // PC 6 ** 31 ** D31 _BV( 6 ) , // PC 6 ** 31 ** D31
_BV( 5 ) , // PC 5 ** 32 ** D32 _BV( 5 ) , // PC 5 ** 32 ** D32
_BV( 4 ) , // PC 4 ** 33 ** D33 _BV( 4 ) , // PC 4 ** 33 ** D33
_BV( 3 ) , // PC 3 ** 34 ** D34 _BV( 3 ) , // PC 3 ** 34 ** D34
_BV( 2 ) , // PC 2 ** 35 ** D35 _BV( 2 ) , // PC 2 ** 35 ** D35
_BV( 1 ) , // PC 1 ** 36 ** D36 _BV( 1 ) , // PC 1 ** 36 ** D36
_BV( 0 ) , // PC 0 ** 37 ** D37 _BV( 0 ) , // PC 0 ** 37 ** D37
_BV( 7 ) , // PD 7 ** 38 ** D38 _BV( 7 ) , // PD 7 ** 38 ** D38
_BV( 2 ) , // PG 2 ** 39 ** D39 _BV( 2 ) , // PG 2 ** 39 ** D39
_BV( 1 ) , // PG 1 ** 40 ** D40 _BV( 1 ) , // PG 1 ** 40 ** D40
_BV( 0 ) , // PG 0 ** 41 ** D41 _BV( 0 ) , // PG 0 ** 41 ** D41
_BV( 7 ) , // PL 7 ** 42 ** D42 _BV( 7 ) , // PL 7 ** 42 ** D42
_BV( 6 ) , // PL 6 ** 43 ** D43 _BV( 6 ) , // PL 6 ** 43 ** D43
_BV( 5 ) , // PL 5 ** 44 ** D44 _BV( 5 ) , // PL 5 ** 44 ** D44
_BV( 4 ) , // PL 4 ** 45 ** D45 _BV( 4 ) , // PL 4 ** 45 ** D45
_BV( 3 ) , // PL 3 ** 46 ** D46 _BV( 3 ) , // PL 3 ** 46 ** D46
_BV( 2 ) , // PL 2 ** 47 ** D47 _BV( 2 ) , // PL 2 ** 47 ** D47
_BV( 1 ) , // PL 1 ** 48 ** D48 _BV( 1 ) , // PL 1 ** 48 ** D48
_BV( 0 ) , // PL 0 ** 49 ** D49 _BV( 0 ) , // PL 0 ** 49 ** D49
_BV( 3 ) , // PB 3 ** 50 ** SPI_MISO _BV( 3 ) , // PB 3 ** 50 ** SPI_MISO
_BV( 2 ) , // PB 2 ** 51 ** SPI_MOSI _BV( 2 ) , // PB 2 ** 51 ** SPI_MOSI
_BV( 1 ) , // PB 1 ** 52 ** SPI_SCK _BV( 1 ) , // PB 1 ** 52 ** SPI_SCK
_BV( 0 ) , // PB 0 ** 53 ** SPI_SS _BV( 0 ) , // PB 0 ** 53 ** SPI_SS
_BV( 0 ) , // PF 0 ** 54 ** A0 _BV( 0 ) , // PF 0 ** 54 ** A0
_BV( 1 ) , // PF 1 ** 55 ** A1 _BV( 1 ) , // PF 1 ** 55 ** A1
_BV( 2 ) , // PF 2 ** 56 ** A2 _BV( 2 ) , // PF 2 ** 56 ** A2
_BV( 3 ) , // PF 3 ** 57 ** A3 _BV( 3 ) , // PF 3 ** 57 ** A3
_BV( 4 ) , // PF 4 ** 58 ** A4 _BV( 4 ) , // PF 4 ** 58 ** A4
_BV( 5 ) , // PF 5 ** 59 ** A5 _BV( 5 ) , // PF 5 ** 59 ** A5
_BV( 6 ) , // PF 6 ** 60 ** A6 _BV( 6 ) , // PF 6 ** 60 ** A6
_BV( 7 ) , // PF 7 ** 61 ** A7 _BV( 7 ) , // PF 7 ** 61 ** A7
_BV( 0 ) , // PK 0 ** 62 ** A8 _BV( 0 ) , // PK 0 ** 62 ** A8
_BV( 1 ) , // PK 1 ** 63 ** A9 _BV( 1 ) , // PK 1 ** 63 ** A9
_BV( 2 ) , // PK 2 ** 64 ** A10 _BV( 2 ) , // PK 2 ** 64 ** A10
_BV( 3 ) , // PK 3 ** 65 ** A11 _BV( 3 ) , // PK 3 ** 65 ** A11
_BV( 4 ) , // PK 4 ** 66 ** A12 _BV( 4 ) , // PK 4 ** 66 ** A12
_BV( 5 ) , // PK 5 ** 67 ** A13 _BV( 5 ) , // PK 5 ** 67 ** A13
_BV( 6 ) , // PK 6 ** 68 ** A14 _BV( 6 ) , // PK 6 ** 68 ** A14
_BV( 7 ) , // PK 7 ** 69 ** A15 _BV( 7 ) , // PK 7 ** 69 ** A15
_BV( 4 ) , // PG 4 ** 70 ** D70 _BV( 4 ) , // PG 4 ** 70 ** D70
_BV( 3 ) , // PG 3 ** 71 ** D71 _BV( 3 ) , // PG 3 ** 71 ** D71
_BV( 2 ) , // PJ 2 ** 72 ** D72 _BV( 2 ) , // PJ 2 ** 72 ** D72
_BV( 3 ) , // PJ 3 ** 73 ** D73 _BV( 3 ) , // PJ 3 ** 73 ** D73
_BV( 7 ) , // PJ 7 ** 74 ** D74 _BV( 7 ) , // PJ 7 ** 74 ** D74
_BV( 4 ) , // PJ 4 ** 75 ** D75 _BV( 4 ) , // PJ 4 ** 75 ** D75
_BV( 5 ) , // PJ 5 ** 76 ** D76 _BV( 5 ) , // PJ 5 ** 76 ** D76
_BV( 6 ) , // PJ 6 ** 77 ** D77 _BV( 6 ) , // PJ 6 ** 77 ** D77
_BV( 2 ) , // PE 2 ** 78 ** D78 _BV( 2 ) , // PE 2 ** 78 ** D78
_BV( 6 ) , // PE 6 ** 79 ** D79 _BV( 6 ) , // PE 6 ** 79 ** D79
_BV( 7 ) , // PE 7 ** 80 ** D80 _BV( 7 ) , // PE 7 ** 80 ** D80
_BV( 4 ) , // PD 4 ** 81 ** D81 _BV( 4 ) , // PD 4 ** 81 ** D81
_BV( 5 ) , // PD 5 ** 82 ** D82 _BV( 5 ) , // PD 5 ** 82 ** D82
_BV( 6 ) , // PD 6 ** 83 ** D83 _BV( 6 ) , // PD 6 ** 83 ** D83
_BV( 2 ) , // PH 2 ** 84 ** D84 _BV( 2 ) , // PH 2 ** 84 ** D84
_BV( 7 ) , // PH 7 ** 85 ** D85 _BV( 7 ) , // PH 7 ** 85 ** D85
}; };
const uint8_t PROGMEM digital_pin_to_timer_PGM[] = { const uint8_t PROGMEM digital_pin_to_timer_PGM[] = {
// TIMERS // TIMERS
// ------------------------------------------- // -------------------------------------------
NOT_ON_TIMER , // PE 0 ** 0 ** USART0_RX NOT_ON_TIMER , // PE 0 ** 0 ** USART0_RX
NOT_ON_TIMER , // PE 1 ** 1 ** USART0_TX NOT_ON_TIMER , // PE 1 ** 1 ** USART0_TX
TIMER3B , // PE 4 ** 2 ** PWM2 TIMER3B , // PE 4 ** 2 ** PWM2
TIMER3C , // PE 5 ** 3 ** PWM3 TIMER3C , // PE 5 ** 3 ** PWM3
TIMER0B , // PG 5 ** 4 ** PWM4 TIMER0B , // PG 5 ** 4 ** PWM4
TIMER3A , // PE 3 ** 5 ** PWM5 TIMER3A , // PE 3 ** 5 ** PWM5
TIMER4A , // PH 3 ** 6 ** PWM6 TIMER4A , // PH 3 ** 6 ** PWM6
TIMER4B , // PH 4 ** 7 ** PWM7 TIMER4B , // PH 4 ** 7 ** PWM7
TIMER4C , // PH 5 ** 8 ** PWM8 TIMER4C , // PH 5 ** 8 ** PWM8
TIMER2B , // PH 6 ** 9 ** PWM9 TIMER2B , // PH 6 ** 9 ** PWM9
TIMER2A , // PB 4 ** 10 ** PWM10 TIMER2A , // PB 4 ** 10 ** PWM10
TIMER1A , // PB 5 ** 11 ** PWM11 TIMER1A , // PB 5 ** 11 ** PWM11
TIMER1B , // PB 6 ** 12 ** PWM12 TIMER1B , // PB 6 ** 12 ** PWM12
TIMER0A , // PB 7 ** 13 ** PWM13 TIMER0A , // PB 7 ** 13 ** PWM13
NOT_ON_TIMER , // PJ 1 ** 14 ** USART3_TX NOT_ON_TIMER , // PJ 1 ** 14 ** USART3_TX
NOT_ON_TIMER , // PJ 0 ** 15 ** USART3_RX NOT_ON_TIMER , // PJ 0 ** 15 ** USART3_RX
NOT_ON_TIMER , // PH 1 ** 16 ** USART2_TX NOT_ON_TIMER , // PH 1 ** 16 ** USART2_TX
NOT_ON_TIMER , // PH 0 ** 17 ** USART2_RX NOT_ON_TIMER , // PH 0 ** 17 ** USART2_RX
NOT_ON_TIMER , // PD 3 ** 18 ** USART1_TX NOT_ON_TIMER , // PD 3 ** 18 ** USART1_TX
NOT_ON_TIMER , // PD 2 ** 19 ** USART1_RX NOT_ON_TIMER , // PD 2 ** 19 ** USART1_RX
NOT_ON_TIMER , // PD 1 ** 20 ** I2C_SDA NOT_ON_TIMER , // PD 1 ** 20 ** I2C_SDA
NOT_ON_TIMER , // PD 0 ** 21 ** I2C_SCL NOT_ON_TIMER , // PD 0 ** 21 ** I2C_SCL
NOT_ON_TIMER , // PA 0 ** 22 ** D22 NOT_ON_TIMER , // PA 0 ** 22 ** D22
NOT_ON_TIMER , // PA 1 ** 23 ** D23 NOT_ON_TIMER , // PA 1 ** 23 ** D23
NOT_ON_TIMER , // PA 2 ** 24 ** D24 NOT_ON_TIMER , // PA 2 ** 24 ** D24
NOT_ON_TIMER , // PA 3 ** 25 ** D25 NOT_ON_TIMER , // PA 3 ** 25 ** D25
NOT_ON_TIMER , // PA 4 ** 26 ** D26 NOT_ON_TIMER , // PA 4 ** 26 ** D26
NOT_ON_TIMER , // PA 5 ** 27 ** D27 NOT_ON_TIMER , // PA 5 ** 27 ** D27
NOT_ON_TIMER , // PA 6 ** 28 ** D28 NOT_ON_TIMER , // PA 6 ** 28 ** D28
NOT_ON_TIMER , // PA 7 ** 29 ** D29 NOT_ON_TIMER , // PA 7 ** 29 ** D29
NOT_ON_TIMER , // PC 7 ** 30 ** D30 NOT_ON_TIMER , // PC 7 ** 30 ** D30
NOT_ON_TIMER , // PC 6 ** 31 ** D31 NOT_ON_TIMER , // PC 6 ** 31 ** D31
NOT_ON_TIMER , // PC 5 ** 32 ** D32 NOT_ON_TIMER , // PC 5 ** 32 ** D32
NOT_ON_TIMER , // PC 4 ** 33 ** D33 NOT_ON_TIMER , // PC 4 ** 33 ** D33
NOT_ON_TIMER , // PC 3 ** 34 ** D34 NOT_ON_TIMER , // PC 3 ** 34 ** D34
NOT_ON_TIMER , // PC 2 ** 35 ** D35 NOT_ON_TIMER , // PC 2 ** 35 ** D35
NOT_ON_TIMER , // PC 1 ** 36 ** D36 NOT_ON_TIMER , // PC 1 ** 36 ** D36
NOT_ON_TIMER , // PC 0 ** 37 ** D37 NOT_ON_TIMER , // PC 0 ** 37 ** D37
NOT_ON_TIMER , // PD 7 ** 38 ** D38 NOT_ON_TIMER , // PD 7 ** 38 ** D38
NOT_ON_TIMER , // PG 2 ** 39 ** D39 NOT_ON_TIMER , // PG 2 ** 39 ** D39
NOT_ON_TIMER , // PG 1 ** 40 ** D40 NOT_ON_TIMER , // PG 1 ** 40 ** D40
NOT_ON_TIMER , // PG 0 ** 41 ** D41 NOT_ON_TIMER , // PG 0 ** 41 ** D41
NOT_ON_TIMER , // PL 7 ** 42 ** D42 NOT_ON_TIMER , // PL 7 ** 42 ** D42
NOT_ON_TIMER , // PL 6 ** 43 ** D43 NOT_ON_TIMER , // PL 6 ** 43 ** D43
TIMER5C , // PL 5 ** 44 ** D44 TIMER5C , // PL 5 ** 44 ** D44
TIMER5B , // PL 4 ** 45 ** D45 TIMER5B , // PL 4 ** 45 ** D45
TIMER5A , // PL 3 ** 46 ** D46 TIMER5A , // PL 3 ** 46 ** D46
NOT_ON_TIMER , // PL 2 ** 47 ** D47 NOT_ON_TIMER , // PL 2 ** 47 ** D47
NOT_ON_TIMER , // PL 1 ** 48 ** D48 NOT_ON_TIMER , // PL 1 ** 48 ** D48
NOT_ON_TIMER , // PL 0 ** 49 ** D49 NOT_ON_TIMER , // PL 0 ** 49 ** D49
NOT_ON_TIMER , // PB 3 ** 50 ** SPI_MISO NOT_ON_TIMER , // PB 3 ** 50 ** SPI_MISO
NOT_ON_TIMER , // PB 2 ** 51 ** SPI_MOSI NOT_ON_TIMER , // PB 2 ** 51 ** SPI_MOSI
NOT_ON_TIMER , // PB 1 ** 52 ** SPI_SCK NOT_ON_TIMER , // PB 1 ** 52 ** SPI_SCK
NOT_ON_TIMER , // PB 0 ** 53 ** SPI_SS NOT_ON_TIMER , // PB 0 ** 53 ** SPI_SS
NOT_ON_TIMER , // PF 0 ** 54 ** A0 NOT_ON_TIMER , // PF 0 ** 54 ** A0
NOT_ON_TIMER , // PF 1 ** 55 ** A1 NOT_ON_TIMER , // PF 1 ** 55 ** A1
NOT_ON_TIMER , // PF 2 ** 56 ** A2 NOT_ON_TIMER , // PF 2 ** 56 ** A2
NOT_ON_TIMER , // PF 3 ** 57 ** A3 NOT_ON_TIMER , // PF 3 ** 57 ** A3
NOT_ON_TIMER , // PF 4 ** 58 ** A4 NOT_ON_TIMER , // PF 4 ** 58 ** A4
NOT_ON_TIMER , // PF 5 ** 59 ** A5 NOT_ON_TIMER , // PF 5 ** 59 ** A5
NOT_ON_TIMER , // PF 6 ** 60 ** A6 NOT_ON_TIMER , // PF 6 ** 60 ** A6
NOT_ON_TIMER , // PF 7 ** 61 ** A7 NOT_ON_TIMER , // PF 7 ** 61 ** A7
NOT_ON_TIMER , // PK 0 ** 62 ** A8 NOT_ON_TIMER , // PK 0 ** 62 ** A8
NOT_ON_TIMER , // PK 1 ** 63 ** A9 NOT_ON_TIMER , // PK 1 ** 63 ** A9
NOT_ON_TIMER , // PK 2 ** 64 ** A10 NOT_ON_TIMER , // PK 2 ** 64 ** A10
NOT_ON_TIMER , // PK 3 ** 65 ** A11 NOT_ON_TIMER , // PK 3 ** 65 ** A11
NOT_ON_TIMER , // PK 4 ** 66 ** A12 NOT_ON_TIMER , // PK 4 ** 66 ** A12
NOT_ON_TIMER , // PK 5 ** 67 ** A13 NOT_ON_TIMER , // PK 5 ** 67 ** A13
NOT_ON_TIMER , // PK 6 ** 68 ** A14 NOT_ON_TIMER , // PK 6 ** 68 ** A14
NOT_ON_TIMER , // PK 7 ** 69 ** A15 NOT_ON_TIMER , // PK 7 ** 69 ** A15
NOT_ON_TIMER , // PG 4 ** 70 ** D70 NOT_ON_TIMER , // PG 4 ** 70 ** D70
NOT_ON_TIMER , // PG 3 ** 71 ** D71 NOT_ON_TIMER , // PG 3 ** 71 ** D71
NOT_ON_TIMER , // PJ 2 ** 72 ** D72 NOT_ON_TIMER , // PJ 2 ** 72 ** D72
NOT_ON_TIMER , // PJ 3 ** 73 ** D73 NOT_ON_TIMER , // PJ 3 ** 73 ** D73
NOT_ON_TIMER , // PJ 7 ** 74 ** D74 NOT_ON_TIMER , // PJ 7 ** 74 ** D74
NOT_ON_TIMER , // PJ 4 ** 75 ** D75 NOT_ON_TIMER , // PJ 4 ** 75 ** D75
NOT_ON_TIMER , // PJ 5 ** 76 ** D76 NOT_ON_TIMER , // PJ 5 ** 76 ** D76
NOT_ON_TIMER , // PJ 6 ** 77 ** D77 NOT_ON_TIMER , // PJ 6 ** 77 ** D77
NOT_ON_TIMER , // PE 2 ** 78 ** D78 NOT_ON_TIMER , // PE 2 ** 78 ** D78
NOT_ON_TIMER , // PE 6 ** 79 ** D79 NOT_ON_TIMER , // PE 6 ** 79 ** D79
NOT_ON_TIMER , // PE 7 ** 80 ** D80 NOT_ON_TIMER , // PE 7 ** 80 ** D80
NOT_ON_TIMER , // PD 4 ** 81 ** D81 NOT_ON_TIMER , // PD 4 ** 81 ** D81
NOT_ON_TIMER , // PD 5 ** 82 ** D82 NOT_ON_TIMER , // PD 5 ** 82 ** D82
NOT_ON_TIMER , // PD 6 ** 83 ** D83 NOT_ON_TIMER , // PD 6 ** 83 ** D83
NOT_ON_TIMER , // PH 2 ** 84 ** D84 NOT_ON_TIMER , // PH 2 ** 84 ** D84
NOT_ON_TIMER , // PH 7 ** 85 ** D85 NOT_ON_TIMER , // PH 7 ** 85 ** D85
}; };
#endif #endif

View file

@ -167,6 +167,7 @@ extern "C" {
#ifdef __cplusplus #ifdef __cplusplus
} // extern "C" } // extern "C"
#endif #endif
/*---------------------------------------------------------------------------- /*----------------------------------------------------------------------------
* Arduino objects - C++ only * Arduino objects - C++ only
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/

View file

@ -121,6 +121,7 @@ extern "C" {
#ifdef __cplusplus #ifdef __cplusplus
} // extern "C" } // extern "C"
#endif #endif
/*---------------------------------------------------------------------------- /*----------------------------------------------------------------------------
* Arduino objects - C++ only * Arduino objects - C++ only
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/

View file

@ -25,7 +25,7 @@ set(SCRIPT_BRANCH 1.0.2) #Set to wanted marlin-cmake release tag or branch
if(NOT EXISTS ${CMAKE_CURRENT_LIST_DIR}/marlin-cmake) if(NOT EXISTS ${CMAKE_CURRENT_LIST_DIR}/marlin-cmake)
file(DOWNLOAD https://github.com/tohara/marlin-cmake/archive/${SCRIPT_BRANCH}.tar.gz file(DOWNLOAD https://github.com/tohara/marlin-cmake/archive/${SCRIPT_BRANCH}.tar.gz
${CMAKE_CURRENT_LIST_DIR}/marlin-cmake-src.tar.gz SHOW_PROGRESS) ${CMAKE_CURRENT_LIST_DIR}/marlin-cmake-src.tar.gz SHOW_PROGRESS)
execute_process(COMMAND ${CMAKE_COMMAND} -E tar -xvf ${CMAKE_CURRENT_LIST_DIR}/marlin-cmake-src.tar.gz WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}) execute_process(COMMAND ${CMAKE_COMMAND} -E tar -xvf ${CMAKE_CURRENT_LIST_DIR}/marlin-cmake-src.tar.gz WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR})
@ -36,7 +36,7 @@ if(NOT EXISTS ${CMAKE_CURRENT_LIST_DIR}/marlin-cmake)
endif() endif()
if(WIN32 AND NOT EXISTS ${CMAKE_BINARY_DIR}/make.exe) if(WIN32 AND NOT EXISTS ${CMAKE_BINARY_DIR}/make.exe)
file(COPY ${CMAKE_CURRENT_LIST_DIR}/marlin-cmake/resources/make.exe DESTINATION ${CMAKE_BINARY_DIR}/) file(COPY ${CMAKE_CURRENT_LIST_DIR}/marlin-cmake/resources/make.exe DESTINATION ${CMAKE_BINARY_DIR}/)
endif() endif()
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_LIST_DIR}/marlin-cmake/modules) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_LIST_DIR}/marlin-cmake/modules)
@ -105,9 +105,9 @@ set(${PROJECT_NAME}_SRCS "${SOURCES};../../../Marlin/Marlin.ino")
# cmake .. -DUPLOAD_PORT=/dev/ttyACM0 # # cmake .. -DUPLOAD_PORT=/dev/ttyACM0 #
#====================================================================# #====================================================================#
if(UPLOAD_PORT) if(UPLOAD_PORT)
set(${PROJECT_NAME}_PORT ${UPLOAD_PORT}) set(${PROJECT_NAME}_PORT ${UPLOAD_PORT})
else() else()
set(${PROJECT_NAME}_PORT /dev/ttyACM0) set(${PROJECT_NAME}_PORT /dev/ttyACM0)
endif() endif()
#====================================================================# #====================================================================#

View file

@ -42,15 +42,15 @@ These tools must be run from a terminal with access to an installed Python 3 and
Pillow is most easily installed with pip: Pillow is most easily installed with pip:
python3 -m pip install pillow python3 -m pip install pillow
## Examples ## Examples
These tools process an `.ICO` file that you specify. The safest method is to create a folder and copy your `.ICO` file there. For example: These tools process an `.ICO` file that you specify. The safest method is to create a folder and copy your `.ICO` file there. For example:
$ mkdir hackicons $ mkdir hackicons
$ cp 9.ICO hackicons $ cp 9.ICO hackicons
$ cd hackicons $ cd hackicons
The following explanations will refer back to this layout. The following explanations will refer back to this layout.
@ -64,19 +64,19 @@ If you want to edit the individual icons stored in an ICO file (or add more imag
In this example we're extracting the constituent JPEG files from `9.ICO` and storing them in a folder named `icons`. As each file is extracted the script reports its index number, byte offset, size, dimensions, and filename: In this example we're extracting the constituent JPEG files from `9.ICO` and storing them in a folder named `icons`. As each file is extracted the script reports its index number, byte offset, size, dimensions, and filename:
$ cd buildroot/share/dwin $ cd buildroot/share/dwin
$ ./bin/splitIco.py 9.ICO icons-9 $ ./bin/splitIco.py 9.ICO icons-9
Splitting 9.ICO into dir icons Splitting 9.ICO into dir icons
Splitting Entry Data... Splitting Entry Data...
00: offset: 0x001000 len: 0x10a2 width: 130 height: 17 00: offset: 0x001000 len: 0x10a2 width: 130 height: 17
Wrote 4258 bytes to icons/000-ICON_LOGO.jpg Wrote 4258 bytes to icons/000-ICON_LOGO.jpg
01: offset: 0x0020a2 len: 0x0eac width: 110 height: 100 01: offset: 0x0020a2 len: 0x0eac width: 110 height: 100
Wrote 3756 bytes to icons/001-ICON_Print_0.jpg Wrote 3756 bytes to icons/001-ICON_Print_0.jpg
02: offset: 0x002f4e len: 0x0eaa width: 110 height: 100 02: offset: 0x002f4e len: 0x0eaa width: 110 height: 100
Wrote 3754 bytes to icons/002-ICON_Print_1.jpg Wrote 3754 bytes to icons/002-ICON_Print_1.jpg
... ...
91: offset: 0x0345fc len: 0x0d89 width: 110 height: 100 91: offset: 0x0345fc len: 0x0d89 width: 110 height: 100
Wrote 3465 bytes to icons/091-ICON_Info_1.jpg Wrote 3465 bytes to icons/091-ICON_Info_1.jpg
Once the individual JPEG files have been saved they can be edited using common graphics applications like Photoshop. JPEG files are inherently lossy and will usually contain ugly artifacts, so cleanup may be needed before they are re-exported. Keep the limits of bank size in mind when exporting images and try to find the best balance between compressed size and image quality. Once the individual JPEG files have been saved they can be edited using common graphics applications like Photoshop. JPEG files are inherently lossy and will usually contain ugly artifacts, so cleanup may be needed before they are re-exported. Keep the limits of bank size in mind when exporting images and try to find the best balance between compressed size and image quality.
@ -84,9 +84,9 @@ Once the individual JPEG files have been saved they can be edited using common g
After editing images you'll create a new `9.ICO` archive with `makeIco.py` like so: After editing images you'll create a new `9.ICO` archive with `makeIco.py` like so:
$ cd buildroot/share/dwin $ cd buildroot/share/dwin
$ ./bin/makeIco.py icons-3 3.ICO $ ./bin/makeIco.py icons-3 3.ICO
Making .ico file '3.ICO' from contents of 'icons-3' Making .ico file '3.ICO' from contents of 'icons-3'
Scanning icon directory icons-3 Scanning icon directory icons-3
...Scanned 16 icon files ...Scanned 16 icon files
Scanning done. 16 icons included. Scanning done. 16 icons included.

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

View file

@ -21,10 +21,10 @@ exec_test $1 "$2" "MKS TinyBee with ESP3D_WIFISUPPORT" "$3"
# #
restore_configs restore_configs
opt_set MOTHERBOARD BOARD_MKS_TINYBEE \ opt_set MOTHERBOARD BOARD_MKS_TINYBEE \
LCD_LANGUAGE en \ LCD_LANGUAGE en \
LCD_INFO_SCREEN_STYLE 0 \ LCD_INFO_SCREEN_STYLE 0 \
DISPLAY_CHARSET_HD44780 WESTERN \ DISPLAY_CHARSET_HD44780 WESTERN \
NEOPIXEL_TYPE NEO_RGB NEOPIXEL_TYPE NEO_RGB
opt_enable FYSETC_MINI_12864_2_1 SDSUPPORT opt_enable FYSETC_MINI_12864_2_1 SDSUPPORT
opt_enable LED_CONTROL_MENU LED_USER_PRESET_STARTUP LED_COLOR_PRESETS NEOPIXEL_LED opt_enable LED_CONTROL_MENU LED_USER_PRESET_STARTUP LED_COLOR_PRESETS NEOPIXEL_LED
exec_test $1 $2 "MKS TinyBee with NeoPixel LCD, SD and Speaker" "$3" exec_test $1 $2 "MKS TinyBee with NeoPixel LCD, SD and Speaker" "$3"

View file

@ -41,7 +41,7 @@ var WmButtonGroups = {
var wmWebSoket = { var wmWebSoket = {
WSObject: null, WSObject: null,
Connect: function() { Connect: function() {
WsUrl=`ws://${location.host}/ws`; WsUrl=`ws://${location.host}/ws`;
try { try {
if(wmWebSoket.WSObject === null) { if(wmWebSoket.WSObject === null) {
jsLog.Debug("WebSocket: Trying connecting to " + WsUrl); jsLog.Debug("WebSocket: Trying connecting to " + WsUrl);