Skip to content

Commit 74b18ea

Browse files
committed
clang
1 parent 5419775 commit 74b18ea

File tree

8 files changed

+1636
-1450
lines changed

8 files changed

+1636
-1450
lines changed

Adafruit_PyCamera.cpp

Lines changed: 109 additions & 105 deletions
Large diffs are not rendered by default.

Adafruit_PyCamera.h

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,37 @@
1-
#include <Adafruit_ST7789.h> // Hardware-specific library for ST7789
2-
#include <Adafruit_NeoPixel.h>
1+
#include "TJpg_Decoder.h"
2+
#include "esp_camera.h"
33
#include <Adafruit_AW9523.h>
4+
#include <Adafruit_NeoPixel.h>
5+
#include <Adafruit_ST7789.h> // Hardware-specific library for ST7789
46
#include <SdFat.h>
5-
#include "esp_camera.h"
6-
#include "TJpg_Decoder.h"
77

88
#ifndef TAG
99
#define TAG "PYCAM"
1010
#endif
1111

1212
#define AW_DOWN_MASK (1UL << AWEXP_BUTTON_DOWN)
1313
#define AW_LEFT_MASK (1UL << AWEXP_BUTTON_LEFT)
14-
#define AW_UP_MASK (1UL << AWEXP_BUTTON_UP)
15-
#define AW_RIGHT_MASK (1UL << AWEXP_BUTTON_RIGHT)
16-
#define AW_OK_MASK (1UL << AWEXP_BUTTON_OK)
17-
#define AW_SEL_MASK (1UL << AWEXP_BUTTON_SEL)
14+
#define AW_UP_MASK (1UL << AWEXP_BUTTON_UP)
15+
#define AW_RIGHT_MASK (1UL << AWEXP_BUTTON_RIGHT)
16+
#define AW_OK_MASK (1UL << AWEXP_BUTTON_OK)
17+
#define AW_SEL_MASK (1UL << AWEXP_BUTTON_SEL)
1818
#define AW_CARDDET_MASK (1UL << AWEXP_SD_DET)
19-
#define AW_INPUTS_MASK (AW_DOWN_MASK | AW_LEFT_MASK | AW_UP_MASK | AW_RIGHT_MASK | AW_OK_MASK | AW_SEL_MASK | AW_CARDDET_MASK)
19+
#define AW_INPUTS_MASK \
20+
(AW_DOWN_MASK | AW_LEFT_MASK | AW_UP_MASK | AW_RIGHT_MASK | AW_OK_MASK | \
21+
AW_SEL_MASK | AW_CARDDET_MASK)
2022

2123
class PyCameraFB : public GFXcanvas16 {
22-
public:
23-
PyCameraFB(uint16_t w, uint16_t h) : GFXcanvas16(w,h) { free(buffer); buffer = NULL; };
24-
25-
void setFB(uint16_t *fb) {
26-
buffer = fb;
27-
}
28-
};
24+
public:
25+
PyCameraFB(uint16_t w, uint16_t h) : GFXcanvas16(w, h) {
26+
free(buffer);
27+
buffer = NULL;
28+
};
2929

30+
void setFB(uint16_t *fb) { buffer = fb; }
31+
};
3032

3133
class Adafruit_PyCamera : public Adafruit_ST7789 {
32-
public:
34+
public:
3335
Adafruit_PyCamera();
3436

3537
bool begin(void);
@@ -64,7 +66,7 @@ class Adafruit_PyCamera : public Adafruit_ST7789 {
6466
uint32_t Wheel(byte WheelPos);
6567

6668
uint32_t timestamp(void);
67-
void timestampPrint(const char *msg) ;
69+
void timestampPrint(const char *msg);
6870

6971
sensor_t *camera;
7072
camera_fb_t *frame = NULL;
@@ -85,16 +87,16 @@ class Adafruit_PyCamera : public Adafruit_ST7789 {
8587
camera_config_t camera_config;
8688
};
8789

88-
8990
#define LIS3DH_REG_STATUS1 0x07
9091
#define LIS3DH_REG_OUTADC1_L 0x08 /**< 1-axis acceleration data. Low value */
9192
#define LIS3DH_REG_OUTADC1_H 0x09 /**< 1-axis acceleration data. High value */
9293
#define LIS3DH_REG_OUTADC2_L 0x0A /**< 2-axis acceleration data. Low value */
9394
#define LIS3DH_REG_OUTADC2_H 0x0B /**< 2-axis acceleration data. High value */
9495
#define LIS3DH_REG_OUTADC3_L 0x0C /**< 3-axis acceleration data. Low value */
9596
#define LIS3DH_REG_OUTADC3_H 0x0D /**< 3-axis acceleration data. High value */
96-
#define LIS3DH_REG_INTCOUNT 0x0E /**< INT_COUNTER register [IC7, IC6, IC5, IC4, IC3, IC2, IC1, IC0] */
97-
#define LIS3DH_REG_WHOAMI 0x0F
97+
#define LIS3DH_REG_INTCOUNT \
98+
0x0E /**< INT_COUNTER register [IC7, IC6, IC5, IC4, IC3, IC2, IC1, IC0] */
99+
#define LIS3DH_REG_WHOAMI 0x0F
98100
#define LIS3DH_REG_TEMPCFG 0x1F
99101
#define LIS3DH_REG_CTRL1 0x20
100102
#define LIS3DH_REG_CTRL2 0x21

0 commit comments

Comments
 (0)