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.

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

Cleanup #84

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 2 additions & 5 deletions Firmware/include/board_ism01a.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,10 @@
//

///
/// @file board_rf50.h
/// @file board_ism01a.h
///
/// Board-specific definitions for the RF50-DEMO board.
/// Board-specific definitions for the ISM01A board.
///

/// @file board.h
/// Board definitions for the ISM01A board

#ifndef _BOARD_ISM01A_H
#define _BOARD_ISM01A_H
Expand Down
16 changes: 7 additions & 9 deletions Firmware/radio/radio_446x.c
Original file line number Diff line number Diff line change
Expand Up @@ -551,7 +551,8 @@ check_part(void) __reentrant
return part == 0x4463;
}

static void radio_gpio_init()
static
void radio_general_config(void)
{
cmd_set_property4(GROUP_FRR_CTL, 0x0,
10, /* FRR A = latched RSSI */
Expand Down Expand Up @@ -581,15 +582,15 @@ static void radio_gpio_init()
wait_for_cts();

cmd_gpio_pin_cfg(
0x40 | GPIO_0_CONFIG,
0x40 | GPIO_1_CONFIG,
0x40 | 8, // 2: CTS
0x40 | GPIO_0_CONFIG,
0x40 | GPIO_1_CONFIG,
0x40 | 8, // 2: CTS
0x40 | 33, // GPIO4: RX state
39, // nIRQ
0, // SDO
2
);
wait_for_cts();
wait_for_cts();
}

// initialise the radio hardware
Expand All @@ -611,8 +612,7 @@ radio_initialise(void)
if (!check_part())
return false;

radio_gpio_init();

radio_general_config();
return true;
}

Expand Down Expand Up @@ -816,8 +816,6 @@ radio_configure(__pdata uint8_t air_rate)
cmd_fifo_info(0x03);
wait_for_cts();

radio_gpio_init();

return true;
}

Expand Down