From 6e6b3b9dc60e887bd3cb747db465d047b275846c Mon Sep 17 00:00:00 2001 From: Maud de Vries Date: Fri, 16 Aug 2019 13:08:14 +0200 Subject: [PATCH 1/4] Update description for version 2.1 --- exercises/resistor-color-duo/description.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/exercises/resistor-color-duo/description.md b/exercises/resistor-color-duo/description.md index a42809ff0e..5f991e01a9 100644 --- a/exercises/resistor-color-duo/description.md +++ b/exercises/resistor-color-duo/description.md @@ -4,7 +4,11 @@ If you want to build something using a Raspberry Pi, you'll probably use _resist * Resistors are small - so small in fact that if you printed the resistance value on them, it would be hard to read. To get around this problem, manufacturers print color-coded bands onto the resistors to denote their resistance values. Each band has a position and a numeric value. For example, if they printed a brown band (value 1) followed by a green band (value 5), it would translate to the number 15. -In this exercise, you are going to create a helpful program so that you don't have to remember the values of the bands. The program will take two colors as input, and output the correct number. +In this exercise, you are going to create a helpful program so that you don't have to remember the values of the bands. The program will take color names as input, and output a two digit number. Even when the input is more than two colors! The colors are mapped to the numbers from 0 to 9 in the sequence: Black - Brown - Red - Orange - Yellow - Green - Blue - Violet - Grey - White + +From the example above: +brown-green should return 15 +brown-green-violet should return 15 too, ignoring the third color. From d1474b117a1902395eb473a3990096ff310572ac Mon Sep 17 00:00:00 2001 From: Maud de Vries Date: Fri, 16 Aug 2019 17:13:03 +0200 Subject: [PATCH 2/4] Update exercises/resistor-color-duo/description.md Co-Authored-By: Corey McCandless --- exercises/resistor-color-duo/description.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/exercises/resistor-color-duo/description.md b/exercises/resistor-color-duo/description.md index 5f991e01a9..804986db62 100644 --- a/exercises/resistor-color-duo/description.md +++ b/exercises/resistor-color-duo/description.md @@ -4,7 +4,7 @@ If you want to build something using a Raspberry Pi, you'll probably use _resist * Resistors are small - so small in fact that if you printed the resistance value on them, it would be hard to read. To get around this problem, manufacturers print color-coded bands onto the resistors to denote their resistance values. Each band has a position and a numeric value. For example, if they printed a brown band (value 1) followed by a green band (value 5), it would translate to the number 15. -In this exercise, you are going to create a helpful program so that you don't have to remember the values of the bands. The program will take color names as input, and output a two digit number. Even when the input is more than two colors! +In this exercise, you are going to create a helpful program so that you don't have to remember the values of the bands. The program will take color names as input, and output a two digit number. Even when the input is more than two colors! The colors are mapped to the numbers from 0 to 9 in the sequence: Black - Brown - Red - Orange - Yellow - Green - Blue - Violet - Grey - White From 3fba006b4fec7453507325dceac726941c6a24f1 Mon Sep 17 00:00:00 2001 From: Maud de Vries Date: Fri, 16 Aug 2019 17:13:21 +0200 Subject: [PATCH 3/4] Update exercises/resistor-color-duo/description.md Co-Authored-By: Corey McCandless --- exercises/resistor-color-duo/description.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/exercises/resistor-color-duo/description.md b/exercises/resistor-color-duo/description.md index 804986db62..79841d0cfd 100644 --- a/exercises/resistor-color-duo/description.md +++ b/exercises/resistor-color-duo/description.md @@ -11,4 +11,4 @@ Black - Brown - Red - Orange - Yellow - Green - Blue - Violet - Grey - White From the example above: brown-green should return 15 -brown-green-violet should return 15 too, ignoring the third color. +brown-green-violet should return 15 too, ignoring the third color. From 182dc809ef68587733500099db485ccb67e3697a Mon Sep 17 00:00:00 2001 From: Maud de Vries Date: Fri, 16 Aug 2019 21:08:48 +0200 Subject: [PATCH 4/4] Update exercises/resistor-color-duo/description.md Co-Authored-By: Ryan Potts --- exercises/resistor-color-duo/description.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/exercises/resistor-color-duo/description.md b/exercises/resistor-color-duo/description.md index 79841d0cfd..62c11c07d3 100644 --- a/exercises/resistor-color-duo/description.md +++ b/exercises/resistor-color-duo/description.md @@ -4,7 +4,7 @@ If you want to build something using a Raspberry Pi, you'll probably use _resist * Resistors are small - so small in fact that if you printed the resistance value on them, it would be hard to read. To get around this problem, manufacturers print color-coded bands onto the resistors to denote their resistance values. Each band has a position and a numeric value. For example, if they printed a brown band (value 1) followed by a green band (value 5), it would translate to the number 15. -In this exercise, you are going to create a helpful program so that you don't have to remember the values of the bands. The program will take color names as input, and output a two digit number. Even when the input is more than two colors! +In this exercise you are going to create a helpful program so that you don't have to remember the values of the bands. The program will take color names as input and output a two digit number, even if the input is more than two colors! The colors are mapped to the numbers from 0 to 9 in the sequence: Black - Brown - Red - Orange - Yellow - Green - Blue - Violet - Grey - White