Skip to content

Commit

Permalink
Merge branch 'master' into kiki-lee-mid
Browse files Browse the repository at this point in the history
  • Loading branch information
kiki-lee authored Mar 26, 2024
2 parents c0f5bc6 + 4c83cb1 commit bb56572
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 3 deletions.
2 changes: 1 addition & 1 deletion docs/hardware/dbg.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

It's often needed to connect a SWD debugger to a board.

We found [Black Magic Probe](https://github.com/blacksphere/blackmagic/wiki) to work well,
We found [Black Magic Probe](https://github.com/blackmagic-debug/blackmagic) to work well,
for a variety of MCUs, and it doesn't require openocd.
You can use their beautifully made hardware, or flash an existing
board with Black Magic firmware.
Expand Down
10 changes: 10 additions & 0 deletions libs/hw---n3/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,14 @@ namespace config {
export const DISPLAY_CFG0 = 0x00000080
export const DISPLAY_CFG1 = 0x00000603
export const DISPLAY_CFG2 = 8

// mappng for big edge connector pins,
export const PIN_P0 = DAL.P0_2
export const PIN_P1 = DAL.P0_3
export const PIN_P2 = DAL.P0_4
}





4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "pxt-arcade",
"version": "1.13.57",
"version": "2.0.1",
"description": "Small arcade editor for MakeCode",
"keywords": [
"JavaScript",
Expand Down Expand Up @@ -32,7 +32,7 @@
},
"dependencies": {
"pxt-common-packages": "11.1.6",
"pxt-core": "9.3.15"
"pxt-core": "10.0.11"
},
"optionalDependencies": {
"pxt-arcade-sim": "microsoft/pxt-arcade-sim.git#v0.11.12"
Expand Down
6 changes: 6 additions & 0 deletions targetconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -404,6 +404,12 @@
"description": "Fly through the dangerous rooftops and ledges of New York City delivering messages!",
"highScoreMode": "None"
},
{
"id": "12407-17885-37645-48510",
"name": "Rhombus Rush!",
"description": "Test your skills in this fast-paced game of reflexes and timing! Levels designed by members of the MakeCode Forum!",
"highScoreMode": "None"
},
{
"id": "16040-59904-05312-47571",
"name": "NINJA",
Expand Down

0 comments on commit bb56572

Please sign in to comment.