Skip to content

Commit a32d8d6

Browse files
classicrocker883classicrocker883
committed
⛙ Merge w/Marlin
2 parents 66e749a + 7086ca6 commit a32d8d6

150 files changed

Lines changed: 949 additions & 682 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/ci-build-tests.yml‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -222,13 +222,6 @@ jobs:
222222
sudo apt-get install libsdl2-net-dev
223223
sudo apt-get install libglm-dev
224224
225-
- name: Checkout Configurations
226-
uses: actions/checkout@v4.2.2
227-
with:
228-
repository: classicrocker883/MRiscoCProUI
229-
ref: ${{ env.CONFIG_BRANCH }}
230-
path: ConfigurationsRepo
231-
232225
- name: Run ${{ matrix.test-platform }} Tests
233226
run: |
234227
make tests-single-ci TEST_TARGET=${{ matrix.test-platform }}

‎Marlin/Configuration.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3157,7 +3157,7 @@
31573157

31583158
//
31593159
// FYSETC variant of the MINI12864 graphic controller with SD support
3160-
// https://wiki.fysetc.com/Mini12864_Panel/
3160+
// https://wiki.fysetc.com/docs/Mini12864Panel
31613161
//
31623162
//#define FYSETC_MINI_12864_X_X // Type C/D/E/F. No tunable RGB Backlight by default
31633163
//#define FYSETC_MINI_12864_1_2 // Type C/D/E/F. Simple RGB Backlight (always on)

‎Marlin/Configuration_adv.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1209,7 +1209,7 @@
12091209
// ZVD, MZV : FTM_RATIO
12101210
// 2HEI : FTM_RATIO * 3 / 2
12111211
// 3HEI : FTM_RATIO * 2
1212-
#endif
1212+
#endif // FT_MOTION
12131213

12141214
/**
12151215
* Input Shaping

‎Marlin/Version.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
* here we define this default string as the date where the latest release
4242
* version was tagged.
4343
*/
44-
//#define STRING_DISTRIBUTION_DATE "2025-08-11"
44+
//#define STRING_DISTRIBUTION_DATE "2025-08-17"
4545

4646
#define STRING_DISTRIBUTION_DATE __DATE__
4747
#define STRING_DISTRIBUTION_TIME __TIME__

