Skip to content

Commit 275fe74

Browse files
author
Eric Schubert
committed
Address PR review feedback
1 parent 2cdf29a commit 275fe74

File tree

5 files changed

+17
-28
lines changed

5 files changed

+17
-28
lines changed

Configuration.hpp

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,12 @@
7373
#ifndef INFO_DISPLAY_I2C_SCL_PIN
7474
#define INFO_DISPLAY_I2C_SCL_PIN 4
7575
#endif
76+
#ifndef INFO_DISPLAY_UPSIDE_DOWN
77+
#define INFO_DISPLAY_UPSIDE_DOWN 0
78+
#endif
79+
#ifndef INFO_DISPLAY_MIRRORED
80+
#define INFO_DISPLAY_MIRRORED 0
81+
#endif
7682
#endif
7783

7884
// Used RA wheel version. Unless you printed your OAT before March 2020, you're using
@@ -266,12 +272,10 @@
266272
#include "boards/AVR_MKS_GEN_L_V2/pins_MKS_GEN_L_V2.h"
267273
#elif (BOARD == BOARD_AVR_MKS_GEN_L_V21)
268274
#include "boards/AVR_MKS_GEN_L_V21/pins_MKS_GEN_L_V21.h"
269-
#elif (BOARD == BOARD_RP2040_JACKW01) || (BOARD == BOARD_RP2350_JACKW01)
275+
#elif (BOARD == BOARD_RP2040_JACKW01)
270276
#include "boards/RP2040_JACKW01/pins_RP2040_JACKW01.hpp"
271277
#elif (BOARD == BOARD_RP2040_SKR_PICO)
272278
#include "boards/RP2040_SKR_PICO/pins_RP2040_SKR_PICO.hpp"
273-
#elif (BOARD == BOARD_RP2040_PICO) || (BOARD == BOARD_RP2350_PICO2)
274-
#include "boards/RP2040_PICO/pins_RP2040_PICO.hpp"
275279
#endif
276280

277281
#include "Configuration_adv.hpp"

ConfigurationValidation.hpp

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,9 @@
112112
#endif
113113
#endif
114114

115+
#elif defined(OAE)
116+
// Valid
117+
115118
#else
116119
#warning Configuration does not support ALT. Use at own risk.
117120
#endif
@@ -228,7 +231,7 @@
228231
#if (AZ_STEPPER_TYPE != STEPPER_TYPE_NONE)
229232
#if (AZ_DRIVER_TYPE == DRIVER_TYPE_A4988_GENERIC) || (AZ_DRIVER_TYPE == DRIVER_TYPE_TMC2209_STANDALONE)
230233
#if !defined(AZ_STEP_PIN) || !defined(AZ_DIR_PIN) || !defined(AZ_EN_PIN) || !defined(AZ_DIAG_PIN)
231-
// Required pin assignments missing
234+
// Required pin assignments missing (ATmega uses SoftwareSerial for this driver)
232235
#error Missing pin assignments for configured AZ DRIVER_TYPE_A4988_GENERIC or DRIVER_TYPE_TMC2209_STANDALONE driver
233236
#endif
234237
#elif (AZ_DRIVER_TYPE == DRIVER_TYPE_TMC2209_UART)
@@ -252,7 +255,7 @@
252255
#if (ALT_STEPPER_TYPE != STEPPER_TYPE_NONE)
253256
#if (ALT_DRIVER_TYPE == DRIVER_TYPE_A4988_GENERIC) || (ALT_DRIVER_TYPE == DRIVER_TYPE_TMC2209_STANDALONE)
254257
#if !defined(ALT_STEP_PIN) || !defined(ALT_DIR_PIN) || !defined(ALT_EN_PIN) || !defined(ALT_DIAG_PIN)
255-
// Required pin assignments missing
258+
// Required pin assignments missing (ATmega uses SoftwareSerial for this driver)
256259
#error Missing pin assignments for configured AZ DRIVER_TYPE_A4988_GENERIC or DRIVER_TYPE_TMC2209_STANDALONE driver
257260
#endif
258261
#elif (ALT_DRIVER_TYPE == DRIVER_TYPE_TMC2209_UART)
@@ -463,7 +466,7 @@
463466
#endif
464467
#endif
465468

466-
// For OAT, we must have DEC limits defined, otherwise free slew does nto work.
469+
// For OAT, we must have DEC limits defined, otherwise free slew does not work.
467470
#ifndef OAM
468471
#ifndef DEC_LIMIT_UP
469472
#error "You must set DEC_LIMIT_UP to the number of degrees that your OAT can move upwards from the home position."

