Skip to content
This repository was archived by the owner on Mar 1, 2024. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: SciLor/Hyperion_LED-Controller
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0.8.4
Choose a base ref
...
head repository: SciLor/Hyperion_LED-Controller
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref

Commits on Jan 31, 2017

  1. Copy the full SHA
    86d0990 View commit details
  2. Copy the full SHA
    3ec6a71 View commit details

Commits on Feb 1, 2017

  1. Copy the full SHA
    e355313 View commit details

Commits on Dec 31, 2017

  1. Update README.md

    SciLor authored Dec 31, 2017
    Copy the full SHA
    5f68926 View commit details
  2. Update README.md

    SciLor authored Dec 31, 2017
    Copy the full SHA
    9b8f5e5 View commit details

Commits on Jan 5, 2018

  1. improved documentation, added working libraries

    Markus Rudel authored and Markus Rudel committed Jan 5, 2018
    Copy the full SHA
    d84dc4e View commit details
  2. more configuration details on forwarding

    Markus Rudel authored and Markus Rudel committed Jan 5, 2018
    Copy the full SHA
    30f245b View commit details
  3. ESP board version > 2.3.0 don't work

    Markus Rudel authored and Markus Rudel committed Jan 5, 2018
    Copy the full SHA
    9e95b5c View commit details

Commits on Jan 7, 2018

  1. Merge pull request #27 from rudelm/better-instructions

    Better instructions
    SciLor authored Jan 7, 2018
    Copy the full SHA
    3bfe2aa View commit details
  2. Copy the full SHA
    b8da252 View commit details
  3. Copy the full SHA
    e7eaba0 View commit details
  4. Copy the full SHA
    57977bc View commit details
  5. Added esp32 libs

    SciLor committed Jan 7, 2018
    Copy the full SHA
    258fe2d View commit details
  6. Copy the full SHA
    c4f7332 View commit details
  7. Merged README.md

    SciLor committed Jan 7, 2018
    Copy the full SHA
    b86c60b View commit details
  8. Added hints about esp32

    SciLor committed Jan 7, 2018
    Copy the full SHA
    d821506 View commit details

Commits on May 5, 2018

  1. ESP32 compatibility

    -Added hint for right onboard LED
    -Workaround for the EnhancedThread compiling problems
    -ESP32Webserver now used for ESP32
    SciLor committed May 5, 2018
    Copy the full SHA
    4903fd3 View commit details
  2. Readme adjustments for ESP32

    SciLor committed May 5, 2018
    Copy the full SHA
    fd084eb View commit details
  3. esp8266 board library 2.4.1 fix for WebServer

    Use pointer to get around the change in 2.4.0 or higher
    SciLor committed May 5, 2018
    Copy the full SHA
    309d129 View commit details
  4. Copy the full SHA
    9b75226 View commit details
  5. Merge branch 'develop'

    ESP32 compatible
    SciLor committed May 5, 2018
    Copy the full SHA
    fdfa441 View commit details
  6. Fix merge

    SciLor committed May 5, 2018
    Copy the full SHA
    d3ea91d View commit details
  7. Fixed Readme

    SciLor committed May 5, 2018
    Copy the full SHA
    d70b539 View commit details
  8. Merge branch 'develop'

    SciLor committed May 5, 2018
    Copy the full SHA
    7a3828c View commit details
  9. Donation url added

    SciLor committed May 5, 2018
    Copy the full SHA
    096fc08 View commit details
  10. Merge branch 'develop'

    SciLor committed May 5, 2018
    Copy the full SHA
    bd2d2a2 View commit details

Commits on May 6, 2018

  1. English tutorial added

    SciLor authored May 6, 2018
    Copy the full SHA
    d43eae1 View commit details
  2. Merge pull request #36 from SciLor/develop

    English tutorial added
    SciLor authored May 6, 2018
    Copy the full SHA
    8c087f5 View commit details

