Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add custom SPI config for CC1101 + added board #1720

Closed
wants to merge 3 commits into from
Closed

add custom SPI config for CC1101 + added board #1720

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bfd3e8c
add custom SPI config for CC1101 + added board
efuturetoday Jul 19, 2023
6ed146b
fixed formatting
efuturetoday Jul 25, 2023
55e3951
cleanup boards
efuturetoday Jul 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
27 changes: 27 additions & 0 deletions environments.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1631,3 +1631,30 @@ build_flags =
custom_description = BLE Gateway using ethernet, requires PIO configuration
custom_hardware = ThingPulse gateway single ESP32

[env:esp32-wt32-eth01-rf-eth]
platform = ${com.esp32_platform}
board = wt32-eth01
lib_deps =
${com-esp32.lib_deps}
${libraries.wifimanager32}
${libraries.rc-switch}
${libraries.smartrc-cc1101-driver-lib}
build_flags =
${com-esp32.build_flags}
'-DESP32_ETHERNET=true'
'-DETH_PHY_ADDR=1'
'-DETH_PHY_POWER=16'
'-DETH_CLK_MODE=ETH_CLOCK_GPIO0_IN'
'-DZgatewayRF="RF"'
'-DGateway_Name="OMG_ESP32_RF"'
'-DZradioCC1101="CC1101"'
'-DRF_MODULE_SCK=12'
'-DRF_MODULE_MISO=15'
'-DRF_MODULE_MOSI=14'
'-DRF_MODULE_CS=2'
'-DLED_INFO=5'
'-DLED_INFO_ON=17'
'-DRF_RECEIVER_GPIO=4'
'-DRF_EMITTER_GPIO=17'
custom_description = RF gateway using RCSwitch library and ethernet
custom_hardware = WT32
7 changes: 7 additions & 0 deletions main/ZactuatorSomfy.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,13 @@

void setupSomfy() {
# ifdef ZradioCC1101 //using with CC1101
# if defined(RF_MODULE_SCK) && defined(RF_MODULE_MISO) && defined(RF_MODULE_MOSI) && defined(RF_MODULE_CS)
Log.notice(F("RF_MODULE_SCK: %d " CR), RF_MODULE_SCK);
Log.notice(F("RF_MODULE_MISO: %d " CR), RF_MODULE_MISO);
Log.notice(F("RF_MODULE_MOSI: %d " CR), RF_MODULE_MOSI);
Log.notice(F("RF_MODULE_CS: %d " CR), RF_MODULE_CS);
ELECHOUSE_cc1101.setSpiPin(RF_MODULE_SCK, RF_MODULE_MISO, RF_MODULE_MOSI, RF_MODULE_CS);
# endif
ELECHOUSE_cc1101.Init();
# endif
pinMode(RF_EMITTER_GPIO, OUTPUT);
Expand Down
7 changes: 7 additions & 0 deletions main/ZgatewayPilight.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,13 @@ void pilightRawCallback(const uint16_t* pulses, size_t length) {

void setupPilight() {
# ifdef ZradioCC1101 //receiving with CC1101
# if defined(RF_MODULE_SCK) && defined(RF_MODULE_MISO) && defined(RF_MODULE_MOSI) && defined(RF_MODULE_CS)
Log.notice(F("RF_MODULE_SCK: %d " CR), RF_MODULE_SCK);
Log.notice(F("RF_MODULE_MISO: %d " CR), RF_MODULE_MISO);
Log.notice(F("RF_MODULE_MOSI: %d " CR), RF_MODULE_MOSI);
Log.notice(F("RF_MODULE_CS: %d " CR), RF_MODULE_CS);
ELECHOUSE_cc1101.setSpiPin(RF_MODULE_SCK, RF_MODULE_MISO, RF_MODULE_MOSI, RF_MODULE_CS);
# endif
ELECHOUSE_cc1101.Init();
ELECHOUSE_cc1101.setMHZ(CC1101_FREQUENCY);
ELECHOUSE_cc1101.SetRx(CC1101_FREQUENCY);
Expand Down
8 changes: 8 additions & 0 deletions main/ZgatewayRF.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,15 @@ void setupRF() {
//RF init parameters
Log.notice(F("RF_EMITTER_GPIO: %d " CR), RF_EMITTER_GPIO);
Log.notice(F("RF_RECEIVER_GPIO: %d " CR), RF_RECEIVER_GPIO);

# ifdef ZradioCC1101 //receiving with CC1101
# if defined(RF_MODULE_SCK) && defined(RF_MODULE_MISO) && defined(RF_MODULE_MOSI) && defined(RF_MODULE_CS)
Log.notice(F("RF_MODULE_SCK: %d " CR), RF_MODULE_SCK);
Log.notice(F("RF_MODULE_MISO: %d " CR), RF_MODULE_MISO);
Log.notice(F("RF_MODULE_MOSI: %d " CR), RF_MODULE_MOSI);
Log.notice(F("RF_MODULE_CS: %d " CR), RF_MODULE_CS);
ELECHOUSE_cc1101.setSpiPin(RF_MODULE_SCK, RF_MODULE_MISO, RF_MODULE_MOSI, RF_MODULE_CS);
# endif
if (ELECHOUSE_cc1101.getCC1101()) {
Log.notice(F("C1101 spi Connection OK" CR));
} else {
Expand Down
7 changes: 7 additions & 0 deletions main/ZgatewayRF2.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,13 @@ RF2rxd rf2rd;

void setupRF2() {
# ifdef ZradioCC1101 //receiving with CC1101
# if defined(RF_MODULE_SCK) && defined(RF_MODULE_MISO) && defined(RF_MODULE_MOSI) && defined(RF_MODULE_CS)
Log.notice(F("RF_MODULE_SCK: %d " CR), RF_MODULE_SCK);
Log.notice(F("RF_MODULE_MISO: %d " CR), RF_MODULE_MISO);
Log.notice(F("RF_MODULE_MOSI: %d " CR), RF_MODULE_MOSI);
Log.notice(F("RF_MODULE_CS: %d " CR), RF_MODULE_CS);
ELECHOUSE_cc1101.setSpiPin(RF_MODULE_SCK, RF_MODULE_MISO, RF_MODULE_MOSI, RF_MODULE_CS);
# endif
ELECHOUSE_cc1101.Init();
ELECHOUSE_cc1101.setMHZ(receiveMhz);
ELECHOUSE_cc1101.SetRx(receiveMhz);
Expand Down