Skip to content

Commit 68cb384

Browse files
hierophecthierophect
committed
Remove logging from shared-bindings, fix translations, revert config target macro
1 parent f90eb23 commit 68cb384

7 files changed

Lines changed: 9 additions & 19 deletions

File tree

‎locale/circuitpython.pot‎

Lines changed: 9 additions & 5 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-10-05 12:59-0400\n"
11+
"POT-Creation-Date: 2020-10-06 13:26-0400\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"
@@ -271,6 +271,10 @@ msgstr ""
271271
msgid "A hardware interrupt channel is already in use"
272272
msgstr ""
273273

274+
#: ports/esp32s2/common-hal/analogio/AnalogIn.c
275+
msgid "ADC2 is being used by WiFi"
276+
msgstr ""
277+
274278
#: shared-bindings/_bleio/Address.c shared-bindings/ipaddress/IPv4Address.c
275279
#, c-format
276280
msgid "Address must be %d bytes long"
@@ -1225,6 +1229,7 @@ msgid "No CCCD for this Characteristic"
12251229
msgstr ""
12261230

12271231
#: ports/atmel-samd/common-hal/analogio/AnalogOut.c
1232+
#: ports/esp32s2/common-hal/analogio/AnalogOut.c
12281233
#: ports/stm/common-hal/analogio/AnalogOut.c
12291234
msgid "No DAC on chip"
12301235
msgstr ""
@@ -1421,6 +1426,7 @@ msgstr ""
14211426

14221427
#: ports/atmel-samd/common-hal/analogio/AnalogIn.c
14231428
#: ports/cxd56/common-hal/analogio/AnalogIn.c
1429+
#: ports/esp32s2/common-hal/analogio/AnalogIn.c
14241430
#: ports/mimxrt10xx/common-hal/analogio/AnalogIn.c
14251431
#: ports/nrf/common-hal/analogio/AnalogIn.c
14261432
#: ports/stm/common-hal/analogio/AnalogIn.c
@@ -1482,10 +1488,6 @@ msgstr ""
14821488
msgid "Pull not used when direction is output."
14831489
msgstr ""
14841490

1485-
#: ports/stm/ref/pulseout-pre-timeralloc.c
1486-
msgid "PulseOut not supported on this chip"
1487-
msgstr ""
1488-
14891491
#: ports/stm/common-hal/os/__init__.c
14901492
msgid "RNG DeInit Error"
14911493
msgstr ""
@@ -3148,13 +3150,15 @@ msgstr ""
31483150
msgid "pow() with 3 arguments requires integers"
31493151
msgstr ""
31503152

3153+
#: ports/esp32s2/boards/adafruit_metro_esp32s2/mpconfigboard.h
31513154
#: ports/esp32s2/boards/electroniccats_bastwifi/mpconfigboard.h
31523155
#: ports/esp32s2/boards/espressif_kaluga_1/mpconfigboard.h
31533156
#: ports/esp32s2/boards/espressif_saola_1_wroom/mpconfigboard.h
31543157
#: ports/esp32s2/boards/espressif_saola_1_wrover/mpconfigboard.h
31553158
#: ports/esp32s2/boards/microdev_micro_s2/mpconfigboard.h
31563159
#: ports/esp32s2/boards/muselab_nanoesp32_s2/mpconfigboard.h
31573160
#: ports/esp32s2/boards/unexpectedmaker_feathers2/mpconfigboard.h
3161+
#: ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.h
31583162
msgid "pressing boot button at start up.\n"
31593163
msgstr ""
31603164

‎ports/esp32s2/common-hal/socketpool/Socket.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
#include "common-hal/ssl/SSLContext.h"
3434

3535
#include "components/esp-tls/esp_tls.h"
36-
#include "components/log/include/esp_log.h"
3736

3837
typedef struct {
3938
mp_obj_base_t base;

‎ports/esp32s2/common-hal/wifi/ScannedNetworks.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
#include "freertos/event_groups.h"
3737

3838
#include "components/esp_wifi/include/esp_wifi_types.h"
39-
#include "components/log/include/esp_log.h"
4039

4140
typedef struct {
4241
mp_obj_base_t base;

‎ports/esp32s2/mpconfigport.h‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,6 @@
3636

3737
#include "py/circuitpy_mpconfig.h"
3838

39-
// ESP-IDF leaves this undefined but uses it everywhere.
40-
// Defining it will reduce chance of undef errors.
41-
#define CONFIG_IDF_TARGET_ESP32 (0)
4239

4340
#define MICROPY_PORT_ROOT_POINTERS \
4441
CIRCUITPY_COMMON_ROOT_POINTERS

‎shared-bindings/socketpool/Socket.c‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@
3636
#include "py/runtime.h"
3737
#include "py/mperrno.h"
3838

39-
static const char* TAG = "socket binding";
40-
4139
//| class Socket:
4240
//| """TCP, UDP and RAW socket. Cannot be created directly. Instead, call
4341
//| `SocketPool.socket()`.
@@ -182,7 +180,6 @@ STATIC mp_obj_t socketpool_socket_connect(mp_obj_t self_in, mp_obj_t addr_in) {
182180

183181
bool ok = common_hal_socketpool_socket_connect(self, host, hostlen, port);
184182
if (!ok) {
185-
ESP_EARLY_LOGW(TAG, "socket connect failed");
186183
mp_raise_OSError(0);
187184
}
188185

‎shared-bindings/socketpool/SocketPool.c‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@
3737
#include "shared-bindings/socketpool/Socket.h"
3838
#include "shared-bindings/socketpool/SocketPool.h"
3939

40-
static const char* TAG = "socketpool binding";
41-
4240
//| class SocketPool:
4341
//| """A pool of socket resources available for the given radio. Only one
4442
//| SocketPool can be created for each radio.
@@ -121,7 +119,6 @@ STATIC mp_obj_t socketpool_socketpool_getaddrinfo(size_t n_args, const mp_obj_t
121119
}
122120

123121
if (ip_str == mp_const_none) {
124-
ESP_EARLY_LOGW(TAG, "no ip str");
125122
mp_raise_OSError(0);
126123
}
127124

‎shared-bindings/wifi/ScannedNetworks.c‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@
3232
#include "py/runtime.h"
3333
#include "shared-bindings/wifi/ScannedNetworks.h"
3434

35-
static const char *TAG = "cp iternext";
36-
3735
//| class ScannedNetworks:
3836
//| """Iterates over all `wifi.Network` objects found while scanning. This object is always created
3937
//| by a `wifi.Radio`: it has no user-visible constructor."""
@@ -46,7 +44,6 @@ STATIC mp_obj_t scannednetworks_iternext(mp_obj_t self_in) {
4644
return network;
4745
}
4846

49-
ESP_EARLY_LOGI(TAG, "stop iteration");
5047
return MP_OBJ_STOP_ITERATION;
5148
}
5249

0 commit comments

Comments
 (0)