deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Update to latest CCxxwares: Launchpad drivers

Browse source
This commit is contained in:
George Oikonomou 2016-06-11 19:42:00 +01:00
parent c42cb2b0cb
commit 5de7b1bbac
2 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
platform/srf06-cc26xx/launchpad/button-sensor.c
View file

@ -83,7 +83,7 @@ button_press_handler(uint8_t ioid)
* Start press duration counter on press (falling), notify on release * Start press duration counter on press (falling), notify on release
* (rising) * (rising)
*/ */
if(ti_lib_gpio_pin_read(BOARD_KEY_LEFT) == 0) { if(ti_lib_gpio_read_dio(BOARD_IOID_KEY_LEFT) == 0) {
left_timer.start = clock_time(); left_timer.start = clock_time();
left_timer.duration = 0; left_timer.duration = 0;
} else { } else {
@ -104,7 +104,7 @@ button_press_handler(uint8_t ioid)
* Start press duration counter on press (falling), notify on release * Start press duration counter on press (falling), notify on release
* (rising) * (rising)
*/ */
if(ti_lib_gpio_pin_read(BOARD_KEY_RIGHT) == 0) { if(ti_lib_gpio_read_dio(BOARD_IOID_KEY_RIGHT) == 0) {
right_timer.start = clock_time(); right_timer.start = clock_time();
right_timer.duration = 0; right_timer.duration = 0;
} else { } else {
@ -122,19 +122,19 @@ config_buttons(int type, int c, uint32_t key)
{ {
switch(type) { switch(type) {
case SENSORS_HW_INIT: case SENSORS_HW_INIT:
ti_lib_gpio_event_clear(1 << key); ti_lib_gpio_clear_event_dio(key);
ti_lib_ioc_port_configure_set(key, IOC_PORT_GPIO, BUTTON_GPIO_CFG); ti_lib_rom_ioc_pin_type_gpio_input(key);
ti_lib_gpio_dir_mode_set((1 << key), GPIO_DIR_MODE_IN); ti_lib_rom_ioc_port_configure_set(key, IOC_PORT_GPIO, BUTTON_GPIO_CFG);
gpio_interrupt_register_handler(key, button_press_handler); gpio_interrupt_register_handler(key, button_press_handler);
break; break;
case SENSORS_ACTIVE: case SENSORS_ACTIVE:
if(c) { if(c) {
ti_lib_gpio_event_clear(1 << key); ti_lib_gpio_clear_event_dio(key);
ti_lib_ioc_port_configure_set(key, IOC_PORT_GPIO, BUTTON_GPIO_CFG); ti_lib_rom_ioc_pin_type_gpio_input(key);
ti_lib_gpio_dir_mode_set((1 << key), GPIO_DIR_MODE_IN); ti_lib_rom_ioc_port_configure_set(key, IOC_PORT_GPIO, BUTTON_GPIO_CFG);
ti_lib_ioc_int_enable(key); ti_lib_rom_ioc_int_enable(key);
} else { } else {
ti_lib_ioc_int_disable(key); ti_lib_rom_ioc_int_disable(key);
} }
break; break;
default: default:
@ -164,7 +164,7 @@ status(int type, uint32_t key_io_id)
switch(type) { switch(type) {
case SENSORS_ACTIVE: case SENSORS_ACTIVE:
case SENSORS_READY: case SENSORS_READY:
if(ti_lib_ioc_port_configure_get(key_io_id) & IOC_INT_ENABLE) { if(ti_lib_rom_ioc_port_configure_get(key_io_id) & IOC_INT_ENABLE) {
return 1; return 1;
} }
break; break;
@ -178,7 +178,7 @@ static int
value_left(int type) value_left(int type)
{ {
if(type == BUTTON_SENSOR_VALUE_STATE) { if(type == BUTTON_SENSOR_VALUE_STATE) {
return ti_lib_gpio_pin_read(BOARD_KEY_LEFT) == 0 ? return ti_lib_gpio_read_dio(BOARD_IOID_KEY_LEFT) == 0 ?
BUTTON_SENSOR_VALUE_PRESSED : BUTTON_SENSOR_VALUE_RELEASED; BUTTON_SENSOR_VALUE_PRESSED : BUTTON_SENSOR_VALUE_RELEASED;
} else if(type == BUTTON_SENSOR_VALUE_DURATION) { } else if(type == BUTTON_SENSOR_VALUE_DURATION) {
return (int)left_timer.duration; return (int)left_timer.duration;
@ -190,7 +190,7 @@ static int
value_right(int type) value_right(int type)
{ {
if(type == BUTTON_SENSOR_VALUE_STATE) { if(type == BUTTON_SENSOR_VALUE_STATE) {
return ti_lib_gpio_pin_read(BOARD_KEY_RIGHT) == 0 ? return ti_lib_gpio_read_dio(BOARD_IOID_KEY_RIGHT) == 0 ?
BUTTON_SENSOR_VALUE_PRESSED : BUTTON_SENSOR_VALUE_RELEASED; BUTTON_SENSOR_VALUE_PRESSED : BUTTON_SENSOR_VALUE_RELEASED;
} else if(type == BUTTON_SENSOR_VALUE_DURATION) { } else if(type == BUTTON_SENSOR_VALUE_DURATION) {
return (int)right_timer.duration; return (int)right_timer.duration;

8
platform/srf06-cc26xx/launchpad/leds-arch.c
View file

@ -55,7 +55,7 @@ leds_arch_init(void)
ti_lib_rom_ioc_pin_type_gpio_output(BOARD_IOID_LED_1); ti_lib_rom_ioc_pin_type_gpio_output(BOARD_IOID_LED_1);
ti_lib_rom_ioc_pin_type_gpio_output(BOARD_IOID_LED_2); ti_lib_rom_ioc_pin_type_gpio_output(BOARD_IOID_LED_2);
ti_lib_gpio_pin_write(BOARD_LED_ALL, 0); ti_lib_gpio_clear_multi_dio(BOARD_LED_ALL);
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
unsigned char unsigned char
@ -68,13 +68,13 @@ void
leds_arch_set(unsigned char leds) leds_arch_set(unsigned char leds)
{ {
c = leds; c = leds;
ti_lib_gpio_pin_write(BOARD_LED_ALL, 0); ti_lib_gpio_clear_multi_dio(BOARD_LED_ALL);
if((leds & LEDS_RED) == LEDS_RED) { if((leds & LEDS_RED) == LEDS_RED) {
ti_lib_gpio_pin_write(BOARD_LED_1, 1); ti_lib_gpio_set_dio(BOARD_IOID_LED_1);
} }
if((leds & LEDS_YELLOW) == LEDS_YELLOW) { if((leds & LEDS_YELLOW) == LEDS_YELLOW) {
ti_lib_gpio_pin_write(BOARD_LED_2, 1); ti_lib_gpio_set_dio(BOARD_IOID_LED_2);
} }
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/