Skip to content

Commit 3ebf8c7

Browse files
committed
apply clang-format
1 parent c2a5f82 commit 3ebf8c7

File tree

11 files changed

+514
-73
lines changed

11 files changed

+514
-73
lines changed

ConfigurationValidation.hpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,7 @@
9090
#endif
9191
#endif
9292
#elif defined(BOARD_OAE_V1)
93-
// Valid
94-
93+
// Valid
9594

9695
#else
9796
#error Configuration does not support AZ. Use at own risk.
@@ -114,7 +113,7 @@
114113
#endif
115114

116115
#elif defined(BOARD_OAE_V1)
117-
// Valid
116+
// Valid
118117

119118
#else
120119
#warning Configuration does not support ALT. Use at own risk.

Configuration_adv.hpp

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -340,13 +340,12 @@
340340
#ifndef AZ_ROD_PITCH
341341
#define AZ_ROD_PITCH 0.5
342342
#endif
343-
#define AZIMUTH_STEPS_PER_REV + \
344-
(AZ_CORRECTION_FACTOR * (AZ_CIRCUMFERENCE / AZ_ROD_PITCH) * AZ_STEPPER_SPR * AZ_MICROSTEPPING) // Actually u-steps/rev
343+
#define AZIMUTH_STEPS_PER_REV \
344+
+(AZ_CORRECTION_FACTOR * (AZ_CIRCUMFERENCE / AZ_ROD_PITCH) * AZ_STEPPER_SPR * AZ_MICROSTEPPING) // Actually u-steps/rev
345345
#else
346346
#define AZ_CIRCUMFERENCE 2538.4f
347347
#endif
348348
#endif
349-
350349

351350
#ifndef OAE
352351
#define AZ_WORMGEAR_RATIO 1.0f
@@ -357,7 +356,7 @@
357356
(AZ_CORRECTION_FACTOR * (AZ_CIRCUMFERENCE / (AZ_PULLEY_TEETH * GT2_BELT_PITCH)) * AZ_STEPPER_SPR \
358357
* AZ_MICROSTEPPING) // Actually u-steps/rev
359358
#endif
360-
359+
361360
#ifndef AZIMUTH_STEPS_PER_ARC_MINUTE
362361
#define AZIMUTH_STEPS_PER_ARC_MINUTE (AZIMUTH_STEPS_PER_REV / (360 * 60.0f)) // Used to determine move distance in steps
363362
#endif
@@ -416,15 +415,16 @@
416415
#define ALTITUDE_STEPS_PER_REV \
417416
(ALT_CORRECTION_FACTOR * (ALT_CIRCUMFERENCE / ALT_ROD_PITCH) * ALT_STEPPER_SPR * ALT_MICROSTEPPING) // Actually u-steps/rev
418417

419-
#else
418+
#else
420419
#ifdef OAE
421420
#ifndef ALT_ROD_PITCH
422421
#define ALT_ROD_PITCH 1.25 // mm/rev
423422
#endif
424423
// the Circumference of the ALT rotation. Roughly 146mm radius.
425424
#define ALT_CIRCUMFERENCE 130.0f * 2 * PI
426-
#define ALTITUDE_STEPS_PER_REV + \
427-
(ALT_CORRECTION_FACTOR * (ALT_CIRCUMFERENCE / ALT_ROD_PITCH) * ALT_STEPPER_SPR * ALT_MICROSTEPPING) // Actually u-steps/rev
425+
#define ALTITUDE_STEPS_PER_REV \
426+
+(ALT_CORRECTION_FACTOR * (ALT_CIRCUMFERENCE / ALT_ROD_PITCH) * ALT_STEPPER_SPR \
427+
* ALT_MICROSTEPPING) // Actually u-steps/rev
428428
#else
429429
// the Circumference of the AZ rotation. 770mm dia.
430430
#define ALT_CIRCUMFERENCE 2419.0f
@@ -436,9 +436,9 @@
436436
#define ALT_WORMGEAR_RATIO (40.0f)
437437
#endif
438438
#ifndef ALTITUDE_STEPS_PER_REV
439-
#define ALTITUDE_STEPS_PER_REV \
440-
(ALT_CORRECTION_FACTOR * (ALT_CIRCUMFERENCE / (ALT_PULLEY_TEETH * GT2_BELT_PITCH)) * ALT_STEPPER_SPR * ALT_MICROSTEPPING \
441-
* ALT_WORMGEAR_RATIO) // Actually u-steps/rev
439+
#define ALTITUDE_STEPS_PER_REV \
440+
(ALT_CORRECTION_FACTOR * (ALT_CIRCUMFERENCE / (ALT_PULLEY_TEETH * GT2_BELT_PITCH)) * ALT_STEPPER_SPR \
441+
* ALT_MICROSTEPPING * ALT_WORMGEAR_RATIO) // Actually u-steps/rev
442442
#endif
443443
#endif
444444
#endif
@@ -649,7 +649,6 @@
649649
// ////////
650650
////////////////////////////////////////////
651651

652-
653652
// Focuser
654653
#if (FOCUS_DRIVER_TYPE == DRIVER_TYPE_TMC2209_UART)
655654
#if defined(ESP32)

Constants.hpp

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

1919
// ESP32 based boards
2020
#define BOARD_ESP32_ESP32DEV 1001
21-
#define BOARD_OAE_V1 1002
21+
#define BOARD_OAE_V1 1002
2222

2323
/**
2424
* Supported keypad/display types. Use one of these values for DISPLAY_TYPE configuration matching your used display and keypad.

boards/ESP32_ESP32DEV/pins_OAE_V1.hpp

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,13 +83,13 @@
8383

8484
// DISPLAY_TYPE_LCD_JOY_I2C_SSD1306 requires 3 analog inputs in Arduino pin numbering
8585
#ifndef LCD_KEY_SENSE_X_PIN
86-
//#define LCD_KEY_SENSE_X_PIN 34
86+
//#define LCD_KEY_SENSE_X_PIN 34
8787
#endif
8888
#ifndef LCD_KEY_SENSE_Y_PIN
89-
//#define LCD_KEY_SENSE_Y_PIN 39
89+
//#define LCD_KEY_SENSE_Y_PIN 39
9090
#endif
9191
#ifndef LCD_KEY_SENSE_PUSH_PIN
92-
//#define LCD_KEY_SENSE_PUSH_PIN 36
92+
//#define LCD_KEY_SENSE_PUSH_PIN 36
9393
#endif
9494

9595
//Serial port for external debugging
@@ -103,7 +103,6 @@
103103
#endif
104104
#endif
105105

106-
107106
// Defines for OAE ///////////////////////
108107

109108
#ifndef RA_WHEEL_CIRCUMFERENCE
@@ -125,7 +124,7 @@
125124
#define DEC_WHEEL_CIRCUMFERENCE 1.0f
126125
#endif
127126
#ifndef RA_STEPPER_SPR
128-
#define RA_STEPPER_SPR (400 * 9) // change to (200 * 9) for 1.8° stepper
127+
#define RA_STEPPER_SPR (400 * 9) // change to (200 * 9) for 1.8° stepper
129128
#endif
130129
#ifndef DEC_STEPPER_SPR
131130
#define DEC_STEPPER_SPR (200 * 50 * 4.5f) // change to (200 * 9) for 1.8° stepper

0 commit comments

Comments
 (0)