Merge pull request #2325 from CedarGroveStudios/main

Upgrade to support 8.0.0

Author: TheKitty

PyGamer_Improved_Thermal_Camera/code.py

@@ -1,16 +1,41 @@
-# SPDX-FileCopyrightText: 2021 Cedar Grove Studios for Adafruit Industries
+# SPDX-FileCopyrightText: Copyright (c) 2022 JG for Cedar Grove Maker Studios
 #
 # SPDX-License-Identifier: MIT
+"""
+`cedargrove_rgb_spectrumtools.grayscale`
+================================================================================
+
+Spectral Index to Grayscale RGB Converter Helper
+
+* Author(s): JG
+
+Implementation Notes
+--------------------
+
+**Hardware:**
+
+**Software and Dependencies:**
+
+* Adafruit CircuitPython firmware for the supported boards:
+  https://circuitpython.org/downloads
+
+"""
+
+__version__ = "0.0.0+auto.0"
+__repo__ = "https://github.com/CedarGroveStudios/CircuitPython_RGB_SpectrumTools.git"
 
-# grayscale_spectrum.py
-# 2021-05-19 version 1.1
-# Copyright 2021 Cedar Grove Studios
-# Spectral Index to Grayscale RGB Converter Helper
 
 def map_range(x, in_min, in_max, out_min, out_max):
     """
     Maps and constrains an input value from one range of values to another.
     (from adafruit_simpleio)
+
+    :param float x: The value to be mapped. No default.
+    :param float in_min: The beginning of the input range. No default.
+    :param float in_max: The end of the input range. No default.
+    :param float out_min: The beginning of the output range. No default.
+    :param float out_max: The end of the output range. No default.
+
     :return: Returns value mapped to new range
     :rtype: float
     """
@@ -28,11 +53,16 @@ def map_range(x, in_min, in_max, out_min, out_max):
         return max(min(mapped, out_max), out_min)
     return min(max(mapped, out_max), out_min)
 
+
 def index_to_rgb(index=0, gamma=0.8):
     """
     Converts a spectral index to a grayscale RGB value. Spectral index in
     range of 0.0 to 1.0. Gamma in range of 0.0 to 1.0 (1.0=linear),
     default 0.8 for color TFT displays.
+
+    :param float index: The normalized index value, range 0 to 1.0. Defaults to 0.
+    :param float gamma: The gamma color perception value. Defaults to 0.8.
+
     :return: Returns a 24-bit RGB value
     :rtype: integer
     """

PyGamer_Improved_Thermal_Camera/index_to_rgb/.circuitpython.skip

@@ -1,16 +1,40 @@
-# SPDX-FileCopyrightText: 2021 Cedar Grove Studios for Adafruit Industries
+# SPDX-FileCopyrightText: Copyright (c) 2022 JG for Cedar Grove Maker Studios
 #
 # SPDX-License-Identifier: MIT
+"""
+`cedargrove_rgb_spectrumtools.iron`
+================================================================================
+
+Temperature Index to Iron Pseudocolor Spectrum RGB Converter Helper
+
+* Author(s): JG
+
+Implementation Notes
+--------------------
+
+**Hardware:**
+
+**Software and Dependencies:**
+
+* Adafruit CircuitPython firmware for the supported boards:
+  https://circuitpython.org/downloads
+"""
+
+__version__ = "0.0.0+auto.0"
+__repo__ = "https://github.com/CedarGroveStudios/CircuitPython_RGB_SpectrumTools.git"
 
-# iron_spectrum.py
-# 2021-05-27 version 1.2
-# Copyright 2021 Cedar Grove Studios
-# Temperature Index to Iron Pseudocolor Spectrum RGB Converter Helper
 
 def map_range(x, in_min, in_max, out_min, out_max):
     """
     Maps and constrains an input value from one range of values to another.
     (from adafruit_simpleio)
+
+    :param float x: The value to be mapped. No default.
+    :param float in_min: The beginning of the input range. No default.
+    :param float in_max: The end of the input range. No default.
+    :param float out_min: The beginning of the output range. No default.
+    :param float out_max: The end of the output range. No default.
+
     :return: Returns value mapped to new range
     :rtype: float
     """
@@ -28,11 +52,16 @@ def map_range(x, in_min, in_max, out_min, out_max):
         return max(min(mapped, out_max), out_min)
     return min(max(mapped, out_max), out_min)
 
+
 def index_to_rgb(index=0, gamma=0.5):
     """
     Converts a temperature index to an iron thermographic pseudocolor spectrum
     RGB value. Temperature index in range of 0.0 to 1.0. Gamma in range of
     0.0 to 1.0 (1.0=linear), default 0.5 for color TFT displays.
+
+    :param float index: The normalized index value, range 0 to 1.0. Defaults to 0.
+    :param float gamma: The gamma color perception value. Defaults to 0.5.
+
     :return: Returns a 24-bit RGB value
     :rtype: integer
     """
@@ -43,25 +72,25 @@ def index_to_rgb(index=0, gamma=0.5):
         red = 0.1
         grn = 0.1
         blu = (0.2 + (0.8 * map_range(band, 0, 70, 0.0, 1.0))) ** gamma
-    if band >= 70 and band < 200:  # blue to violet
+    if 70 <= band < 200:  # blue to violet
         red = map_range(band, 70, 200, 0.0, 0.6) ** gamma
         grn = 0.0
-        blu = 1.0 ** gamma
-    if band >= 200 and band < 300:  # violet to red
+        blu = 1.0**gamma
+    if 200 <= band < 300:  # violet to red
         red = map_range(band, 200, 300, 0.6, 1.0) ** gamma
         grn = 0.0
         blu = map_range(band, 200, 300, 1.0, 0.0) ** gamma
