djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #67 from glennrub/leds_update

Browse Source 
Leds update
This commit is contained in:
Daniel Tralamazza 2017-06-07 18:24:06 +02:00 committed by GitHub
commit 0dbb06f9a5
14 changed files with 38 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nrf5/boards/feather52/mpconfigboard.h
View File

@ -38,6 +38,7 @@
#define MICROPY_PY_MACHINE_ADC (1) #define MICROPY_PY_MACHINE_ADC (1)
#define MICROPY_PY_MACHINE_TEMP (1) #define MICROPY_PY_MACHINE_TEMP (1)
#define MICROPY_HW_HAS_LED (1)
#define MICROPY_HW_HAS_SWITCH (0) #define MICROPY_HW_HAS_SWITCH (0)
#define MICROPY_HW_HAS_FLASH (0) #define MICROPY_HW_HAS_FLASH (0)
#define MICROPY_HW_HAS_SDCARD (0) #define MICROPY_HW_HAS_SDCARD (0)

10
nrf5/boards/microbit/mpconfigboard.h
View File

@ -39,6 +39,7 @@
#define MICROPY_PY_MACHINE_ADC (1) #define MICROPY_PY_MACHINE_ADC (1)
#define MICROPY_PY_MACHINE_TEMP (1) #define MICROPY_PY_MACHINE_TEMP (1)
#define MICROPY_HW_HAS_LED (0)
#define MICROPY_HW_HAS_SWITCH (0) #define MICROPY_HW_HAS_SWITCH (0)
#define MICROPY_HW_HAS_FLASH (0) #define MICROPY_HW_HAS_FLASH (0)
#define MICROPY_HW_HAS_SDCARD (0) #define MICROPY_HW_HAS_SDCARD (0)
@ -52,13 +53,6 @@
#define MICROPY_HW_ENABLE_DAC (0) #define MICROPY_HW_ENABLE_DAC (0)
#define MICROPY_HW_ENABLE_CAN (0) #define MICROPY_HW_ENABLE_CAN (0)
#define MICROPY_HW_LED_PULLUP (1)
#define MICROPY_HW_LED1 (21) // LED1
#define MICROPY_HW_LED2 (22) // LED2
#define MICROPY_HW_LED3 (23) // LED3
#define MICROPY_HW_LED4 (24) // LED4
// UART config // UART config
#define MICROPY_HW_UART1_RX (pin_A25) #define MICROPY_HW_UART1_RX (pin_A25)
#define MICROPY_HW_UART1_TX (pin_A24) #define MICROPY_HW_UART1_TX (pin_A24)
@ -72,5 +66,3 @@
// micro:bit music pin // micro:bit music pin
#define MICROPY_HW_MUSIC_PIN (pin_A3) #define MICROPY_HW_MUSIC_PIN (pin_A3)
#define HELP_TEXT_BOARD_LED "1,2,3,4"

1
nrf5/boards/pca10000/mpconfigboard.h
View File

@ -33,6 +33,7 @@
#define MICROPY_PY_MACHINE_HW_SPI (0) #define MICROPY_PY_MACHINE_HW_SPI (0)
#define MICROPY_PY_MACHINE_TEMP (1) #define MICROPY_PY_MACHINE_TEMP (1)
#define MICROPY_HW_HAS_LED (1)
#define MICROPY_HW_HAS_SWITCH (0) #define MICROPY_HW_HAS_SWITCH (0)
#define MICROPY_HW_HAS_FLASH (0) #define MICROPY_HW_HAS_FLASH (0)
#define MICROPY_HW_HAS_SDCARD (0) #define MICROPY_HW_HAS_SDCARD (0)

1
nrf5/boards/pca10001/mpconfigboard.h
View File

