[python] Turtle module

escher/include/escher/palette.h

@@ -30,6 +30,8 @@ class Palette {
   constexpr static KDColor Orange = KDColor::RGB24(0xfe871f);
   constexpr static KDColor Green = KDColor::RGB24(0x50c102);
   constexpr static KDColor GreenLight = KDColor::RGB24(0x52db8f);
+  constexpr static KDColor Brown = KDColor::RGB24(0x8d7350);
+  constexpr static KDColor Purple = KDColor::RGB24(0x6e2d79);
   constexpr static KDColor DataColor[] = {Red, Blue, Green, YellowDark};
   constexpr static KDColor DataColorLight[] = {RedLight, BlueLight, GreenLight, YellowLight};
 };

escher/src/palette.cpp

@@ -25,5 +25,7 @@ constexpr KDColor Palette::BlueLight;
 constexpr KDColor Palette::Orange;
 constexpr KDColor Palette::Green;
 constexpr KDColor Palette::GreenLight;
+constexpr KDColor Palette::Brown;
+constexpr KDColor Palette::Purple;
 constexpr KDColor Palette::DataColor[];
 constexpr KDColor Palette::DataColorLight[];

python/port/genhdr/qstrdefs.in.h

@@ -28,22 +28,21 @@ Q(set_pixel)
 
 Q(turtle)
 
-Q(reset)
-
 Q(forward)
 Q(fd)
 Q(backward)
 Q(bk)
+Q(back)
 Q(right)
 Q(rt)
 Q(left)
 Q(lt)
-Q(circle)
 Q(goto)
 Q(setpos)
 Q(setposition)
 Q(setheading)
 Q(seth)
+Q(circle)
 Q(speed)
 
 Q(position)
@@ -56,18 +55,20 @@ Q(down)
 Q(penup)
 Q(pu)
 Q(up)
-Q(isdown)
 Q(pensize)
 Q(width)
+Q(isdown)
+
+Q(pencolor)
+
+Q(reset)
 
 Q(showturtle)
 Q(st)
 Q(hideturtle)
 Q(ht)
 Q(isvisible)
 
-Q(pencolor)
-
 // utime QSTRs
 Q(time)
 Q(sleep)

python/port/mod/turtle/modturtle.cpp

@@ -44,8 +44,16 @@ mp_obj_t modturtle_left(mp_obj_t angle) {
   return mp_const_none;
 }
 
