clean up some include files

dhalbert · dhalbert · commit e16467da854f · 2024-07-26T18:38:13.000-04:00
diff --git a/ports/atmel-samd/common-hal/rtc/RTC.h b/ports/atmel-samd/common-hal/rtc/RTC.h
@@ -5,8 +5,3 @@
 // SPDX-License-Identifier: MIT
 
 #pragma once
-
-#ifndef MICROPY_INCLUDED_ATMEL_SAMD_COMMON_HAL_RTC_RTC_H
-#define MICROPY_INCLUDED_ATMEL_SAMD_COMMON_HAL_RTC_RTC_H
-
-#endif  // MICROPY_INCLUDED_ATMEL_SAMD_COMMON_HAL_RTC_RTC_H
diff --git a/ports/cxd56/common-hal/rtc/RTC.h b/ports/cxd56/common-hal/rtc/RTC.h
@@ -5,8 +5,3 @@
 // SPDX-License-Identifier: MIT
 
 #pragma once
-
-#ifndef MICROPY_INCLUDED_CXD56_COMMON_HAL_RTC_RTC_H
-#define MICROPY_INCLUDED_CXD56_COMMON_HAL_RTC_RTC_H
-
-#endif  // MICROPY_INCLUDED_CXD56_COMMON_HAL_RTC_RTC_H
diff --git a/ports/nordic/common-hal/watchdog/__init__.h b/ports/nordic/common-hal/watchdog/__init__.h
@@ -5,8 +5,3 @@
 // SPDX-License-Identifier: MIT
 
 #pragma once
-
-#ifndef MICROPY_INCLUDED_NRF_COMMON_HAL_WATCHDOG___INIT___H
-#define MICROPY_INCLUDED_NRF_COMMON_HAL_WATCHDOG___INIT___H
-
-#endif  // MICROPY_INCLUDED_NRF_COMMON_HAL_WATCHDOG___INIT___H
diff --git a/ports/raspberrypi/common-hal/i2ctarget/I2CTarget.h b/ports/raspberrypi/common-hal/i2ctarget/I2CTarget.h
@@ -6,9 +6,6 @@
 
 #pragma once
 
-#ifndef MICROPY_INCLUDED_RPI_COMMON_HAL_I2C_TARGET_H
-#define MICROPY_INCLUDED_RPI_COMMON_HAL_I2C_TARGET_H
-
 #include "py/obj.h"
 #include "common-hal/microcontroller/Pin.h"
 #include "src/rp2_common/hardware_i2c/include/hardware/i2c.h"
@@ -24,5 +21,3 @@ typedef struct {
     uint8_t scl_pin;
     uint8_t sda_pin;
 } i2ctarget_i2c_target_obj_t;
-
-#endif MICROPY_INCLUDED_RPI_COMMON_HAL_BUSIO_I2C_TARGET_H
diff --git a/shared-bindings/__future__/__init__.h b/shared-bindings/__future__/__init__.h
@@ -5,8 +5,3 @@
 // SPDX-License-Identifier: MIT
 
 #pragma once
-
-#ifndef MICROPY_INCLUDED_SHARED_BINDINGS___FUTURE_____INIT___H
-#define MICROPY_INCLUDED_SHARED_BINDINGS___FUTURE_____INIT___H
-
-#endif  // MICROPY_INCLUDED_SHARED_BINDINGS___FUTURE_____INIT___H
diff --git a/shared-bindings/_pixelmap/__init__.h b/shared-bindings/_pixelmap/__init__.h
@@ -5,8 +5,3 @@
 // SPDX-License-Identifier: MIT
 
 #pragma once
-
-#ifndef CP_SHARED_BINDINGS_PIXELBUF_INIT_H
-#define CP_SHARED_BINDINGS_PIXELBUF_INIT_H
-
-#endif // CP_SHARED_BINDINGS_PIXELBUF_INIT_H
diff --git a/shared-bindings/adafruit_bus_device/__init__.h b/shared-bindings/adafruit_bus_device/__init__.h
@@ -5,5 +5,3 @@
 // SPDX-License-Identifier: MIT
 
 #pragma once
-
-// Nothing now.
diff --git a/shared-bindings/adafruit_pixelbuf/__init__.h b/shared-bindings/adafruit_pixelbuf/__init__.h
@@ -5,8 +5,3 @@
 // SPDX-License-Identifier: MIT
 
 #pragma once
-
-#ifndef CP_SHARED_BINDINGS_PIXELBUF_INIT_H
-#define CP_SHARED_BINDINGS_PIXELBUF_INIT_H
-
-#endif // CP_SHARED_BINDINGS_PIXELBUF_INIT_H
diff --git a/shared-bindings/analogbufio/__init__.h b/shared-bindings/analogbufio/__init__.h
@@ -5,7 +5,3 @@
 // SPDX-License-Identifier: MIT
 
 #pragma once
-
-#include "py/obj.h"
-
-// Nothing now.
diff --git a/shared-bindings/analogio/__init__.h b/shared-bindings/analogio/__init__.h
@@ -5,7 +5,3 @@
 // SPDX-License-Identifier: MIT
 
 #pragma once
