Update readme, remove commented code

Author: ffont

README.md

@@ -338,11 +338,12 @@ push = push2_python.Push2()
 # This function is defined in a rather silly way, could probably be optimized a lot ;)
 def generate_3_color_frame():
     colors = ['{b:05b}{g:06b}{r:05b}'.format(
-                  r=int(32*random.random()), g=int(64*random.random()), b=int(32*random.random())),
-              '{b:05b}{g:06b}{r:05b}'.format(
-                  r=int(32*random.random()), g=int(64*random.random()), b=int(32*random.random())),
-              '{b:05b}{g:06b}{r:05b}'.format(
-                  r=int(32*random.random()), g=int(64*random.random()), b=int(32*random.random()))]
+        r=int(31*random.random()), g=int(63*random.random()), b=int(31*random.random())),
+        '{b:05b}{g:06b}{r:05b}'.format(
+        r=int(31*random.random()), g=int(63*random.random()), b=int(31*random.random())),
+        '{b:05b}{g:06b}{r:05b}'.format(
+        r=int(31*random.random()), g=int(63*random.random()), b=int(31*random.random()))]
+    colors = [int(c, 2) for c in colors]
     line_bytes = []
     for i in range(0, 960):  # 960 pixels per line
         if i <= 960 // 3:
@@ -364,7 +365,7 @@ for i in range(0, 20):
 # Now crate an extra frame which loads an image from a file. Image must be 960x160 pixels.
 img = Image.open('test_img_960x160.png')
 frame = numpy.array(img)
-#frame = img_array/255  # Convert rgb values to [0.0, 1.0] floats
+frame = img_array/255  # Convert rgb values to [0.0, 1.0] floats
 
 # Now lets configure some action handlers which will display frames in Push2's display in 
 # reaction to pad and button presses

push2_python/simulator/simulator.py

@@ -104,23 +104,7 @@ def prepare_next_frame_for_display(self, frame, input_format=push2_python.consta
                 frame_b_shifted = numpy.left_shift(frame_b_filtered, 8)  # Shift 8 to the left so G sits at the 16-23 bits
                 rgb_frame = frame_r_shifted + frame_g_shifted + frame_b_shifted  # Combine all channels
                 rgb_frame = numpy.bitwise_or(rgb_frame, int('11111111000000000000000000000000', 2))  # Set alpha channel to "full!" (bits 24-32)
-
-            '''
-            elif input_format == push2_python.constants.FRAME_FORMAT_RGB:
-                
-                r_filter = int('111111110000000000000000', 2)
-                g_filter = int('000000001111111100000000', 2)
-                b_filter = int('000000000000000011111111', 2)
-                frame_r_filtered = numpy.bitwise_and(rgb_frame, r_filter)
-                frame_r_shifted = numpy.left_shift(frame_r_filtered, 16)  # Shift 16 to left so R starts at bit 32
-                frame_g_filtered = numpy.bitwise_and(rgb_frame, g_filter)
-                frame_g_shifted = numpy.left_shift(frame_g_filtered, 8)  # Shift 8 to the left so G start at bit 24
-                frame_b_filtered = numpy.bitwise_and(rgb_frame, b_filter)
-                frame_b_shifted = frame_b_filtered  # No shift, B already starts at 16
-                rgb_frame = frame_r_shifted + frame_g_shifted + frame_b_shifted  # Combine all channels
-                rgb_frame = numpy.bitwise_or(rgb_frame, int('00000000000000000000000011111111', 2))  # Set alpha channel to "full!"
-            '''
-                
+     
             img = Image.frombytes('RGBA', (960, 160), rgb_frame.tobytes())
             buffered = BytesIO()
             img.save(buffered, format="png")