Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge upstream #4593

Open
wants to merge 55 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
fd6b12c
set hardware compilation constants
G0RIAN Oct 8, 2021
9192d29
Merge branch 'master' of github.com:G0RIAN/WLED
G0RIAN Oct 8, 2021
db6b1b2
add new custom effect 'Hive 51'
G0RIAN Oct 8, 2021
2a0634d
Code Formatting, modified new effect
G0RIAN Oct 9, 2021
d5148ac
add new hive rotation effect
G0RIAN Oct 10, 2021
5feace1
adjust power usage constant to hardware
G0RIAN Oct 10, 2021
22f5d62
get edge directions from segment number
G0RIAN Oct 10, 2021
8738ac1
made basic rotation effect work
G0RIAN Oct 11, 2021
15d8f99
Merge branch 'Aircoookie:master' into master
G0RIAN Oct 11, 2021
31d3600
Merge branch 'Aircoookie:master' into master
G0RIAN Oct 12, 2021
c2ebdb7
finished rotating hives effects, added matrix effects
G0RIAN Oct 12, 2021
dba71a4
Merge branch 'master' of https://github.com/G0RIAN/WLED
G0RIAN Oct 12, 2021
e7ee31c
Merge branch 'Aircoookie:master' into master
G0RIAN Oct 17, 2021
815cc34
Updated README
G0RIAN Oct 20, 2021
f9234b3
Merge branch 'Aircoookie:master' into master
G0RIAN Oct 20, 2021
2285ed9
clean Code, make the strobing segments effect use the color palette
G0RIAN Oct 20, 2021
233e272
add icon
G0RIAN Oct 20, 2021
56680d6
rename swipe function
G0RIAN Oct 21, 2021
f1e0ece
switch to ESP32
G0RIAN Nov 7, 2021
4adf2fa
define LED indices for effect edges
G0RIAN Nov 7, 2021
5983ec1
fix effects, simplify code, add comments, add exception handling, cha…
G0RIAN Nov 8, 2021
07acf63
Merge branch 'Aircoookie:master' into master
G0RIAN Nov 8, 2021
59f6994
fix active edges count per slider, fix skipping LED, optimize reversi…
Nov 14, 2021
21e277d
Merge branch 'Aircoookie:master' into master
G0RIAN Nov 14, 2021
7642b2d
add 'hex_' prefix to binaries
G0RIAN Nov 14, 2021
73db7ba
change repo url to fork
G0RIAN Nov 14, 2021
33c8ce6
Added wave effect
Jonazzzzzz Nov 14, 2021
4323624
remove redundant memory allocation check, fix: use correct edge count…
G0RIAN Nov 15, 2021
a68133f
Merge branch 'master' of https://github.com/G0RIAN/WLED
G0RIAN Nov 15, 2021
5c769b3
add missing function declaration for HIVE wave effect
G0RIAN Nov 15, 2021
6cecd22
reduced strobing interval
G0RIAN Dec 12, 2021
5e3d67e
allow the compiler to use exceptions
G0RIAN Dec 12, 2021
8123869
added full matrix effects
G0RIAN Dec 12, 2021
64641d7
Merge branch 'master' of https://github.com/Aircoookie/WLED into Airc…
G0RIAN Dec 12, 2021
27bcd8e
added full matrix effects
G0RIAN Dec 12, 2021
5adc477
Merge branch 'master' of https://github.com/G0RIAN/WLED
G0RIAN Dec 12, 2021
6a053ec
make full matrix swipe use full segments, change direction of edge 40…
G0RIAN Dec 12, 2021
378f87d
Merge branch 'Aircookie-master'
G0RIAN Dec 12, 2021
9c7ba88
Merge branch 'Aircookie-master'
G0RIAN Dec 12, 2021
149062f
Merge branch 'master' of https://github.com/G0RIAN/WLED
G0RIAN Dec 13, 2021
19ae28c
Merge branch 'master' of https://github.com/G0RIAN/WLED
G0RIAN Dec 13, 2021
fde87ba
added WLED Hive image
G0RIAN Dec 13, 2021
c111b71
Merge branch 'master' of https://github.com/G0RIAN/WLED
G0RIAN Dec 13, 2021
52c6c11
Added hives image
G0RIAN Dec 13, 2021
8157035
build: change upload speed to 921600
G0RIAN Jan 16, 2022
b32ca19
bugfix: last edge can now light up
G0RIAN Jan 21, 2022
907b099
Merge pull request from G0RIAN/master
G0RIAN May 15, 2022
a645526
fix: Upper limit fix for random strobing segments
G0RIAN May 15, 2022
90b7cc6
Merge branch 'master' of https://github.com/Aircoookie/WLED into Airc…
G0RIAN Dec 12, 2021
bca4cc0
Merge branch 'Aircookie-master' of https://github.com/G0RIAN/WLED int…
G0RIAN May 15, 2022
62e6543
fix: add missing semicolons and braces
G0RIAN May 15, 2022
9559ca1
Merge branch 'main' of https://github.com/Aircoookie/WLED into Aircoo…
G0RIAN May 15, 2022
dfdb6a5
Merge branch 'Aircookie-master'
G0RIAN May 15, 2022
525bc7f
Merge branch 'Aircoookie-master'
G0RIAN May 15, 2022
6dd5f45
Merge pull request #4 from Aircoookie/main
G0RIAN Aug 23, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@
node_modules
.idea
.direnv
.vscode/extensions.json
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Conflicting ignore settings for extensions.json