Commits on May 8, 2018

  1. French tutorial added

    SciLor authored May 8, 2018
    Copy the full SHA
    7c6c214 View commit details
  2. Merge pull request #38 from SciLor/develop

    French tutorial added
    SciLor authored May 8, 2018
    Copy the full SHA
    a566606 View commit details
  3. Typo

    SciLor authored May 8, 2018
    Copy the full SHA
    175c2e5 View commit details
  4. Merge pull request #39 from SciLor/develop

    Typo
    SciLor authored May 8, 2018
    Copy the full SHA
    5895797 View commit details

Commits on Jun 8, 2018

  1. Copy the full SHA
    70adf21 View commit details
  2. 1
    Copy the full SHA
    3d5a974 View commit details

Commits on Jun 9, 2018

  1. Prepare configuration for udp protocol selection

    Not checked if compileable
    SciLor committed Jun 9, 2018
    Copy the full SHA
    28dabf7 View commit details
  2. Implemented protocol 2, begin for protocol 3

    Not compiles (untested)
    SciLor committed Jun 9, 2018
    Copy the full SHA
    2d56101 View commit details

Commits on Jun 10, 2018

  1. Copy the full SHA
    ca9f316 View commit details
  2. Copy the full SHA
    cdd007f View commit details
  3. Copy the full SHA
    3b95fb9 View commit details
  4. Copy the full SHA
    99007eb View commit details
  5. Described enigmalight support

    SciLor committed Jun 10, 2018
    Copy the full SHA
    02acae8 View commit details
  6. Copy the full SHA
    a8e6d7d View commit details

Commits on Oct 8, 2018

  1. Update WrapperOTA.cpp

    SciLor authored Oct 8, 2018
    Copy the full SHA
    daac07f View commit details

Commits on May 10, 2019

  1. Copy the full SHA
    638bf31 View commit details

Commits on Dec 4, 2020

  1. Update README.md

    mike-sirs authored Dec 4, 2020
    Copy the full SHA
    26b2180 View commit details
  2. Merge pull request #61 from mike-sirs/patch-1

    Update README.md
    SciLor authored Dec 4, 2020
    Copy the full SHA
    c403796 View commit details

Commits on Dec 14, 2020

  1. ArduinoJSON 5 to 6 migration

    SciLor committed Dec 14, 2020
    Copy the full SHA
    28153ce View commit details
  2. Add missing UdpProtocol cast

    SciLor committed Dec 14, 2020
    Copy the full SHA
    60c8823 View commit details
  3. Copy the full SHA
    12b5410 View commit details
  4. Added OTA password

    SciLor committed Dec 14, 2020
    Copy the full SHA
    85fc158 View commit details
12 changes: 12 additions & 0 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# These are supported funding model platforms

github: SciLor # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
patreon: # Replace with a single Patreon username
open_collective: # Replace with a single Open Collective username
ko_fi: # Replace with a single Ko-fi username
tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
liberapay: # Replace with a single Liberapay username
issuehunt: # Replace with a single IssueHunt username
otechie: # Replace with a single Otechie username
custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.vscode/
3 changes: 2 additions & 1 deletion HyperionRGB/.gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
ConfigStatic.h
ConfigStatic.h
ConfigStatic.h-*
4 changes: 2 additions & 2 deletions HyperionRGB/BaseHeader.h
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@
typeof (Y) y_ = (Y); \
(x_ < y_) ? x_ : y_; })*/

enum Mode { OFF, HYPERION_UDP, STATIC_COLOR, RAINBOW, FIRE2012 };
enum Mode { OFF, HYPERION_UDP, STATIC_COLOR, RAINBOW, FIRE2012, RAINBOW_V2, RAINBOW_FULL, MODE_NONE };
enum UdpProtocol { UDP_RAW, UDP_FILLER, UDP_FRAGMENT, UDP_TPM2 };

#endif