-
-#include "py/obj.h"
-
-// Nothing now.
diff --git a/shared-bindings/audiobusio/__init__.h b/shared-bindings/audiobusio/__init__.h
@@ -5,7 +5,3 @@
 // SPDX-License-Identifier: MIT
 
 #pragma once
-
-#include "py/obj.h"
-
-// Nothing now.
diff --git a/shared-bindings/audiocore/__init__.h b/shared-bindings/audiocore/__init__.h
@@ -5,7 +5,3 @@
 // SPDX-License-Identifier: MIT
 
 #pragma once
-
-#include "py/obj.h"
-
-// Nothing now.
diff --git a/shared-bindings/audioio/__init__.h b/shared-bindings/audioio/__init__.h
@@ -5,7 +5,3 @@
 // SPDX-License-Identifier: MIT
 
 #pragma once
-
-#include "py/obj.h"
-
-// Nothing now.
diff --git a/shared-bindings/audiomixer/__init__.h b/shared-bindings/audiomixer/__init__.h
@@ -5,7 +5,3 @@
 // SPDX-License-Identifier: MIT
 
 #pragma once
-
-#include "py/obj.h"
-
-// Nothing now.
diff --git a/shared-bindings/audiomp3/__init__.h b/shared-bindings/audiomp3/__init__.h
@@ -5,7 +5,3 @@
 // SPDX-License-Identifier: MIT
 
 #pragma once
-
-#include "py/obj.h"
-
-// Nothing now.
diff --git a/shared-bindings/audiopwmio/__init__.h b/shared-bindings/audiopwmio/__init__.h
@@ -5,7 +5,3 @@
 // SPDX-License-Identifier: MIT
 
 #pragma once
-
-#include "py/obj.h"
-
-// Nothing now.
diff --git a/shared-bindings/busio/__init__.h b/shared-bindings/busio/__init__.h
@@ -5,7 +5,3 @@
 // SPDX-License-Identifier: MIT
 
 #pragma once
-
-#include "py/obj.h"
-
-// Nothing now.
diff --git a/shared-bindings/countio/__init__.h b/shared-bindings/countio/__init__.h
@@ -5,7 +5,3 @@
 // SPDX-License-Identifier: MIT
 
 #pragma once
-
-#include "py/obj.h"
-
-// Nothing now.
diff --git a/shared-bindings/digitalio/__init__.h b/shared-bindings/digitalio/__init__.h
@@ -5,7 +5,3 @@
 // SPDX-License-Identifier: MIT
 
 #pragma once
-
-#include "py/obj.h"
-
-// Nothing now.
diff --git a/shared-bindings/fontio/__init__.h b/shared-bindings/fontio/__init__.h
@@ -5,9 +5,3 @@
 // SPDX-License-Identifier: MIT
 
 #pragma once
-
-#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_FONTIO___INIT___H
-#define MICROPY_INCLUDED_SHARED_BINDINGS_FONTIO___INIT___H
-
-
-#endif  // MICROPY_INCLUDED_SHARED_BINDINGS_FONTIO___INIT___H
diff --git a/shared-bindings/frequencyio/__init__.h b/shared-bindings/frequencyio/__init__.h
@@ -5,7 +5,3 @@
 // SPDX-License-Identifier: MIT
 
 #pragma once
-
-#include "py/obj.h"
-
-// Nothing now.
diff --git a/shared-bindings/gnss/GNSS.h b/shared-bindings/gnss/GNSS.h
@@ -2,8 +2,7 @@
 //
 // SPDX-License-Identifier: MIT
 
-#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_GNSS_GNSS_H
-#define MICROPY_INCLUDED_SHARED_BINDINGS_GNSS_GNSS_H
+#pragma once
 
 #include "common-hal/gnss/GNSS.h"
 #include "shared-bindings/gnss/SatelliteSystem.h"
@@ -23,5 +22,3 @@ mp_float_t common_hal_gnss_get_longitude(gnss_obj_t *self);
 mp_float_t common_hal_gnss_get_altitude(gnss_obj_t *self);
 void common_hal_gnss_get_timestamp(gnss_obj_t *self, timeutils_struct_time_t *tm);
 gnss_positionfix_t common_hal_gnss_get_fix(gnss_obj_t *self);
-
-#endif // MICROPY_INCLUDED_SHARED_BINDINGS_GNSS_GNSS_H
diff --git a/shared-bindings/gnss/PositionFix.h b/shared-bindings/gnss/PositionFix.h
@@ -2,8 +2,7 @@
 //
 // SPDX-License-Identifier: MIT
 
-#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_GNSS_POSITIONFIX_H
-#define MICROPY_INCLUDED_SHARED_BINDINGS_GNSS_POSITIONFIX_H
+#pragma once
 
 #include "py/obj.h"
 
