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

Replace ENERGEST_OFF+_ON with ENERGEST_SWITCH #2695

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Replace ENERGEST_OFF+_ON with ENERGEST_SWITCH #2695

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d8524d8
Replace ENERGEST_OFF+_ON with ENERGEST_SWITCH
ngammarano Oct 3, 2021
86df95e
Replace ENERGEST_OFF+_ON with ENERGEST_SWITCH
ngammarano Oct 3, 2021
bdbf95a
Replace ENERGEST_OFF+_ON with ENERGEST_SWITCH
ngammarano Oct 3, 2021
7aa7df9
Replace ENERGEST_OFF+_ON with ENERGEST_SWITCH
ngammarano Oct 3, 2021
da134b8
Replace ENERGEST_ON+_OFF with ENERGEST_SWITCH
ngammarano Oct 3, 2021
959b9ad
Replace ENERGEST_OFF+_ON with ENERGEST_SWITCH
ngammarano Oct 3, 2021
628ee4e
Replace ENERGEST_OFF+_ON with ENERGEST_SWITCH
ngammarano Oct 3, 2021
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
6 changes: 2 additions & 4 deletions cpu/cc2538/dev/cc2538-rf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -641,8 +641,7 @@ transmit(unsigned short transmit_len)
}

/* Start the transmission */
ENERGEST_OFF(ENERGEST_TYPE_LISTEN);
ENERGEST_ON(ENERGEST_TYPE_TRANSMIT);
ENERGEST_SWITCH(ENERGEST_TYPE_LISTEN, ENERGEST_TYPE_TRANSMIT);

CC2538_RF_CSP_ISTXON();

Expand All @@ -661,8 +660,7 @@ transmit(unsigned short transmit_len)
while(REG(RFCORE_XREG_FSMSTAT1) & RFCORE_XREG_FSMSTAT1_TX_ACTIVE);
ret = RADIO_TX_OK;
}
ENERGEST_OFF(ENERGEST_TYPE_TRANSMIT);
ENERGEST_ON(ENERGEST_TYPE_LISTEN);
ENERGEST_SWITCH(ENERGEST_TYPE_TRANSMIT, ENERGEST_TYPE_LISTEN);

if(was_off) {
off();
Expand Down
6 changes: 2 additions & 4 deletions cpu/cc253x/dev/cc2530-rf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,8 +446,7 @@ transmit(unsigned short transmit_len)

/* Start the transmission */
RF_TX_LED_ON();
ENERGEST_OFF(ENERGEST_TYPE_LISTEN);
ENERGEST_ON(ENERGEST_TYPE_TRANSMIT);
ENERGEST_SWITCH(ENERGEST_TYPE_LISTEN, ENERGEST_TYPE_TRANSMIT);

CC2530_CSP_ISTXON();

Expand All @@ -465,8 +464,7 @@ transmit(unsigned short transmit_len)
while(FSMSTAT1 & FSMSTAT1_TX_ACTIVE);
ret = RADIO_TX_OK;
}
ENERGEST_OFF(ENERGEST_TYPE_TRANSMIT);
ENERGEST_ON(ENERGEST_TYPE_LISTEN);
ENERGEST_SWITCH(ENERGEST_TYPE_TRANSMIT, ENERGEST_TYPE_LISTEN);