‎Marlin/src/HAL/HC32/eeprom/eeprom_sdcard.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ bool PersistentStore::access_start() {
5353
int bytes_read = file.read(HAL_eeprom_data, MARLIN_EEPROM_SIZE);
5454
if (bytes_read < 0) return false;
5555

56-
for (; bytes_read < MARLIN_EEPROM_SIZE; bytes_read++)
56+
for (; bytes_read < long(MARLIN_EEPROM_SIZE); bytes_read++)
5757
HAL_eeprom_data[bytes_read] = 0xFF;
5858

5959
file.close();

‎Marlin/src/HAL/STM32/eeprom/eeprom_flash.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,13 +125,13 @@ bool PersistentStore::access_start() {
125125
}
126126
if (current_slot == -1) {
127127
// We didn't find anything, so we'll just initialize to empty
128-
for (int i = 0; i < MARLIN_EEPROM_SIZE; i++) ram_eeprom[i] = EMPTY_UINT8;
128+
for (int i = 0; i < long(MARLIN_EEPROM_SIZE); i++) ram_eeprom[i] = EMPTY_UINT8;
129129
current_slot = EEPROM_SLOTS;
130130
}
131131
else {
132132
// load current settings
133133
uint8_t *eeprom_data = (uint8_t *)SLOT_ADDRESS(current_slot);
134-
for (int i = 0; i < MARLIN_EEPROM_SIZE; i++) ram_eeprom[i] = eeprom_data[i];
134+
for (int i = 0; i < long(MARLIN_EEPROM_SIZE); i++) ram_eeprom[i] = eeprom_data[i];
135135
DEBUG_ECHOLNPGM("EEPROM loaded from slot ", current_slot, ".");
136136
}
137137
eeprom_data_written = false;

‎Marlin/src/HAL/STM32/eeprom/eeprom_sdcard.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ bool PersistentStore::access_start() {
5454

5555
int bytes_read = file.read(HAL_eeprom_data, MARLIN_EEPROM_SIZE);
5656
if (bytes_read < 0) return false;
57-
for (; bytes_read < MARLIN_EEPROM_SIZE; bytes_read++)
57+
for (; bytes_read < long(MARLIN_EEPROM_SIZE); bytes_read++)
5858
HAL_eeprom_data[bytes_read] = 0xFF;
5959
file.close();
6060
return true;

‎Marlin/src/HAL/STM32/pinsDebug.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ const XrefInfo pin_xref[] PROGMEM = {
150150

151151
#ifndef M43_NEVER_TOUCH
152152
#define _M43_NEVER_TOUCH(x) WITHIN(x, 9, 12) // SERIAL/USB pins: PA9(TX) PA10(RX) PA11(USB_DM) PA12(USB_DP)
153-
#ifdef KILL_PIN
153+
#if PIN_EXISTS(KILL)
154154
#define M43_NEVER_TOUCH(x) m43_never_touch(x)
155155

156156
bool m43_never_touch(const pin_t index) {

‎Marlin/src/HAL/STM32F1/HAL.cpp‎

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -134,27 +134,28 @@ uint16_t MarlinHAL::adc_result;
134134
// Init the AD in continuous capture mode
135135
void MarlinHAL::adc_init() {
136136
static const uint8_t adc_pins[] = {
137-
OPTITEM(HAS_TEMP_ADC_0, TEMP_0_PIN )
138-
OPTITEM(HAS_TEMP_ADC_1, TEMP_1_PIN )
139-
OPTITEM(HAS_TEMP_ADC_2, TEMP_2_PIN )
140-
OPTITEM(HAS_TEMP_ADC_3, TEMP_3_PIN )
141-
OPTITEM(HAS_TEMP_ADC_4, TEMP_4_PIN )
142-
OPTITEM(HAS_TEMP_ADC_5, TEMP_5_PIN )
143-
OPTITEM(HAS_TEMP_ADC_6, TEMP_6_PIN )
144-
OPTITEM(HAS_TEMP_ADC_7, TEMP_7_PIN )
145-
OPTITEM(HAS_TEMP_ADC_BED, TEMP_BED_PIN )
146-
OPTITEM(HAS_TEMP_ADC_CHAMBER, TEMP_CHAMBER_PIN )
147-
OPTITEM(HAS_TEMP_ADC_PROBE, TEMP_PROBE_PIN )
148-
OPTITEM(HAS_TEMP_ADC_COOLER, TEMP_COOLER_PIN )
149-
OPTITEM(HAS_TEMP_ADC_BOARD, TEMP_BOARD_PIN )
150-
OPTITEM(HAS_TEMP_ADC_SOC, TEMP_SOC_PIN )
151-
OPTITEM(FILAMENT_WIDTH_SENSOR, FILWIDTH_PIN )
152-
OPTITEM(HAS_ADC_BUTTONS, ADC_KEYPAD_PIN )
153-
OPTITEM(HAS_JOY_ADC_X, JOY_X_PIN )
154-
OPTITEM(HAS_JOY_ADC_Y, JOY_Y_PIN )
155-
OPTITEM(HAS_JOY_ADC_Z, JOY_Z_PIN )
156-
OPTITEM(POWER_MONITOR_CURRENT, POWER_MONITOR_CURRENT_PIN)
157-
OPTITEM(POWER_MONITOR_VOLTAGE, POWER_MONITOR_VOLTAGE_PIN)
137+
OPTITEM(HAS_TEMP_ADC_0, TEMP_0_PIN )
138+
OPTITEM(HAS_TEMP_ADC_1, TEMP_1_PIN )
139+
OPTITEM(HAS_TEMP_ADC_2, TEMP_2_PIN )
140+
OPTITEM(HAS_TEMP_ADC_3, TEMP_3_PIN )
141+
OPTITEM(HAS_TEMP_ADC_4, TEMP_4_PIN )
142+
OPTITEM(HAS_TEMP_ADC_5, TEMP_5_PIN )
143+
OPTITEM(HAS_TEMP_ADC_6, TEMP_6_PIN )
144+
OPTITEM(HAS_TEMP_ADC_7, TEMP_7_PIN )
145+
OPTITEM(HAS_TEMP_ADC_BED, TEMP_BED_PIN )
146+
OPTITEM(HAS_TEMP_ADC_CHAMBER, TEMP_CHAMBER_PIN )
147+
OPTITEM(HAS_TEMP_ADC_PROBE, TEMP_PROBE_PIN )
148+
OPTITEM(HAS_TEMP_ADC_COOLER, TEMP_COOLER_PIN )
149+
OPTITEM(HAS_TEMP_ADC_BOARD, TEMP_BOARD_PIN )
150+
OPTITEM(HAS_TEMP_ADC_SOC, TEMP_SOC_PIN )
151+
OPTITEM(HAS_FILWIDTH_ADC, FILWIDTH_PIN )
152+
OPTITEM(HAS_FILWIDTH2_ADC, FILWIDTH2_PIN )
153+
OPTITEM(HAS_ADC_BUTTONS, ADC_KEYPAD_PIN )
154+
OPTITEM(HAS_JOY_ADC_X, JOY_X_PIN )
155+
OPTITEM(HAS_JOY_ADC_Y, JOY_Y_PIN )
156+
OPTITEM(HAS_JOY_ADC_Z, JOY_Z_PIN )
157+
OPTITEM(POWER_MONITOR_CURRENT, POWER_MONITOR_CURRENT_PIN)
158+
OPTITEM(POWER_MONITOR_VOLTAGE, POWER_MONITOR_VOLTAGE_PIN)
158159
};
159160
static STM32ADC adc(ADC1);
160161
// Configure the ADC
@@ -189,7 +190,8 @@ void MarlinHAL::adc_start(const pin_t pin) {
189190
_TCASE(HAS_TEMP_ADC_COOLER, TEMP_COOLER_PIN, TEMP_COOLER )
190191
_TCASE(HAS_TEMP_ADC_BOARD, TEMP_BOARD_PIN, TEMP_BOARD )
191192
_TCASE(HAS_TEMP_ADC_SOC, TEMP_SOC_PIN, TEMP_SOC )
192-
_TCASE(FILAMENT_WIDTH_SENSOR, FILWIDTH_PIN, FILWIDTH )
193+
_TCASE(HAS_FILWIDTH_ADC, FILWIDTH_PIN, FILWIDTH )
194+
_TCASE(HAS_FILWIDTH2_ADC, FILWIDTH2_PIN, FILWIDTH2 )
193195
_TCASE(HAS_ADC_BUTTONS, ADC_KEYPAD_PIN, ADC_KEY )
194196
_TCASE(HAS_JOY_ADC_X, JOY_X_PIN, JOY_X )
195197
_TCASE(HAS_JOY_ADC_Y, JOY_Y_PIN, JOY_Y )

‎Marlin/src/HAL/STM32F1/HAL_N32.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -612,7 +612,7 @@ void ADC_DMA_init() {
612612
* n32g452 - end
613613
==============================================================================*/
614614

615-
#define NS_PINRT(V...) do{ SERIAL_ECHO_START(); SERIAL_ECHOLNPAIR(V); }while(0)
615+
#define NS_PINRT(V...) do{ SERIAL_ECHO_START(); SERIAL_ECHOLNPGM(V); }while(0)
616616

617617
// Init the AD in continuous capture mode
618618
void MarlinHAL::adc_init() {
@@ -622,7 +622,7 @@ void MarlinHAL::adc_init() {
622622

623623
// GPIO settings
624624
reg_temp = ADC_RCC_APB2PCLKEN;
625-
reg_temp |= 0x0f; // Make PORT mouth clock
625+
reg_temp |= 0x0F; // Make PORT mouth clock
626626
ADC_RCC_APB2PCLKEN = reg_temp;
627627

628628
//reg_temp = NS_GPIOC_PL_CFG;

0 commit comments

Comments
 (0)