Coderbot Music Features

api.py

@@ -15,6 +15,7 @@
 from config import Config
 from coderbotTestUnit import run_test as runCoderbotTestUnit
 import pigpio
+from musicPackages import MusicPackageManager
 
 BUTTON_PIN = 16
 
@@ -179,6 +180,25 @@ def updateFromPackage():
     os.system('sudo reboot')
     return 200
 
+def updatePackages():
+    """
+    Add a musical package an save the list of available packages on disk
+    also add sounds and directory
+    """
+    """zipName = request.args.get("zipname")
+    """
+    file_to_upload = connexion.request.files['file_to_upload']
+    print("adding " +str(file_to_upload))
+    print("adding " + file_to_upload.filename)
+    file_to_upload.save(os.path.join('./updatePackages/', file_to_upload.filename))
+    musicPkg = MusicPackageManager.get_instance()
+    response = musicPkg.addPackage(file_to_upload.filename)
+    if response == 1:
+        return 200
+    elif response == 2:
+        return 2
+    elif response == 3:
+        return 3
 
 
 ## Programs
@@ -252,4 +272,4 @@ def reset():
 def testCoderbot(data):
     # taking first JSON key value (varargin)
     tests_state = runCoderbotTestUnit(data[list(data.keys())[0]])
-    return tests_state
+    return tests_state

audioControls.py

@@ -0,0 +1,54 @@
+#    CoderBot, a didactical programmable robot.
+#    Copyright (C) 2014, 2015 Roberto Previtera <[email protected]>
+#
+#    This program is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License along
+#    with this program; if not, write to the Free Software Foundation, Inc.,
+#    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+############################################################################
+#    CoderBot, a didactical programmable robot.
+#    Copyright (C) 2014, 2015 Roberto Previtera <[email protected]>
+#
+#    MUSICAL EXTENTION for CoderBot
+#    This extention is develop by:
+#    Michele Carbonera - [email protected] - [email protected] - [email protected]
+#    Antonino Tramontana - [email protected]
+#    Copyright (C) 2020 
+############################################################################
+
+import os
+import alsaaudio
+
+class AudioCtrl:
+    mixer = None
+    _instance = None
+
+    @classmethod
+    def get_instance(cls):
+        if cls._instance is None:
+            cls._instance = AudioCtrl()
+        return cls._instance
+
+    def __init__(self):
+        self.mixer = alsaaudio.Mixer('PCM', cardindex=1)
+        #self.mixer = alsaaudio.PCM(device='numid=1', cardindex=1)
+
+    def getVolume(self):
+        print(self.mixer.getvolume())
+
+    def setVolume(self,valueVolume):
+        self.mixer.setvolume(valueVolume)
+'''
+if __name__ == "__main__":
+    a = AudioCtrl()
+    a.setVolume(20)
+    #a.setVolume(100)'''

coderbot.cfg

