Skip to content

Commit 0367ba7

Browse files
dhalbertdhalbert
committed
fix some typos and leftovers
1 parent 2a75196 commit 0367ba7

7 files changed

Lines changed: 11 additions & 117 deletions

File tree

‎locale/circuitpython.pot‎

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: PACKAGE VERSION\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2020-01-07 14:31-0800\n"
11+
"POT-Creation-Date: 2020-01-13 18:15-0500\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -513,21 +513,21 @@ msgstr ""
513513
msgid "Could not initialize UART"
514514
msgstr ""
515515

516-
#: shared-module/audiomp3/MP3File.c
516+
#: shared-module/audiomp3/MP3Decoder.c
517517
msgid "Couldn't allocate decoder"
518518
msgstr ""
519519

520520
#: shared-module/audiocore/WaveFile.c shared-module/audiomixer/Mixer.c
521-
#: shared-module/audiomp3/MP3File.c
521+
#: shared-module/audiomp3/MP3Decoder.c
522522
msgid "Couldn't allocate first buffer"
523523
msgstr ""
524524

525-
#: shared-module/audiomp3/MP3File.c
525+
#: shared-module/audiomp3/MP3Decoder.c
526526
msgid "Couldn't allocate input buffer"
527527
msgstr ""
528528

529529
#: shared-module/audiocore/WaveFile.c shared-module/audiomixer/Mixer.c
530-
#: shared-module/audiomp3/MP3File.c
530+
#: shared-module/audiomp3/MP3Decoder.c
531531
msgid "Couldn't allocate second buffer"
532532
msgstr ""
533533

@@ -620,7 +620,7 @@ msgstr ""
620620
msgid "Failed sending command."
621621
msgstr ""
622622

623-
#: ports/nrf/sd_mutex.c
623+
#: ports/nrf/sd.c ports/nrf/sd_mutex.c
624624
#, c-format
625625
msgid "Failed to acquire mutex, err 0x%04x"
626626
msgstr ""
@@ -643,11 +643,11 @@ msgstr ""
643643
msgid "Failed to connect: timeout"
644644
msgstr ""
645645

646-
#: shared-module/audiomp3/MP3File.c
646+
#: shared-module/audiomp3/MP3Decoder.c
647647
msgid "Failed to parse MP3 file"
648648
msgstr ""
649649

650-
#: ports/nrf/sd_mutex.c
650+
#: ports/nrf/sd.c ports/nrf/sd_mutex.c
651651
#, c-format
652652
msgid "Failed to release mutex, err 0x%04x"
653653
msgstr ""
@@ -660,10 +660,6 @@ msgstr ""
660660
msgid "File exists"
661661
msgstr ""
662662

663-
#: ports/nrf/common-hal/nvm/ByteArray.c
664-
msgid "Flash write failed"
665-
msgstr ""
666-
667663
#: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c
668664
msgid "Frequency captured is above capability. Capture Paused."
669665
msgstr ""
@@ -1776,7 +1772,7 @@ msgstr ""
17761772
msgid "extra positional arguments given"
17771773
msgstr ""
17781774

1779-
#: shared-bindings/audiocore/WaveFile.c shared-bindings/audiomp3/MP3File.c
1775+
#: shared-bindings/audiocore/WaveFile.c shared-bindings/audiomp3/MP3Decoder.c
17801776
#: shared-bindings/displayio/OnDiskBitmap.c
17811777
msgid "file must be a file opened in byte mode"
17821778
msgstr ""

‎ports/nrf/common-hal/_bleio/Connection.c‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,6 @@ bool connection_on_ble_evt(ble_evt_t *ble_evt, void *self_in) {
308308
} else {
309309
if (bonding_load_cccd_info(self->is_central, self->conn_handle, self->ediv)) {
310310
// Did an sd_ble_gatts_sys_attr_set() with the stored sys_attr values.
311-
// Not quite paired yet: wait for BLE_GAP_EVT_AUTH_STATUS with BLE_GAP_SEC_STATUS_SUCCESS.
312311
} else {
313312
// No matching bonding found, so use fresh system attributes.
314313
sd_ble_gatts_sys_attr_set(self->conn_handle, NULL, 0, 0);
@@ -553,7 +552,7 @@ STATIC void on_desc_discovery_rsp(ble_gattc_evt_desc_disc_rsp_t *response, bleio
553552
default:
554553
// TODO: sd_ble_gattc_descriptors_discover() can return things that are not descriptors,
555554
// so ignore those.
556-
// htts:p//devzone.nordicsemi.com/f/nordic-q-a/49500/sd_ble_gattc_descriptors_discover-is-returning-attributes-that-are-not-descriptors
555+
// https://devzone.nordicsemi.com/f/nordic-q-a/49500/sd_ble_gattc_descriptors_discover-is-returning-attributes-that-are-not-descriptors
557556
break;
558557
}
559558

‎ports/nrf/common-hal/_bleio/Connection.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ typedef struct {
6767
ble_gap_conn_params_t conn_params;
6868
volatile bool conn_params_updating;
6969
uint16_t mtu;
70+
// Request that CCCD values for this conenction be saved, using sys_attr values.
7071
volatile bool do_bond_cccds;
7172
// Request that security key info for this connection be saved.
7273
volatile bool do_bond_keys;

‎ports/nrf/mpconfigport.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
#define NRF5_MPCONFIGPORT_H__
3030

3131
#include "ble_drv.h"
32-
#include "common-hal/_bleio/bonding.h"
3332

3433
#include "nrf_mbr.h" // for MBR_SIZE
3534
#include "nrf_sdm.h" // for SD_FLASH_SIZE

‎ports/nrf/sd.c‎

Lines changed: 0 additions & 54 deletions
This file was deleted.

‎ports/nrf/sd.h‎

Lines changed: 0 additions & 46 deletions
This file was deleted.

‎tools/preprocess_frozen_modules.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ def copy_and_process(in_dir, out_dir):
4848
output_file_path = Path(out_dir, input_file_path.relative_to(in_dir))
4949

5050
if file.endswith(".py"):
51-
print(file)
5251
if not output_file_path.parent.exists():
5352
output_file_path.parent.mkdir(parents=True)
5453
with input_file_path.open("r") as input, output_file_path.open("w") as output:

0 commit comments

Comments
 (0)