Skip to content

Commit 017cd6d

Browse files
authored
Fix warnings generated when running pytest (#1519)
1. @pytest.mark.slow is not defined 2. Unsupported escape sequence "\_" in comments (which also resulted in stray `\` characters in the PDF output) 3. Prevent test_sbp2json_unbuffered() from failing once and then passing the second time 4. A user warning is triggered whenever sbp.jit is imported, so remove it
1 parent 4556504 commit 017cd6d

File tree

24 files changed

+42
-84
lines changed

24 files changed

+42
-84
lines changed

c/include/libsbp/signing/MSG_AES_CMAC_SIGNATURE.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ typedef struct {
7070
u8 signature[SBP_MSG_AES_CMAC_SIGNATURE_SIGNATURE_MAX];
7171

7272
/**
73-
* Describes the format of the 'signed messages' field below.
73+
* Describes the format of the 'signed_messages' field.
7474
*/
7575
u8 flags;
7676

c/include/libsbp/signing/MSG_ECDSA_SIGNATURE.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ extern "C" {
4545
*/
4646
typedef struct {
4747
/**
48-
* Describes the format of the `signed\_messages` field below.
48+
* Describes the format of the 'signed_messages' field.
4949
*/
5050
u8 flags;
5151

c/include/libsbp/signing/MSG_ECDSA_SIGNATURE_DEP_A.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ extern "C" {
4444
*/
4545
typedef struct {
4646
/**
47-
* Describes the format of the `signed\_messages` field below.
47+
* Describes the format of the 'signed_messages' field.
4848
*/
4949
u8 flags;
5050

c/include/libsbp/signing/MSG_ECDSA_SIGNATURE_DEP_B.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ extern "C" {
4444
*/
4545
typedef struct {
4646
/**
47-
* Describes the format of the `signed\_messages` field below.
47+
* Describes the format of the 'signed_messages' field.
4848
*/
4949
u8 flags;
5050

docs/sbp.pdf

10.2 KB
Binary file not shown.

generator/sbpg/targets/latex.py

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -33,18 +33,6 @@ def no_us(value):
3333
pass
3434
return None
3535

36-
# Note, these reg exps will not replace the '^' character to allow
37-
# exponents in the units text field
38-
LATEX_SUBS_ALLOW_EXPONENTS = (
39-
(re.compile(r'\\'), r'\\textbackslash'),
40-
(re.compile(r'([{}_#%&$])'), r'\\\1'),
41-
(re.compile(r'~'), r'\~{}'),
42-
(re.compile(r'_'), r'_'),
43-
(re.compile(r'"'), r"''"),
44-
(re.compile(r'\.\.\.+'), r'\\ldots'),
45-
(re.compile(r'\n'), r'\\newline ')
46-
)
47-
4836
TEMPLATE_NAME = "sbp_messages_desc.tex"
4937

5038
LATEX_SUBS_MIN = (

generator/sbpg/targets/resources/sbp_messages_desc.tex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ \subsubsection{(((m.name | escape_tex ))) ((*- if m.is_real_message *)) --- ((('
6767
((*- for bf in f.bitfields *))
6868
\regfieldb{(((bf['desc'])))((* if 'vals' in bf *)) (\autoref{tab:(((m.name)))_(((f.name|nobrackets)))(((bf['range'])))})((* endif *))}{(((bf['len'])))}{(((bf['lsb'])))}
6969
((*- endfor *))
70-
\captionof{field}{(((f.desc))) (\texttt{(((f.name|removearray|escape_tex)))})}
70+
\captionof{field}{(((f.desc|escape_tex))) (\texttt{(((f.name|removearray|escape_tex)))})}
7171
\label{fld:(((m.name)))_(((f.name|nobrackets)))}
7272
\end{minipage}
7373
\hfill
@@ -157,7 +157,7 @@ \subsubsection*{(((m.name|escape_tex|no_us))) --- ((('0x%04X'|format(m.sbp_id)))
157157
((*- for bf in f.bitfields *))
158158
\regfieldb{(((bf['desc'])))((* if 'vals' in bf *)) (\autoref{tab:(((m.name)))_(((f.name|nobrackets)))(((bf['range'])))})((* endif *))}{(((bf['len'])))}{(((bf['lsb'])))}
159159
((*- endfor *))
160-
\captionof{field}{(((f.desc))) (\texttt{(((f.name|removearray|escape_tex)))})}
160+
\captionof{field}{(((f.desc|escape_tex))) (\texttt{(((f.name|removearray|escape_tex)))})}
161161
\label{fld:(((m.name)))_(((f.name|nobrackets)))}
162162
\end{minipage}
163163
\hfill

haskell/src/SwiftNav/SBP/Signing.hs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ data MsgAesCmacSignature = MsgAesCmacSignature
247247
, _msgAesCmacSignature_signature :: ![Word8]
248248
-- ^ Signature (CMAC tag value)
249249
, _msgAesCmacSignature_flags :: !Word8
250-
-- ^ Describes the format of the 'signed messages' field below.
250+
-- ^ Describes the format of the 'signed_messages' field.
251251
, _msgAesCmacSignature_signed_messages :: ![Word8]
252252
-- ^ CRCs of the messages covered by this signature. For Skylark, which
253253
-- delivers SBP messages wrapped in Swift's proprietary RTCM message,
@@ -286,7 +286,7 @@ msgEcdsaSignature = 0x0C08
286286
-- An ECDSA-256 signature using SHA-256 as the message digest algorithm.
287287
data MsgEcdsaSignature = MsgEcdsaSignature
288288
{ _msgEcdsaSignature_flags :: !Word8
289-
-- ^ Describes the format of the `signed\_messages` field below.
289+
-- ^ Describes the format of the 'signed_messages' field.
290290
, _msgEcdsaSignature_stream_counter :: !Word8
291291
-- ^ Signature message counter. Zero indexed and incremented with each
292292
-- signature message. The counter will not increment if this message was
@@ -340,7 +340,7 @@ msgEcdsaSignatureDepB = 0x0C07
340340
-- Deprecated.
341341
data MsgEcdsaSignatureDepB = MsgEcdsaSignatureDepB
342342
{ _msgEcdsaSignatureDepB_flags :: !Word8
343-
-- ^ Describes the format of the `signed\_messages` field below.
343+
-- ^ Describes the format of the 'signed_messages' field.
344344
, _msgEcdsaSignatureDepB_stream_counter :: !Word8
345345
-- ^ Signature message counter. Zero indexed and incremented with each
346346
-- signature message. The counter will not increment if this message was
@@ -401,7 +401,7 @@ msgEcdsaSignatureDepA = 0x0C06
401401
-- Deprecated.
402402
data MsgEcdsaSignatureDepA = MsgEcdsaSignatureDepA
403403
{ _msgEcdsaSignatureDepA_flags :: !Word8
404-
-- ^ Describes the format of the `signed\_messages` field below.
404+
-- ^ Describes the format of the 'signed_messages' field.
405405
, _msgEcdsaSignatureDepA_stream_counter :: !Word8
406406
-- ^ Signature message counter. Zero indexed and incremented with each
407407
-- signature message. The counter will not increment if this message was

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public class MsgAesCmacSignature extends SBPMessage {
5151
/** Signature (CMAC tag value) */
5252
public int[] signature;
5353

54-
/** Describes the format of the 'signed messages' field below. */
54+
/** Describes the format of the 'signed_messages' field. */
5555
public int flags;
5656

5757
/**

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. */
3434
public int flags;
3535

3636
/**

0 commit comments

Comments
 (0)