Skip to content

drivers/sx127x: rework of implementations from #6645 and #6002 #6797

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

Merged
miri64 merged 3 commits into from
Jun 30, 2017
Merged

drivers/sx127x: rework of implementations from #6645 and #6002 #6797

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
b80c249
sys/netopt: add new enum types for LoRa
aabadie Jun 30, 2017
0ccc264
drivers: initial implementation of sx127x radio (LoRa mode only)
aabadie Jun 30, 2017
57c51e4
test: add sx127x test application
aabadie Jun 30, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions cpu/cc2538/radio/cc2538_rf_getset.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,8 @@ void cc2538_set_state(cc2538_rf_t *dev, netopt_state_t state)
RFCORE_WAIT_UNTIL(RFCORE->XREG_FSMSTAT0bits.FSM_FFCTRL_STATE > FSM_STATE_RX_CALIBRATION);
dev->state = NETOPT_STATE_IDLE;
break;
default:
break;
Copy link
Copy Markdown
Member

@PeterKietzmann PeterKietzmann May 30, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How is this related to this PR? It is picky, sure, but could you make a separate PR out of it in case it is unrelated?

Copy link
Copy Markdown
Contributor Author

@aabadie aabadie May 30, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because this PR introduces a new netopt state for LoRA which is not handled by this switch. Thus the build for cc2538 was raising warning: enumeration value '[...]'not handled in switch [-Wswitch] => error.
I can open a dedicated PR if you prefer.

Copy link
Copy Markdown
Member

@PeterKietzmann PeterKietzmann May 31, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah now I see. No, leave it as is.

}
}

Expand Down
7 changes: 7 additions & 0 deletions drivers/Makefile.dep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,13 @@ ifneq (,$(filter srf08,$(USEMODULE)))
USEMODULE += xtimer
endif

ifneq (,$(filter sx127%,$(USEMODULE)))
FEATURES_REQUIRED += periph_gpio
FEATURES_REQUIRED += periph_spi
USEMODULE += xtimer
USEMODULE += sx127x
endif

ifneq (,$(filter veml6070,$(USEMODULE)))
FEATURES_REQUIRED += periph_i2c
endif
Expand Down
3 changes: 3 additions & 0 deletions drivers/Makefile.include
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,3 +130,6 @@ endif
ifneq (,$(filter adcxx1c,$(USEMODULE)))
USEMODULE_INCLUDES += $(RIOTBASE)/drivers/adcxx1c/include
endif
ifneq (,$(filter sx127%,$(USEMODULE)))
USEMODULE_INCLUDES += $(RIOTBASE)/drivers/sx127x/include
endif
6 changes: 6 additions & 0 deletions drivers/include/net/netdev.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,7 @@ enum {
NETDEV_TYPE_ETHERNET,
NETDEV_TYPE_IEEE802154,
NETDEV_TYPE_CC110X,
NETDEV_TYPE_LORA,
NETDEV_TYPE_NRFMIN
};

Expand All @@ -230,6 +231,11 @@ typedef enum {
NETDEV_EVENT_TX_MEDIUM_BUSY, /**< couldn't transfer packet */
NETDEV_EVENT_LINK_UP, /**< link established */
NETDEV_EVENT_LINK_DOWN, /**< link gone */
NETDEV_EVENT_TX_TIMEOUT, /**< timeout when sending */
NETDEV_EVENT_RX_TIMEOUT, /**< timeout when receiving */
NETDEV_EVENT_CRC_ERROR, /**< wrong CRC */
NETDEV_EVENT_FHSS_CHANGE_CHANNEL, /**< channel changed */
NETDEV_EVENT_CAD_DONE, /**< channel activity detection done */
/* expand this list if needed */
} netdev_event_t;

Expand Down
Loading