Skip to content

Commit

Permalink
upd
Browse files Browse the repository at this point in the history
  • Loading branch information
@PTALTS-LK
PTALTS-LK committed Jan 27, 2024
1 parent 402cf56 commit 7f53ff2
Show file tree
Hide file tree
Showing 6 changed files with 89 additions and 176 deletions.
8 changes: 3 additions & 5 deletions RKD/boards/RKD/board.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,12 @@
],
"docs": "",
"features": [
"Breadboard friendly",
"Castellated Pads",
"Micro USB"
"USB-C"
],
"id": "RKD",
"mcu": "rp2040",
"product": "RKD",
"thumbnail": "",
"url": "https://github.com/PCX-LK",
"vendor": "PCX-LK"
"url": "https://github.com/PTALTS-LK",
"vendor": "PTALTS-LK"
}
6 changes: 6 additions & 0 deletions RKD/boards/RKD/mpconfigboard.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,11 @@
#define MICROPY_HW_BOARD_NAME "RKD"
#define MICROPY_HW_FLASH_STORAGE_BYTES (3 * 1024 * 1024)

#define MICROPY_HW_USB_VID (0x0)
#define MICROPY_HW_USB_PID (0x4a0)

// Enable USB Mass Storage with FatFS filesystem.
#define MICROPY_HW_USB_MSC (1)
#define MICROPY_HW_USB_MSC_INQUIRY_VENDOR_STRING "PTALTS-LK"
#define MICROPY_HW_USB_MSC_INQUIRY_PRODUCT_STRING "RKD-MPY"
#define MICROPY_HW_USB_MSC_INQUIRY_REVISION_STRING "1.0"
1 change: 1 addition & 0 deletions RKD/boards/RKD/pins.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
LED,GPIO2
67 changes: 67 additions & 0 deletions RKD/help.c
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
/*
* This file is part of the MicroPython project, http://micropython.org/
*
* The MIT License (MIT)
*
* Copyright (c) 2023 Damien P. George
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/

#include "py/builtin.h"

const char rp2_help_text[] =
"Welcome to MicroPython!\n"
"\n"
"For online docs please visit http://docs.micropython.org/\n"
"\n"
"For access to the hardware use the 'machine' module. RP2 specific commands\n"
"are in the 'rp2' module.\n"
"\n"
"Quick overview of some objects:\n"
" machine.Pin(pin) -- get a pin, eg machine.Pin(0)\n"
" machine.Pin(pin, m, [p]) -- get a pin and configure it for IO mode m, pull mode p\n"
" methods: init(..), value([v]), high(), low(), irq(handler)\n"
" machine.ADC(pin) -- make an analog object from a pin\n"
" methods: read_u16()\n"
" machine.PWM(pin) -- make a PWM object from a pin\n"
" methods: deinit(), freq([f]), duty_u16([d]), duty_ns([d])\n"
" machine.I2C(id) -- create an I2C object (id=0,1)\n"
" methods: readfrom(addr, buf, stop=True), writeto(addr, buf, stop=True)\n"
" readfrom_mem(addr, memaddr, arg), writeto_mem(addr, memaddr, arg)\n"
" machine.SPI(id, baudrate=1000000) -- create an SPI object (id=0,1)\n"
" methods: read(nbytes, write=0x00), write(buf), write_readinto(wr_buf, rd_buf)\n"
" machine.Timer(freq, callback) -- create a software timer object\n"
" eg: machine.Timer(freq=1, callback=lambda t:print(t))\n"
"\n"
"Pins are numbered 0-29, and 26-29 have ADC capabilities\n"
"Pin IO modes are: Pin.IN, Pin.OUT, Pin.ALT\n"
"Pin pull modes are: Pin.PULL_UP, Pin.PULL_DOWN\n"
"\n"
"Useful control commands:\n"
" CTRL-C -- interrupt a running program\n"
" CTRL-D -- on a blank line, do a soft reset of the board\n"
" CTRL-E -- on a blank line, enter paste mode\n"
"\n"
"For further help on a specific object, type help(obj)\n"
"For a list of available modules, type help('modules')\n"
"MicroPython for RKD\n"
"Ported by PTALTS-LK\n"
"https://github.com/PTALTS-LK/RKD\n"
;
56 changes: 12 additions & 44 deletions RKD/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
#include "shared/readline/readline.h"
#include "shared/runtime/gchelper.h"
#include "shared/runtime/pyexec.h"
#include "shared/runtime/softtimer.h"
#include "tusb.h"
#include "uart.h"
#include "modmachine.h"
Expand Down Expand Up @@ -72,6 +73,9 @@ bi_decl(bi_program_feature_group_with_flags(BINARY_INFO_TAG_MICROPYTHON,
BI_NAMED_GROUP_SEPARATE_COMMAS | BI_NAMED_GROUP_SORT_ALPHA));

int main(int argc, char **argv) {
// This is a tickless port, interrupts should always trigger SEV.
SCB->SCR |= SCB_SCR_SEVONPEND_Msk;

#if MICROPY_HW_ENABLE_UART_REPL
bi_decl(bi_program_feature("UART REPL"))
setup_default_uart();
Expand Down Expand Up @@ -106,6 +110,7 @@ int main(int argc, char **argv) {
};
rtc_init();
rtc_set_datetime(&t);
mp_hal_time_ns_set_from_rtc();

// Initialise stack extents and GC heap.
mp_stack_set_top(&__StackTop);
Expand All @@ -122,7 +127,7 @@ int main(int argc, char **argv) {
#endif
#endif

#if MICROPY_PY_NETWORK_CYW43
#if MICROPY_PY_NETWORK_CYW43 || MICROPY_PY_BLUETOOTH_CYW43
{
cyw43_init(&cyw43_state);
cyw43_irq_init();
Expand Down Expand Up @@ -154,6 +159,7 @@ int main(int argc, char **argv) {
readline_init0();
machine_pin_init();
rp2_pio_init();
rp2_dma_init();
machine_i2s_init0();

#if MICROPY_PY_BLUETOOTH
Expand All @@ -178,7 +184,7 @@ int main(int argc, char **argv) {
if (ret & PYEXEC_FORCED_EXIT) {
goto soft_reset_exit;
}
if (pyexec_mode_kind == PYEXEC_MODE_FRIENDLY_REPL) {
if (pyexec_mode_kind == PYEXEC_MODE_FRIENDLY_REPL && ret != 0) {
ret = pyexec_file_if_exists("main.py");
if (ret & PYEXEC_FORCED_EXIT) {
goto soft_reset_exit;
Expand All @@ -198,18 +204,21 @@ int main(int argc, char **argv) {
}

soft_reset_exit:
mp_printf(MP_PYTHON_PRINTER, "MPY: soft reboot\n");
mp_printf(MP_PYTHON_PRINTER, "MPY: soft reboot（软重启）\n");
#if MICROPY_PY_NETWORK
mod_network_deinit();
#endif
rp2_dma_deinit();
rp2_pio_deinit();
#if MICROPY_PY_BLUETOOTH
mp_bluetooth_deinit();
#endif
machine_pwm_deinit_all();
machine_pin_deinit();
#if MICROPY_PY_THREAD
mp_thread_deinit();
#endif
soft_timer_deinit();
gc_sweep_all();
mp_deinit();
}
Expand Down Expand Up @@ -259,44 +268,3 @@ uint32_t rosc_random_u32(void) {
}
return value;
}

const char rp2_help_text[] =
"Welcome to MicroPython!\n"
"\n"
"For online help please visit https://micropython.org/help/.\n"
"\n"
"For access to the hardware use the 'machine' module. RP2 specific commands\n"
"are in the 'rp2' module.\n"
"\n"
"Quick overview of some objects:\n"
" machine.Pin(pin) -- get a pin, eg machine.Pin(0)\n"
" machine.Pin(pin, m, [p]) -- get a pin and configure it for IO mode m, pull mode p\n"
" methods: init(..), value([v]), high(), low(), irq(handler)\n"
" machine.ADC(pin) -- make an analog object from a pin\n"
" methods: read_u16()\n"
" machine.PWM(pin) -- make a PWM object from a pin\n"
" methods: deinit(), freq([f]), duty_u16([d]), duty_ns([d])\n"
" machine.I2C(id) -- create an I2C object (id=0,1)\n"
" methods: readfrom(addr, buf, stop=True), writeto(addr, buf, stop=True)\n"
" readfrom_mem(addr, memaddr, arg), writeto_mem(addr, memaddr, arg)\n"
" machine.SPI(id, baudrate=1000000) -- create an SPI object (id=0,1)\n"
" methods: read(nbytes, write=0x00), write(buf), write_readinto(wr_buf, rd_buf)\n"
" machine.Timer(freq, callback) -- create a software timer object\n"
" eg: machine.Timer(freq=1, callback=lambda t:print(t))\n"
"\n"
"Pins are numbered 0-29, and 26-29 have ADC capabilities\n"
"Pin IO modes are: Pin.IN, Pin.OUT, Pin.ALT\n"
"Pin pull modes are: Pin.PULL_UP, Pin.PULL_DOWN\n"
"\n"
"Useful control commands:\n"
" CTRL-C -- interrupt a running program\n"
" CTRL-D -- on a blank line, do a soft reset of the board\n"
" CTRL-E -- on a blank line, enter paste mode\n"
"\n"
"For further help on a specific object, type help(obj)\n"
"For a list of available modules, type help('modules')\n"
"\n"
"MicroPython for RKD\n"
"Ported by PCX-LK\n"
"https://github.com/PCX-LK/RKD\n"
;
127 changes: 0 additions & 127 deletions RKD/msc_disk.c
View file

This file was deleted.

0 comments on commit 7f53ff2

Please sign in to comment.