-if platform is not None:
-    if platform == "esp8266":
-        board = "huzzah"
-    elif platform == "Atmel SAMD21":
-        board="feather_m0_express"
-    elif platform == "pyboard":
-        platform="STM32F405RG"
-        board="pyboard"
-else:
-    board = None
+board = None
+if microcontroller is not None:
+    if microcontroller == "esp8266": # TODO more conservative board-guessing
+        board = "feather_huzzah"
+    elif microcontroller == "samd21":
+        board = "feather_m0_express"
+    elif microcontroller == "pyboard":
+        microcontroller = "stm32"
+        board = "pyboard"