-
Notifications
You must be signed in to change notification settings - Fork 12
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #21 from dj1ch/development
massive overhaul
- Loading branch information
Showing
18 changed files
with
1,205 additions
and
1,021 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,120 +1,124 @@ | ||
| /** | ||
| * channel.cpp: handles channel switching | ||
| */ | ||
| */ | ||
|
|
||
| #include "channel.h" | ||
|
|
||
| /** developer note: | ||
| * | ||
| * i am using the ideal 2.4 GHz channels, which are 1, 6, and 11. | ||
| * the reason for that is so we don't interfere with other devices on our frequency. | ||
| * there are probably plenty more reasons but this is a good practice for such iot devices. | ||
| * the reason for that is so we don't interfere with other devices on our | ||
| * frequency. there are probably plenty more reasons but this is a good practice | ||
| * for such iot devices. | ||
| * | ||
| */ | ||
|
|
||
| // same channels in config | ||
| int Channel::channelList[13] = { | ||
| Config::channels[0], Config::channels[1], Config::channels[2], Config::channels[3], | ||
| Config::channels[4], Config::channels[5], Config::channels[6], Config::channels[7], | ||
| Config::channels[8], Config::channels[9], Config::channels[10], Config::channels[11], | ||
| Config::channels[12] | ||
| }; | ||
| Config::channels[0], Config::channels[1], Config::channels[2], | ||
| Config::channels[3], Config::channels[4], Config::channels[5], | ||
| Config::channels[6], Config::channels[7], Config::channels[8], | ||
| Config::channels[9], Config::channels[10], Config::channels[11], | ||
| Config::channels[12]}; | ||
|
|
||
| void Channel::init(int initChannel) { | ||
| // start on user specified channel | ||
| delay(250); | ||
| Serial.println(" "); | ||
| Serial.print("(-.-) Initializing on channel "); | ||
| Serial.println(initChannel); | ||
| Serial.println(" "); | ||
| Display::cleanDisplayFace("(-.-)"); | ||
| Display::attachSmallText("Initializing on channel " + (String) initChannel); | ||
| delay(250); | ||
| // start on user specified channel | ||
| delay(250); | ||
| Serial.println(" "); | ||
| Serial.print("(-.-) Initializing on channel "); | ||
| Serial.println(initChannel); | ||
| Serial.println(" "); | ||
| Display::cleanDisplayFace("(-.-)"); | ||
| Display::attachSmallText("Initializing on channel " + (String)initChannel); | ||
| delay(250); | ||
|
|
||
| // switch channel | ||
| Minigotchi::monStop(); | ||
| esp_err_t err = esp_wifi_set_channel(initChannel, WIFI_SECOND_CHAN_NONE); | ||
| Minigotchi::monStart(); | ||
| // switch channel | ||
| Minigotchi::monStop(); | ||
| esp_err_t err = esp_wifi_set_channel(initChannel, WIFI_SECOND_CHAN_NONE); | ||
| Minigotchi::monStart(); | ||
|
|
||
| if (err == ESP_OK && initChannel == getChannel()) { | ||
| Serial.print("('-') Successfully initialized on channel "); | ||
| Serial.println(getChannel()); | ||
| Display::cleanDisplayFace("('-')"); | ||
| Display::attachSmallText("Successfully initialized on channel " + (String) getChannel()); | ||
| delay(250); | ||
| } else { | ||
| Serial.println("(X-X) Channel initialization failed, try again?"); | ||
| Display::cleanDisplayFace("(X-X)"); | ||
| Display::attachSmallText("Channel initialization failed, try again?"); | ||
| delay(250); | ||
| } | ||
| if (err == ESP_OK && initChannel == getChannel()) { | ||
| Serial.print("('-') Successfully initialized on channel "); | ||
| Serial.println(getChannel()); | ||
| Display::cleanDisplayFace("('-')"); | ||
| Display::attachSmallText("Successfully initialized on channel " + | ||
| (String)getChannel()); | ||
| delay(250); | ||
| } else { | ||
| Serial.println("(X-X) Channel initialization failed, try again?"); | ||
| Display::cleanDisplayFace("(X-X)"); | ||
| Display::attachSmallText("Channel initialization failed, try again?"); | ||
| delay(250); | ||
| } | ||
| } | ||
|
|
||
| void Channel::cycle() { | ||
| // get channels | ||
| int numChannels = sizeof(channelList) / sizeof(channelList[0]); | ||
| void Channel::cycle() { | ||
| // get channels | ||
| int numChannels = sizeof(channelList) / sizeof(channelList[0]); | ||
|
|
||
| // select a random one | ||
| int randomIndex = random(numChannels); | ||
| int newChannel = channelList[randomIndex]; | ||
| // select a random one | ||
| int randomIndex = random(numChannels); | ||
| int newChannel = channelList[randomIndex]; | ||
|
|
||
| // switch here | ||
| switchChannel(newChannel); | ||
| // switch here | ||
| switchChannel(newChannel); | ||
| } | ||
|
|
||
| void Channel::switchChannel(int newChannel) { | ||
| // switch to channel | ||
| delay(250); | ||
| Serial.print("(-.-) Switching to channel "); | ||
| Serial.println(newChannel); | ||
| Serial.println(" "); | ||
| Display::cleanDisplayFace("(-.-)"); | ||
| Display::attachSmallText("Switching to channel " + (String) newChannel); | ||
| delay(250); | ||
| // switch to channel | ||
| delay(250); | ||
| Serial.print("(-.-) Switching to channel "); | ||
| Serial.println(newChannel); | ||
| Serial.println(" "); | ||
| Display::cleanDisplayFace("(-.-)"); | ||
| Display::attachSmallText("Switching to channel " + (String)newChannel); | ||
| delay(250); | ||
|
|
||
| // monitor this one channel | ||
| Minigotchi::monStop(); | ||
| esp_err_t err = esp_wifi_set_channel(newChannel, WIFI_SECOND_CHAN_NONE); | ||
| Minigotchi::monStart(); | ||
| // monitor this one channel | ||
| Minigotchi::monStop(); | ||
| esp_err_t err = esp_wifi_set_channel(newChannel, WIFI_SECOND_CHAN_NONE); | ||
| Minigotchi::monStart(); | ||
|
|
||
| // check if the channel switch was successful | ||
| if (err == ESP_OK) { | ||
| checkChannel(newChannel); | ||
| } else { | ||
| Serial.println("(X-X) Failed to switch channel."); | ||
| Display::cleanDisplayFace("(X-X)"); | ||
| Display::attachSmallText("Failed to switch channel."); | ||
| delay(250); | ||
| } | ||
| // check if the channel switch was successful | ||
| if (err == ESP_OK) { | ||
| checkChannel(newChannel); | ||
| } else { | ||
| Serial.println("(X-X) Failed to switch channel."); | ||
| Serial.println(" "); | ||
| Display::cleanDisplayFace("(X-X)"); | ||
| Display::attachSmallText("Failed to switch channel."); | ||
| delay(250); | ||
| } | ||
| } | ||
|
|
||
| // check if the channel switch was successful | ||
| void Channel::checkChannel(int channel) { | ||
| int currentChannel = Channel::getChannel(); | ||
| if (channel == currentChannel) { | ||
| Serial.print("('-') Currently on channel "); | ||
| Serial.println(currentChannel); | ||
| Display::cleanDisplayFace("('-')"); | ||
| Display::attachSmallText("Currently on channel " + (String) getChannel()); | ||
| Serial.println(" "); | ||
| delay(250); | ||
| } else { | ||
| Serial.print("(X-X) Channel switch to channel "); | ||
| Serial.print(channel); | ||
| Serial.println(" has failed"); | ||
| Serial.print("(X-X) Currently on channel "); | ||
| Serial.print(currentChannel); | ||
| Serial.println(" instead"); | ||
| Serial.println(" "); | ||
| Display::cleanDisplayFace("(X-X)"); | ||
| Display::attachSmallText("Channel switch to " + (String) channel + " has failed"); | ||
| delay(250); | ||
| } | ||
| int currentChannel = Channel::getChannel(); | ||
| if (channel == currentChannel) { | ||
| Serial.print("('-') Currently on channel "); | ||
| Serial.println(currentChannel); | ||
| Display::cleanDisplayFace("('-')"); | ||
| Display::attachSmallText("Currently on channel " + (String)getChannel()); | ||
| Serial.println(" "); | ||
| delay(250); | ||
| } else { | ||
| Serial.print("(X-X) Channel switch to channel "); | ||
| Serial.print(channel); | ||
| Serial.println(" has failed"); | ||
| Serial.print("(X-X) Currently on channel "); | ||
| Serial.print(currentChannel); | ||
| Serial.println(" instead"); | ||
| Serial.println(" "); | ||
| Display::cleanDisplayFace("(X-X)"); | ||
| Display::attachSmallText("Channel switch to " + (String)channel + | ||
| " has failed"); | ||
| delay(250); | ||
| } | ||
| } | ||
|
|
||
| int Channel::getChannel() { | ||
| uint8_t primary; | ||
| wifi_second_chan_t second; | ||
| esp_wifi_get_channel(&primary, &second); | ||
| return primary; | ||
| uint8_t primary; | ||
| wifi_second_chan_t second; | ||
| esp_wifi_get_channel(&primary, &second); | ||
| return primary; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,30 +1,30 @@ | ||
| /** | ||
| * channel.h: header files for channel.cpp | ||
| */ | ||
| */ | ||
|
|
||
| #ifndef CHANNEL_H | ||
| #define CHANNEL_H | ||
|
|
||
| #include "minigotchi.h" | ||
| #include "config.h" | ||
| #include "display.h" | ||
| #include "minigotchi.h" | ||
| #include <WiFi.h> | ||
| #include <esp_wifi.h> | ||
|
|
||
| class Channel { | ||
| public: | ||
| static void init(int initChannel); | ||
| static void cycle(); | ||
| static void switchChannel(int newChannel); | ||
| static int getChannel(); | ||
| static void checkChannel(int channel); | ||
| static int channelList[13]; // 13 channels | ||
| static void init(int initChannel); | ||
| static void cycle(); | ||
| static void switchChannel(int newChannel); | ||
| static int getChannel(); | ||
| static void checkChannel(int channel); | ||
| static int channelList[13]; // 13 channels | ||
|
|
||
| private: | ||
| static int randomIndex; | ||
| static int numChannels; | ||
| static int currentChannel; | ||
| static int newChannel; | ||
| static int randomIndex; | ||
| static int numChannels; | ||
| static int currentChannel; | ||
| static int newChannel; | ||
| }; | ||
|
|
||
| #endif // CHANNEL_H |
Oops, something went wrong.