Changes

picoscratch · Dec 1, 2024 · 63ee2f0 · 63ee2f0
1 parent 1b89c50
commit 63ee2f0
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/ports/rp2/boards/RPI_PICO_W/mpconfigboard.h b/ports/rp2/boards/RPI_PICO_W/mpconfigboard.h
@@ -1,12 +1,12 @@
 // Board and hardware specific configuration
-#define MICROPY_HW_BOARD_NAME                   "Raspberry Pi Pico W"
+#define MICROPY_HW_BOARD_NAME                   "PicoScratch MINT (pre-production)"
 
 // todo: We need something to check our binary size
 #define MICROPY_HW_FLASH_STORAGE_BYTES          (848 * 1024)
 
 // Enable networking.
 #define MICROPY_PY_NETWORK 1
-#define MICROPY_PY_NETWORK_HOSTNAME_DEFAULT     "PicoW"
+#define MICROPY_PY_NETWORK_HOSTNAME_DEFAULT     "picoscratchmint"
 
 // CYW43 driver configuration.
 #define CYW43_USE_SPI (1)

diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
@@ -108,7 +108,7 @@
 
 // Fine control over Python builtins, classes, modules, etc
 #define MICROPY_PY_BUILTINS_HELP_TEXT           rp2_help_text
-#define MICROPY_PY_SYS_PLATFORM                 "rp2"
+#define MICROPY_PY_SYS_PLATFORM                 "mint"
 #ifndef MICROPY_PY_THREAD
 #define MICROPY_PY_THREAD                       (1)
 #define MICROPY_PY_THREAD_GIL                   (0)
@@ -209,7 +209,7 @@
 #define MICROPY_PY_WEBSOCKET            (1)
 #endif
 #ifndef MICROPY_PY_WEBREPL
-#define MICROPY_PY_WEBREPL              (1)
+#define MICROPY_PY_WEBREPL              (0)
 #endif
 #endif
 
@@ -268,7 +268,7 @@ extern const struct _mp_obj_type_t mod_network_nic_type_wiznet5k;
 #define MICROPY_HW_USB_VID (0x2E8A) // Raspberry Pi
 #endif
 #ifndef MICROPY_HW_USB_PID
-#define MICROPY_HW_USB_PID (0x0005) // RP2 MicroPython
+#define MICROPY_HW_USB_PID (0x10B9) // PicoScratch MINT
 #endif
 
 #ifndef MICROPY_HW_BOOTSEL_DELAY_US
@@ -314,3 +314,7 @@ extern void lwip_lock_release(void);
 #ifndef MICROPY_BOARD_END_SOFT_RESET
 #define MICROPY_BOARD_END_SOFT_RESET()
 #endif
+
+#define MICROPY_HW_USB_MANUFACTURER_STRING "PicoScratch"
+#define MICROPY_HW_USB_PRODUCT_FS_STRING "MINT"
+#define MICROPY_HW_USB_MSC_INQUIRY_VENDOR_STRING "PicoScratch"
diff --git a/py/makeversionhdr.py b/py/makeversionhdr.py
@@ -31,7 +31,7 @@ def get_version_info_from_git(repo_path):
     # Note: git describe doesn't work if no tag is available
     try:
         git_tag = subprocess.check_output(
-            ["git", "describe", "--tags", "--dirty", "--always", "--match", "v[1-9].*"],
+            ["git", "describe", "--tags", "--always", "--match", "v[1-9].*"],
             cwd=repo_path,
             stderr=subprocess.STDOUT,
             universal_newlines=True,