Skip to content

Commit

Permalink
Merge pull request #32 from NordicSemiconductor/nrf54l15_0-3-0_defini…
Browse files Browse the repository at this point in the history
…tion

nRF54L15 v0.3.0 definition
  • Loading branch information
cybic authored Jan 31, 2024
2 parents e74681e + 7287703 commit 3ac1ff9
Show file tree
Hide file tree
Showing 2 changed files with 83 additions and 4 deletions.
69 changes: 69 additions & 0 deletions src/common/boards/nrf_PCA10156_0.3.0.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
{
"board": {
"boardVersion": "PCA10156",
"boardRevision": "0.3.0",
"boardName": "nRF54L15 PDK (hw rev. 0.3.0)"
},
"pins": [
{
"type": "vcom",
"id": "vcom0",
"name": "VCOM 0",
"enable": {
"pin": 42
},
"hwfc": {
"pin": 20
}
},
{
"type": "vcom",
"id": "vcom1",
"name": "VCOM 1",
"enable": {
"pin": 22
},
"hwfc": {
"pin": 23
}
},
{
"type": "slide",
"id": "ledcontrol",
"title": "LED Control",
"label": "LED Enable",
"enable": {
"pin": 45
},
"alternatives": ["GPIO", "LED"]
},
{
"type": "switch",
"id": "swd-control",
"title": "SWD Control",
"label": "Enable or disable the SWD connection between the IMCU and target chip. This can be done to e.g. use an external debugger.",
"enable": {
"pin": 6
}
}
],
"pmicPorts": [
{
"type": "voltage",
"port": 1,
"mVmin": 1800,
"mVmax": 3000
}
],
"defaults": {
"pins": [
[42, true],
[20, false],
[22, true],
[23, false],
[45, true],
[6, true]
],
"pmicPorts": [[1, 1800]]
}
}
18 changes: 14 additions & 4 deletions src/features/Configuration/Configuration.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ import BoardControllerConfigDefinition from '../../common/boards/BoardController
import nrf54h20json from '../../common/boards/nrf_PCA10145_54H20.json';
import nrf9161v091json from '../../common/boards/nrf_PCA10153_0.9.1_9161.json';
import nrf9161v0100json from '../../common/boards/nrf_PCA10153_0.10.0_9161.json';
import nrf54l15json from '../../common/boards/nrf_PCA10156_0.2.0.json';
import nrf54l15v020json from '../../common/boards/nrf_PCA10156_0.2.0.json';
import nrf54l15v030json from '../../common/boards/nrf_PCA10156_0.3.0.json';
import ConfigSlideSelector from '../ConfigSlideSelector/ConfigSlideSelector';
import ConfigSwitch from '../ConfigSwitch/ConfigSwitch';
import { getBoardRevisionSemver } from '../Device/deviceSlice';
Expand All @@ -34,7 +35,10 @@ const BoardController = ({ active }: BoardControllerProps) => {
const typednrf9161json =
nrf9161v0100json as BoardControllerConfigDefinition;
const typednrf9161v091 = nrf9161v091json as BoardControllerConfigDefinition;
const typednrf54l15json = nrf54l15json as BoardControllerConfigDefinition;
const typednrf54l15v020json =
nrf54l15v020json as BoardControllerConfigDefinition;
const typednrf54l15v030json =
nrf54l15v030json as BoardControllerConfigDefinition;
const typednrf54h20json = nrf54h20json as BoardControllerConfigDefinition;

const dispatch = useDispatch();
Expand All @@ -59,8 +63,14 @@ const BoardController = ({ active }: BoardControllerProps) => {
switch (device?.devkit?.boardVersion) {
case 'PCA10156':
// nRF54L15
setDefaultConfig(dispatch, typednrf54l15json);
return BuildGui(typednrf54l15json);
if (boardRevision === '0.3.0') {
setDefaultConfig(dispatch, typednrf54l15v030json);
return BuildGui(typednrf54l15v030json);
}

// Default is revision 0.2.0 or 0.2.1
setDefaultConfig(dispatch, typednrf54l15v020json);
return BuildGui(typednrf54l15v020json);

case 'PCA10153':
// nRF9161
Expand Down

0 comments on commit 3ac1ff9

Please sign in to comment.