8000 Move analogReadTemp() to C++-only (#1097) · dyno-project/arduino-pico@94abf9d · GitHub
[go: up one dir, main page]
Skip to content

Commit 94abf9d

Browse files
earlephilhowerearlephilhower
authored
Move analogReadTemp() to C++-only (earlephilhower#1097)
Now that we have a default parameter, need to only allow it in C++ since default values are not part of C spec. Should not affect any users since only legacy code is in C.
1 parent 7a42441 commit 94abf9d

File tree

2 files changed

+32
-30
lines changed

2 files changed

+32
-30
lines changed

‎cores/rp2040/Arduino.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,9 @@ void noInterrupts();
7575

7676
// ADC RP2040-specific calls
7777
void analogReadResolution(int bits);
78+
#ifdef __cplusplus
7879
float analogReadTemp(float vref = 3.3); // Returns core temp in Centigrade
80+
#endif
7981

8082
// PWM RP2040-specific calls
8183
void analogWriteFreq(uint32_t freq);

‎libraries/I2S/src/pio_i2s.pio.h

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,16 @@
1616
#define pio_i2s_out_wrap 7
1717

1818
static const uint16_t pio_i2s_out_program_instructions[] = {
19-
// .wrap_target
20-
0xa822, // 0: mov x, y side 1
21-
0x6001, // 1: out pins, 1 side 0
22-
0x0841, // 2: jmp x--, 1 side 1
23-
0x7001, // 3: out pins, 1 side 2
24-
0xb822, // 4: mov x, y side 3
25-
0x7001, // 5: out pins, 1 side 2
26-
0x1845, // 6: jmp x--, 5 side 3
27-
0x6001, // 7: out pins, 1 side 0
28-
// .wrap
19+
// .wrap_target
20+
0xa822, // 0: mov x, y side 1
21+
0x6001, // 1: out pins, 1 side 0
22+
0x0841, // 2: jmp x--, 1 side 1
23+
0x7001, // 3: out pins, 1 side 2
24+
0xb822, // 4: mov x, y side 3
25+
0x7001, // 5: out pins, 1 side 2
26+
0x1845, // 6: jmp x--, 5 side 3
27+
0x6001, // 7: out pins, 1 side 0
28+
// .wrap
2929
};
3030

3131
#if !PICO_NO_HARDWARE
@@ -51,16 +51,16 @@ static inline pio_sm_config pio_i2s_out_program_get_default_config(uint offset)
5151
#define pio_lsbj_out_wrap 7
5252

5353
static const uint16_t pio_lsbj_out_program_instructions[] = {
54-
// .wrap_target
55-
0xa822, // 0: mov x, y side 1
56-
0x7001, // 1: out pins, 1 side 2
57-
0x1841, // 2: jmp x--, 1 side 3
58-
0x7001, // 3: out pins, 1 side 2
59-
0xb822, // 4: mov x, y side 3
60-
0x6001, // 5: out pins, 1 side 0
61-
0x0845, // 6: jmp x--, 5 side 1
62-
0x6001, // 7: out pins, 1 side 0
63-
// .wrap
54+
// .wrap_target
55+
0xa822, // 0: mov x, y side 1
56+
0x7001, // 1: out pins, 1 side 2
57+
0x1841, // 2: jmp x--, 1 side 3
58+
0x7001, // 3: out pins, 1 side 2
59+
0xb822, // 4: mov x, y side 3
60+
0x6001, // 5: out pins, 1 side 0
61+
0x0845, // 6: jmp x--, 5 side 1
62+
0x6001, // 7: out pins, 1 side 0
63+
// .wrap
6464
};
6565

6666
#if !PICO_NO_HARDWARE
@@ -86,16 +86,16 @@ static inline pio_sm_config pio_lsbj_out_program_get_default_config(uint offset)
8686
#define pio_i2s_in_wrap 7
8787

8888
static const uint16_t pio_i2s_in_program_instructions[] = {
89-
// .wrap_target
90-
0xa022, // 0: mov x, y side 0
91-
0x4801, // 1: in pins, 1 side 1
92-
0x0041, // 2: jmp x--, 1 side 0
93-
0x5801, // 3: in pins, 1 side 3
94-
0xb022, // 4: mov x, y side 2
95-
0x5801, // 5: in pins, 1 side 3
96-
0x1045, // 6: jmp x--, 5 side 2
97-
0x4801, // 7: in pins, 1 side 1
98-
// .wrap
89+
// .wrap_target
90+
0xa022, // 0: mov x, y side 0
91+
0x4801, // 1: in pins, 1 side 1
92+
0x0041, // 2: jmp x--, 1 side 0
93+
0x5801, // 3: in pins, 1 side 3
94+
0xb022, // 4: mov x, y side 2
95+
0x5801, // 5: in pins, 1 side 3
96+
0x1045, // 6: jmp x--, 5 side 2
97+
0x4801, // 7: in pins, 1 side 1
98+
// .wrap
9999
};
100100

101101
#if !PICO_NO_HARDWARE

0 commit comments

Comments
 (0)
0