8000 added enable_dim_neopixel(), disable_dim_neopixel(), set_dim_level() by asherlie · Pull Request #246 · adafruit/circuitpython · GitHub
[go: up one dir, main page]
Skip to content

added enable_dim_neopixel(), disable_dim_neopixel(), set_dim_level() #246

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
merged 6 commits into from
Sep 12, 2017
Merged

added enable_dim_neopixel(), disable_dim_neopixel(), set_dim_level() #246

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b30c363
added enable_dim_neopixel(), disable_dim_neopixel(), set_dim_level()
asherlie Sep 5, 2017
32a4d21
removed dim_neopixel.{c,h}, added set_rgb_status_brightness()
asherlie Sep 9, 2017
375403b
fixed ifdefs
asherlie Sep 10, 2017
26e15f3
changed -finline-limit
asherlie Sep 10, 2017
dd1c81a
rgb_status_brightness is now uint8_t, samd_set_rgb_status_brightness …
asherlie Sep 12, 2017
03acc65
got rid of unused include
asherlie Sep 12, 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
Prev Previous commit
Next Next commit
rgb_status_brightness is now uint8_t, samd_set_rgb_status_brightness … 
…now throws ValueError if value is not between 0 and 255
  • Loading branch information
@asherlie
asherlie committed Sep 12, 2017
commit dd1c81a409c2033bd83592e392c82291d73eb075
7 changes: 6 additions & 1 deletion atmel-samd/bindings/samd/__init__.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,12 @@ MP_DEFINE_CONST_FUN_OBJ_0(samd_disable_autoreload_obj, samd_disable_autoreload);
//| `set_rgb_status_brightness` is called.
//|
STATIC mp_obj_t samd_set_rgb_status_brightness(mp_obj_t lvl){
set_rgb_status_brightness((int)mp_obj_get_int(lvl));
// This must be int. If cast to uint8_t first, will never raise a ValueError.
int brightness_int = mp_obj_get_int(lvl);
if(brightness_int < 0 || brightness_int > 255){
mp_raise_ValueError("Brightness must be between 0 and 255");
}
set_rgb_status_brightness((uint8_t)brightness_int);
return mp_const_none;
}
MP_DEFINE_CONST_FUN_OBJ_1(samd_set_rgb_status_brightness_obj, samd_set_rgb_status_brightness);
Expand Down
5 changes: 3 additions & 2 deletions atmel-samd/rgb_led_status.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#include "asf/sam0/drivers/port/port.h"

#include "mphalport.h"
#include "py/runtime.h"

#include "common-hal/microcontroller/Pin.h"
#include "shared-bindings/bitbangio/SPI.h"
Expand All @@ -12,7 +13,7 @@
#include "rgb_led_status.h"
#include "samd21_pins.h"

int rgb_status_brightness = 255;
uint8_t rgb_status_brightness = 255;
#ifdef MICROPY_HW_NEOPIXEL
static uint8_t status_neopixel_color[3];
static digitalio_digitalinout_obj_t status_neopixel;
Expand Down Expand Up @@ -173,6 +174,6 @@ uint32_t color_brightness(uint32_t color, uint8_t brightness) {
#endif
}

void set_rgb_status_brightness(int level){
void set_rgb_status_brightness(uint8_t level){
rgb_status_brightness = level;
}
2 changes: 1 addition & 1 deletion atmel-samd/rgb_led_status.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,6 @@ void temp_status_color(uint32_t rgb);
void clear_temp_status(void);

uint32_t color_brightness(uint32_t color, uint8_t brightness);
void set_rgb_status_brightness(int level);
void set_rgb_status_brightness(uint8_t level);

#endif // MICROPY_INCLUDED_ATMEL_SAMD_RGB_LED_STATUS_H
0