Add feature conditionals and clean up

1 files changed, 52 insertions, 52 deletions

diff --git a/shared-bindings/board/__init__.c b/shared-bindings/board/__init__.c
index ccf9ec5ab..9107fc57f 100644
--- a/shared-bindings/board/__init__.c
+++ b/shared-bindings/board/__init__.c
@@ -46,23 +46,23 @@
 //|   Returns the `busio.I2C` object for the board designated SDA and SCL pins. It is a singleton.
 //|
 
-// #if BOARD_I2C
-// mp_obj_t board_i2c(void) {
-//     mp_obj_t singleton = common_hal_board_get_i2c();
-//     if (singleton != NULL) {
-//         return singleton;
-//     }
-//     assert_pin_free(DEFAULT_I2C_BUS_SDA);
-//     assert_pin_free(DEFAULT_I2C_BUS_SCL);
-//     return common_hal_board_create_i2c();
-// }
-// #else
-// mp_obj_t board_i2c(void) {
-//     mp_raise_NotImplementedError_varg(translate("No default %q bus"), MP_QSTR_I2C);
-//     return NULL;
-// }
-// #endif
-// MP_DEFINE_CONST_FUN_OBJ_0(board_i2c_obj, board_i2c);
+#if BOARD_I2C
+mp_obj_t board_i2c(void) {
+    mp_obj_t singleton = common_hal_board_get_i2c();
+    if (singleton != NULL) {
+        return singleton;
+    }
+    assert_pin_free(DEFAULT_I2C_BUS_SDA);
+    assert_pin_free(DEFAULT_I2C_BUS_SCL);
+    return common_hal_board_create_i2c();
+}
+#else
+mp_obj_t board_i2c(void) {
+    mp_raise_NotImplementedError_varg(translate("No default %q bus"), MP_QSTR_I2C);
+    return NULL;
+}
+#endif
+MP_DEFINE_CONST_FUN_OBJ_0(board_i2c_obj, board_i2c);
 
 
 // //| .. function:: SPI()
@@ -70,48 +70,48 @@
 // //|   Returns the `busio.SPI` object for the board designated SCK, MOSI and MISO pins. It is a
 // //|   singleton.
 // //|
-// #if BOARD_SPI
-// mp_obj_t board_spi(void) {
-//     mp_obj_t singleton = common_hal_board_get_spi();
-//     if (singleton != NULL) {
-//         return singleton;
-//     }
-//     assert_pin_free(DEFAULT_SPI_BUS_SCK);
-//     assert_pin_free(DEFAULT_SPI_BUS_MOSI);
-//     assert_pin_free(DEFAULT_SPI_BUS_MISO);
-//     return common_hal_board_create_spi();
-// }
-// #else
-// mp_obj_t board_spi(void) {
-//     mp_raise_NotImplementedError_varg(translate("No default %q bus"), MP_QSTR_SPI);
-//     return NULL;
-// }
-// #endif
-// MP_DEFINE_CONST_FUN_OBJ_0(board_spi_obj, board_spi);
+#if BOARD_SPI
+mp_obj_t board_spi(void) {
+    mp_obj_t singleton = common_hal_board_get_spi();
+    if (singleton != NULL) {
+        return singleton;
+    }
+    assert_pin_free(DEFAULT_SPI_BUS_SCK);
+    assert_pin_free(DEFAULT_SPI_BUS_MOSI);
+    assert_pin_free(DEFAULT_SPI_BUS_MISO);
+    return common_hal_board_create_spi();
+}
+#else
+mp_obj_t board_spi(void) {
+    mp_raise_NotImplementedError_varg(translate("No default %q bus"), MP_QSTR_SPI);
+    return NULL;
+}
+#endif
+MP_DEFINE_CONST_FUN_OBJ_0(board_spi_obj, board_spi);
 
 // //| .. function:: UART()
 // //|
 // //|   Returns the `busio.UART` object for the board designated TX and RX pins. It is a singleton.
 // //|
-// #if BOARD_UART
-// mp_obj_t board_uart(void) {
-//     mp_obj_t singleton = common_hal_board_get_uart();
-//     if (singleton != NULL) {
-//         return singleton;
-//     }
+#if BOARD_UART
+mp_obj_t board_uart(void) {
+    mp_obj_t singleton = common_hal_board_get_uart();
+    if (singleton != NULL) {
+        return singleton;
+    }
 
-//     assert_pin_free(DEFAULT_UART_BUS_RX);
-//     assert_pin_free(DEFAULT_UART_BUS_TX);
+    assert_pin_free(DEFAULT_UART_BUS_RX);
+    assert_pin_free(DEFAULT_UART_BUS_TX);
 
-//     return common_hal_board_create_uart();
-// }
-// #else
-// mp_obj_t board_uart(void) {
-//     mp_raise_NotImplementedError_varg(translate("No default %q bus"), MP_QSTR_SPI);
-//     return NULL;
-// }
-// #endif
-// MP_DEFINE_CONST_FUN_OBJ_0(board_uart_obj, board_uart);
+    return common_hal_board_create_uart();
+}
+#else
+mp_obj_t board_uart(void) {
+    mp_raise_NotImplementedError_varg(translate("No default %q bus"), MP_QSTR_SPI);
+    return NULL;
+}
+#endif
+MP_DEFINE_CONST_FUN_OBJ_0(board_uart_obj, board_uart);
 
 const mp_obj_module_t board_module = {
     .base = { &mp_type_module },