@@ -1 +1,40 @@
-{"move_power_angle_3": "60", "cnn_default_model": "generic_fast_low", "prog_maxblocks": "-1", "camera_jpeg_quality": "5", "show_page_control": "true", "camera_framerate": "30", "prog_scrollbars": "true", "move_fw_speed": "100", "prog_level": "adv", "move_motor_trim": "1", "move_motor_mode": "dc", "cv_image_factor": "2", "move_power_angle_1": "45", "camera_path_object_size_min": "4000", "button_func": "none", "camera_color_object_size_min": "4000", "camera_jpeg_bitrate": "1000000", "move_fw_elapse": "1", "show_control_move_commands": "true", "camera_color_object_size_max": "160000", "show_page_prefs": "true", "camera_exposure_mode": "auto", "ctrl_tr_elapse": "-1", "show_page_program": "true", "move_tr_elapse": "0.5", "camera_path_object_size_max": "160000", "sound_shutter": "$shutter.mp3", "ctrl_fw_elapse": "-1", "sound_stop": "$shutdown.mp3", "ctrl_tr_speed": "80", "ctrl_fw_speed": "100", "move_tr_speed": "85", "move_power_angle_2": "60", "ctrl_hud_image": "", "load_at_start": "", "sound_start": "$startup.mp3", "encoder": "True"}
+{
+   "move_power_angle_3":"60",
+   "cnn_default_model":"generic_fast_low",
+   "prog_maxblocks":"-1",
+   "camera_jpeg_quality":"5",
+   "show_page_control":"true",
+   "camera_framerate":"30",
+   "prog_scrollbars":"true",
+   "move_fw_speed":"100",
+   "prog_level":"adv",
+   "move_motor_trim":"1",
+   "move_motor_mode":"dc",
+   "cv_image_factor":"2",
+   "move_power_angle_1":"45",
+   "camera_path_object_size_min":"4000",
+   "button_func":"none",
+   "camera_color_object_size_min":"4000",
+   "camera_jpeg_bitrate":"1000000",
+   "move_fw_elapse":"1",
+   "show_control_move_commands":"true",
+   "camera_color_object_size_max":"160000",
+   "show_page_prefs":"true",
+   "camera_exposure_mode":"auto",
+   "ctrl_tr_elapse":"-1",
+   "show_page_program":"true",
+   "move_tr_elapse":"0.5",
+   "camera_path_object_size_max":"160000",
+   "sound_shutter":"$shutter.mp3",
+   "ctrl_fw_elapse":"-1",
+   "sound_stop":"$shutdown.mp3",
+   "ctrl_tr_speed":"80",
+   "ctrl_fw_speed":"100",
+   "move_tr_speed":"85",
+   "move_power_angle_2":"60",
+   "ctrl_hud_image":"",
+   "load_at_start":"",
+   "sound_start":"$startup.mp3",
+   "encoder":"True",
+   "audio_volume_level":"100"
+}

dist/static/music_package.json