-    if band >= 300 and band < 400:   # red to orange
-        red = 1.0 ** gamma
+    if 300 <= band < 400:  # red to orange
+        red = 1.0**gamma
         grn = map_range(band, 300, 400, 0.0, 0.5) ** gamma
         blu = 0.0
-    if band >= 400 and band < 500:  # orange to yellow
-        red = 1.0 ** gamma
+    if 400 <= band < 500:  # orange to yellow
+        red = 1.0**gamma
         grn = map_range(band, 400, 500, 0.5, 1.0) ** gamma
         blu = 0.0
     if band >= 500:  # yellow to white
-        red = 1.0 ** gamma
-        grn = 1.0 ** gamma
+        red = 1.0**gamma
+        grn = 1.0**gamma
         blu = map_range(band, 500, 580, 0.0, 1.0) ** gamma
 
     return (int(red * 255) << 16) + (int(grn * 255) << 8) + int(blu * 255)

PyGamer_Improved_Thermal_Camera/index_to_rgb/grayscale_spectrum.py renamed to PyGamer_Improved_Thermal_Camera/index_to_rgb/grayscale.py

@@ -0,0 +1,73 @@
+# SPDX-FileCopyrightText: Copyright (c) 2022 JG for Cedar Grove Maker Studios
+#
+# SPDX-License-Identifier: MIT
+"""
+`cedargrove_rgb_spectrumtools.visible`
+================================================================================
+
+A Spectral Index to Visible (Rainbow) Spectrum RGB Converter Helper
+
+Based on original 1996 Fortran code by Dan Bruton:
+physics.sfasu.edu/astro/color/spectra.html
+
+* Author(s): JG
+
+Implementation Notes
+--------------------
+
+**Hardware:**
+
+**Software and Dependencies:**
+
+* Adafruit CircuitPython firmware for the supported boards:
+  https://circuitpython.org/downloads
+"""
+
+__version__ = "0.0.0+auto.0"
+__repo__ = "https://github.com/CedarGroveStudios/CircuitPython_RGB_SpectrumTools.git"
+
+
+def index_to_rgb(index=0, gamma=0.5):
+    """
+    Converts a spectral index to rainbow (visible light wavelength)
+    spectrum to an RGB value. Spectral index in range of 0.0 to 1.0
+    (violet --> white). Gamma in range of 0.0 to 1.0 (1.0=linear),
+    default 0.5 for color TFT displays.
+
+    :param float index: The normalized index value, range 0 to 1.0. Defaults to 0.
+    :param float gamma: The gamma color perception value. Defaults to 0.5.
+
+    :return: Returns a 24-bit RGB value
+    :rtype: integer
+    """
+
+    wavelength = (index * 320) + 380
+
+    if wavelength < 440:
+        intensity = 0.1 + (0.9 * (wavelength - 380) / (440 - 380))
+        red = ((-1.0 * (wavelength - 440) / (440 - 380)) * intensity) ** gamma
+        grn = 0.0
+        blu = (1.0 * intensity) ** gamma
+    if 440 <= wavelength < 490:
+        red = 0.0
+        grn = (1.0 * (wavelength - 440) / (490 - 440)) ** gamma
+        blu = 1.0**gamma
+    if 490 <= wavelength < 510:
+        red = 0.0
+        grn = 1.0**gamma
+        blu = (-1.0 * (wavelength - 510) / (510 - 490)) ** gamma
+    if 510 <= wavelength < 580:
+        red = (1.0 * (wavelength - 510) / (580 - 510)) ** gamma
+        grn = 1.0**gamma
+        blu = 0.0
+    if 580 <= wavelength < 645:
+        red = 1.0**gamma
+        grn = (-1.0 * (wavelength - 645) / (645 - 580)) ** gamma
+        blu = 0.0
+    if wavelength >= 645:
+        intensity = 0.3 + (0.7 * (700 - wavelength) / (700 - 645))
+        red = (1.0) ** gamma
+        grn = (1.0 - intensity) ** gamma
+        blu = (1.0 - intensity) ** gamma
+
+    return (int(red * 255) << 16) + (int(grn * 255) << 8) + int(blu * 255)

PyGamer_Improved_Thermal_Camera/index_to_rgb/iron_spectrum.py renamed to PyGamer_Improved_Thermal_Camera/index_to_rgb/iron.py

@@ -0,0 +1,16 @@
+# SPDX-FileCopyrightText: 2022 Jan Goolsbey for Adafruit Industries
+# SPDX-License-Identifier: MIT
+
+"""
+`thermalcamera_config`
+================================================================================
+Thermal Camera configuration parameters.
+"""
+
+# ### Alarm and range default values in Farenheit ###
+ALARM_F = 120
+MIN_RANGE_F = 60
+MAX_RANGE_F = 120
+
+# ### Display characteristics
+SELFIE = False  # Rear camera view; True for front view

PyGamer_Improved_Thermal_Camera/index_to_rgb/visible.py

@@ -0,0 +1,18 @@
+# SPDX-FileCopyrightText: 2022 Jan Goolsbey for Adafruit Industries
+# SPDX-License-Identifier: MIT
+
+"""
+`thermalcamera_converters`
+================================================================================
+Celsius-to-Fahrenheit and Fahrenheit-to-Celsius converter helpers.
+"""
+
+
+def celsius_to_fahrenheit(deg_c=None):
+    """Convert C to F; round to 1 degree C"""
+    return round(((9 / 5) * deg_c) + 32)
+
+
+def fahrenheit_to_celsius(deg_f=None):
+    """Convert F to C; round to 1 degree F"""
+    return round((deg_f - 32) * (5 / 9))