Merge pull request #9273 from bill88t/cardputer_gripes

Some cardputer definition improvements

Author: dhalbert

ports/espressif/boards/m5stack_cardputer/mpconfigboard.h

@@ -8,7 +8,7 @@
 
 // Micropython setup
 
-#define MICROPY_HW_BOARD_NAME       "M5 Stack Cardputer"
+#define MICROPY_HW_BOARD_NAME       "M5Stack Cardputer"
 #define MICROPY_HW_MCU_NAME         "ESP32S3"
 
 #define MICROPY_HW_NEOPIXEL (&pin_GPIO21)

ports/espressif/boards/m5stack_cardputer/mpconfigboard.mk

@@ -1,6 +1,6 @@
 USB_VID = 0x303A
 USB_PID = 0x81DA
-USB_PRODUCT = "M5STACK Cardputer - CircuitPython"
+USB_PRODUCT = "M5Stack Cardputer - CircuitPython"
 USB_MANUFACTURER = "M5STACK"
 
 IDF_TARGET = esp32s3
@@ -11,3 +11,4 @@ CIRCUITPY_ESP_FLASH_SIZE = 8MB
 CIRCUITPY_ESPCAMERA = 0
 
 CIRCUITPY_GIFIO = 1
+CIRCUITPY_MAX3421E = 0

ports/espressif/boards/m5stack_cardputer/pins.c

@@ -15,9 +15,11 @@ static const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO1) },
     { MP_ROM_QSTR(MP_QSTR_PORTA1), MP_ROM_PTR(&pin_GPIO1) },
     { MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_GPIO1) },
+    { MP_ROM_QSTR(MP_QSTR_G1), MP_ROM_PTR(&pin_GPIO1) },
     { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO2) },
     { MP_ROM_QSTR(MP_QSTR_PORTA2), MP_ROM_PTR(&pin_GPIO2) },
     { MP_ROM_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_GPIO2) },
+    { MP_ROM_QSTR(MP_QSTR_G2), MP_ROM_PTR(&pin_GPIO2) },
 
     // Keyboard
     { MP_ROM_QSTR(MP_QSTR_KB_COL_0), MP_ROM_PTR(&pin_GPIO13) },

ports/espressif/boards/m5stack_cardputer/sdkconfig

@@ -7,7 +7,7 @@
 #
 # LWIP
 #
-CONFIG_LWIP_LOCAL_HOSTNAME="espressif-esp32s3"
+CONFIG_LWIP_LOCAL_HOSTNAME="m5stack-cardputer"
 # end of LWIP
 
 # end of Component config