@@ -0,0 +1,172 @@
+{
+    "packages": {
+        "cat": {
+            "category": "animal",
+            "name_IT": "gatto",
+            "name_EN": "cat",
+            "version": "0.1",
+            "date": "2020-04-08",
+            "interface": {
+                "base": {
+                    "available": "TRUE",
+                    "icon": "cat.png"
+                },
+                "intermediate": {
+                    "available": "TRUE",
+                    "icon": "cat.png"
+                },
+                "advanced": {
+                    "available": "TRUE",
+                    "icon": "cat.png"
+                }
+            }
+        },
+        "dog": {
+            "category": "animal",
+            "name_IT": "cane",
+            "name_EN": "dog",
+            "version": "0.1",
+            "date": "2020-04-08",
+            "interface": {
+                "base": {
+                    "available": "TRUE",
+                    "icon": "dog.png"
+                },
+                "intermediate": {
+                    "available": "TRUE",
+                    "icon": "dog.png"
+                },
+                "advanced": {
+                    "available": "TRUE",
+                    "icon": "dog.png"
+                }
+            }
+        },
+        "piano": {
+            "category": "instrument",
+            "name_IT": "pianoforte",
+            "name_EN": "piano",
+            "version": "0.1",
+            "date": "2020-04-08",
+            "interface": {
+                "base": {
+                    "available": "TRUE",
+                    "icon": "piano.png"
+                },
+                "intermediate": {
+                    "available": "TRUE",
+                    "icon": "piano.png"
+                },
+                "advanced": {
+                    "available": "TRUE",
+                    "icon": "piano.png"
+                }
+            }
+        },
+        "guitar": {
+            "category": "instrument",
+            "name_IT": "chitarra",
+            "name_EN": "guitar",
+            "version": "0.1",
+            "date": "2020-04-08",
+            "interface": {
+                "base": {
+                    "available": "TRUE",
+                    "icon": "guitar.png"
+                },
+                "intermediate": {
+                    "available": "TRUE",
+                    "icon": "guitar.png"
+                },
+                "advanced": {
+                    "available": "TRUE",
+                    "icon": "guitar.png"
+                }
+            }
+        },
+        "flute": {
+            "category": "instrument",
+            "name_IT": "flauto",
+            "name_EN": "flute",
+            "version": "0.1",
+            "date": "2020-04-08",
+            "interface": {
+                "base": {
+                    "available": "TRUE",
+                    "icon": "flute.png"
+                },
+                "intermediate": {
+                    "available": "TRUE",
+                    "icon": "flute.png"
+                },
+                "advanced": {
+                    "available": "TRUE",
+                    "icon": "flute.png"
+                }
+            }
+        },
+        "pig": {
+            "category": "animal",
+            "name_IT": "maiale",
+            "name_EN": "pig",
+            "version": "0.1",
+            "date": "2020-06-01",
+            "interface": {
+                "base": {
+                    "available": "TRUE",
+                    "icon": "pig.png"
+                },
+                "intermediate": {
+                    "available": "TRUE",
+                    "icon": "pig.png"
+                },
+                "advanced": {
+                    "available": "TRUE",
+                    "icon": "pig.png"
+                }
+            }
+        },
+        "elephant": {
+            "category": "animal",
+            "name_IT": "elefante",
+            "name_EN": "elephant",
+            "version": "0.1",
+            "date": "2020-06-01",
+            "interface": {
+                "base": {
+                    "available": "TRUE",
+                    "icon": "elephant.png"
+                },
+                "intermediate": {
+                    "available": "TRUE",
+                    "icon": "elephant.png"
+                },
+                "advanced": {
+                    "available": "TRUE",
+                    "icon": "elephant.png"
+                }
+            }
+        },
+        "snake": {
+            "category": "animal",
+            "name_IT": "serpente",
+            "name_EN": "snake",
+            "version": "0.1",
+            "date": "2020-06-01",
+            "interface": {
+                "base": {
+                    "available": "TRUE",
+                    "icon": "snake.png"
+                },
+                "intermediate": {
+                    "available": "TRUE",
+                    "icon": "snake.png"
+                },
+                "advanced": {
+                    "available": "TRUE",
+                    "icon": "snake.png"
+                }
+            }
+        }
+    }
+}

main.py

@@ -30,7 +30,8 @@
 from config import Config
 from cnn_manager import CNNManager
 from event import EventManager
-
+from audioControls import AudioCtrl
+from musicPackages import MusicPackageManager
 # Logging configuration
 logger = logging.getLogger()
 logger.setLevel(logging.INFO)
@@ -59,6 +60,8 @@
 app.prog = None
 app.shutdown_requested = False
 
+
+
 ## New API and web application
 
 # API v2 is defined in v2.yml and its methods are in api.py
@@ -153,10 +156,23 @@ def handle_config():
     """
     Overwrite configuration file on disk and reload it
     """
+    audioCtrl = AudioCtrl.get_instance()
+    audioCtrl.setVolume(int(request.form['audio_volume_level']))
     Config.write(updateDict(app.bot_config, request.form))
     app.bot_config = Config.get()
     return "ok"
 
+@app.route("/deletepkg", methods=["POST"])
+def handle_packages():
+    """
+    Delete a musical package an save the list of available packages on disk
+    also delete package sounds and directory
+    """
+    packageName = request.form.get("nameID")
+    musicPkg = MusicPackageManager.get_instance()
+    musicPkg.deletePackage(packageName)
+    return "package deleted"
+
 @app.route("/config", methods=["GET"])
 def returnConfig():
     """
@@ -468,6 +484,10 @@ def run_server():
                                         encoder=bool(app.bot_config.get('encoder')))
             audio = Audio.get_instance()
             audio.say(app.bot_config.get("sound_start"))
+
+            audioCtrl = AudioCtrl.get_instance()
+            audioCtrl.setVolume(int(app.bot_config.get['audio_volume_level']))
+
             try:
                 cam = Camera.get_instance()
                 Motion.get_instance()