Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

deleted the PWM control for LEDin the light.py #35

Closed
wants to merge 4 commits into from
Closed

deleted the PWM control for LEDin the light.py #35

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
263f4e5
deleted the PWM control for LED
Oumayma-hy May 16, 2024
0670392
Merge remote-tracking branch 'upstream/main' into refactoring/light.py
Oumayma-hy May 16, 2024
6a1ca76
removing of unused methods in light.py and keeping only one led
Oumayma-hy May 28, 2024
a7d5fa5
Merge remote-tracking branch 'upstream/main' into refactoring/light.py
Oumayma-hy May 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
171 changes: 14 additions & 157 deletions control/planktoscopehat/planktoscope/light.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,6 @@ def output_to_led1(self):
logger.debug("Switching output to LED 1")
RPi.GPIO.output(self.LED_selectPin, RPi.GPIO.HIGH)

def output_to_led2(self):
logger.debug("Switching output to LED 2")
RPi.GPIO.output(self.LED_selectPin, RPi.GPIO.LOW)

def get_id(self):
led_id = self._read_byte(self.Register.id_reset)
Expand All @@ -94,23 +91,11 @@ def get_id(self):
def get_state(self):
return self.on

def activate_torch_ramp(self):
logger.debug("Activating the torch ramp")
reg = self._read_byte(self.Register.configuration)
reg = reg | 0b1
self._write_byte(self.Register.configuration, reg)

def deactivate_torch_ramp(self):
logger.debug("Deactivating the torch ramp")
reg = self._read_byte(self.Register.configuration)
reg = reg | 0b0
self._write_byte(self.Register.configuration, reg)

def force_reset(self):
logger.debug("Resetting the LED chip")
self._write_byte(self.Register.id_reset, 0b10000000)

def get_flags(self):
def get_flags(self): # this method checks the state of the LED and logs it out
flags = self._read_byte(self.Register.flags)
self.flash_timeout = bool(flags & 0b1)
self.UVLO = bool(flags & 0b10)
Expand All @@ -132,38 +117,13 @@ def get_flags(self):
logger.warning("Flag IVFM asserted")
return flags

def set_torch_current(self, current):
# From 3 to 376mA
# Curve is not linear for some reason, but this is close enough
if current > 376:
raise ValueError("the chosen current is too high, max value is 376mA")
value = int(current * 0.34)
logger.debug(
f"Setting torch current to {current}mA, or integer {value} in the register"
)
try:
self._write_byte(self.Register.torch, value)
except Exception as e:
logger.exception(f"Error with the LED control module, {e}")
raise

def set_flash_current(self, current):
# From 11 to 1500mA
# Curve is not linear for some reason, but this is close enough
value = int(current * 0.085)
logger.debug(f"Setting flash current to {value}")
self._write_byte(self.Register.flash, value)

def activate_torch(self):
logger.debug("Activate torch")
self._write_byte(self.Register.enable, 0b10)
self.on = True

def deactivate_torch(self):
logger.debug("Deactivate torch")
self._write_byte(self.Register.enable, 0b00)
self.off = False

def _write_byte(self, address, data):
with smbus.SMBus(1) as bus:
bus.write_byte_data(self.DEVICE_ADDRESS, address, data)
Expand All @@ -174,50 +134,6 @@ def _read_byte(self, address):
return b


class pwm_led:
def __init__(self, led):
RPi.GPIO.setmode(RPi.GPIO.BCM)
self.led = led
if self.led == 0:
RPi.GPIO.setup(led0Pin, RPi.GPIO.OUT)
RPi.GPIO.output(led0Pin, RPi.GPIO.LOW)
self.pwm0 = RPi.GPIO.PWM(led0Pin, FREQUENCY)
self.pwm0.start(0)
elif self.led == 1:
RPi.GPIO.setup(led1Pin, RPi.GPIO.OUT)
RPi.GPIO.output(led1Pin, RPi.GPIO.LOW)
self.pwm1 = RPi.GPIO.PWM(led1Pin, FREQUENCY)
self.pwm1.start(0)

def change_duty(self, dc):
if self.led == 0:
self.pwm0.ChangeDutyCycle(dc)
elif self.led == 1:
self.pwm1.ChangeDutyCycle(dc)