-mp_obj_t modturtle_circle(mp_obj_t radius, mp_obj_t angle) {
-  sTurtle.circle(mp_obj_get_int(radius), mp_obj_get_float(angle));
+mp_obj_t modturtle_circle(size_t n_args, const mp_obj_t *args) {
+  mp_int_t radius = mp_obj_get_int(args[0]);
+
+  if (n_args == 1) {
+    sTurtle.circle(radius);
+  }
+  else {
+    mp_float_t angle = mp_obj_get_float(args[1]);
+    sTurtle.circle(radius, angle);
+  }
   return mp_const_none;
 }
 
@@ -112,8 +120,39 @@ mp_obj_t modturtle_isdown() {
   return sTurtle.isPenDown() ? mp_const_true : mp_const_false;
 }
 
-mp_obj_t modturtle_color(mp_obj_t r, mp_obj_t g, mp_obj_t b) {
-  sTurtle.setColor(KDColor::RGB888(mp_obj_get_int(r), mp_obj_get_int(g), mp_obj_get_int(b)));
+mp_obj_t modturtle_pencolor(size_t n_args, const mp_obj_t *args) {
+  if (n_args == 0) {
+    // pencolor()
+    KDColor c = sTurtle.color();
+    mp_obj_t mp_col[3];
+    mp_col[0] = mp_obj_new_int_from_uint(c.red());
+    mp_col[1] = mp_obj_new_int_from_uint(c.green());
+    mp_col[2] = mp_obj_new_int_from_uint(c.blue());
+    return mp_obj_new_tuple(3, mp_col);
+  }
+  if (n_args == 1) {
+    if (MP_OBJ_IS_STR(args[0])) {
+      // pencolor("blue")
+      size_t l;
+      sTurtle.setColor(mp_obj_str_get_data(args[0], &l));
+    } else {
+      // pencolor((r, g, b))
+      mp_obj_t * rgb;
+      mp_obj_get_array_fixed_n(args[0], 3, &rgb);
+      sTurtle.setColor(
+          KDColor::RGB888(
+            mp_obj_get_int(rgb[0]),
+            mp_obj_get_int(rgb[1]),
+            mp_obj_get_int(rgb[2])));
+    }
+  } else if (n_args == 3) {
+    // pencolor(r, g, b)
+    sTurtle.setColor(
+        KDColor::RGB888(
+          mp_obj_get_int(args[0]),
+          mp_obj_get_int(args[1]),
+          mp_obj_get_int(args[2])));
+  }
   return mp_const_none;
 }
 

python/port/mod/turtle/modturtle.h

@@ -9,7 +9,7 @@ mp_obj_t modturtle_forward(mp_obj_t px);
 mp_obj_t modturtle_backward(mp_obj_t px);
 mp_obj_t modturtle_right(mp_obj_t deg);
 mp_obj_t modturtle_left(mp_obj_t deg);
-mp_obj_t modturtle_circle(mp_obj_t radius, mp_obj_t angle);
+mp_obj_t modturtle_circle(size_t n_args, const mp_obj_t *args);
 mp_obj_t modturtle_goto(size_t n_args, const mp_obj_t *args);
 mp_obj_t modturtle_setheading(mp_obj_t deg);
 mp_obj_t modturtle_speed(mp_obj_t speed);
@@ -23,7 +23,7 @@ mp_obj_t modturtle_isdown();
 mp_obj_t modturtle_pensize(size_t n_args, const mp_obj_t *args);
 mp_obj_t modturtle_isvisible();
 
-mp_obj_t modturtle_color(mp_obj_t r, mp_obj_t g, mp_obj_t b);
+mp_obj_t modturtle_pencolor(size_t n_args, const mp_obj_t *args);
 
 mp_obj_t modturtle_showturtle();
 mp_obj_t modturtle_hideturtle();

python/port/mod/turtle/modturtle_table.c

@@ -1,25 +1,25 @@
 #include "modturtle.h"
 
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(modturtle_reset_obj, modturtle_reset);
-
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(modturtle_forward_obj, modturtle_forward);
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(modturtle_backward_obj, modturtle_backward);
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(modturtle_right_obj, modturtle_right);
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(modturtle_left_obj, modturtle_left);
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(modturtle_circle_obj, modturtle_circle);
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(modturtle_goto_obj, 1, 2, modturtle_goto);
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(modturtle_setheading_obj, modturtle_setheading);
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(modturtle_circle_obj, 1, 2, modturtle_circle);
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(modturtle_speed_obj, modturtle_speed);
 
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(modturtle_position_obj, modturtle_position);
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(modturtle_heading_obj, modturtle_heading);
 
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(modturtle_pendown_obj, modturtle_pendown);
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(modturtle_penup_obj, modturtle_penup);
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(modturtle_isdown_obj, modturtle_isdown);
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(modturtle_pensize_obj, 0, 1, modturtle_pensize);
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(modturtle_isdown_obj, modturtle_isdown);
 
-STATIC MP_DEFINE_CONST_FUN_OBJ_3(modturtle_color_obj, modturtle_color);
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(modturtle_pencolor_obj, 0, 3, modturtle_pencolor);
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(modturtle_reset_obj, modturtle_reset);
 
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(modturtle_showturtle_obj, modturtle_showturtle);
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(modturtle_hideturtle_obj, modturtle_hideturtle);
@@ -31,22 +31,21 @@ STATIC const mp_rom_map_elem_t modturtle_module_globals_table[] = {
   { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_turtle) },
   { MP_ROM_QSTR(MP_QSTR___init__), (mp_obj_t)&modturtle___init___obj },
 
-  { MP_ROM_QSTR(MP_QSTR_reset), (mp_obj_t)&modturtle_reset_obj },
-
   { MP_ROM_QSTR(MP_QSTR_forward), (mp_obj_t)&modturtle_forward_obj },
   { MP_ROM_QSTR(MP_QSTR_fd), (mp_obj_t)&modturtle_forward_obj },
   { MP_ROM_QSTR(MP_QSTR_backward), (mp_obj_t)&modturtle_backward_obj },
   { MP_ROM_QSTR(MP_QSTR_bk), (mp_obj_t)&modturtle_backward_obj },
+  { MP_ROM_QSTR(MP_QSTR_back), (mp_obj_t)&modturtle_backward_obj },
   { MP_ROM_QSTR(MP_QSTR_right), (mp_obj_t)&modturtle_right_obj },
   { MP_ROM_QSTR(MP_QSTR_rt), (mp_obj_t)&modturtle_right_obj },
   { MP_ROM_QSTR(MP_QSTR_left), (mp_obj_t)&modturtle_left_obj },
   { MP_ROM_QSTR(MP_QSTR_lt), (mp_obj_t)&modturtle_left_obj },
-  { MP_ROM_QSTR(MP_QSTR_circle), (mp_obj_t)&modturtle_circle_obj },
   { MP_ROM_QSTR(MP_QSTR_goto), (mp_obj_t)&modturtle_goto_obj },
   { MP_ROM_QSTR(MP_QSTR_setpos), (mp_obj_t)&modturtle_goto_obj },
   { MP_ROM_QSTR(MP_QSTR_setposition), (mp_obj_t)&modturtle_goto_obj },
   { MP_ROM_QSTR(MP_QSTR_setheading), (mp_obj_t)&modturtle_setheading_obj },
   { MP_ROM_QSTR(MP_QSTR_seth), (mp_obj_t)&modturtle_setheading_obj },
+  { MP_ROM_QSTR(MP_QSTR_circle), (mp_obj_t)&modturtle_circle_obj },
   { MP_ROM_QSTR(MP_QSTR_speed), (mp_obj_t)&modturtle_speed_obj },
 
   { MP_ROM_QSTR(MP_QSTR_position), (mp_obj_t)&modturtle_position_obj },
@@ -59,11 +58,14 @@ STATIC const mp_rom_map_elem_t modturtle_module_globals_table[] = {
   { MP_ROM_QSTR(MP_QSTR_penup), (mp_obj_t)&modturtle_penup_obj },
   { MP_ROM_QSTR(MP_QSTR_pu), (mp_obj_t)&modturtle_penup_obj },
   { MP_ROM_QSTR(MP_QSTR_up), (mp_obj_t)&modturtle_penup_obj },
-  { MP_ROM_QSTR(MP_QSTR_isdown), (mp_obj_t)&modturtle_isdown_obj },
   { MP_ROM_QSTR(MP_QSTR_pensize), (mp_obj_t)&modturtle_pensize_obj },
   { MP_ROM_QSTR(MP_QSTR_width), (mp_obj_t)&modturtle_pensize_obj },
+  { MP_ROM_QSTR(MP_QSTR_isdown), (mp_obj_t)&modturtle_isdown_obj },
+
+  { MP_ROM_QSTR(MP_QSTR_color), (mp_obj_t)&modturtle_pencolor_obj },
+  { MP_ROM_QSTR(MP_QSTR_pencolor), (mp_obj_t)&modturtle_pencolor_obj },
 
-  { MP_ROM_QSTR(MP_QSTR_pencolor), (mp_obj_t)&modturtle_color_obj },
+  { MP_ROM_QSTR(MP_QSTR_reset), (mp_obj_t)&modturtle_reset_obj },
 
   { MP_ROM_QSTR(MP_QSTR_showturtle), (mp_obj_t)&modturtle_showturtle_obj },
   { MP_ROM_QSTR(MP_QSTR_st), (mp_obj_t)&modturtle_showturtle_obj },