@ -33,6 +33,7 @@
#define MICROPY_PY_MACHINE_HW_SPI (0) #define MICROPY_PY_MACHINE_HW_SPI (0)
#define MICROPY_PY_MACHINE_TEMP (1) #define MICROPY_PY_MACHINE_TEMP (1)
#define MICROPY_HW_HAS_LED (1)
#define MICROPY_HW_HAS_SWITCH (0) #define MICROPY_HW_HAS_SWITCH (0)
#define MICROPY_HW_HAS_FLASH (0) #define MICROPY_HW_HAS_FLASH (0)
#define MICROPY_HW_HAS_SDCARD (0) #define MICROPY_HW_HAS_SDCARD (0)

2
nrf5/boards/pca10028/mpconfigboard.h
View File

@ -37,6 +37,7 @@
#define MICROPY_PY_MACHINE_ADC (1) #define MICROPY_PY_MACHINE_ADC (1)
#define MICROPY_PY_MACHINE_TEMP (1) #define MICROPY_PY_MACHINE_TEMP (1)
#define MICROPY_HW_HAS_LED (1)
#define MICROPY_HW_HAS_SWITCH (0) #define MICROPY_HW_HAS_SWITCH (0)
#define MICROPY_HW_HAS_FLASH (0) #define MICROPY_HW_HAS_FLASH (0)
#define MICROPY_HW_HAS_SDCARD (0) #define MICROPY_HW_HAS_SDCARD (0)
@ -50,6 +51,7 @@
#define MICROPY_HW_ENABLE_DAC (0) #define MICROPY_HW_ENABLE_DAC (0)
#define MICROPY_HW_ENABLE_CAN (0) #define MICROPY_HW_ENABLE_CAN (0)
#define MICROPY_HW_LED_COUNT (4)
#define MICROPY_HW_LED_PULLUP (1) #define MICROPY_HW_LED_PULLUP (1)
#define MICROPY_HW_LED1 (21) // LED1 #define MICROPY_HW_LED1 (21) // LED1

1
nrf5/boards/pca10031/mpconfigboard.h
View File

@ -32,6 +32,7 @@
#define MICROPY_PY_MACHINE_TEMP (1) #define MICROPY_PY_MACHINE_TEMP (1)
#define MICROPY_HW_HAS_LED (1)
#define MICROPY_HW_HAS_SWITCH (0) #define MICROPY_HW_HAS_SWITCH (0)
#define MICROPY_HW_HAS_FLASH (0) #define MICROPY_HW_HAS_FLASH (0)
#define MICROPY_HW_HAS_SDCARD (0) #define MICROPY_HW_HAS_SDCARD (0)

2
nrf5/boards/pca10040/mpconfigboard.h
View File

@ -38,6 +38,7 @@
#define MICROPY_PY_MACHINE_ADC (1) #define MICROPY_PY_MACHINE_ADC (1)
#define MICROPY_PY_MACHINE_TEMP (1) #define MICROPY_PY_MACHINE_TEMP (1)
#define MICROPY_HW_HAS_LED (1)
#define MICROPY_HW_HAS_SWITCH (0) #define MICROPY_HW_HAS_SWITCH (0)
#define MICROPY_HW_HAS_FLASH (0) #define MICROPY_HW_HAS_FLASH (0)
#define MICROPY_HW_HAS_SDCARD (0) #define MICROPY_HW_HAS_SDCARD (0)
@ -51,6 +52,7 @@
#define MICROPY_HW_ENABLE_DAC (0) #define MICROPY_HW_ENABLE_DAC (0)
#define MICROPY_HW_ENABLE_CAN (0) #define MICROPY_HW_ENABLE_CAN (0)
#define MICROPY_HW_LED_COUNT (4)
#define MICROPY_HW_LED_PULLUP (1) #define MICROPY_HW_LED_PULLUP (1)
#define MICROPY_HW_LED1 (17) // LED1 #define MICROPY_HW_LED1 (17) // LED1

2
nrf5/boards/pca10056/mpconfigboard.h
View File

