Skip to content

Commit f894ce2

Browse files
committed
Merge branch 'update-libsbp-build' into fix-python-warnings
2 parents 0bc4bf4 + 6312937 commit f894ce2

File tree

6 files changed

+12
-9
lines changed

6 files changed

+12
-9
lines changed

generator/sbpg/targets/latex.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -354,6 +354,9 @@ def render_source(output_dir, package_specs, version: ReleaseVersion):
354354
os.chdir(output_dir)
355355
if "TEXMFVAR" not in os.environ:
356356
os.environ["TEXMFVAR"] = "/tmp"
357+
# fix "dubious ownership in repository" error with git 2.35.2 and later
358+
subprocess.check_call(["git", "config", "--global", "--add",
359+
"safe-directory", ".."])
357360
subprocess.check_call(["pdflatex", "--enable-write18",
358361
"-shell-escape", "sbp_out.tex"])
359362
subprocess.check_call(["mv", "sbp_out.pdf", "../docs/sbp.pdf"])

java/src/com/swiftnav/sbp/signing/MsgEcdsaSignature.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
public class MsgEcdsaSignature extends SBPMessage {
3131
public static final int TYPE = 0x0C08;
3232

33-
/** Describes the format of the `signed_messages` field below. */
33+
/** Describes the format of the `signed\_messages` field below. */
3434
public int flags;
3535

3636
/**

java/src/com/swiftnav/sbp/signing/MsgEcdsaSignatureDepA.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
public class MsgEcdsaSignatureDepA extends SBPMessage {
3131
public static final int TYPE = 0x0C06;
3232

33-
/** Describes the format of the `signed_messages` field below. */
33+
/** Describes the format of the `signed\_messages` field below. */
3434
public int flags;
3535

3636
/**

java/src/com/swiftnav/sbp/signing/MsgEcdsaSignatureDepB.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
public class MsgEcdsaSignatureDepB extends SBPMessage {
3131
public static final int TYPE = 0x0C07;
3232

33-
/** Describes the format of the `signed_messages` field below. */
33+
/** Describes the format of the `signed\_messages` field below. */
3434
public int flags;
3535

3636
/**

javascript/sbp/signing.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ MsgAesCmacSignature.prototype.fieldSpec.push(['signed_messages', 'array', 'write
281281
* An ECDSA-256 signature using SHA-256 as the message digest algorithm.
282282
*
283283
* Fields in the SBP payload (`sbp.payload`):
284-
* @field flags number (unsigned 8-bit int, 1 byte) Describes the format of the `signed_messages` field below.
284+
* @field flags number (unsigned 8-bit int, 1 byte) Describes the format of the `signed\_messages` field below.
285285
* @field stream_counter number (unsigned 8-bit int, 1 byte) Signature message counter. Zero indexed and incremented with each signature
286286
* message. The counter will not increment if this message was in response to an
287287
* on demand request. The counter will roll over after 256 messages. Upon
@@ -333,7 +333,7 @@ MsgEcdsaSignature.prototype.fieldSpec.push(['signed_messages', 'array', 'writeUI
333333
* Deprecated.
334334
*
335335
* Fields in the SBP payload (`sbp.payload`):
336-
* @field flags number (unsigned 8-bit int, 1 byte) Describes the format of the `signed_messages` field below.
336+
* @field flags number (unsigned 8-bit int, 1 byte) Describes the format of the `signed\_messages` field below.
337337
* @field stream_counter number (unsigned 8-bit int, 1 byte) Signature message counter. Zero indexed and incremented with each signature
338338
* message. The counter will not increment if this message was in response to an
339339
* on demand request. The counter will roll over after 256 messages. Upon
@@ -390,7 +390,7 @@ MsgEcdsaSignatureDepB.prototype.fieldSpec.push(['signed_messages', 'array', 'wri
390390
* Deprecated.
391391
*
392392
* Fields in the SBP payload (`sbp.payload`):
393-
* @field flags number (unsigned 8-bit int, 1 byte) Describes the format of the `signed_messages` field below.
393+
* @field flags number (unsigned 8-bit int, 1 byte) Describes the format of the `signed\_messages` field below.
394394
* @field stream_counter number (unsigned 8-bit int, 1 byte) Signature message counter. Zero indexed and incremented with each signature
395395
* message. The counter will not increment if this message was in response to an
396396
* on demand request. The counter will roll over after 256 messages. Upon

rust/sbp/src/messages/signing.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -649,7 +649,7 @@ pub mod msg_ecdsa_signature {
649649
/// The message sender_id
650650
#[cfg_attr(feature = "serde", serde(skip_serializing, alias = "sender"))]
651651
pub sender_id: Option<u16>,
652-
/// Describes the format of the `signed_messages` field below.
652+
/// Describes the format of the `signed\_messages` field below.
653653
#[cfg_attr(feature = "serde", serde(rename = "flags"))]
654654
pub flags: u8,
655655
/// Signature message counter. Zero indexed and incremented with each
@@ -825,7 +825,7 @@ pub mod msg_ecdsa_signature_dep_a {
825825
/// The message sender_id
826826
#[cfg_attr(feature = "serde", serde(skip_serializing, alias = "sender"))]
827827
pub sender_id: Option<u16>,
828-
/// Describes the format of the `signed_messages` field below.
828+
/// Describes the format of the `signed\_messages` field below.
829829
#[cfg_attr(feature = "serde", serde(rename = "flags"))]
830830
pub flags: u8,
831831
/// Signature message counter. Zero indexed and incremented with each
@@ -1001,7 +1001,7 @@ pub mod msg_ecdsa_signature_dep_b {
10011001
/// The message sender_id
10021002
#[cfg_attr(feature = "serde", serde(skip_serializing, alias = "sender"))]
10031003
pub sender_id: Option<u16>,
1004-
/// Describes the format of the `signed_messages` field below.
1004+
/// Describes the format of the `signed\_messages` field below.
10051005
#[cfg_attr(feature = "serde", serde(rename = "flags"))]
10061006
pub flags: u8,
10071007
/// Signature message counter. Zero indexed and incremented with each

0 commit comments

Comments
 (0)