8000 Move analogReadTemp() to C++-only by earlephilhower · Pull Request #1097 · earlephilhower/arduino-pico · GitHub
[go: up one dir, main page]
Skip to content

Move analogReadTemp() to C++-only #1097

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 3, 2023
Merged

Move analogReadTemp() to C++-only #1097

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1f9f244
Move analogReadTemp() to C++-only
earlephilhower Jan 3, 2023
fa51fee
Merge branch 'master' into artc
earlephilhower Jan 3, 2023
490a3b5
Fix whitespace
earlephilhower Jan 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions cores/rp2040/Arduino.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,9 @@ void noInterrupts();

// ADC RP2040-specific calls
void analogReadResolution(int bits);
#ifdef __cplusplus
float analogReadTemp(float vref = 3.3); // Returns core temp in Centigrade
#endif

// PWM RP2040-specific calls
void analogWriteFreq(uint32_t freq);
Expand Down
60 changes: 30 additions & 30 deletions libraries/I2S/src/pio_i2s.pio.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,16 @@
#define pio_i2s_out_wrap 7

static const uint16_t pio_i2s_out_program_instructions[] = {
// .wrap_target
0xa822, // 0: mov x, y side 1
0x6001, // 1: out pins, 1 side 0
0x0841, // 2: jmp x--, 1 side 1
0x7001, // 3: out pins, 1 side 2
0xb822, // 4: mov x, y side 3
0x7001, // 5: out pins, 1 side 2
0x1845, // 6: jmp x--, 5 side 3
0x6001, // 7: out pins, 1 side 0
// .wrap
// .wrap_target
0xa822, // 0: mov x, y side 1
0x6001, // 1: out pins, 1 side 0
0x0841, // 2: jmp x--, 1 side 1
0x7001, // 3: out pins, 1 side 2
0xb822, // 4: mov x, y side 3
0x7001, // 5: out pins, 1 side 2
0x1845, // 6: jmp x--, 5 side 3
0x6001, // 7: out pins, 1 side 0
// .wrap
};

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

static const uint16_t pio_lsbj_out_program_instructions[] = {
// .wrap_target
0xa822, // 0: mov x, y side 1
0x7001, // 1: out pins, 1 side 2
0x1841, // 2: jmp x--, 1 side 3
0x7001, // 3: out pins, 1 side 2
0xb822, // 4: mov x, y side 3
0x6001, // 5: out pins, 1 side 0
0x0845, // 6: jmp x--, 5 side 1
0x6001, // 7: out pins, 1 side 0
// .wrap
// .wrap_target
< 9F53 span class='blob-code-inner blob-code-marker ' data-code-marker="+"> 0xa822, // 0: mov x, y side 1
0x7001, // 1: out pins, 1 side 2
0x1841, // 2: jmp x--, 1 side 3
0x7001, // 3: out pins, 1 side 2
0xb822, // 4: mov x, y side 3
0x6001, // 5: out pins, 1 side 0
0x0845, // 6: jmp x--, 5 side 1
0x6001, // 7: out pins, 1 side 0
// .wrap
};

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

static const uint16_t pio_i2s_in_program_instructions[] = {
// .wrap_target
0xa022, // 0: mov x, y side 0
0x4801, // 1: in pins, 1 side 1
0x0041, // 2: jmp x--, 1 side 0
0x5801, // 3: in pins, 1 side 3
0xb022, // 4: mov x, y side 2
0x5801, // 5: in pins, 1 side 3
0x1045, // 6: jmp x--, 5 side 2
0x4801, // 7: in pins, 1 side 1
// .wrap
// .wrap_target
0xa022, // 0: mov x, y side 0
0x4801, // 1: in pins, 1 side 1
0x0041, // 2: jmp x--, 1 side 0
0x5801, // 3: in pins, 1 side 3
0xb022, // 4: mov x, y side 2
0x5801, // 5: in pins, 1 side 3
0x1045, // 6: jmp x--, 5 side 2
0x4801, // 7: in pins, 1 side 1
// .wrap
};

#if !PICO_NO_HARDWARE
Expand Down
0