Skip to content
This repository was archived by the owner on Jan 17, 2023. It is now read-only.

--sd-id param added to *pkg generate* #64

Merged
merged 7 commits into from
Jun 29, 2017
Merged

--sd-id param added to *pkg generate* #64

merged 7 commits into from
Jun 29, 2017

Conversation

philips77
Copy link
Member

The new parameter allows to specify required SD_REQ for SD(+BL) update and App update if they are in the same ZIP file and are to be sent in 2 connections. The second update with and App will require the ID ot the just-flashed SD, not the one that was before the first update.

@mrodem mrodem requested review from SimenN and removed request for SimenN June 2, 2017 07:46
Copy link
Contributor

@mrodem mrodem left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry for taking so long to respond to this PR.

@@ -380,7 +380,13 @@ def pkg():
'\n|s132_nrf52_3.0.0|0x8C|'
'\n|s132_nrf52_3.1.0|0x91|'
'\n|s132_nrf52_4.0.0|0x95|'
'\n|s132_nrf52_4.0.2|0x98|',
'\n|s132_nrf52_4.0.2|0x98|'
'\n|s140_nrf52840_5.0.0-2.alpha|0x96|',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is also 5.0.0-1.alpha and 5.0.0-3.alpha. Should those be added as well?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Must also remember to update README.md with the new SD versions.

@@ -152,6 +155,9 @@ def __init__(self,
filename=app_fw,
init_packet_data=init_packet_vars)

if sd_req is not None:
init_packet_vars[PacketField.REQUIRED_SOFTDEVICES_ARRAY] = sd_req
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On line 148, init_packet_vars[PacketField.REQUIRED_SOFTDEVICES_ARRAY] might have already been set to sd_id. This would overwrite that.

If the same init packet field is being used for both --sd-req and --sd-id, then why do we need --sd-id? Couldn't we just use --sd-req?

Copy link
Contributor

@mrodem mrodem Jun 2, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, I thought init_packet_vars was the final init packet, but I see now that init_packet_vars is just a temporary variable. The init_packet_vars is mutated with different softdevice requirements between each call to __add_firmware_info(). Then it makes sense.

@@ -37,4 +37,4 @@

""" Version definition for nrfutil. """

NRFUTIL_VERSION = "2.2.0"
NRFUTIL_VERSION = "2.3.0"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

2.3.0 has now been released, so this should be bumped to 2.4.0. There is also a merge conflict that needs to be resolved.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants