From 81c7ba899d90aa06b752398b6eb7eca72b09f5d4 Mon Sep 17 00:00:00 2001 From: Lee Atkinson Date: Fri, 12 Aug 2022 13:57:45 -0400 Subject: [PATCH] Copyright Update/Acknowledgements --- .../common-hal/analogio/AnalogFastIn.c | 4 ++- .../common-hal/analogio/AnalogFastIn.h | 26 +++---------------- shared-bindings/analogio/AnalogFastIn.c | 3 ++- shared-bindings/analogio/AnalogFastIn.h | 3 ++- 4 files changed, 10 insertions(+), 26 deletions(-) diff --git a/ports/raspberrypi/common-hal/analogio/AnalogFastIn.c b/ports/raspberrypi/common-hal/analogio/AnalogFastIn.c index 1d08956bd4..d1145bb4fb 100644 --- a/ports/raspberrypi/common-hal/analogio/AnalogFastIn.c +++ b/ports/raspberrypi/common-hal/analogio/AnalogFastIn.c @@ -3,7 +3,9 @@ * * The MIT License (MIT) * - * Copyright (c) 2021 Scott Shawcroft for Adafruit Industries + * SPDX-FileCopyrightText: Copyright (c) 2022 Lee A. Atkinson + * Taken from AnalogIn by Scott Shawcroft for Adafruit Industries + * Also from DMA_Capture by Luke Wren of Raspberry Pi (Trading) Ltd. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/ports/raspberrypi/common-hal/analogio/AnalogFastIn.h b/ports/raspberrypi/common-hal/analogio/AnalogFastIn.h index 3b8b8f0da9..87508949e6 100644 --- a/ports/raspberrypi/common-hal/analogio/AnalogFastIn.h +++ b/ports/raspberrypi/common-hal/analogio/AnalogFastIn.h @@ -3,7 +3,9 @@ * * The MIT License (MIT) * - * Copyright (c) 2021 Scott Shawcroft for Adafruit Industries + * SPDX-FileCopyrightText: Copyright (c) 2022 Lee A. Atkinson + * Taken from AnalogIn by Scott Shawcroft for Adafruit Industries + * Also from DMA_Capture by Luke Wren of Raspberry Pi (Trading) Ltd. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -44,30 +46,8 @@ typedef struct { uint8_t chan; uint dma_chan; dma_channel_config cfg; - // data_size = DMA_SIZE_8; // - default DMA_SIZE_8 - // data_size = DMA_SIZE_16; // - default DMA_SIZE_16 - // Either 12 bits in 16 or 12 over 2 bytes or truncate 12 to 8 in 8 - // Either B or H, default array.array("h", [0]*length) "h"==short (16 bits signed) } analogio_analogfastin_obj_t; -// void common_hal_analogio_analogfastin_construct(analogio_analogfastin_obj_t *self, const mcu_pin_obj_t *pin, uint8_t *buffer, uint32_t len, uint8_t bytes_per_sample, bool samples_signed, uint32_t sample_rate) -/* -void common_hal_analogio_analogfastin_construct(analogio_analogfastin_obj_t *self, - const mcu_pin_obj_t *pin, - uint8_t *buffer, - uint32_t len, - uint8_t bytes_per_sample, - bool samples_signed, - uint32_t sample_rate) { - self->pin = pin; - self->buffer = buffer; - self->len = len; - //self->bits_per_sample = bytes_per_sample * 8; - self->samples_signed = samples_signed; - self->sample_rate = sample_rate; -} -*/ - void analogfastin_init(void); #endif // MICROPY_INCLUDED_RASPBERRYPI_COMMON_HAL_ANALOGIO_ANALOGFASTIN_H diff --git a/shared-bindings/analogio/AnalogFastIn.c b/shared-bindings/analogio/AnalogFastIn.c index 4fda809e0b..602abf67ed 100644 --- a/shared-bindings/analogio/AnalogFastIn.c +++ b/shared-bindings/analogio/AnalogFastIn.c @@ -3,7 +3,8 @@ * * The MIT License (MIT) * - * SPDX-FileCopyrightText: Copyright (c) 2013, 2014 Damien P. George + * SPDX-FileCopyrightText: Copyright (c) 2022 Lee A. Atkinson + * Taken from AnalogIn by Damien P. George * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/shared-bindings/analogio/AnalogFastIn.h b/shared-bindings/analogio/AnalogFastIn.h index 816eaa0d42..04ab0644f1 100644 --- a/shared-bindings/analogio/AnalogFastIn.h +++ b/shared-bindings/analogio/AnalogFastIn.h @@ -3,7 +3,8 @@ * * The MIT License (MIT) * - * SPDX-FileCopyrightText: Copyright (c) 2013, 2014 Damien P. George + * SPDX-FileCopyrightText: Copyright (c) 2022 Lee A. Atkinson + * Taken from AnalogIn by Damien P. George * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal