Re-enable pads 9 and 10

code-dot-org · Feb 26, 2018 · 0bdbed6 · 0bdbed6
1 parent b6f40cc
commit 0bdbed6
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/apps/src/lib/kits/maker/PlaygroundConstants.js b/apps/src/lib/kits/maker/PlaygroundConstants.js
@@ -1,7 +1,7 @@
 import experiments from '../../../util/experiments';
 export const N_COLOR_LEDS = 10;
 export const EXTERNAL_PINS = [0, 1, 2, 3, 6, 9, 10, 12];
-export const TOUCH_PINS = [0, 2, 3, 6, 12];
+export const TOUCH_PINS = [0, 2, 3, 6, 9, 10, 12];
 export const J5_CONSTANTS = {
   INPUT: 0,
   OUTPUT: 1,

diff --git a/apps/test/unit/lib/kits/maker/CircuitPlaygroundBoardTest.js b/apps/test/unit/lib/kits/maker/CircuitPlaygroundBoardTest.js
@@ -70,7 +70,7 @@ describe('CircuitPlaygroundBoard', () => {
 
     it('initializes a set of components', () => {
       return board.connect().then(() => {
-        expect(Object.keys(board.prewiredComponents_)).to.have.length(21);
+        expect(Object.keys(board.prewiredComponents_)).to.have.length(23);
         expect(board.prewiredComponents_.board).to.be.a('object');
         expect(board.prewiredComponents_.colorLeds).to.be.a('array');
         expect(board.prewiredComponents_.led).to.be.a('object');
@@ -86,6 +86,8 @@ describe('CircuitPlaygroundBoard', () => {
         expect(board.prewiredComponents_.touchPad2).to.be.a('object');
         expect(board.prewiredComponents_.touchPad3).to.be.a('object');
         expect(board.prewiredComponents_.touchPad6).to.be.a('object');
+        expect(board.prewiredComponents_.touchPad9).to.be.a('object');
+        expect(board.prewiredComponents_.touchPad10).to.be.a('object');
         expect(board.prewiredComponents_.touchPad12).to.be.a('object');
         expect(board.prewiredComponents_.INPUT).to.be.a('number');
         expect(board.prewiredComponents_.OUTPUT).to.be.a('number');

diff --git a/apps/test/unit/lib/kits/maker/PlaygroundComponentsTest.js b/apps/test/unit/lib/kits/maker/PlaygroundComponentsTest.js
@@ -98,6 +98,8 @@ describe('Circuit Playground Components', () => {
             'touchPad2',
             'touchPad3',
             'touchPad6',
+            'touchPad9',
+            'touchPad10',
             'touchPad12',
           ]);
         });
@@ -613,14 +615,14 @@ describe('Circuit Playground Components', () => {
     });
 
     it('destroys everything that createCircuitPlaygroundComponents creates', () => {
-      expect(Object.keys(components)).to.have.length(15);
+      expect(Object.keys(components)).to.have.length(17);
       destroyCircuitPlaygroundComponents(components);
       expect(Object.keys(components)).to.have.length(0);
     });
 
     it('does not destroy components not created by createCircuitPlaygroundComponents', () => {
       components.someOtherComponent = {};
-      expect(Object.keys(components)).to.have.length(16);
+      expect(Object.keys(components)).to.have.length(18);
       destroyCircuitPlaygroundComponents(components);
       expect(Object.keys(components)).to.have.length(1);
       expect(components).to.haveOwnProperty('someOtherComponent');