q3k/sangaboard-firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplified configuration

Browse source 
I've moved SUPPORT_EEPROM into boards.h
because that seemed simplest.

I've removed a bit of logic related to serial
ports, because we now just listen on both if there
is more than one, using PRIMARY_SERIAL_PORT and
SECONDARY_SERIAL_PORT in boards.h.

I've deleted the `picohw` environment because it's no longer necessary.
This commit is contained in:
Richard Bowman 2023-02-28 10:30:37 +00:00
parent 8a18c1444c
commit d9e7c1429a
3 changed files with 3 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

8
platformio.ini
View file

@ -64,14 +64,6 @@ build_flags = -D MCU_ESP32
monitor_filters = esp32_exception_decoder monitor_filters = esp32_exception_decoder
build_type = debug build_type = debug
[env:picohw]
platform = https://github.com/maxgerhardt/platform-raspberrypi.git
board = pico
framework = arduino
board_build.core = earlephilhower
upload_port = /media/filip/RPI-RP2
build_flags = -D MCU_PICO -D HW_SERIAL
[env:pico] [env:pico]
platform = https://github.com/maxgerhardt/platform-raspberrypi.git platform = https://github.com/maxgerhardt/platform-raspberrypi.git
board = pico board = pico

9
src/boards.h
View file

@ -70,6 +70,7 @@
#define WIRING_ADDITIONAL_STEPPERS = {{0, 1, 22, 23}} #define WIRING_ADDITIONAL_STEPPERS = {{0, 1, 22, 23}}
#define WIRING_STEPSTICK {13,14,15} //enable, step, dir todo: move to boards.h #define WIRING_STEPSTICK {13,14,15} //enable, step, dir todo: move to boards.h
#define PRIMARY_SERIAL_PORT Serial #define PRIMARY_SERIAL_PORT Serial
#define SECONDARY_SERIAL_PORT Serial2
#define PWM_NUM 0 #define PWM_NUM 0
#define WIRING_PWM_LEDS {} #define WIRING_PWM_LEDS {}
#define SUPPORT_EEPROM #define SUPPORT_EEPROM
@ -87,12 +88,8 @@
#define WIRING_STEPSTICK {23,22,1} //enable, step, dir todo: move to boards.h #define WIRING_STEPSTICK {23,22,1} //enable, step, dir todo: move to boards.h
#define WIRING_SERIAL_TX 8 #define WIRING_SERIAL_TX 8
#define WIRING_SERIAL_RX 9 #define WIRING_SERIAL_RX 9
#ifdef USB_SERIAL #define PRIMARY_SERIAL_PORT Serial
#define PRIMARY_SERIAL_PORT Serial #define SECONDARY_SERIAL_PORT Serial2
#else
#define PRIMARY_SERIAL_PORT Serial
#define SECONDARY_SERIAL_PORT Serial2
#endif
#define PWM_NUM 2 #define PWM_NUM 2
#define WIRING_PWM_LEDS {25, 29} #define WIRING_PWM_LEDS {25, 29}
#define WIRING_CC_LED 24 #define WIRING_CC_LED 24

10
src/config.h
View file

@ -3,12 +3,6 @@
#define BOARD_AUTO #define BOARD_AUTO
//#define BOARD_SANGABOARDv5 //#define BOARD_SANGABOARDv5
//if HW_SERIAL is not defined, we'll use USB serial communication
//the details are board specific and configured in boards.h
#ifndef HW_SERIAL
#define USB_SERIAL
#endif
#include <boards.h> //defines wiring #include <boards.h> //defines wiring
//general settings //general settings
@ -44,9 +38,5 @@
#define LIGHT_SENSOR_ADAFRUIT_TSL2591 #define LIGHT_SENSOR_ADAFRUIT_TSL2591
//#define LIGHT_SENSOR_ADAFRUIT_ADS1115 //#define LIGHT_SENSOR_ADAFRUIT_ADS1115
//config for non-standard platforms
#ifndef MCU_PICO
#define SUPPORT_EEPROM
#endif
#define CONFIGURED #define CONFIGURED
#endif #endif