Skip to content

Commit f5e40ec

Browse files
committed
fix(fruit jam): correct Arduino board define
chore(version): bump to 1.0.0-beta.115
1 parent 54f4680 commit f5e40ec

File tree

4 files changed

+58
-48
lines changed

4 files changed

+58
-48
lines changed

library.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name=Adafruit WipperSnapper
2-
version=1.0.0-beta.114
2+
version=1.0.0-beta.115
33
author=Adafruit
44
maintainer=Adafruit <[email protected]>
55
sentence=Arduino application for Adafruit.io WipperSnapper

platformio.ini

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -669,6 +669,16 @@ build_flags =
669669
; -DPIO_FRAMEWORK_ARDUINO_ENABLE_IPV6
670670

671671
[env:adafruit_fruitjam]
672+
extends = common:arduinopico
673+
board = adafruit_fruitjam
674+
board_build.filesystem_size = 8m
675+
lib_ignore = WiFi, WiFi101, Adafruit Zero DMA Library
676+
build_flags = -DUSE_TINYUSB -DARDUINO_ADAFRUIT_FRUITJAM_RP2350
677+
678+
[env:adafruit_fruitjam_debug]
679+
extends = common:arduinopico
680+
build_type = debug
672681
board = adafruit_fruitjam
682+
board_build.filesystem_size = 8m
673683
lib_ignore = WiFi, WiFi101, Adafruit Zero DMA Library
674-
build_flags = -DUSE_TINYUSB -DADAFRUIT_FRUITJAM_RP2350
684+
build_flags = -DUSE_TINYUSB -DARDUINO_ADAFRUIT_FRUITJAM_RP2350

src/Wippersnapper.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@
144144
#endif
145145

146146
#define WS_VERSION \
147-
"1.0.0-beta.114" ///< WipperSnapper app. version (semver-formatted)
147+
"1.0.0-beta.115" ///< WipperSnapper app. version (semver-formatted)
148148

149149
// Reserved Adafruit IO MQTT topics
150150
#define TOPIC_IO_THROTTLE "/throttle" ///< Adafruit IO Throttle MQTT Topic

src/Wippersnapper_Networking.h

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,46 @@
1-
/*!
2-
* @file Wippersnapper_Networking.h
3-
*
4-
* This file includes network interfaces at compile-time.
5-
*
6-
* Adafruit invests time and resources providing this open source code,
7-
* please support Adafruit and open-source hardware by purchasing
8-
* products from Adafruit!
9-
*
10-
* Copyright (c) Brent Rubell 2020-2021 for Adafruit Industries.
11-
*
12-
* BSD license, all text here must be included in any redistribution.
13-
*
14-
*/
15-
16-
#ifndef WIPPERSNAPPER_NETWORKING_H
17-
#define WIPPERSNAPPER_NETWORKING_H
18-
19-
#ifndef WL_MAC_ADDR_LENGTH
20-
#define WL_MAC_ADDR_LENGTH 6 ///< MAC address length - from RP2040 BSP
21-
#endif
22-
#define WS_MAX_ALT_WIFI_NETWORKS 3 ///< Maximum number of alternative networks
23-
24-
#if defined(ADAFRUIT_METRO_M4_EXPRESS) || \
25-
defined(ADAFRUIT_METRO_M4_AIRLIFT_LITE) || defined(ADAFRUIT_PYPORTAL) || \
26-
defined(ADAFRUIT_PYPORTAL_M4_TITANO) || defined(USE_AIRLIFT) || \
27-
defined(ADAFRUIT_FRUITJAM_RP2350)
28-
#include "network_interfaces/Wippersnapper_AIRLIFT.h"
29-
/** Nina-FW (adafruit fork) networking class */
30-
typedef Wippersnapper_AIRLIFT Wippersnapper_WiFi;
31-
#elif defined(ARDUINO_ARCH_ESP8266)
32-
#include "network_interfaces/Wippersnapper_ESP8266.h"
33-
/** ESP8266's networking class */
34-
typedef Wippersnapper_ESP8266 Wippersnapper_WiFi;
35-
#elif defined(ARDUINO_ARCH_ESP32)
36-
#include "network_interfaces/Wippersnapper_ESP32.h"
37-
/** ESP32's networking class */
38-
typedef Wippersnapper_ESP32 Wippersnapper_WiFi;
39-
#elif defined(ARDUINO_ARCH_RP2040)
40-
#include "network_interfaces/ws_networking_pico.h"
41-
typedef ws_networking_pico Wippersnapper_WiFi;
42-
#else
43-
#warning "Must define network interface in config.h!"
44-
#endif
45-
1+
/*!
2+
* @file Wippersnapper_Networking.h
3+
*
4+
* This file includes network interfaces at compile-time.
5+
*
6+
* Adafruit invests time and resources providing this open source code,
7+
* please support Adafruit and open-source hardware by purchasing
8+
* products from Adafruit!
9+
*
10+
* Copyright (c) Brent Rubell 2020-2021 for Adafruit Industries.
11+
*
12+
* BSD license, all text here must be included in any redistribution.
13+
*
14+
*/
15+
16+
#ifndef WIPPERSNAPPER_NETWORKING_H
17+
#define WIPPERSNAPPER_NETWORKING_H
18+
19+
#ifndef WL_MAC_ADDR_LENGTH
20+
#define WL_MAC_ADDR_LENGTH 6 ///< MAC address length - from RP2040 BSP
21+
#endif
22+
#define WS_MAX_ALT_WIFI_NETWORKS 3 ///< Maximum number of alternative networks
23+
24+
#if defined(ADAFRUIT_METRO_M4_EXPRESS) || \
25+
defined(ADAFRUIT_METRO_M4_AIRLIFT_LITE) || defined(ADAFRUIT_PYPORTAL) || \
26+
defined(ADAFRUIT_PYPORTAL_M4_TITANO) || defined(USE_AIRLIFT) || \
27+
defined(ARDUINO_ADAFRUIT_FRUITJAM_RP2350)
28+
#include "network_interfaces/Wippersnapper_AIRLIFT.h"
29+
/** Nina-FW (adafruit fork) networking class */
30+
typedef Wippersnapper_AIRLIFT Wippersnapper_WiFi;
31+
#elif defined(ARDUINO_ARCH_ESP8266)
32+
#include "network_interfaces/Wippersnapper_ESP8266.h"
33+
/** ESP8266's networking class */
34+
typedef Wippersnapper_ESP8266 Wippersnapper_WiFi;
35+
#elif defined(ARDUINO_ARCH_ESP32)
36+
#include "network_interfaces/Wippersnapper_ESP32.h"
37+
/** ESP32's networking class */
38+
typedef Wippersnapper_ESP32 Wippersnapper_WiFi;
39+
#elif defined(ARDUINO_ARCH_RP2040)
40+
#include "network_interfaces/ws_networking_pico.h"
41+
typedef ws_networking_pico Wippersnapper_WiFi;
42+
#else
43+
#warning "Must define network interface in config.h!"
44+
#endif
45+
4646
#endif // WIPPERSNAPPER_NETWORKING_H

0 commit comments

Comments
 (0)