adafruit-mirror/arduino-pico
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove hardcoded paths for includes

Browse source
This commit is contained in:
Earle F. Philhower, III 2021-02-24 20:45:10 -08:00
parent 30b83d0442
commit b8fbbb0fe4
2 changed files with 13 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
cores/rp2040/wiring_analog.cpp
View file

@ -15,20 +15,18 @@
*/ */
#include <Arduino.h> #include <Arduino.h>
#include "/home/earle/src/pico/pico-sdk/src/rp2_common/hardware_gpio/include/hardware/gpio.h" #include "../../pico-sdk/src/rp2_common/hardware_gpio/include/hardware/gpio.h"
#include "/home/earle/src/pico/pico-sdk/src/rp2_common/hardware_pwm/include/hardware/pwm.h" #include "../../pico-sdk/src/rp2_common/hardware_pwm/include/hardware/pwm.h"
#include "/home/earle/src/pico/pico-sdk/src/rp2_common/hardware_clocks/include/hardware/clocks.h" #include "../../pico-sdk/src/rp2_common/hardware_clocks/include/hardware/clocks.h"
#include "/home/earle/src/pico/pico-sdk/src/rp2_common/hardware_pll/include/hardware/pll.h" #include "../../pico-sdk/src/rp2_common/hardware_pll/include/hardware/pll.h"
#include "/home/earle/src/pico/pico-sdk/src/rp2_common/hardware_clocks/include/hardware/clocks.h" #include "../../pico-sdk/src/rp2_common/hardware_clocks/include/hardware/clocks.h"
extern "C" {
static int32_t analogScale = 255; static int32_t analogScale = 255;
static uint32_t analogMap = 0; static uint32_t analogMap = 0;
static uint16_t analogFreq = 1000; static uint16_t analogFreq = 1000;
static bool pwmInitted = false; static bool pwmInitted = false;
void analogWriteFreq(uint32_t freq) { extern "C" void analogWriteFreq(uint32_t freq) {
if (freq == analogFreq) { if (freq == analogFreq) {
return; return;
} }
@ -42,7 +40,7 @@ void analogWriteFreq(uint32_t freq) {
pwmInitted = false; pwmInitted = false;
} }
void analogWriteRange(uint32_t range) { extern "C" void analogWriteRange(uint32_t range) {
if (range == analogScale) { if (range == analogScale) {
return; return;
} }
@ -52,13 +50,13 @@ void analogWriteRange(uint32_t range) {
} }
} }
void analogWriteResolution(int res) { extern "C" void analogWriteResolution(int res) {
if ((res >= 4) && (res <= 16)) { if ((res >= 4) && (res <= 16)) {
analogWriteRange((1 << res) - 1); analogWriteRange((1 << res) - 1);
} }
} }
void analogWrite(pin_size_t pin, int val) { extern "C" void analogWrite(pin_size_t pin, int val) {
if (!pwmInitted) { if (!pwmInitted) {
pwm_config c = pwm_get_default_config(); pwm_config c = pwm_get_default_config();
pwm_config_set_clkdiv( &c, clock_get_hz(clk_sys) / 1.0 * (analogScale * analogFreq) ); pwm_config_set_clkdiv( &c, clock_get_hz(clk_sys) / 1.0 * (analogScale * analogFreq) );
@ -79,4 +77,3 @@ void analogWrite(pin_size_t pin, int val) {
pwm_set_gpio_level(pin, val); pwm_set_gpio_level(pin, val);
} }
}

14
cores/rp2040/wiring_digital.cpp
View file

@ -1,10 +1,7 @@
#include "Arduino.h" #include "Arduino.h"
#include "/home/earle/src/pico/pico-sdk/src/rp2_common/hardware_gpio/include/hardware/gpio.h" #include "../../pico-sdk/src/rp2_common/hardware_gpio/include/hardware/gpio.h"
#ifdef __cplusplus
extern "C" {
#endif
void pinMode( pin_size_t ulPin, PinMode ulMode ) extern "C" void pinMode( pin_size_t ulPin, PinMode ulMode )
{ {
switch (ulMode) { switch (ulMode) {
case INPUT: case INPUT:
@ -31,7 +28,7 @@ void pinMode( pin_size_t ulPin, PinMode ulMode )
} }
} }
void digitalWrite( pin_size_t ulPin, PinStatus ulVal ) extern "C" void digitalWrite( pin_size_t ulPin, PinStatus ulVal )
{ {
if (!gpio_is_dir_out(ulPin)) { if (!gpio_is_dir_out(ulPin)) {
if (ulVal == LOW) { if (ulVal == LOW) {
@ -44,11 +41,8 @@ void digitalWrite( pin_size_t ulPin, PinStatus ulVal )
} }
} }
PinStatus digitalRead( pin_size_t ulPin ) extern "C" PinStatus digitalRead( pin_size_t ulPin )
{ {
return gpio_get(ulPin) ? HIGH : LOW; return gpio_get(ulPin) ? HIGH : LOW;
} }
#ifdef __cplusplus
}
#endif