@ -36,6 +36,7 @@
#define MICROPY_PY_MACHINE_ADC (1) #define MICROPY_PY_MACHINE_ADC (1)
#define MICROPY_PY_MACHINE_TEMP (1) #define MICROPY_PY_MACHINE_TEMP (1)
#define MICROPY_HW_HAS_LED (1)
#define MICROPY_HW_HAS_SWITCH (0) #define MICROPY_HW_HAS_SWITCH (0)
#define MICROPY_HW_HAS_FLASH (0) #define MICROPY_HW_HAS_FLASH (0)
#define MICROPY_HW_HAS_SDCARD (0) #define MICROPY_HW_HAS_SDCARD (0)
@ -49,6 +50,7 @@
#define MICROPY_HW_ENABLE_DAC (0) #define MICROPY_HW_ENABLE_DAC (0)
#define MICROPY_HW_ENABLE_CAN (0) #define MICROPY_HW_ENABLE_CAN (0)
#define MICROPY_HW_LED_COUNT (4)
#define MICROPY_HW_LED_PULLUP (1) #define MICROPY_HW_LED_PULLUP (1)
#define MICROPY_HW_LED1 (13) // LED1 #define MICROPY_HW_LED1 (13) // LED1

8
nrf5/hal/hal_gpio.h
View File

@ -92,12 +92,10 @@ static inline void hal_gpio_pin_clear(uint8_t port, uint32_t pin) {
static inline void hal_gpio_pin_toggle(uint8_t port, uint32_t pin) { static inline void hal_gpio_pin_toggle(uint8_t port, uint32_t pin) {
uint32_t pin_mask = (1 << pin); uint32_t pin_mask = (1 << pin);
uint32_t pins_state = NRF_GPIO->OUT;
if (GPIO_BASE(port)->OUT ^ pin_mask) { GPIO_BASE(port)->OUTSET = (~pins_state) & pin_mask;
GPIO_BASE(port)->OUTSET = pin_mask; GPIO_BASE(port)->OUTCLR = pins_state & pin_mask;
} else {
GPIO_BASE(port)->OUTCLR = pin_mask;
}
} }
typedef enum { typedef enum {

2
nrf5/help.c
View File

@ -37,8 +37,10 @@ const char * nrf5_help_text =
"For online help please visit http://micropython.org/help/.\n" "For online help please visit http://micropython.org/help/.\n"
"\n" "\n"
"Quick overview of commands for the board:\n" "Quick overview of commands for the board:\n"
#if MICROPY_HW_HAS_LED
" pyb.LED(n) -- create an LED object for LED n (n=" HELP_TEXT_BOARD_LED ")\n" " pyb.LED(n) -- create an LED object for LED n (n=" HELP_TEXT_BOARD_LED ")\n"
"\n" "\n"
#endif
#if BLUETOOTH_SD #if BLUETOOTH_SD
HELP_TEXT_SD HELP_TEXT_SD
#endif #endif

14
nrf5/main.c
View File

@ -90,7 +90,6 @@ soft_reset:
// to recover from limit hit. (Limit is measured in bytes.) // to recover from limit hit. (Limit is measured in bytes.)
mp_stack_set_limit((char*)&_ram_end - (char*)&_heap_end - 400); mp_stack_set_limit((char*)&_ram_end - (char*)&_heap_end - 400);
led_init();
machine_init(); machine_init();
gc_init(&_heap_start, &_heap_end); gc_init(&_heap_start, &_heap_end);
@ -171,19 +170,12 @@ pin_init0();
} }
#endif #endif
#if MICROPY_HW_LED_TRICOLOR #if (MICROPY_HW_HAS_LED)
led_init();
do_str("import pyb\r\n" \ do_str("import pyb\r\n" \
"pyb.LED(1).on()", "pyb.LED(1).on()",
MP_PARSE_FILE_INPUT); MP_PARSE_FILE_INPUT);
#elif (MICROPY_HW_LED_COUNT == 2)
do_str("import pyb\r\n" \
"pyb.LED(1).on()",
MP_PARSE_FILE_INPUT);
#else
do_str("import pyb\r\n" \
"pyb.LED(1).on()\r\n" \
"pyb.LED(3).on()",
MP_PARSE_FILE_INPUT);
#endif #endif
// Main script is finished, so now go into REPL mode. // Main script is finished, so now go into REPL mode.

3
nrf5/modules/machine/led.c
View File

@ -31,6 +31,8 @@
#include "led.h" #include "led.h"
#include "mpconfigboard.h" #include "mpconfigboard.h"
#if MICROPY_HW_HAS_LED
#define LED_OFF(led) {(MICROPY_HW_LED_PULLUP) ? hal_gpio_pin_set(0, led) : hal_gpio_pin_clear(0, led); } #define LED_OFF(led) {(MICROPY_HW_LED_PULLUP) ? hal_gpio_pin_set(0, led) : hal_gpio_pin_clear(0, led); }
#define LED_ON(led) {(MICROPY_HW_LED_PULLUP) ? hal_gpio_pin_clear(0, led) : hal_gpio_pin_set(0, led); } #define LED_ON(led) {(MICROPY_HW_LED_PULLUP) ? hal_gpio_pin_clear(0, led) : hal_gpio_pin_set(0, led); }
@ -154,3 +156,4 @@ const mp_obj_type_t pyb_led_type = {
.locals_dict = (mp_obj_dict_t*)&led_locals_dict, .locals_dict = (mp_obj_dict_t*)&led_locals_dict,
}; };
#endif // MICROPY_HW_HAS_LED

