mchapman/nina-fw
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added INPUT_PULLUP support and let analog write use full PWM range

Browse Source
This commit is contained in:
ZodiusInfuser
2021-03-22 16:52:06 +00:00
parent f2a0e601b2
commit d0074840ab
7 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG
View File

@@ -1,3 +1,8 @@
Adafruit's Arduino NINA-W102 firmware 1.7.2 - 2021.03.22
* Changed Analog Write to use full PWM range.
* Added support to Pin Mode for INPUT_PULLUP.
Adafruit's Arduino NINA-W102 firmware 1.7.1 - 2020.10.24 Adafruit's Arduino NINA-W102 firmware 1.7.1 - 2020.10.24
* Enable HCI BLE for AirLift boards and breakouts. * Enable HCI BLE for AirLift boards and breakouts.

2
Makefile
View File

@@ -28,7 +28,7 @@ load-passthrough:
cp passthrough.UF2 $(BOOT_VOLUME) cp passthrough.UF2 $(BOOT_VOLUME)
load-nina: load-nina:
esptool.py --port $(M4_PORT) --before no_reset --baud $(UPLOAD_BAUD) write_flash 0 NINA_W102-1.7.1.bin esptool.py --port $(M4_PORT) --before no_reset --baud $(UPLOAD_BAUD) write_flash 0 NINA_W102-1.7.2.bin
load-circuitpython: load-circuitpython:
cp $(CIRCUITPYTHON_UF2) $(BOOT_VOLUME) cp $(CIRCUITPYTHON_UF2) $(BOOT_VOLUME)

2
arduino/cores/esp32/wiring_analog.c
View File

@@ -38,7 +38,7 @@ void analogWrite(uint32_t pin, uint32_t value)
ledc_channel_config_t ledc_conf = { ledc_channel_config_t ledc_conf = {
.channel = (pin % 7), .channel = (pin % 7),
.duty = (value << 2), .duty = (value << 2) | ((value & 0xC0) >> 6),
.gpio_num = pin, .gpio_num = pin,
.intr_type = LEDC_INTR_DISABLE, .intr_type = LEDC_INTR_DISABLE,
.speed_mode = LEDC_HIGH_SPEED_MODE, .speed_mode = LEDC_HIGH_SPEED_MODE,

5
arduino/cores/esp32/wiring_digital.c
View File

@@ -33,6 +33,11 @@ void pinMode(uint32_t pin, uint32_t mode)
gpio_set_direction((gpio_num_t)pin, GPIO_MODE_OUTPUT); gpio_set_direction((gpio_num_t)pin, GPIO_MODE_OUTPUT);
gpio_set_pull_mode((gpio_num_t)pin, GPIO_FLOATING); gpio_set_pull_mode((gpio_num_t)pin, GPIO_FLOATING);
break; break;
case INPUT_PULLUP:
gpio_set_direction((gpio_num_t)pin, GPIO_MODE_INPUT);
gpio_set_pull_mode((gpio_num_t)pin, GPIO_PULLUP_ONLY);
break;
} }
PIN_FUNC_SELECT(GPIO_PIN_MUX_REG[pin], PIN_FUNC_GPIO); PIN_FUNC_SELECT(GPIO_PIN_MUX_REG[pin], PIN_FUNC_GPIO);

1
arduino/cores/esp32/wiring_digital.h
View File

@@ -31,6 +31,7 @@ extern "C" {
#define INPUT 0x00 #define INPUT 0x00
#define OUTPUT 0x01 #define OUTPUT 0x01
#define INPUT_PULLUP 0x02
extern void pinMode(uint32_t pin, uint32_t mode); extern void pinMode(uint32_t pin, uint32_t mode);

2
combine.py
View File

@@ -31,7 +31,7 @@ for i in range(0, len(certsData)):
# zero terminate the pem file # zero terminate the pem file
outputData[0x10000 + len(certsData)] = 0 outputData[0x10000 + len(certsData)] = 0
outputFilename = "NINA_W102-1.7.1.bin" outputFilename = "NINA_W102-1.7.2.bin"
if (len(sys.argv) > 1): if (len(sys.argv) > 1):
outputFilename = sys.argv[1] outputFilename = sys.argv[1]

2
main/CommandHandler.cpp
View File

@@ -28,7 +28,7 @@
#include "Arduino.h" #include "Arduino.h"
const char FIRMWARE_VERSION[6] = "1.7.1"; const char FIRMWARE_VERSION[6] = "1.7.2";
// Optional, user-defined X.509 certificate // Optional, user-defined X.509 certificate
char CERT_BUF[1300]; char CERT_BUF[1300];