Constants.hpp

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,10 @@
1919
// ESP32 based boards
2020
#define BOARD_ESP32_ESP32DEV 1001
2121

22-
// RP2040/RP2350 based boards (2000-2999)
23-
// 2001-2099: Generic bare Pico family (user-defined wiring) -- NOT YET SUPPORTED
22+
// RP2040 based boards (2000-2999)
2423
// 2101-2199: Pico family + JackW01 printer carrier board
2524
// 2201-2299: BTT SKR Pico family
26-
// #define BOARD_RP2040_PICO 2001 // NOT YET SUPPORTED: requires user-defined pin wiring in local config
27-
// #define BOARD_RP2350_PICO2 2002 // NOT YET SUPPORTED: requires user-defined pin wiring in local config
2825
#define BOARD_RP2040_JACKW01 2101 // Raspberry Pi Pico (RP2040) + JackW01 printer board
29-
#define BOARD_RP2350_JACKW01 2102 // Raspberry Pi Pico 2 (RP2350) + JackW01 printer board
3026
#define BOARD_RP2040_SKR_PICO 2201 // Raspberry Pi Pico (RP2040) on BTT SKR Pico v1.0
3127

3228
/**

LocalConfiguration.hpp

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,8 @@
1818
#include "Configuration_local_esp32dev.hpp"
1919
#elif BOARD == BOARD_RP2040_JACKW01 && __has_include("Configuration_local_rp2040_jackw01.hpp")
2020
#include "Configuration_local_rp2040_jackw01.hpp"
21-
#elif BOARD == BOARD_RP2350_JACKW01 && __has_include("Configuration_local_rp2350_jackw01.hpp")
22-
#include "Configuration_local_rp2350_jackw01.hpp"
2321
#elif BOARD == BOARD_RP2040_SKR_PICO && __has_include("Configuration_local_rp2040_skr_pico.hpp")
2422
#include "Configuration_local_rp2040_skr_pico.hpp"
25-
// #elif BOARD == BOARD_RP2040_PICO && __has_include("Configuration_local_rp2040_pico.hpp") // NOT YET SUPPORTED
26-
// #include "Configuration_local_rp2040_pico.hpp"
27-
// #elif BOARD == BOARD_RP2350_PICO2 && __has_include("Configuration_local_rp2350_pico2.hpp") // NOT YET SUPPORTED
28-
// #include "Configuration_local_rp2350_pico2.hpp"
2923
#elif __has_include("Configuration_local.hpp")
3024
#include "Configuration_local.hpp"
3125
#endif

platformio.ini

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ lib_deps =
1313
arduino-libraries/LiquidCrystal @ ^1.0.7
1414
lincomatic/LiquidTWI2@^1.2.7
1515
olikraus/U8g2@^2.28.8
16-
https://github.com/ClutchplateDude/esp8266-oled-ssd1306@4.6.0
16+
https://github.com/ClutchplateDude/esp8266-oled-ssd1306#4.6.2
1717

1818
[env]
1919
extra_scripts =
@@ -95,7 +95,7 @@ debug_build_flags =
9595
lib_deps =
9696
${common.lib_deps}
9797
jdolinay/avr-debugger @ 1.2
98-
https://github.com/andre-stefanov/avr-interrupt-stepper@0.0.4
98+
https://github.com/andre-stefanov/avr-interrupt-stepper#0.0.4
9999

100100
[env:mksgenlv21]
101101
extends = env:ramps
@@ -136,8 +136,7 @@ extends = common_embedded
136136
platform = https://github.com/maxgerhardt/platform-raspberrypi.git
137137
board_build.core = earlephilhower
138138
lib_deps =
139-
;teemuatlut/TMCStepper @ ^0.7.1 ;Placeholder for if/when changes get merged with official repository code
140-
https://github.com/EricSchubert/TMCStepper-RP2040_Support.git#rp2040-single-wire-uart ;
139+
teemuatlut/TMCStepper @ ^0.7.1
141140
waspinator/AccelStepper @ ^1.61
142141
mikalhart/TinyGPSPlus @ ^1.0.2
143142
; TimerInterrupt is AVR-only (uses OCR1A etc.); RP2040 uses hardware/timer.h directly
@@ -150,13 +149,6 @@ build_flags =
150149
${env.build_flags}
151150
-D BOARD=BOARD_RP2040_JACKW01
152151

153-
[env:rp2350_jackw01]
154-
extends = common_rp2xxx
155-
board = rpipico2
156-
build_flags =
157-
${env.build_flags}
158-
-D BOARD=BOARD_RP2350_JACKW01
159-
160152
[env:rp2040_skr_pico]
161153
extends = common_rp2xxx
162154
board = rpipico

0 commit comments

Comments
 (0)