8
nrf5/modules/pyb/modpyb.c
View File

@ -32,11 +32,17 @@
#include "nrf.h" // TODO: figure out where to put this import #include "nrf.h" // TODO: figure out where to put this import
#include "pin.h" #include "pin.h"
#if MICROPY_HW_HAS_LED
#define PYB_LED_MODULE { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pyb_led_type) },
#else
#define PYB_LED_MODULE
#endif
STATIC const mp_rom_map_elem_t pyb_module_globals_table[] = { STATIC const mp_rom_map_elem_t pyb_module_globals_table[] = {
{ MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_pyb) }, { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_pyb) },
{ MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pyb_led_type) },
{ MP_ROM_QSTR(MP_QSTR_repl_info), MP_ROM_PTR(&pyb_set_repl_info_obj) }, { MP_ROM_QSTR(MP_QSTR_repl_info), MP_ROM_PTR(&pyb_set_repl_info_obj) },
{ MP_ROM_QSTR(MP_QSTR_Pin), MP_ROM_PTR(&pin_type) }, { MP_ROM_QSTR(MP_QSTR_Pin), MP_ROM_PTR(&pin_type) },
PYB_LED_MODULE
/* { MP_ROM_QSTR(MP_QSTR_main), MP_ROM_PTR(&pyb_main_obj) }*/ /* { MP_ROM_QSTR(MP_QSTR_main), MP_ROM_PTR(&pyb_main_obj) }*/
}; };

8
nrf5/mpconfigport.h
View File

@ -116,6 +116,14 @@
#define MICROPY_PY_MACHINE_SPI_MIN_DELAY (0) #define MICROPY_PY_MACHINE_SPI_MIN_DELAY (0)
#define MICROPY_PY_FRAMEBUF (0) #define MICROPY_PY_FRAMEBUF (0)
#ifndef MICROPY_HW_LED_COUNT
#define MICROPY_HW_LED_COUNT (0)
#endif
#ifndef MICROPY_HW_LED_PULLUP
#define MICROPY_HW_LED_PULLUP (0)
#endif
#ifndef MICROPY_PY_MUSIC #ifndef MICROPY_PY_MUSIC
#define MICROPY_PY_MUSIC (0) #define MICROPY_PY_MUSIC (0)
#endif #endif