Rename function

detection.py

@@ -70,7 +70,7 @@ def detect_columns(board):
                 return y + 1 + DETECT_COLUMN_OFFSET_Y - COLUMN_VSHIFT[col]
 
 
-def detect_block_type(board, x, y):
+def detect_block(board, x, y):
     # check for basic blocks first, use saturation filter to avoid confusing
     # green blocks with background
     h, s, v = board.getpixel((x + DETECT_BASIC_X,
@@ -109,7 +109,7 @@ def detect_blocks(board):
     for y in range(maxy, miny, -BLOCK_SIZE):
         for col in range(COLUMNS):
             x = col * BLOCK_SIZE
-            yield detect_block_type(board, x, y + COLUMN_VSHIFT[col])
+            yield detect_block(board, x, y + COLUMN_VSHIFT[col])
 
 
 def detect_exa(board):
@@ -127,7 +127,7 @@ def detect_held(board, exa):
         y = DETECT_EXA_LIGHT_Y + COLUMN_VSHIFT[exa]
         h, s, v = board.getpixel((x, y))
         if not is_hue(h, EXA_LIGHT_HUE) or v < MIN_EXA_LIGHT_VAL:
-            return detect_block_type(board, exa * BLOCK_SIZE, DETECT_HELD_Y)
+            return detect_block(board, exa * BLOCK_SIZE, DETECT_HELD_Y)
 
     return NOBLOCK