if(rf_flags & WAS_OFF) {
off();
Expand Down
6 changes: 2 additions & 4 deletions cpu/cc26xx-cc13xx/rf-core/ieee-mode.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -947,8 +947,7 @@ transmit(unsigned short transmit_len)

if(ret) {
/* If we enter here, TX actually started */
ENERGEST_OFF(ENERGEST_TYPE_LISTEN);
ENERGEST_ON(ENERGEST_TYPE_TRANSMIT);
ENERGEST_SWITCH(ENERGEST_TYPE_LISTEN, ENERGEST_TYPE_TRANSMIT);

/* Idle away while the command is running */
while((cmd.status & RF_CORE_RADIO_OP_MASKED_STATUS)
Expand Down Expand Up @@ -987,8 +986,7 @@ transmit(unsigned short transmit_len)
* Update ENERGEST state here, before a potential call to off(), which
* will correctly update it if required.
*/
ENERGEST_OFF(ENERGEST_TYPE_TRANSMIT);
ENERGEST_ON(ENERGEST_TYPE_LISTEN);
ENERGEST_SWITCH(ENERGEST_TYPE_TRANSMIT, ENERGEST_TYPE_LISTEN);

/*
* Disable LAST_FG_COMMAND_DONE interrupt. We don't really care about it
Expand Down
6 changes: 2 additions & 4 deletions cpu/cc26xx-cc13xx/rf-core/prop-mode.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -708,8 +708,7 @@ transmit(unsigned short transmit_len)

if(ret) {
/* If we enter here, TX actually started */
ENERGEST_OFF(ENERGEST_TYPE_LISTEN);
ENERGEST_ON(ENERGEST_TYPE_TRANSMIT);
ENERGEST_SWITCH(ENERGEST_TYPE_LISTEN, ENERGEST_TYPE_TRANSMIT);

watchdog_periodic();

Expand Down Expand Up @@ -740,8 +739,7 @@ transmit(unsigned short transmit_len)
* Update ENERGEST state here, before a potential call to off(), which
* will correctly update it if required.
*/
ENERGEST_OFF(ENERGEST_TYPE_TRANSMIT);
ENERGEST_ON(ENERGEST_TYPE_LISTEN);
ENERGEST_SWITCH(ENERGEST_TYPE_TRANSMIT, ENERGEST_TYPE_LISTEN);

/*
* Disable LAST_FG_COMMAND_DONE interrupt. We don't really care about it
Expand Down
9 changes: 3 additions & 6 deletions cpu/stm32w108/dev/stm32w-radio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -536,8 +536,7 @@ stm32w_radio_transmit(unsigned short payload_len)
last_tx_status = -1;
LED_TX_ON();
if(ST_RadioTransmit(stm32w_txbuf) == ST_SUCCESS) {
ENERGEST_OFF(ENERGEST_TYPE_LISTEN);
ENERGEST_ON(ENERGEST_TYPE_TRANSMIT);
ENERGEST_SWITCH(ENERGEST_TYPE_LISTEN, ENERGEST_TYPE_TRANSMIT);
PRINTF("stm32w: sending %d bytes\r\n", payload_len);

#if DEBUG > 1
Expand Down Expand Up @@ -704,8 +703,7 @@ void
ST_RadioTransmitCompleteIsrCallback(StStatus status,
uint32_t txSyncTime, boolean framePending)
{
ENERGEST_OFF(ENERGEST_TYPE_TRANSMIT);
ENERGEST_ON(ENERGEST_TYPE_LISTEN);
ENERGEST_SWITCH(ENERGEST_TYPE_TRANSMIT, ENERGEST_TYPE_LISTEN);
LED_TX_OFF();

last_tx_status = status;
Expand All @@ -718,8 +716,7 @@ ST_RadioTransmitCompleteIsrCallback(StStatus status,
/* Retransmission */
LED_TX_ON();
if(ST_RadioTransmit(stm32w_txbuf) == ST_SUCCESS) {
ENERGEST_OFF(ENERGEST_TYPE_LISTEN);
ENERGEST_ON(ENERGEST_TYPE_TRANSMIT);
ENERGEST_SWITCH(ENERGEST_TYPE_LISTEN, ENERGEST_TYPE_TRANSMIT);
PRINTF("stm32w: retransmission.\r\n");
DEC_RETRY_CNT();
} else {
Expand Down
3 changes: 1 addition & 2 deletions dev/cc1200/cc1200.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1976,8 +1976,7 @@ idle_tx_rx(const uint8_t *payload, uint16_t payload_len)

TX_LEDS_OFF();

ENERGEST_OFF(ENERGEST_TYPE_TRANSMIT);
ENERGEST_ON(ENERGEST_TYPE_LISTEN);
ENERGEST_SWITCH(ENERGEST_TYPE_TRANSMIT, ENERGEST_TYPE_LISTEN);

return RADIO_TX_OK;

Expand Down
12 changes: 3 additions & 9 deletions platform/seedeye/dev/mrf24j40/mrf24j40.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -739,9 +739,7 @@ mrf24j40_prepare(const void *data, unsigned short len)

mrf24j40_on();

ENERGEST_OFF(ENERGEST_TYPE_LISTEN);

ENERGEST_ON(ENERGEST_TYPE_TRANSMIT);
ENERGEST_SWITCH(ENERGEST_TYPE_LISTEN, ENERGEST_TYPE_TRANSMIT);

mrf24j40_set_txfifo(data, len);

Expand All @@ -765,10 +763,8 @@ mrf24j40_transmit(unsigned short len)

mrf24j40_on();

ENERGEST_OFF(ENERGEST_TYPE_LISTEN);
ENERGEST_SWITCH(ENERGEST_TYPE_LISTEN, ENERGEST_TYPE_TRANSMIT);

ENERGEST_ON(ENERGEST_TYPE_TRANSMIT);

status_tx = MRF24J40_TX_WAIT;

set_short_add_mem(MRF24J40_TXNCON, 0b00000001);
Expand Down Expand Up @@ -829,10 +825,8 @@ mrf24j40_cca(void)

mrf24j40_on();

ENERGEST_OFF(ENERGEST_TYPE_LISTEN);
ENERGEST_SWITCH(ENERGEST_TYPE_LISTEN, ENERGEST_TYPE_TRANSMIT);

ENERGEST_ON(ENERGEST_TYPE_TRANSMIT);

ret = mrf24j40_get_rssi() <= 95; /* -69dbm */

if(!receive_was_on) {
Expand Down