Skip to content

Commit afa3349

Browse files
authored
Merge pull request #118 from adafruit/net-fsm
Better network handling
2 parents d391af5 + e97e4ef commit afa3349

13 files changed

+418
-467
lines changed

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ PROJECT_VER_MAJOR := 1
77
PROJECT_VER_MINOR := 0
88
PROJECT_VER_PATCH := 0
99
PROJECT_VER_BUILD := beta
10-
PROJECT_VER_BUILD_NUM := 3
10+
PROJECT_VER_BUILD_NUM := 4
1111

1212
BOARD_PYPORTAL := samd51-pyportal
1313
BOARD_METRO_AIRLIFT := samd51-metro-airlift
@@ -50,7 +50,7 @@ clean-esp32s2: clean-esp32s2-funhouse clean-esp32s2-metro clean-esp32s2-magtag
5050

5151
esp32s2-magtag:
5252
mkdir -p build/$(BOARD_MAGTAG_S2)/
53-
arduino-cli compile --fqbn esp32:esp32:adafruit_magtag29_esp32s2:SerialMode=cdc,PSRAM=enabled,PartitionScheme=default,CPUFreq=240,FlashMode=qio,FlashFreq=80,FlashSize=4M,UploadSpeed=921600,DebugLevel=none,USBStack=tinyusb -e examples/Wippersnapper_demo/Wippersnapper_demo.ino
53+
arduino-cli compile --fqbn esp32:esp32:adafruit_magtag29_esp32s2:SerialMode=cdc,PSRAM=enabled,PartitionScheme=default,CPUFreq=240,FlashMode=qio,FlashFreq=80,FlashSize=4M,UploadSpeed=921600,DebugLevel=verbose,USBStack=tinyusb -e examples/Wippersnapper_demo/Wippersnapper_demo.ino
5454
python3 $(UF2CONV) examples/Wippersnapper_demo/build/esp32.esp32.adafruit_magtag29_esp32s2/Wippersnapper_demo.ino.bin -f $(UF2_FAMILY_ESP32S2) -b $(UF2_BASE_ESP32S2) -o build/esp32s2-magtag/$(PROJECT_NAME)-$(BOARD_MAGTAG_S2)-$(PROJECT_VER_MAJOR)-$(PROJECT_VER_MINOR)-$(PROJECT_VER_PATCH)-$(PROJECT_VER_BUILD).$(PROJECT_VER_BUILD_NUM).uf2
5555

5656
clean-esp32s2-magtag:
@@ -59,7 +59,7 @@ clean-esp32s2-magtag:
5959

6060
esp32s2-metro:
6161
mkdir -p build/$(BOARD_METRO_S2)/
62-
arduino-cli compile --fqbn esp32:esp32:adafruit_metro_esp32s2:SerialMode=cdc,PSRAM=enabled,PartitionScheme=default,CPUFreq=240,FlashMode=qio,FlashFreq=80,FlashSize=4M,UploadSpeed=921600,DebugLevel=none,USBStack=tinyusb -e examples/Wippersnapper_demo/Wippersnapper_demo.ino
62+
arduino-cli compile --fqbn esp32:esp32:adafruit_metro_esp32s2:SerialMode=cdc,PSRAM=enabled,PartitionScheme=default,CPUFreq=240,FlashMode=qio,FlashFreq=80,FlashSize=4M,UploadSpeed=921600,DebugLevel=verbose,USBStack=tinyusb -e examples/Wippersnapper_demo/Wippersnapper_demo.ino
6363
python3 $(UF2CONV) examples/Wippersnapper_demo/build/esp32.esp32.adafruit_metro_esp32s2/Wippersnapper_demo.ino.bin -f $(UF2_FAMILY_ESP32S2) -b $(UF2_BASE_ESP32S2) -o build/esp32s2-metro/$(PROJECT_NAME)-$(BOARD_METRO_S2)-$(PROJECT_VER_MAJOR)-$(PROJECT_VER_MINOR)-$(PROJECT_VER_PATCH)-$(PROJECT_VER_BUILD).$(PROJECT_VER_BUILD_NUM).uf2
6464

6565
clean-esp32s2-metro:

examples/Wippersnapper_demo/Wippersnapper_demo.ino

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,7 @@ void setup() {
2626
Serial.begin(115200);
2727
//while (!Serial) delay(10);
2828

29-
// Set Adafruit IO credentials
30-
wipper.set_user_key();
31-
// Set WiFi credentials
32-
wipper.set_ssid_pass();
33-
34-
Serial.println("Connecting to WipperSnapper");
3529
wipper.connect();
36-
Serial.print("Connected to WipperSnapper!");
3730

3831
}
3932

0 commit comments

Comments
 (0)