Skip to content

Commit 0467a82

Browse files
hierophecthierophect
committed
Fix/remove various style issues
1 parent a8dfae5 commit 0467a82

5 files changed

Lines changed: 4 additions & 14 deletions

File tree

‎locale/circuitpython.pot‎

Lines changed: 1 addition & 1 deletion
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-01 17:17-0400\n"
11+
"POT-Creation-Date: 2020-10-05 12:59-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"

‎ports/esp32s2/common-hal/analogio/AnalogIn.h‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,4 @@ typedef struct {
3939
const mcu_pin_obj_t * pin;
4040
} analogio_analogin_obj_t;
4141

42-
static inline uint8_t stm32_adc_units(uint8_t adc_packed) {
43-
return adc_packed >> 5;
44-
}
45-
46-
static inline uint8_t stm32_adc_channel(uint8_t adc_packed) {
47-
return adc_packed & 0x1f;
48-
}
49-
5042
#endif // MICROPY_INCLUDED_ESP32S2_COMMON_HAL_ANALOGIO_ANALOGIN_H

‎ports/esp32s2/common-hal/analogio/AnalogOut.c‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939

4040
void common_hal_analogio_analogout_construct(analogio_analogout_obj_t* self,
4141
const mcu_pin_obj_t *pin) {
42-
//mp_raise_ValueError(translate("No DAC on chip"));
42+
mp_raise_NotImplementedError(translate("No DAC on chip"));
4343
}
4444

4545
bool common_hal_analogio_analogout_deinited(analogio_analogout_obj_t *self) {
@@ -52,7 +52,6 @@ void common_hal_analogio_analogout_deinit(analogio_analogout_obj_t *self) {
5252

5353
void common_hal_analogio_analogout_set_value(analogio_analogout_obj_t *self,
5454
uint16_t value) {
55-
5655
}
5756

5857
void analogout_reset(void) {

‎ports/esp32s2/common-hal/analogio/AnalogOut.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
* THE SOFTWARE.
2626
*/
2727

28-
#ifndef MICROPY_INCLUDED_STM32F4_COMMON_HAL_ANALOGIO_ANALOGOUT_H
29-
#define MICROPY_INCLUDED_STM32F4_COMMON_HAL_ANALOGIO_ANALOGOUT_H
28+
#ifndef MICROPY_INCLUDED_ESP32S2_COMMON_HAL_ANALOGIO_ANALOGOUT_H
29+
#define MICROPY_INCLUDED_ESP32S2_COMMON_HAL_ANALOGIO_ANALOGOUT_H
3030

3131
#include "common-hal/microcontroller/Pin.h"
3232

‎ports/esp32s2/mpconfigport.mk‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ USB_SERIAL_NUMBER_LENGTH = 12
1313
LONGINT_IMPL = MPZ
1414

1515
# These modules are implemented in ports/<port>/common-hal:
16-
# CIRCUITPY_ANALOGIO = 0
1716
CIRCUITPY_FULL_BUILD = 1
1817
CIRCUITPY_AUDIOBUSIO = 0
1918
CIRCUITPY_AUDIOIO = 0

0 commit comments

Comments
 (0)