The newly added line ignores .vscode/extensions.json, but line 6 has !.vscode/extensions.json which explicitly includes this file. These directives contradict each other, causing ambiguous behavior.

Apply this diff to resolve the conflict:

-!.vscode/extensions.json
+# .vscode settings tracked except for extensions.json
 .vscode/extensions.json

Alternatively, if the intent is to include extensions.json in version control, remove line 18 instead.

Binary file added images/hives.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@
},
"repository": {
"type": "git",
"url": "git+https://github.com/Aircoookie/WLED.git"
"url": "git+https://github.com/G0RIAN/WLED.git"
},
"author": "",
"license": "ISC",
"bugs": {
"url": "https://github.com/Aircoookie/WLED/issues"
"url": "https://github.com/G0RIAN/WLED/issues"
},
"homepage": "https://github.com/Aircoookie/WLED#readme",
"homepage": "https://github.com/G0RIAN/WLED#readme",
"dependencies": {
"clean-css": "^4.2.3",
"html-minifier-terser": "^5.1.1",
Expand Down
2 changes: 1 addition & 1 deletion pio-scripts/output_bins.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ def bin_rename_copy(source, target, env):
if release_name:
_create_dirs(["release"])
version = _get_cpp_define_value(env, "WLED_VERSION")
release_file = "{}release{}WLED_{}_{}.bin".format(OUTPUT_DIR, os.path.sep, version, release_name)
release_file = "{}release{}WLED_hex_{}_{}.bin".format(OUTPUT_DIR, os.path.sep, version, release_name)
shutil.copy(str(target[0]), release_file)

# check if new target files exist and remove if necessary
Expand Down
11 changes: 7 additions & 4 deletions platformio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
; default_envs = travis_esp8266, travis_esp32

# Release binaries
default_envs = nodemcuv2, esp8266_2m, esp01_1m_full, esp32dev, esp32_eth, esp32s2_saola, esp32c3
; default_envs = nodemcuv2, esp8266_2m, esp01_1m_full, esp32dev, esp32_eth

# Build everything
; default_envs = esp32dev, esp8285_4CH_MagicHome, codm-controller-0.6-rev2, codm-controller-0.6, esp32s2_saola, d1_mini_5CH_Shojo_PCB, d1_mini, sp501e, travis_esp8266, travis_esp32, nodemcuv2, esp32_eth, anavi_miracle_controller, esp07, esp01_1m_full, m5atom, h803wf, d1_mini_ota, heltec_wifi_kit_8, esp8285_H801, d1_mini_debug, wemos_shield_esp32, elekstube_ips
Expand All @@ -28,7 +28,7 @@ default_envs = nodemcuv2, esp8266_2m, esp01_1m_full, esp32dev, esp32_eth, esp32s
; default_envs = h803wf
; default_envs = d1_mini_debug
; default_envs = d1_mini_ota
; default_envs = esp32dev
default_envs = esp32dev
; default_envs = esp8285_4CH_MagicHome
; default_envs = esp8285_H801
; default_envs = d1_mini_5CH_Shojo_PCB
Expand Down Expand Up @@ -115,8 +115,11 @@ build_flags =
-D DECODE_LG=true
-DWLED_USE_MY_CONFIG
; -D USERMOD_SENSORSTOMQTT
-fexceptions


build_unflags =
-fno-exceptions
Comment on lines +118 to +122
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Contradictory exception handling flags

You've added both -fexceptions to build_flags and -fno-exceptions to build_unflags. These flags contradict each other - one enables C++ exceptions and the other disables them.

This configuration may lead to unexpected behavior during builds. PlatformIO applies build_unflags before build_flags, so the final result would be enabling exceptions. If that's your intention, you should remove one of these flags to avoid confusion:

build_flags =
  -DMQTT_MAX_PACKET_SIZE=1024
  -DSECURE_CLIENT=SECURE_CLIENT_BEARSSL
  -DBEARSSL_SSL_BASIC
  -D CORE_DEBUG_LEVEL=0
  -D NDEBUG
  #build_flags for the IRremoteESP8266 library (enabled decoders have to appear here)
  -D _IR_ENABLE_DEFAULT_=false
  -D DECODE_HASH=true
  -D DECODE_NEC=true
  -D DECODE_SONY=true
  -D DECODE_SAMSUNG=true
  -D DECODE_LG=true
  -DWLED_USE_MY_CONFIG
  ; -D USERMOD_SENSORSTOMQTT
  -fexceptions

build_unflags =
-  -fno-exceptions
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
-fexceptions
build_unflags =
-fno-exceptions
build_flags =
-DMQTT_MAX_PACKET_SIZE=1024
-DSECURE_CLIENT=SECURE_CLIENT_BEARSSL
-DBEARSSL_SSL_BASIC
-D CORE_DEBUG_LEVEL=0
-D NDEBUG
#build_flags for the IRremoteESP8266 library (enabled decoders have to appear here)
-D _IR_ENABLE_DEFAULT_=false
-D DECODE_HASH=true
-D DECODE_NEC=true
-D DECODE_SONY=true
-D DECODE_SAMSUNG=true
-D DECODE_LG=true
-DWLED_USE_MY_CONFIG
; -D USERMOD_SENSORSTOMQTT
-fexceptions
build_unflags =


# enables all features for travis CI
build_flags_all_features =
Expand Down Expand Up @@ -148,9 +151,9 @@ framework = arduino
board_build.flash_mode = dout
monitor_speed = 115200
# slow upload speed (comment this out with a ';' when building for development use)
upload_speed = 115200
; upload_speed = 115200
# fast upload speed (remove ';' when building for development use)
; upload_speed = 921600
upload_speed = 921600

# ------------------------------------------------------------------------------
# LIBRARIES: required dependencies
Expand Down
16 changes: 16 additions & 0 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,22 @@
<a href="https://gitpod.io/#https://github.com/Aircoookie/WLED"><img src="https://img.shields.io/badge/Gitpod-ready--to--code-blue?style=flat-square&logo=gitpod"></a>

</p>

# WLED on hexagon structures ⬡
This fork of WLED implements further effects designed for hexagon structures (specifically a struture of 3 * 5 hexagons (a total of 60 edges) with an edge length of 10 LEDs (=16.67 cm with a 60 LEDs/m strip). The basic functionality of WLED is still given. Current added effects include:
- 6 rotating hexagons (color adapts to chosen palette, see image below)
- 6 reverse rotating hexagons (color adapts to chosen palette)
- randomly strobing edges (color adapts to chosen palette)
- matrix style descending stripes on the 6 "vertical" edges (color adapts to chosen palette)
- matrix style ascending stripes on the 6 "vertical" edges (color adapts to chosen palette)
- more to come

Using a ESP32 over an ESP8266 is highly recommended (especially on strobing effects).

## 🖼️ Image
<img src="/images/hives.jpg" width="50%">

Original project description of WLED by Aircoookie below.

# Welcome to my project WLED! ✨

Expand Down
Loading