Merge branch 'markhenrick-master'

Author: Gadgetoid

examples/README.md

@@ -17,14 +17,15 @@ Complete example for monitoring temperature and automatic fan control.
 * A long press on the button will toggle automatic mode off/on
 * A short press - when automatic is off - will toggle the fan
 
-The LED should light up Green when the fan is enabled, and Red when it's not.
+The LED will fade between green (cool) to red (hot) as the Pi's temperature changes.
 
 The script supports these arguments:
 
 * `--on-threshold N` the temperature at which to turn the fan on, in degrees C (default 65)
 * `--off-threshold N` the temperature at which to turn the fan off, in degrees C (default 55)
 * `--delay N` the delay between subsequent temperature readings, in seconds (default 2)
 * `--preempt` preemptively kick in the fan when the CPU frequency is raised (default off)
+* `--brightness` the brightness (value of HSV) of the LED (0-255, default 255)
 
 Deprecated arguments
 

examples/automatic.py

@@ -9,10 +9,6 @@
 import sys
 
 
-T_MIN = 35
-T_MAX = 95
-
-
 parser = argparse.ArgumentParser()
 parser.add_argument('--threshold', type=float, default=-1, help='Temperature threshold in degrees C to enable fan')
 parser.add_argument('--hysteresis', type=float, default=-1, help='Distance from threshold before fan is disabled')
@@ -24,6 +20,7 @@
 parser.add_argument('--verbose', action='store_true', default=False, help='Output temp and fan status messages')
 parser.add_argument('--nobutton', action='store_true', default=False, help='Disable button input')
 parser.add_argument('--noled', action='store_true', default=False, help='Disable LED control')
+parser.add_argument('--brightness', type=float, default=255.0, help='LED brightness, from 0 to 255')
 
 args = parser.parse_args()
 
@@ -44,20 +41,11 @@ def update_led_temperature(temp):
     temp = 1.0 - temp
     temp *= 120.0
     temp /= 360.0
-    r, g, b = [int(c * 255.0) for c in colorsys.hsv_to_rgb(temp, 1.0, 1.0)]
+    r, g, b = [int(c * 255.0) for c in colorsys.hsv_to_rgb(temp, 1.0, args.brightness / 255.0)]
     fanshim.set_light(r, g, b)
     led_busy.release()
 
 
-def update_led(state):
-    if args.noled:
-        return
-    if state:
-        fanshim.set_light(0, 255, 0)
-    else:
-        fanshim.set_light(255, 0, 0)
-
-
 def get_cpu_temp():
     t = psutil.sensors_temperatures()
     for x in ['cpu-thermal', 'cpu_thermal']:
@@ -77,7 +65,6 @@ def set_fan(status):
     changed = False
     if status != enabled:
         changed = True
-        # update_led(status)
         fanshim.set_fan(status)
     enabled = status
     return changed

examples/install-service.sh

@@ -7,6 +7,7 @@ PREEMPT="no"
 POSITIONAL_ARGS=()
 NOLED="no"
 NOBUTTON="no"
+BRIGHTNESS=255
 
 OLD_THRESHOLD=""
 OLD_HYSTERESIS=""
@@ -80,6 +81,11 @@ while [[ $# -gt 0 ]]; do
 		shift
 		shift
 		;;
+	--brightness)
+		BRIGHTNESS="$2"
+		shift
+		shift
+		;;
 	*)
 		POSITIONAL_ARGS+=("$1")
 		shift
@@ -125,9 +131,10 @@ Delay: $DELAY seconds
 Preempt: $PREEMPT
 No LED: $NOLED
 No Button: $NOBUTTON
+Brightness: $BRIGHTNESS
 
 To change these options, run:
-sudo ./install-service.sh --off-threshold <n> --on-threshold <n> --delay <n> (--preempt) (--noled) (--nobutton)
+sudo ./install-service.sh --off-threshold <n> --on-threshold <n> --delay <n> --brightness <n> (--preempt) (--noled) (--nobutton)
 
 Or edit: $SERVICE_PATH
 
@@ -142,7 +149,7 @@ After=multi-user.target
 [Service]
 Type=simple
 WorkingDirectory=$(pwd)
-ExecStart=$(pwd)/automatic.py --on-threshold $ON_THRESHOLD --off-threshold $OFF_THRESHOLD --delay $DELAY $EXTRA_ARGS
+ExecStart=$(pwd)/automatic.py --on-threshold $ON_THRESHOLD --off-threshold $OFF_THRESHOLD --delay $DELAY --brightness $BRIGHTNESS $EXTRA_ARGS
 Restart=on-failure
 
 [Install]