Berry animation remove strip from DSL (arendst#23817)

Author: s-hadinger

lib/libesp32/berry_animation/anim_examples/compiled/COMPILATION_REPORT.md

@@ -1,11 +1,11 @@
 # DSL Compilation Report
 
-Generated: Ven  1 aoû 2025 18:49:41 CEST
+Generated: Sam 23 aoû 2025 10:30:34 CEST
 
 ## Summary
 
-- **Total files**: 25
-- **Successfully compiled**: 25
+- **Total files**: 24
+- **Successfully compiled**: 24
 - **Failed to compile**: 0
 - **Success rate**: 100%
 
@@ -27,7 +27,6 @@ Generated: Ven  1 aoû 2025 18:49:41 CEST
 - ✅ ocean_waves.anim
 - ✅ palette_demo.anim
 - ✅ palette_showcase.anim
-- ✅ pattern_animation_demo.anim
 - ✅ plasma_wave.anim
 - ✅ police_lights.anim
 - ✅ property_assignment_demo.anim

lib/libesp32/berry_animation/anim_examples/compiled/matrix_rain.be

@@ -13,7 +13,7 @@
 # 
 # # Dark background
 # color matrix_bg = 0x000000
-# animation background = solid(color=matrix_bg)
+# animation background = solid(color=matrix_bg, priority=50)
 # 
 # # Define matrix green palette
 # palette matrix_greens = [
@@ -29,33 +29,34 @@
 # animation stream1 = comet_animation(
 #   color=stream1_pattern, # color source
 #   tail_length=15,        # long tail
-#   speed=1.5s             # speed
+#   speed=1.5s,            # speed
+#   priority = 10
 # )
-# stream1.priority = 10
+# 
 # 
 # color stream2_pattern = rich_palette(palette=matrix_greens, cycle_period=1.8s, transition_type=LINEAR, brightness=200)
 # animation stream2 = comet_animation(
 #   color=stream2_pattern, # color source
 #   tail_length=12,        # medium tail
-#   speed=2.2s             # different speed
+#   speed=2.2s,            # different speed
+#   priority = 8
 # )
-# stream2.priority = 8
 # 
 # color stream3_pattern = rich_palette(palette=matrix_greens, cycle_period=2.5s, transition_type=LINEAR, brightness=180)
 # animation stream3 = comet_animation(
 #   color=stream3_pattern, # color source
 #   tail_length=10,        # shorter tail
-#   speed=1.8s             # another speed
+#   speed=1.8s,            # another speed
+#   priority = 6
 # )
-# stream3.priority = 6
 # 
 # # Add random bright flashes (like code highlights)
 # animation code_flash = twinkle_animation(
 #   color=0x00FFAA,  # Bright cyan-green
 #   density=3,       # density (few flashes)
-#   twinkle_speed=150ms # twinkle speed (quick flash)
+#   twinkle_speed=150ms, # twinkle speed (quick flash)
+#   priority = 20
 # )
-# code_flash.priority = 20
 # 
 # # Start all animations
 # run background
@@ -76,6 +77,7 @@ var engine = animation.init_strip()
 var matrix_bg_ = 0xFF000000
 var background_ = animation.solid(engine)
 background_.color = animation.global('matrix_bg_', 'matrix_bg')
+background_.priority = 50
 # Define matrix green palette
 var matrix_greens_ = bytes("00000000" "40003300" "80006600" "C000AA00" "FF00FF00")
 # Create multiple cascading streams
@@ -87,8 +89,8 @@ stream1_pattern_.brightness = 255
 var stream1_ = animation.comet_animation(engine)
 stream1_.color = animation.global('stream1_pattern_', 'stream1_pattern')
 stream1_.tail_length = 15
-stream1_.speed = 1500  # speed
-animation.global('stream1_').priority = 10
+stream1_.speed = 1500
+stream1_.priority = 10
 var stream2_pattern_ = animation.rich_palette(engine)
 stream2_pattern_.palette = animation.global('matrix_greens_', 'matrix_greens')
 stream2_pattern_.cycle_period = 1800
@@ -97,8 +99,8 @@ stream2_pattern_.brightness = 200
 var stream2_ = animation.comet_animation(engine)
 stream2_.color = animation.global('stream2_pattern_', 'stream2_pattern')
 stream2_.tail_length = 12
-stream2_.speed = 2200  # different speed
-animation.global('stream2_').priority = 8
+stream2_.speed = 2200
+stream2_.priority = 8
 var stream3_pattern_ = animation.rich_palette(engine)
 stream3_pattern_.palette = animation.global('matrix_greens_', 'matrix_greens')
 stream3_pattern_.cycle_period = 2500
@@ -107,14 +109,14 @@ stream3_pattern_.brightness = 180
 var stream3_ = animation.comet_animation(engine)
 stream3_.color = animation.global('stream3_pattern_', 'stream3_pattern')
 stream3_.tail_length = 10
-stream3_.speed = 1800  # another speed
-animation.global('stream3_').priority = 6
+stream3_.speed = 1800
+stream3_.priority = 6
 # Add random bright flashes (like code highlights)
 var code_flash_ = animation.twinkle_animation(engine)
 code_flash_.color = 0xFF00FFAA
 code_flash_.density = 3
-code_flash_.twinkle_speed = 150  # twinkle speed (quick flash)
-animation.global('code_flash_').priority = 20
+code_flash_.twinkle_speed = 150
+code_flash_.priority = 20
 # Start all animations
 # Start all animations/sequences
 if global.contains('sequence_background')

lib/libesp32/berry_animation/anim_examples/compiled/run_successful_tests.sh

@@ -154,15 +154,6 @@ else
 fi
 ((TOTAL_COUNT++))
 
-echo -n "Testing pattern_animation_demo.be... "
-if $BERRY_CMD "$COMPILED_DIR/pattern_animation_demo.be" > /dev/null 2>&1; then
-    echo "✓"
-    ((SUCCESS_COUNT++))
-else
-    echo "✗"
-fi
-((TOTAL_COUNT++))
-
 echo -n "Testing plasma_wave.be... "
 if $BERRY_CMD "$COMPILED_DIR/plasma_wave.be" > /dev/null 2>&1; then
     echo "✓"

lib/libesp32/berry_animation/anim_examples/compiled/run_tests.sh

@@ -4,8 +4,8 @@
 
 set -e
 
-BERRY_CMD="./berry -s -g -m lib/libesp32/berry_animation -e 'import tasmota'"
-COMPILED_DIR="anim_examples/compiled"
+BERRY_CMD="./berry -s -g -m lib/libesp32/berry_animation/src -e 'import tasmota'"
+COMPILED_DIR="lib/libesp32/berry_animation/anim_examples/compiled"
 
 echo "Running compiled DSL examples..."
 echo "==============================="

lib/libesp32/berry_animation/anim_examples/matrix_rain.anim

@@ -5,7 +5,7 @@
 
 # Dark background
 color matrix_bg = 0x000000
-animation background = solid(color=matrix_bg)
+animation background = solid(color=matrix_bg, priority=50)
 
 # Define matrix green palette
 palette matrix_greens = [
@@ -21,33 +21,34 @@ color stream1_pattern = rich_palette(palette=matrix_greens, cycle_period=2s, tra
 animation stream1 = comet_animation(
   color=stream1_pattern, # color source
   tail_length=15,        # long tail
-  speed=1.5s             # speed
+  speed=1.5s,            # speed
+  priority = 10
 )
-stream1.priority = 10
+
 
 color stream2_pattern = rich_palette(palette=matrix_greens, cycle_period=1.8s, transition_type=LINEAR, brightness=200)
 animation stream2 = comet_animation(
   color=stream2_pattern, # color source
   tail_length=12,        # medium tail
-  speed=2.2s             # different speed
+  speed=2.2s,            # different speed
+  priority = 8
 )
-stream2.priority = 8
 
 color stream3_pattern = rich_palette(palette=matrix_greens, cycle_period=2.5s, transition_type=LINEAR, brightness=180)
 animation stream3 = comet_animation(
   color=stream3_pattern, # color source
   tail_length=10,        # shorter tail
-  speed=1.8s             # another speed
+  speed=1.8s,            # another speed
+  priority = 6
 )
-stream3.priority = 6
 
 # Add random bright flashes (like code highlights)
 animation code_flash = twinkle_animation(
   color=0x00FFAA,  # Bright cyan-green
   density=3,       # density (few flashes)
-  twinkle_speed=150ms # twinkle speed (quick flash)
+  twinkle_speed=150ms, # twinkle speed (quick flash)
+  priority = 20
 )
-code_flash.priority = 20
 
 # Start all animations
 run background

lib/libesp32/berry_animation/docs/DSL_REFERENCE.md

@@ -12,7 +12,8 @@ Comments use the `#` character and extend to the end of the line:
 
 ```dsl
 # This is a full-line comment
-strip length 30  # This is an inline comment
+# strip length 30  # This is an inline comment (TEMPORARILY DISABLED)
+color red = #FF0000  # This is an inline comment
 ```
 
 Comments are preserved in the generated code and can appear anywhere in the DSL.
@@ -22,8 +23,8 @@ Comments are preserved in the generated code and can appear anywhere in the DSL.
 A DSL program consists of statements that can appear in any order:
 
 ```dsl
-# Optional strip configuration (must be first if present)
-strip length 60
+# Strip configuration is handled automatically
+# strip length 60  # TEMPORARILY DISABLED
 
 # Color definitions
 color red = #FF0000
@@ -52,7 +53,7 @@ run demo
 The following keywords are reserved and cannot be used as identifiers:
 
 **Configuration Keywords:**
-- `strip` - Strip configuration
+- `strip` - Strip configuration (temporarily disabled, reserved keyword)
 - `set` - Variable assignment
 
 **Definition Keywords:**
@@ -179,13 +180,15 @@ Color123        # Valid identifier
 
 ### Strip Configuration
 
-The `strip` statement configures the LED strip and must be the first statement if present:
+**Note: The `strip` directive is temporarily disabled.** Strip configuration is handled automatically by the host system.
+
+~~The `strip` statement configures the LED strip and must be the first statement if present:~~
 
 ```dsl
-strip length 60     # Set strip length to 60 LEDs
+# strip length 60     # TEMPORARILY DISABLED
 ```
 
-If omitted, the system uses the configured strip length from the host system.
+~~If omitted,~~ The system uses the configured strip length from the host system.
 
 ### Variable Assignment
 
@@ -578,8 +581,8 @@ statement = config_stmt
           | execution_stmt ;
 
 (* Configuration *)
-config_stmt = strip_config | variable_assignment ;
-strip_config = "strip" "length" number ;
+config_stmt = variable_assignment ;
+(* strip_config = "strip" "length" number ; -- TEMPORARILY DISABLED *)
 variable_assignment = "set" identifier "=" expression ;
 
 (* Definitions *)

lib/libesp32/berry_animation/src/animation.be

@@ -156,6 +156,9 @@ register_to_animation(rich_palette_animation)
 
 # Function called to initialize the `Leds` and `engine` objects
 #
+# It keeps track of previously created engines and strips to reuse
+# when called with the same arguments
+#
 # Parameters:
 #   l - list of arguments (vararg)
 #
@@ -164,8 +167,24 @@ register_to_animation(rich_palette_animation)
 def animation_init_strip(*l)
   import global
   import animation
-  var strip = call(global.Leds, l)    # call global.Leds() with vararg
-  var engine = animation.create_engine(strip)
+  import introspect
+  # we keep a hash of strip configurations to reuse existing engines
+  if !introspect.contains(animation, "_engines")
+    animation._engines = {}
+  end
+
+  var l_as_string = str(l)
+  var engine = animation._engines.find(l_as_string)
+  if (engine != nil)
+    # we reuse it
+    engine.stop()
+    engine.clear()
+  else
+    var strip = call(global.Leds, l)    # call global.Leds() with vararg
+    engine = animation.create_engine(strip)
+    animation._engines[l_as_string] = engine
+  end
+
   return engine
 end
 animation.init_strip = animation_init_strip

lib/libesp32/berry_animation/src/dsl/transpiler.be

@@ -102,12 +102,10 @@ class SimpleDSLTranspiler
     # Handle keywords
     if tok.type == animation_dsl.Token.KEYWORD
       if tok.value == "strip"
-        if !is_first_real_statement
-          self.error("'strip' declaration must be the first statement")
-          self.skip_statement()
-          return
-        end
-        self.process_strip()
+        # Strip directive is temporarily disabled but remains a reserved keyword
+        self.error("'strip' directive is temporarily disabled. Strip configuration is handled automatically.")
+        self.skip_statement()
+        return
       else
         # For any other statement, ensure strip is initialized
         if !self.strip_initialized
@@ -324,16 +322,17 @@ class SimpleDSLTranspiler
   end
 
   # Process strip configuration: strip length 60
-  def process_strip()
-    self.next()  # skip 'strip'
-    var prop = self.expect_identifier()
-    if prop == "length"
-      var length = self.expect_number()
-      var inline_comment = self.collect_inline_comment()
-      self.add(f"var engine = animation.init_strip({length}){inline_comment}")
-      self.strip_initialized = true  # Mark that strip was initialized
-    end
-  end
+  # Temporarily disabled
+  # def process_strip()
+  #   self.next()  # skip 'strip'
+  #   var prop = self.expect_identifier()
+  #   if prop == "length"
+  #     var length = self.expect_number()
+  #     var inline_comment = self.collect_inline_comment()
+  #     self.add(f"var engine = animation.init_strip({length}){inline_comment}")
+  #     self.strip_initialized = true  # Mark that strip was initialized
+  #   end
+  # end
 
   # Process variable assignment: set brightness = 80%
   def process_set()