15 changes: 14 additions & 1 deletion HyperionRGB/Config.cpp
Original file line number Diff line number Diff line change
@@ -29,6 +29,9 @@ void Config::initConfig(void) {
_cfgStruct.ports.udpLed = 19446;
_cfgStruct.led.timeoutMs = 5000;
_cfgStruct.led.autoswitch = true;
_cfgStruct.led.count = 1;
_cfgStruct.led.color = CRGB(254, 254, 254);
_cfgStruct.misc.udpProtocol = UDP_RAW;
EEPROM.end();
saveConfig();
Log.info("Configuration at 0x%x with v%i (v%i expected), new configuration created", CONFIG_START_ADDRESS, version, CONFIG_ACTIVE_VERSION);
@@ -72,10 +75,14 @@ void Config::loadStaticConfig(void) {
_cfgStruct.led.idleMode = CONFIG_LED_STANDARD_MODE;
_cfgStruct.led.timeoutMs = CONFIG_LED_STANDARD_MODE_TIMEOUT_MS;
_cfgStruct.led.autoswitch = CONFIG_LED_HYPERION_AUTOSWITCH;
_cfgStruct.led.count = CONFIG_LED_COUNT;
_cfgStruct.led.color = CONFIG_LED_STATIC_COLOR;

_cfgStruct.ports.jsonServer = CONFIG_PORT_JSON_SERVER;
_cfgStruct.ports.udpLed = CONFIG_PORT_UDP_LED;

_cfgStruct.misc.udpProtocol = CONFIG_PROTOCOL_UDP;

saveConfig();
Log.info("CFG=%s", "loadStaticConfig END");
}
@@ -96,10 +103,17 @@ void Config::logConfig(void) {
Log.debug(" idleMode=%i", _cfgStruct.led.idleMode);
Log.debug(" timeoutMs=%i", _cfgStruct.led.timeoutMs);
Log.debug(" autoswitch=%i", _cfgStruct.led.autoswitch);
Log.debug(" count=%i", _cfgStruct.led.count);
Log.debug(" static-color.r=%i", _cfgStruct.led.color.r);
Log.debug(" static-color.g=%i", _cfgStruct.led.color.g);
Log.debug(" static-color.b=%i", _cfgStruct.led.color.b);

Log.debug("+PORTS+");
Log.debug(" jsonServer=%i", _cfgStruct.ports.jsonServer);
Log.debug(" udpLed=%i", _cfgStruct.ports.udpLed);

Log.debug("+MISC+");
Log.debug(" udpProtocol=%i", _cfgStruct.misc.udpProtocol);

}

@@ -123,4 +137,3 @@ ConfigIP Config::ip2cfg(const byte ip[4]) {
cfgIp.d = ip[3];
return cfgIp;
}

15 changes: 10 additions & 5 deletions HyperionRGB/ConfigStatic.h.example
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
/*------------------------------------------------*/
/*Configuration type*/

//#define CONFIG_ENABLE_WEBCONFIG 1
#define CONFIG_ENABLE_WEBCONFIG 1

//Replaces all values in the webconfig with the ConfigStatic.h values when CONFIG_ENABLE_WEBCONFIG is enabled
//#define CONFIG_OVERWRITE_WEBCONFIG 1

/*------------------------------------------------*/
/*Logging level*/

#define LOGLEVEL LOG_LEVEL_INFOS
//#define LOGLEVEL LOG_LEVEL_INFOS
//#define LOGLEVEL LOG_LEVEL_DEBUG
//#define LOGLEVEL LOG_LEVEL_VERBOSE

@@ -36,10 +36,11 @@
#define CONFIG_LED_COLOR_ORDER RGB
#define CONFIG_LED_COUNT 50

//OFF, HYPERION_UDP, STATIC_COLOR, RAINBOW, FIRE2012
#define CONFIG_LED_STANDARD_MODE FIRE2012
//OFF, HYPERION_UDP, STATIC_COLOR, RAINBOW, FIRE2012, RAINBOW_V2, RAINBOW_FULL
#define CONFIG_LED_STANDARD_MODE RAINBOW_V2
#define CONFIG_LED_HYPERION_AUTOSWITCH true
#define CONFIG_LED_STANDARD_MODE_TIMEOUT_MS 5000
#define CONFIG_LED_STATIC_COLOR CRGB(254, 254, 254)

/*------------------------------------------------*/
/*Main configuration*/
@@ -52,7 +53,11 @@
//const byte CONFIG_WIFI_SUBNET[] = {255, 255, 255, 0};
//const byte CONFIG_WIFI_DNS[] = {192, 168, 0, 1};

#define CONFIG_WIFI_HOSTNAME "ESP8266"
#define CONFIG_WIFI_HOSTNAME "HyperionRGB"

#define CONFIG_PORT_JSON_SERVER 19444
#define CONFIG_PORT_UDP_LED 19446

#define CONFIG_PROTOCOL_UDP UDP_RAW //UDP_RAW, UDP_FRAGMENT, UDP_TPM2 - Hyperion 0: RAW, 2: Fragmented, 3: TPM2 - Check the README

#define CONFIG_OTA_AP_PASSWORD "HyperionRGB"
14 changes: 12 additions & 2 deletions HyperionRGB/ConfigStructures.h
Original file line number Diff line number Diff line change
@@ -4,6 +4,8 @@
#define CONFIG_START_ADDRESS 0
#define CONFIG_ACTIVE_VERSION 3

#include <FastLED.h>

typedef struct {
uint8_t a;
uint8_t b;
@@ -30,8 +32,9 @@ typedef struct {
uint8_t idleMode;
uint32_t timeoutMs;
boolean autoswitch;

char spacer[59];
uint16_t count;
CRGB color;
char spacer[54];
} ConfigLed;

typedef struct {
@@ -41,11 +44,18 @@ typedef struct {
char spacer[32];
} ConfigPort;

typedef struct {
uint8_t udpProtocol;

char spacer[63];
} ConfigMisc;

typedef struct {
uint8_t version;
ConfigWifi wifi;
ConfigLed led;
ConfigPort ports;
ConfigMisc misc;
} ConfigStruct;

#endif
31 changes: 6 additions & 25 deletions HyperionRGB/EnhancedThread.cpp
Original file line number Diff line number Diff line change
@@ -1,25 +1,6 @@
#include "EnhancedThread.h"

void EnhancedThread::run() {
Thread::run();
if (_runOnce)
Thread::enabled = false;
}

void EnhancedThread::runIfNeeded(void) {
if(Thread::shouldRun())
Thread::run();
}

void EnhancedThread::reset(void) {
Thread::enabled = true;
Thread::runned();
}

void EnhancedThread::setRunOnce(bool runOnce) {
_runOnce = runOnce;
}
unsigned long EnhancedThread::getInterval(void) {
return interval;
}

//#include "EnhancedThread.h"
/*
* Put everything into the EnhancedThread.h to make it compatible with the ESP32
* There seems to be a bug in the ArduinoThread lib
*
*/
25 changes: 24 additions & 1 deletion HyperionRGB/EnhancedThread.h
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
#include "BaseHeader.h"
#include <Thread.h>

class EnhancedThread: public Thread {
class EnhancedThread : public Thread {
public:
void
run(void),
@@ -16,4 +16,27 @@ class EnhancedThread: public Thread {
bool _runOnce;
};

void EnhancedThread::run() {
Thread::run();
if (_runOnce)
Thread::enabled = false;
}

void EnhancedThread::runIfNeeded(void) {
if(Thread::shouldRun())
Thread::run();
}

void EnhancedThread::reset(void) {
Thread::enabled = true;
Thread::runned();
}

void EnhancedThread::setRunOnce(bool runOnce) {
_runOnce = runOnce;
}
unsigned long EnhancedThread::getInterval(void) {
return interval;
}

#endif
Loading