Skip to content

Commit 39ed24e

Browse files
committed
pbio/color: rename PURPLE to VIOLET
In color science, "violet" is usually used for the spectral color name while "purple" is used to describe pigment color (i.e. dark magenta). This is a breaking change from Pybricks v2.0. Issue: pybricks/support#95 (comment)
1 parent 7539f35 commit 39ed24e

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

bricks/ev3dev/pb_type_ev3dev_image.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ STATIC GrxColor map_color(mp_obj_t *obj) {
7272
return grx_color_get(165, 42, 42);
7373
case PBIO_COLOR_ORANGE:
7474
return grx_color_get(255, 165, 0);
75-
case PBIO_COLOR_PURPLE:
76-
return grx_color_get(128, 0, 128);
75+
case PBIO_COLOR_VIOLET:
76+
return grx_color_get(238, 130, 238);
7777
}
7878
return grx_color_get_black();
7979
}

lib/pbio/include/pbio/color.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ typedef enum {
4444
PBIO_COLOR_GREEN = PBIO_COLOR_ENCODE(120, 100, 100), /**< green */
4545
PBIO_COLOR_CYAN = PBIO_COLOR_ENCODE(180, 100, 100), /**< cyan */
4646
PBIO_COLOR_BLUE = PBIO_COLOR_ENCODE(240, 100, 100), /**< blue */
47-
PBIO_COLOR_PURPLE = PBIO_COLOR_ENCODE(270, 100, 100), /**< purple */
47+
PBIO_COLOR_VIOLET = PBIO_COLOR_ENCODE(270, 100, 100), /**< violet */
4848
PBIO_COLOR_MAGENTA = PBIO_COLOR_ENCODE(300, 100, 100), /**< magenta */
4949
} pbio_color_t;
5050

lib/pbio/test/color.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ void test_color_to_hsv(void *env) {
255255
tt_want_int_op(hsv.s, ==, 100);
256256
tt_want_int_op(hsv.v, ==, 100);
257257

258-
pbio_color_to_hsv(PBIO_COLOR_PURPLE, &hsv);
258+
pbio_color_to_hsv(PBIO_COLOR_VIOLET, &hsv);
259259
tt_want_int_op(hsv.h, ==, 270);
260260
tt_want_int_op(hsv.s, ==, 100);
261261
tt_want_int_op(hsv.v, ==, 100);

pybricks/parameters.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ const pb_obj_enum_member_t pb_Button_BEACON_obj;
3939
const mp_obj_type_t pb_enum_type_Color;
4040

4141
const pb_obj_enum_member_t pb_Color_BLACK_obj;
42-
const pb_obj_enum_member_t pb_Color_PURPLE_obj;
42+
const pb_obj_enum_member_t pb_Color_VIOLET_obj;
4343
const pb_obj_enum_member_t pb_Color_BLUE_obj;
4444
const pb_obj_enum_member_t pb_Color_GREEN_obj;
4545
const pb_obj_enum_member_t pb_Color_YELLOW_obj;
@@ -52,7 +52,7 @@ const pb_obj_enum_member_t pb_Color_CYAN_obj;
5252
const pb_obj_enum_member_t pb_Color_MAGENTA_obj;
5353

5454
#define pb_const_color_black MP_OBJ_FROM_PTR(&pb_Color_BLACK_obj)
55-
#define pb_const_color_purple MP_OBJ_FROM_PTR(&pb_Color_PURPLE_obj)
55+
#define pb_const_color_purple MP_OBJ_FROM_PTR(&pb_Color_VIOLET_obj)
5656
#define pb_const_color_blue MP_OBJ_FROM_PTR(&pb_Color_BLUE_obj)
5757
#define pb_const_color_green MP_OBJ_FROM_PTR(&pb_Color_GREEN_obj)
5858
#define pb_const_color_yellow MP_OBJ_FROM_PTR(&pb_Color_YELLOW_obj)

pybricks/parameters/pb_type_color.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ const pb_obj_enum_member_t pb_Color_BLACK_obj = {
1717
.value = PBIO_COLOR_BLACK
1818
};
1919

20-
const pb_obj_enum_member_t pb_Color_PURPLE_obj = {
20+
const pb_obj_enum_member_t pb_Color_VIOLET_obj = {
2121
{&pb_enum_type_Color},
22-
.name = MP_QSTR_PURPLE,
23-
.value = PBIO_COLOR_PURPLE
22+
.name = MP_QSTR_VIOLET,
23+
.value = PBIO_COLOR_VIOLET
2424
};
2525

2626
const pb_obj_enum_member_t pb_Color_BLUE_obj = {
@@ -85,7 +85,7 @@ const pb_obj_enum_member_t pb_Color_MAGENTA_obj = {
8585

8686
STATIC const mp_rom_map_elem_t pb_enum_Color_table[] = {
8787
{ MP_ROM_QSTR(MP_QSTR_BLACK), MP_ROM_PTR(&pb_Color_BLACK_obj) },
88-
{ MP_ROM_QSTR(MP_QSTR_PURPLE), MP_ROM_PTR(&pb_Color_PURPLE_obj) },
88+
{ MP_ROM_QSTR(MP_QSTR_VIOLET), MP_ROM_PTR(&pb_Color_VIOLET_obj) },
8989
{ MP_ROM_QSTR(MP_QSTR_BLUE), MP_ROM_PTR(&pb_Color_BLUE_obj) },
9090
{ MP_ROM_QSTR(MP_QSTR_GREEN), MP_ROM_PTR(&pb_Color_GREEN_obj) },
9191
{ MP_ROM_QSTR(MP_QSTR_YELLOW), MP_ROM_PTR(&pb_Color_YELLOW_obj) },

0 commit comments

Comments
 (0)