Skip to content

Commit e6ff7af

Browse files
classicrocker883classicrocker883
committed
update #define spaces
remove spaces in #define
1 parent 95c8f12 commit e6ff7af

File tree

15 files changed

+72
-72
lines changed

15 files changed

+72
-72
lines changed

‎Marlin/src/MarlinCore.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -527,7 +527,7 @@ inline void manage_inactivity(const bool no_stepper_sleep=false) {
527527
const bool printer_not_busy = !printingIsActive();
528528
#define HAS_CUSTOM_USER_BUTTON(N) (PIN_EXISTS(BUTTON##N) && defined(BUTTON##N##_HIT_STATE) && defined(BUTTON##N##_GCODE))
529529
#define HAS_BETTER_USER_BUTTON(N) HAS_CUSTOM_USER_BUTTON(N) && defined(BUTTON##N##_DESC)
530-
#define _CHECK_CUSTOM_USER_BUTTON(N, CODE) do{ \
530+
#define _CHECK_CUSTOM_USER_BUTTON(N,CODE) do{ \
531531
constexpr millis_t CUB_DEBOUNCE_DELAY_##N = 250UL; \
532532
static millis_t next_cub_ms_##N; \
533533
if (BUTTON##N##_HIT_STATE == READ(BUTTON##N##_PIN) \

‎Marlin/src/lcd/dogm/fontdata/langdata.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@
2323

2424
#include <U8glib-HAL.h>
2525

26-
#define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
26+
#define FONTDATA_ITEM(page,begin,end,data) { page, begin, end, COUNT(data), data }

‎Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/linear_advance_screen.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ void LinearAdvanceScreen::onRedraw(draw_mode_t what) {
3434
w.precision(2, DEFAULT_LOWEST).color(e_axis);
3535
w.heading( GET_TEXT_F(MSG_LINEAR_ADVANCE));
3636
#if !HAS_MULTI_EXTRUDER
37-
w.adjuster( 2, GET_TEXT_F(MSG_LINEAR_ADVANCE_K), getLinearAdvance_mm_mm_s(E0) );
37+
w.adjuster( 2, GET_TEXT_F(MSG_LINEAR_ADVANCE_K), getLinearAdvance_mm_mm_s(E0) );
3838
#else
3939
w.adjuster( 2, GET_TEXT_F(MSG_LINEAR_ADVANCE_K1), getLinearAdvance_mm_mm_s(E0) );
4040
w.adjuster( 4, GET_TEXT_F(MSG_LINEAR_ADVANCE_K2), getLinearAdvance_mm_mm_s(E1) );

‎Marlin/src/lcd/extui/nextion/nextion_tft.cpp

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -272,9 +272,9 @@ void NextionTFT::panelInfo(uint8_t req) {
272272

273273
case 24: // TMC Motor Current
274274
#if HAS_TRINAMIC_CONFIG
275-
#define SEND_TRINAMIC_CURR(A, B) SEND_VALasTXT(A, getAxisCurrent_mA(B))
275+
#define SEND_TRINAMIC_CURR(A,B) SEND_VALasTXT(A, getAxisCurrent_mA(B))
276276
#else
277-
#define SEND_TRINAMIC_CURR(A, B) SEND_NA(A)
277+
#define SEND_TRINAMIC_CURR(A,B) SEND_NA(A)
278278
#endif
279279
SEND_TRINAMIC_CURR("x", X);
280280
SEND_TRINAMIC_CURR("x2", X2);
@@ -288,9 +288,9 @@ void NextionTFT::panelInfo(uint8_t req) {
288288

289289
case 25: // TMC Bump Sensitivity
290290
#if HAS_TRINAMIC_CONFIG
291-
#define SEND_TRINAMIC_BUMP(A, B) SEND_VALasTXT(A, getTMCBumpSensitivity(B))
291+
#define SEND_TRINAMIC_BUMP(A,B) SEND_VALasTXT(A, getTMCBumpSensitivity(B))
292292
#else
293-
#define SEND_TRINAMIC_BUMP(A, B) SEND_NA(A)
293+
#define SEND_TRINAMIC_BUMP(A,B) SEND_NA(A)
294294
#endif
295295
SEND_TRINAMIC_BUMP("x", X);
296296
SEND_TRINAMIC_BUMP("x2", X2);
@@ -302,9 +302,9 @@ void NextionTFT::panelInfo(uint8_t req) {
302302

303303
case 26: // TMC Hybrid Threshold Speed
304304
#if 0 && ALL(HAS_TRINAMIC_CONFIG, HYBRID_THRESHOLD)
305-
#define SEND_TRINAMIC_THRS(A, B) SEND_VALasTXT(A, getAxisPWMthrs(B))
305+
#define SEND_TRINAMIC_THRS(A,B) SEND_VALasTXT(A, getAxisPWMthrs(B))
306306
#else
307-
#define SEND_TRINAMIC_THRS(A, B) SEND_NA(A)
307+
#define SEND_TRINAMIC_THRS(A,B) SEND_NA(A)
308308
#endif
309309
SEND_TRINAMIC_THRS("x", X);
310310
SEND_TRINAMIC_THRS("x2", X2);
@@ -319,9 +319,9 @@ void NextionTFT::panelInfo(uint8_t req) {
319319
case 27: // Printcounter
320320
#if ENABLED(PRINTCOUNTER)
321321
char buffer[21];
322-
#define SEND_PRINT_INFO(A, B) SEND_VALasTXT(A, B(buffer))
322+
#define SEND_PRINT_INFO(A,B) SEND_VALasTXT(A, B(buffer))
323323
#else
324-
#define SEND_PRINT_INFO(A, B) SEND_NA(A)
324+
#define SEND_PRINT_INFO(A,B) SEND_NA(A)
325325
#endif
326326
SEND_PRINT_INFO("t5", getTotalPrints_str);
327327
SEND_PRINT_INFO("t3", getFinishedPrints_str);
@@ -333,9 +333,9 @@ void NextionTFT::panelInfo(uint8_t req) {
333333

334334
case 28: // Filament load/unload
335335
#if ENABLED(ADVANCED_PAUSE_FEATURE)
336-
#define SEND_PAUSE_INFO(A, B) SEND_VALasTXT(A, fc_settings[getActiveTool()].B)
336+
#define SEND_PAUSE_INFO(A,B) SEND_VALasTXT(A, fc_settings[getActiveTool()].B)
337337
#else
338-
#define SEND_PAUSE_INFO(A, B) SEND_NA(A)
338+
#define SEND_PAUSE_INFO(A,B) SEND_NA(A)
339339
#endif
340340
SEND_PAUSE_INFO("filamentin", load_length);
341341
SEND_PAUSE_INFO("filamentout", unload_length);
@@ -384,9 +384,9 @@ void NextionTFT::panelInfo(uint8_t req) {
384384

385385
case 31: // Jerk
386386
#if ENABLED(CLASSIC_JERK)
387-
#define SEND_JERK_INFO(A, B) SEND_VALasTXT(A, getAxisMaxJerk_mm_s(B))
387+
#define SEND_JERK_INFO(A,B) SEND_VALasTXT(A, getAxisMaxJerk_mm_s(B))
388388
#else
389-
#define SEND_JERK_INFO(A, B) SEND_NA(A)
389+
#define SEND_JERK_INFO(A,B) SEND_NA(A)
390390
//SEND_VALasTXT("x", getJunctionDeviation_mm());
391391
SEND_TXT("tmppage.M117", "classic Jerk not enabled");
392392
#endif
@@ -416,9 +416,9 @@ void NextionTFT::panelInfo(uint8_t req) {
416416

417417
case 34: // Dual X carriage offset
418418
#if ENABLED(DUAL_X_CARRIAGE)
419-
#define SEND_IDEX_INFO(A, B) SEND_VALasTXT(A, getNozzleOffset_mm(B, getActiveTool()))
419+
#define SEND_IDEX_INFO(A,B) SEND_VALasTXT(A, getNozzleOffset_mm(B, getActiveTool()))
420420
#else
421-
#define SEND_IDEX_INFO(A, B) SEND_NA(A)
421+
#define SEND_IDEX_INFO(A,B) SEND_NA(A)
422422
#endif
423423
SEND_IDEX_INFO("x", X);
424424
SEND_IDEX_INFO("y", Y);
@@ -427,9 +427,9 @@ void NextionTFT::panelInfo(uint8_t req) {
427427

428428
case 35: // Probe offset
429429
#if HAS_PROBE_XY_OFFSET
430-
#define SEND_PROBE_INFO(A, B) SEND_VALasTXT(A, getProbeOffset_mm(B))
430+
#define SEND_PROBE_INFO(A,B) SEND_VALasTXT(A, getProbeOffset_mm(B))
431431
#else
432-
#define SEND_PROBE_INFO(A, B) SEND_NA(A)
432+
#define SEND_PROBE_INFO(A,B) SEND_NA(A)
433433
#endif
434434
SEND_PROBE_INFO("x", X);
435435
SEND_PROBE_INFO("y", Y);
@@ -465,13 +465,13 @@ void NextionTFT::panelInfo(uint8_t req) {
465465
break;
466466

467467
case 37: // PID
468-
#define SEND_PID_INFO_0(A, B) TERN(PIDTEMP, SEND_VALasTXT(A, getPID_K##B(E0)), SEND_NA(A))
468+
#define SEND_PID_INFO_0(A,B) TERN(PIDTEMP, SEND_VALasTXT(A, getPID_K##B(E0)), SEND_NA(A))
469469
#if ALL(PIDTEMP, HAS_MULTI_EXTRUDER)
470-
#define SEND_PID_INFO_1(A, B) SEND_VALasTXT(A, getPID_K##B(E1))
470+
#define SEND_PID_INFO_1(A,B) SEND_VALasTXT(A, getPID_K##B(E1))
471471
#else
472-
#define SEND_PID_INFO_1(A, B) SEND_NA(A)
472+
#define SEND_PID_INFO_1(A,B) SEND_NA(A)
473473
#endif
474-
#define SEND_PID_INFO_BED(A, B) TERN(PIDTEMPBED, SEND_VALasTXT(A, getBedPID_K##B()), SEND_NA(A))
474+
#define SEND_PID_INFO_BED(A,B) TERN(PIDTEMPBED, SEND_VALasTXT(A, getBedPID_K##B()), SEND_NA(A))
475475
SEND_PID_INFO_0("p0", p); SEND_PID_INFO_0("i0", i); SEND_PID_INFO_0("d0", d);
476476
SEND_PID_INFO_1("p1", p); SEND_PID_INFO_1("i1", i); SEND_PID_INFO_1("d1", d);
477477
SEND_PID_INFO_BED("hbp", p); SEND_PID_INFO_BED("hbi", i); SEND_PID_INFO_BED("hbd", d);

‎Marlin/src/lcd/extui/ui_api.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -590,8 +590,8 @@ namespace ExtUI {
590590
*
591591
* UI_INCREMENT(TargetTemp_celsius, E0)
592592
*/
593-
#define UI_INCREMENT_BY(method, inc, ...) ExtUI::set ## method(ExtUI::get ## method (__VA_ARGS__) + inc, ##__VA_ARGS__)
594-
#define UI_DECREMENT_BY(method, inc, ...) ExtUI::set ## method(ExtUI::get ## method (__VA_ARGS__) - inc, ##__VA_ARGS__)
593+
#define UI_INCREMENT_BY(method,inc,...) ExtUI::set ## method(ExtUI::get ## method (__VA_ARGS__) + inc, ##__VA_ARGS__)
594+
#define UI_DECREMENT_BY(method,inc,...) ExtUI::set ## method(ExtUI::get ## method (__VA_ARGS__) - inc, ##__VA_ARGS__)
595595

596-
#define UI_INCREMENT(method, ...) UI_INCREMENT_BY(method, increment, ##__VA_ARGS__)
597-
#define UI_DECREMENT(method, ...) UI_DECREMENT_BY(method, increment, ##__VA_ARGS__)
596+
#define UI_INCREMENT(method,...) UI_INCREMENT_BY(method, increment, ##__VA_ARGS__)
597+
#define UI_DECREMENT(method,...) UI_DECREMENT_BY(method, increment, ##__VA_ARGS__)

‎Marlin/src/lcd/lcdprint.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,10 +118,10 @@
118118
#define LCD_COL_X_RJ(len) (LCD_PIXEL_WIDTH - LCD_COL_X(len))
119119
#endif
120120

121-
#define SETCURSOR(col, row) lcd_moveto(LCD_COL_X(col), LCD_ROW_Y(row))
122-
#define SETCURSOR_RJ(len, row) lcd_moveto(LCD_COL_X_RJ(len), LCD_ROW_Y(row))
123-
#define SETCURSOR_X(col) SETCURSOR(col, _lcdLineNr)
124-
#define SETCURSOR_X_RJ(len) SETCURSOR_RJ(len, _lcdLineNr)
121+
#define SETCURSOR(col,row) lcd_moveto(LCD_COL_X(col), LCD_ROW_Y(row))
122+
#define SETCURSOR_RJ(len,row) lcd_moveto(LCD_COL_X_RJ(len), LCD_ROW_Y(row))
123+
#define SETCURSOR_X(col) SETCURSOR(col, _lcdLineNr)
124+
#define SETCURSOR_X_RJ(len) SETCURSOR_RJ(len, _lcdLineNr)
125125

126126
int lcd_glyph_height();
127127

‎Marlin/src/sd/SdFatConfig.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
// UTF-8 may use up to 3 bytes to represent single UTF-16 code point.
107107
// We discard 3-byte characters allowing only 2-bytes
108108
// or 1-byte if UTF_FILENAME_SUPPORT disabled.
109-
#define LONG_FILENAME_CHARSIZE TERN(UTF_FILENAME_SUPPORT, 2, 1)
109+
#define LONG_FILENAME_CHARSIZE TERN(UTF_FILENAME_SUPPORT,2,1)
110110

111111
// Total bytes needed to store a single long filename
112112
#define LONG_FILENAME_LENGTH (FILENAME_LENGTH * LONG_FILENAME_CHARSIZE * VFAT_ENTRIES_LIMIT + 1)

‎Marlin/src/sd/usb_flashdrive/Sd2Card_FlashDrive.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
MAX3421E_HOST usb(USB_CS_PIN, USB_INTR_PIN);
7979
UHS_Bulk_Storage bulk(&usb);
8080

81-
#define UHS_START (usb.Init() == 0)
81+
#define UHS_START (usb.Init() == 0)
8282
#define UHS_STATE(state) UHS_USB_HOST_STATE_##state
8383

8484
#elif ENABLED(USE_OTG_USB_HOST)
@@ -181,7 +181,7 @@ void DiskIODriver_USBFlash::idle() {
181181

182182
static millis_t next_state_ms = 0;
183183

184-
#define GOTO_STATE_AFTER_DELAY(STATE, DELAY) do{ state = STATE; next_state_ms = millis() + DELAY; }while(0)
184+
#define GOTO_STATE_AFTER_DELAY(STATE,DELAY) do{ state = STATE; next_state_ms = millis() + DELAY; }while(0)
185185

186186
if (PENDING(millis(), next_state_ms)) return;
187187

‎Marlin/src/sd/usb_flashdrive/Sd2Card_FlashDrive.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@
4040
// SPI pin definitions - do not edit here - change in SdFatConfig.h
4141
#if ENABLED(SOFTWARE_SPI)
4242
#warning "Auto-assigning '10' as the SD_CHIP_SELECT_PIN."
43-
#define SD_CHIP_SELECT_PIN 10 // Software SPI chip select pin for the SD
43+
#define SD_CHIP_SELECT_PIN 10 // Software SPI chip select pin for the SD
4444
#else
4545
// hardware pin defs
46-
#define SD_CHIP_SELECT_PIN SD_SS_PIN // The default chip select pin for the SD card is SS.
46+
#define SD_CHIP_SELECT_PIN SD_SS_PIN // The default chip select pin for the SD card is SS.
4747
#endif
4848
#endif
4949

‎Marlin/src/sd/usb_flashdrive/lib-uhs2/macros.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@
3232
// HANDY MACROS
3333
////////////////////////////////////////////////////////////////////////////////
3434

35-
#define VALUE_BETWEEN(v,l,h) (((v)>(l)) && ((v)<(h)))
36-
#define VALUE_WITHIN(v,l,h) (((v)>=(l)) && ((v)<=(h)))
35+
#define VALUE_BETWEEN(v,l,h) (((v) > (l)) && ((v) < (h)))
36+
#define VALUE_WITHIN(v,l,h) (((v) >= (l)) && ((v) <= (h)))
3737
#define output_pgm_message(wa,fp,mp,el) wa = &mp, fp((char *)pgm_read_pointer(wa), el)
38-
#define output_if_between(v,l,h,wa,fp,mp,el) if (VALUE_BETWEEN(v,l,h)) output_pgm_message(wa,fp,mp[v-(l+1)],el);
38+
#define output_if_between(v,l,h,wa,fp,mp,el) if (VALUE_BETWEEN(v, l, h)) output_pgm_message(wa, fp, mp[v - (l + 1)], el);
3939

40-
#define SWAP(a, b) (((a) ^= (b)), ((b) ^= (a)), ((a) ^= (b)))
40+
#define SWAP(a,b) (((a) ^= (b)), ((b) ^= (a)), ((a) ^= (b)))
4141
#ifndef __BYTE_GRABBING_DEFINED__
4242
#define __BYTE_GRABBING_DEFINED__ 1
4343
#ifdef BROKEN_OPTIMIZER_LITTLE_ENDIAN

‎Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_UsbCore.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -322,9 +322,9 @@ typedef struct {
322322
// 8 bytes total
323323
} __attribute__((packed)) SETUP_PKT, *PSETUP_PKT;
324324

325-
// little endian :-) 8 8 8 8 16 16
326-
#define mkSETUP_PKT8(bmReqType, bRequest, wValLo, wValHi, wInd, total) ((uint64_t)(((uint64_t)(bmReqType)))|(((uint64_t)(bRequest))<<8)|(((uint64_t)(wValLo))<<16)|(((uint64_t)(wValHi))<<24)|(((uint64_t)(wInd))<<32)|(((uint64_t)(total)<<48)))
327-
#define mkSETUP_PKT16(bmReqType, bRequest, wVal, wInd, total) ((uint64_t)(((uint64_t)(bmReqType)))|(((uint64_t)(bRequest))<<8)|(((uint64_t)(wVal ))<<16) |(((uint64_t)(wInd))<<32)|(((uint64_t)(total)<<48)))
325+
// little endian :-) 8 8 8 8 16 16
326+
#define mkSETUP_PKT8(bmReqType,bRequest,wValLo,wValHi,wInd,total) ((uint64_t)(((uint64_t)(bmReqType)))|(((uint64_t)(bRequest))<<8)|(((uint64_t)(wValLo))<<16)|(((uint64_t)(wValHi))<<24)|(((uint64_t)(wInd))<<32)|(((uint64_t)(total)<<48)))
327+
#define mkSETUP_PKT16(bmReqType,bRequest,wVal,wInd,total) ((uint64_t)(((uint64_t)(bmReqType)))|(((uint64_t)(bRequest))<<8)|(((uint64_t)(wVal ))<<16) |(((uint64_t)(wInd))<<32)|(((uint64_t)(total)<<48)))
328328

329329
// Big endian -- but we aren't able to use this :-/
330330
//#define mkSETUP_PKT8(bmReqType, bRequest, wValLo, wValHi, wInd, total) ((uint64_t)(((uint64_t)(bmReqType))<<56)|(((uint64_t)(bRequest))<<48)|(((uint64_t)(wValLo))<<40)|(((uint64_t)(wValHi))<<32)|(((uint64_t)(wInd))<<16)|((uint64_t)(total)))

‎Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_macros.h

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -114,14 +114,14 @@ e-mail : support@circuitsathome.com
114114
#endif
115115

116116
#if defined(__arm__) && defined(CORE_TEENSY)
117-
#define UHS_PIN_WRITE(p, v) digitalWriteFast(p, v)
117+
#define UHS_PIN_WRITE(p,v) digitalWriteFast(p, v)
118118
#define UHS_PIN_READ(p) digitalReadFast(p)
119119
#endif
120120
// TODO: Fast inline code for AVR and SAM based microcontrollers
121121
// This can be done pretty easily.
122122
// For now, this will just work out-of-the-box.
123123
#ifndef UHS_PIN_WRITE
124-
#define UHS_PIN_WRITE(p, v) digitalWrite(p, v)
124+
#define UHS_PIN_WRITE(p,v) digitalWrite(p, v)
125125
#endif
126126
#ifndef UHS_PIN_READ
127127
#define UHS_PIN_READ(p) digitalRead(p)
@@ -154,16 +154,16 @@ e-mail : support@circuitsathome.com
154154
// Bonus, it makes code easier to read too.
155155
// Bitbanding is a wonderful thing.
156156
#define BITNR(i) (i&0x1?0:i&0x2?1:i&0x4?2:i&0x8?3:i&0x10?4:i&0x20?5:i&0x40?6:i&0x80?7:i&0x100?8:i&0x200?9:i&0x400?10:i&0x800?11:i&0x1000?12:i&0x2000?13:i&0x4000?14:i&0x8000?15:i&0x10000?16:i&0x20000?17:i&0x40000?18:i&0x80000?19:i&0x100000?20:i&0x200000?21:i&0x400000?22:i&0x800000?23:i&0x1000000?24:i&0x2000000?25:i&0x4000000?26:i&0x8000000?27:i&0x10000000?28:i&0x20000000?29:i&0x40000000?30:i&0x80000000?31:32)
157-
#define UHS_KIO_BITBAND_ADDR(r, i) (((uint32_t)&(r) - 0x40000000) * 32 + (i) * 4 + 0x42000000)
158-
#define UHS_KIO_SETBIT_ATOMIC(r, m) (*(uint32_t *)UHS_KIO_BITBAND_ADDR((r), BITNR((m)))) = 1
159-
#define UHS_KIO_CLRBIT_ATOMIC(r, m) (*(uint32_t *)UHS_KIO_BITBAND_ADDR((r), BITNR((m)))) = 0
157+
#define UHS_KIO_BITBAND_ADDR(r,i) (((uint32_t)&(r) - 0x40000000) * 32 + (i) * 4 + 0x42000000)
158+
#define UHS_KIO_SETBIT_ATOMIC(r,m) (*(uint32_t *)UHS_KIO_BITBAND_ADDR((r), BITNR((m)))) = 1
159+
#define UHS_KIO_CLRBIT_ATOMIC(r,m) (*(uint32_t *)UHS_KIO_BITBAND_ADDR((r), BITNR((m)))) = 0
160160

161-
#define VALUE_BETWEEN(v,l,h) (((v)>(l)) && ((v)<(h)))
162-
#define VALUE_WITHIN(v,l,h) (((v)>=(l)) && ((v)<=(h)))
161+
#define VALUE_BETWEEN(v,l,h) (((v) > (l)) && ((v) < (h)))
162+
#define VALUE_WITHIN(v,l,h) (((v) >= (l)) && ((v) <= (h)))
163163
#define output_pgm_message(wa,fp,mp,el) wa = &mp, fp((char *)pgm_read_pointer(wa), el)
164-
#define output_if_between(v,l,h,wa,fp,mp,el) if(VALUE_BETWEEN(v,l,h)) output_pgm_message(wa,fp,mp[v-(l+1)],el);
164+
#define output_if_between(v,l,h,wa,fp,mp,el) if(VALUE_BETWEEN(v, l, h)) output_pgm_message(wa, fp, mp[v - (l + 1)], el);
165165

166-
#define UHS_SWAP_VALUES(a, b) (((a) ^= (b)), ((b) ^= (a)), ((a) ^= (b)))
166+
#define UHS_SWAP_VALUES(a,b) (((a) ^= (b)), ((b) ^= (a)), ((a) ^= (b)))
167167
#ifndef __BYTE_GRABBING_DEFINED__
168168
#define __BYTE_GRABBING_DEFINED__ 1
169169
#ifdef BROKEN_OPTIMIZER_LITTLE_ENDIAN
@@ -217,8 +217,8 @@ e-mail : support@circuitsathome.com
217217
#define USBTRACE(s) (USBTRACE1((s), 0x80)); USB_HOST_SERIAL.flush()
218218
#define USBTRACE3(s,r,l) (Notify(PSTR(s), l), D_PrintHex((r), l), Notify(PSTR("\r\n"), l))
219219
#define USBTRACE3X(s,r,l) (Notify(PSTR(s), l), D_PrintHex((r), l))
220-
#define USBTRACE2(s,r) (USBTRACE3((s),(r),0x80)); USB_HOST_SERIAL.flush()
221-
#define USBTRACE2X(s,r) (USBTRACE3X((s),(r),0x80)); USB_HOST_SERIAL.flush()
220+
#define USBTRACE2(s,r) (USBTRACE3((s), (r), 0x80)); USB_HOST_SERIAL.flush()
221+
#define USBTRACE2X(s,r) (USBTRACE3X((s), (r), 0x80)); USB_HOST_SERIAL.flush()
222222

223223
#define VOID0 ((void)0)
224224
#ifndef NOTUSED

‎Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/macro_logic.h

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
#ifndef MACRO_LOGIC_H
1212
#define MACRO_LOGIC_H
1313

14-
#define AJK_CAT(a, ...) AJK_PRIMITIVE_CAT(a, __VA_ARGS__)
15-
#define AJK_PRIMITIVE_CAT(a, ...) a ## __VA_ARGS__
14+
#define AJK_CAT(a,...) AJK_PRIMITIVE_CAT(a, __VA_ARGS__)
15+
#define AJK_PRIMITIVE_CAT(a,...) a ## __VA_ARGS__
1616

1717
#define AJK_COMPL(b) AJK_PRIMITIVE_CAT(AJK_COMPL_, b)
1818
#define AJK_COMPL_0 1
@@ -48,7 +48,7 @@
4848
#define AJK_DEC_9 8
4949
#define AJK_DEC_10 9
5050

51-
#define AJK_CHECK_N(x, n, ...) n
51+
#define AJK_CHECK_N(x,n,...) n
5252
#define AJK_CHECK(...) AJK_CHECK_N(__VA_ARGS__, 0,)
5353
#define AJK_PROBE(x) x, 1,
5454

@@ -65,8 +65,8 @@
6565
#define AJK_BOOL(x) AJK_COMPL(AJK_NOT(x))
6666

6767
#define AJK_IIF(c) AJK_PRIMITIVE_CAT(AJK_IIF_, c)
68-
#define AJK_IIF_0(t, ...) __VA_ARGS__
69-
#define AJK_IIF_1(t, ...) t
68+
#define AJK_IIF_0(t,...) __VA_ARGS__
69+
#define AJK_IIF_1(t,...) t
7070

7171
#define AJK_IF(c) AJK_IIF(AJK_BOOL(c))
7272

@@ -85,7 +85,7 @@
8585
#define AJK_EVAL4(...) AJK_EVAL5(AJK_EVAL5(AJK_EVAL5(__VA_ARGS__)))
8686
#define AJK_EVAL5(...) __VA_ARGS__
8787

88-
#define AJK_REPEAT(AJK_count, AJK_macro, ...) \
88+
#define AJK_REPEAT(AJK_count,AJK_macro,...) \
8989
AJK_WHEN(AJK_count) \
9090
( \
9191
AJK_OBSTRUCT(AJK_REPEAT_INDIRECT) () \
@@ -99,7 +99,7 @@
9999
)
100100
#define AJK_REPEAT_INDIRECT() AJK_REPEAT
101101

102-
#define AJK_WHILE(AJK_pred, AJK_op, ...) \
102+
#define AJK_WHILE(AJK_pred,AJK_op,...) \
103103
IF(AJK_pred(__VA_ARGS__)) \
104104
( \
105105
AJK_OBSTRUCT(AJK_WHILE_INDIRECT) () \
@@ -110,32 +110,32 @@
110110
)
111111
#define AJK_WHILE_INDIRECT() AJK_WHILE
112112

113-
#define AJK_PRIMITIVE_COMPARE(x, y) AJK_IS_PAREN \
113+
#define AJK_PRIMITIVE_COMPARE(x,y) AJK_IS_PAREN \
114114
( \
115115
AJK_COMPARE_ ## x ( AJK_COMPARE_ ## y) (()) \
116116
)
117117

118118
#define AJK_IS_COMPARABLE(x) AJK_IS_PAREN( AJK_CAT(AJK_COMPARE_, x) (()) )
119119

120-
#define AJK_NOT_EQUAL(x, y) \
120+
#define AJK_NOT_EQUAL(x,y) \
121121
AJK_IIF(AJK_BITAND(AJK_IS_COMPARABLE(x))(AJK_IS_COMPARABLE(y)) ) \
122122
( \
123123
AJK_PRIMITIVE_COMPARE, \
124124
1 AJK_EAT \
125125
)(x, y)
126126

127-
#define AJK_EQUAL(x, y) AJK_COMPL(AJK_NOT_EQUAL(x, y))
127+
#define AJK_EQUAL(x,y) AJK_COMPL(AJK_NOT_EQUAL(x, y))
128128

129129
#define AJK_COMMA() ,
130130

131131
#define AJK_COMMA_IF(n) AJK_IF(n)(AJK_COMMA, AJK_EAT)()
132132

133-
#define AJK_COMMA_VAR(AJK_count, AJK_v) AJK_COMMA_IF(AJK_count) AJK_v ## AJK_count
133+
#define AJK_COMMA_VAR(AJK_count,AJK_v) AJK_COMMA_IF(AJK_count) AJK_v ## AJK_count
134134

135-
#define AJK_MAKE_LIST(AJK_v, AJK_count) AJK_EVAL(AJK_REPEAT(AJK_count, AJK_COMMA_VAR, AJK_v))
135+
#define AJK_MAKE_LIST(AJK_v,AJK_count) AJK_EVAL(AJK_REPEAT(AJK_count, AJK_COMMA_VAR, AJK_v))
136136

137-
#define AJK_FUN(AJK_count, AJK_v, AJK_args, AJK_body) AJK_v ## AJK_count (AJK_args) { AJK_body(AJK_count) }
138-
#define AJK_MAKE_FUNS(AJK_v, AJK_args, AJK_count, AJK_body) AJK_EVAL(AJK_REPEAT(AJK_count, AJK_FUN, AJK_v, AJK_args, AJK_body))
137+
#define AJK_FUN(AJK_count,AJK_v,AJK_args,AJK_body) AJK_v ## AJK_count (AJK_args) { AJK_body(AJK_count) }
138+
#define AJK_MAKE_FUNS(AJK_v,AJK_args,AJK_count,AJK_body) AJK_EVAL(AJK_REPEAT(AJK_count, AJK_FUN, AJK_v, AJK_args, AJK_body))
139139
#ifdef AJK_TEST_MACRO_LOGIC
140140

141141
#define BODY(AJKindex) some(C, statement); containing(a, test[AJKindex]);

‎Marlin/src/sd/usb_flashdrive/lib-uhs3/dyn_SWI/dyn_SWI.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ extern "C"
7979
#define NVIC_GET_PENDING(n) NVIC_GetPendingIRQ((IRQn_Type)n)
8080
#define NVIC_SET_PENDING(n) NVIC_SetPendingIRQ((IRQn_Type)n)
8181
#define NVIC_ENABLE_IRQ(n) NVIC_EnableIRQ((IRQn_Type)n)
82-
#define NVIC_SET_PRIORITY(n, p) NVIC_SetPriority((IRQn_Type)n, (uint32_t) p)
82+
#define NVIC_SET_PRIORITY(n,p) NVIC_SetPriority((IRQn_Type)n, (uint32_t) p)
8383
//extern "C" {
8484
// extern uint32_t _VectorsRam[VECTORTABLE_SIZE] __attribute__((aligned(VECTORTABLE_ALIGNMENT)));
8585
//}

0 commit comments

Comments
 (0)