def off(self):
if self.led == 0:
logger.debug("Turning led 1 off")
self.pwm0.ChangeDutyCycle(0)
elif self.led == 1:
logger.debug("Turning led 2 off")
self.pwm1.ChangeDutyCycle(0)

def on(self):
if self.led == 0:
logger.debug("Turning led 1 on")
self.pwm0.ChangeDutyCycle(100)
elif self.led == 1:
logger.debug("Turning led 2 on")
self.pwm1.ChangeDutyCycle(100)

def stop(self):
if self.led == 0:
self.pwm0.stop()
elif self.led == 1:
self.pwm1.stop()


################################################################################
# Main Segmenter class
################################################################################
Expand All @@ -238,41 +154,23 @@ def __init__(self, event):
self.light_client = None
try:
self.led = i2c_led()
self.led.set_torch_current(self.led.DEFAULT_CURRENT)
self.led.output_to_led1()
self.led.activate_torch_ramp()
self.led.activate_torch()
time.sleep(0.5)
self.led.output_to_led2()
time.sleep(0.5)
self.led.deactivate_torch()
self.led.output_to_led1()
except Exception as e:
logger.error(
f"We have encountered an error trying to start the LED module, stopping now, exception is {e}"
)
self.led.output_to_led2()
raise e
else:
logger.success("planktoscope.light is initialised and ready to go!")

def led_off(self, led):
if led == 0:
logger.debug("Turning led 1 off")
elif led == 1:
logger.debug("Turning led 2 off")
self.led.deactivate_torch()
logger.debug("Turning led 1 off")


def led_on(self, led):
if led not in [0, 1]:
raise ValueError("Led number is wrong")
if led == 0:
logger.debug("Turning led 1 on")
self.led.output_to_led1()
elif led == 1:
logger.debug("Turning led 2 on")
self.led.output_to_led2()
self.led.activate_torch()
logger.debug("Turning led 1 on")
self.led.output_to_led1()

@logger.catch
def treat_message(self):
Expand All @@ -296,40 +194,20 @@ def treat_message(self):
if last_message["action"] == "on":
# {"action":"on", "led":"1"}
logger.info("Turning the light on.")
if "led" not in last_message or last_message["led"] == 1:
self.led_on(0)
self.light_client.client.publish(
"status/light", '{"status":"Led 1: On"}'
)
elif last_message["led"] == 2:
self.led_on(1)
self.light_client.client.publish(
"status/light", '{"status":"Led 2: On"}'
)
else:
self.light_client.client.publish(
"status/light", '{"status":"Error with led number"}'
)
self.led_on(0)
self.light_client.client.publish(
"status/light", '{"status":"Led 1: On"}'
)
elif last_message["action"] == "off":
# {"action":"off", "led":"1"}
logger.info("Turn the light off.")
if "led" not in last_message or last_message["led"] == 1:
self.led_off(0)
self.light_client.client.publish(
"status/light", '{"status":"Led 1: Off"}'
)
elif last_message["led"] == 2:
self.led_off(1)
self.light_client.client.publish(
"status/light", '{"status":"Led 2: Off"}'
)
else:
self.light_client.client.publish(
"status/light", '{"status":"Error with led number"}'
)
self.led_off(0)
self.light_client.client.publish(
"status/light", '{"status":"Led 1: Off"}'
)
else:
logger.warning(
f"We did not understand the received request {action} - {last_message}"
f"We did not understand the received request {last_message}"
)
if "settings" in last_message:
if "current" in last_message["settings"]:
Expand Down Expand Up @@ -389,30 +267,9 @@ def run(self):
time.sleep(0.1)

logger.info("Shutting down the light process")
self.led.deactivate_torch()
self.led.set_torch_current(1)
self.led.set_flash_current(1)
self.led.get_flags()
RPi.GPIO.cleanup()
self.light_client.client.publish("status/light", '{"status":"Dead"}')
self.light_client.shutdown()
logger.success("Light process shut down! See you!")


# This is called if this script is launched directly
if __name__ == "__main__":
led = i2c_led()
led.set_torch_current(30)
led.output_to_led1()
led.activate_torch_ramp()
led.activate_torch()
time.sleep(5)
led.deactivate_torch()
led.set_torch_current(10)
led.activate_torch()
time.sleep(5)
led.deactivate_torch()
led.set_torch_current(1)
led.set_flash_current(1)
led.get_flags()
RPi.GPIO.cleanup()