@@ -24,5 +23,3 @@ typedef struct {
 extern const gnss_positionfix_obj_t gnss_positionfix_invalid_obj;
 extern const gnss_positionfix_obj_t gnss_positionfix_fix2d_obj;
 extern const gnss_positionfix_obj_t gnss_positionfix_fix3d_obj;
-
-#endif // MICROPY_INCLUDED_SHARED_BINDINGS_GNSS_POSITIONFIX_H
diff --git a/shared-bindings/gnss/SatelliteSystem.h b/shared-bindings/gnss/SatelliteSystem.h
@@ -2,8 +2,7 @@
 //
 // SPDX-License-Identifier: MIT
 
-#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_GNSS_SATELLITESYSTEM_H
-#define MICROPY_INCLUDED_SHARED_BINDINGS_GNSS_SATELLITESYSTEM_H
+#pragma once
 
 #include "py/obj.h"
 
@@ -29,5 +28,3 @@ extern const gnss_satellitesystem_obj_t gnss_satellitesystem_glonass_obj;
 extern const gnss_satellitesystem_obj_t gnss_satellitesystem_sbas_obj;
 extern const gnss_satellitesystem_obj_t gnss_satellitesystem_qzss_l1ca_obj;
 extern const gnss_satellitesystem_obj_t gnss_satellitesystem_qzss_l1s_obj;
-
-#endif // MICROPY_INCLUDED_SHARED_BINDINGS_GNSS_SATELLITESYSTEM_H
diff --git a/shared-bindings/memorymap/__init__.h b/shared-bindings/memorymap/__init__.h
@@ -5,8 +5,3 @@
 // SPDX-License-Identifier: MIT
 
 #pragma once
-
-#ifndef SHARED_BINDINGS_MEMORYMAP_H
-#define SHARED_BINDINGS_MEMORYMAP_H
-
-#endif  // SHARED_BINDINGS_MEMORYMAP_H
diff --git a/shared-bindings/nvm/__init__.h b/shared-bindings/nvm/__init__.h
@@ -5,8 +5,3 @@
 // SPDX-License-Identifier: MIT
 
 #pragma once
-
-#ifndef SHARED_BINDINGS_NVM_H
-#define SHARED_BINDINGS_NVM_H
-
-#endif  // SHARED_BINDINGS_NVM_H
diff --git a/shared-bindings/onewireio/__init__.h b/shared-bindings/onewireio/__init__.h
@@ -5,7 +5,3 @@
 // SPDX-License-Identifier: MIT
 
 #pragma once
-
-#include "py/obj.h"
-
-// Nothing now.
diff --git a/shared-bindings/ps2io/__init__.h b/shared-bindings/ps2io/__init__.h
@@ -6,7 +6,3 @@
 // SPDX-License-Identifier: MIT
 
 #pragma once
-
-#include "py/obj.h"
-
-// Nothing now.
diff --git a/shared-bindings/pulseio/__init__.h b/shared-bindings/pulseio/__init__.h
@@ -5,7 +5,3 @@
 // SPDX-License-Identifier: MIT
 
 #pragma once
-
-#include "py/obj.h"
-
-// Nothing now.
diff --git a/shared-bindings/pwmio/__init__.h b/shared-bindings/pwmio/__init__.h
@@ -5,7 +5,3 @@
 // SPDX-License-Identifier: MIT
 
 #pragma once
-
-#include "py/obj.h"
-
-// Nothing now.
diff --git a/shared-bindings/rainbowio/__init__.c b/shared-bindings/rainbowio/__init__.c
@@ -4,9 +4,11 @@
 //
 // SPDX-License-Identifier: MIT
 
-#include "shared-bindings/rainbowio/__init__.h"
 #include "py/mpconfig.h"
 #include "py/obj.h"
+
+#include "shared-bindings/rainbowio/__init__.h"
+
 //| """`rainbowio` module.
 //|
 //| Provides the `colorwheel()` function."""
diff --git a/shared-bindings/rainbowio/__init__.h b/shared-bindings/rainbowio/__init__.h
@@ -6,6 +6,9 @@
 
 #pragma once
 #include <stdint.h>
-#include "py/misc.h"
+
+#include "py/obj.h"
+
+///#include "shared-module/rainbowio/__init__.h"
 
 int32_t colorwheel(mp_float_t pos);
diff --git a/shared-bindings/rotaryio/__init__.h b/shared-bindings/rotaryio/__init__.h
@@ -5,7 +5,3 @@
 // SPDX-License-Identifier: MIT
 
 #pragma once
-
-#include "py/obj.h"
-
-// Nothing now.
diff --git a/shared-bindings/terminalio/__init__.h b/shared-bindings/terminalio/__init__.h
@@ -5,5 +5,3 @@
 // SPDX-License-Identifier: MIT
 
 #pragma once
-
-// Nothing now.
diff --git a/shared-bindings/touchio/__init__.h b/shared-bindings/touchio/__init__.h
@@ -5,7 +5,3 @@
 // SPDX-License-Identifier: MIT
 
 #pragma once
-
-#include "py/obj.h"
-
-// Nothing now.
