Finetuning...

theyosh · Dec 10, 2018 · f06a9d7 · f06a9d7
1 parent 035d88c
commit f06a9d7
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/terrariumSwitch.py b/terrariumSwitch.py
@@ -589,7 +589,7 @@ def __dim_switch(self,value,duration):
           dim_freq = terrariumPowerDimmerDC.DIMMER_FREQ
 
         for gpiopin in self.get_address().split(','):
-          if '' == gpiopin.strip():
+          if terrariumUtils.to_BCM_port_number(gpiopin) is False:
             continue
           logger.debug('Dimmer animation: Step: %s, value %s%%, Dim value: %s, timeout %s',counter+1, self.__dimmer_state, dim_value, duration)
           self.__pigpio.hardware_PWM(terrariumUtils.to_BCM_port_number(gpiopin), dim_freq, int(dim_value) * 1000) # 5000Hz state*1000% dutycycle

diff --git a/terrariumWebcam.py b/terrariumWebcam.py
@@ -421,6 +421,7 @@ def is_live(self):
 class terrariumWebcamRPI(terrariumWebcamSource):
   TYPE = 'rpicam'
   VALID_SOURCE = '^rpicam$'
+  INFO_SOURCE = 'rpicam'
 
   def set_resolution(self,width,height):
     self.resolution = {'width' : 1920,
@@ -454,6 +455,7 @@ def get_location(self):
 class terrariumWebcamUSB(terrariumWebcamSource):
   TYPE = 'usb'
   VALID_SOURCE = '^/dev/video\d+'
+  INFO_SOURCE = '/dev/video0'
 
   def get_raw_data(self):
     logger.debug('Using USB device: %s' % (self.location,))
@@ -496,6 +498,7 @@ def get_type(self):
 class terrariumWebcamRemote(terrariumWebcamSource):
   TYPE = 'remote'
   VALID_SOURCE = '^https?://.*\.[^m3u8]*$'
+  INFO_SOURCE = 'https://server.com/stream.jpg'
 
   def get_raw_data(self):
     logger.debug('Using URL: %s' % (self.location,))
@@ -517,6 +520,7 @@ def get_type(self):
 class terrariumWebcamRPILive(terrariumWebcamSource):
   TYPE = 'rpicam_live'
   VALID_SOURCE = '^rpicam_live$'
+  INFO_SOURCE = 'rpicam_live'
 
   TILE_LOCATION = terrariumWebcamSource.TILE_LOCATION
   STORE_LOCATION = '/dev/shm/' + terrariumWebcamSource.TILE_LOCATION
@@ -579,6 +583,7 @@ def is_live(self):
 class terrariumWebcamRemoteLive(terrariumWebcamSource):
   TYPE = 'remote_live'
   VALID_SOURCE = '^https?://.*\.m3u8$'
+  INFO_SOURCE = 'https://server.com/stream/playlist.m3u8'
 
   def get_raw_data(self):
     logger.debug('Using URL: %s' % (self.location,))
@@ -621,3 +626,11 @@ def __new__(self,webcam_id, location, name = '', rotation = '0', width = 640, he
         return webcam_source(webcam_id,location,name,rotation,width,height,archive,archive_light,archive_door,environment)
 
     raise terrariumWebcamSourceException()
+
+  @staticmethod
+  def valid_sources():
+    data = {}
+    for webcam_source in terrariumWebcam.SOURCES:
+      data[webcam_source.TYPE] = webcam_source.INFO_SOURCE
+
+    return data
diff --git a/views/notifications.tpl b/views/notifications.tpl
@@ -70,11 +70,11 @@
                   <div class="clearfix"></div>
                 </div>
                 <div class="x_content">
-                  <div class="col-md-3 col-sm-3 col-xs-12 form-group">
+                  <div class="col-md-4 col-sm-4 col-xs-12 form-group">
                     <label for="display_address">{{_('I2C address')}}</label>
                     <input class="form-control" name="display_address" placeholder="{{_('I2C address')}}" type="text" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="{{translations.get_translation('notification_display_address')}}">
                   </div>
-                  <div class="col-md-3 col-sm-3 col-xs-12 form-group">
+                  <div class="col-md-4 col-sm-4 col-xs-12 form-group">
                     <label for="display_resolution">{{_('Screen resolution')}}</label>
                     <div class="form-group" data-toggle="tooltip" data-placement="right" title="" data-original-title="{{translations.get_translation('notification_display_resolution')}}">
                       <select class="form-control" name="display_resolution" tabindex="-1" placeholder="{{_('Select an option')}}">
@@ -84,7 +84,7 @@
                       </select>
                     </div>
                   </div>
-                  <div class="col-md-3 col-sm-3 col-xs-12 form-group">
+                  <div class="col-md-4 col-sm-4 col-xs-12 form-group">
                     <label for="display_title">{{_('Title')}}</label>
                     <div class="form-group" data-toggle="tooltip" data-placement="right" title="" data-original-title="{{translations.get_translation('notification_display_title')}}">
                       <select class="form-control" name="display_title" tabindex="-1" placeholder="{{_('Select an option')}}">