Skip to content

Commit 2a52eed

Browse files
hax0kartikhax0kartik
committed
Use a more consistent style throughout codebase
1 parent 64a81bc commit 2a52eed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+3121
-2972
lines changed

‎.astylerc

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
--align-reference=none
2+
--convert-tabs
3+
--break-blocks
4+
--break-one-line-headers
5+
--unpad-paren
6+
--indent-switches
7+
--indent=spaces=4
8+
--pad-header
9+
--pad-oper
10+
--pad-comma
11+
--style=java
12+
--suffix=none

‎source/Accelerometer.cpp

Lines changed: 49 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,115 +1,113 @@
11
#include "Accelerometer.hpp"
22
#include "mcuhid.hpp"
33

4-
void Accelerometer::Initialize()
5-
{
4+
void Accelerometer::Initialize() {
65
AccelerometerCalibration calib;
7-
if(!m_initialized)
8-
{
6+
7+
if (!m_initialized) {
98
cfguInit();
109
Result ret = CFG_GetConfigInfoBlk4(0xC, 0x40003u, &calib);
1110
cfguExit();
12-
if(ret != 0) *(u32*)0x123456 = ret;
11+
12+
if (ret != 0)
13+
*(u32*)0x123456 = ret;
14+
1315
m_calib.scalex = calib.offsetx;
1416
m_calib.offsetx = calib.scalex;
1517
m_calib.scaley = calib.offsety;
1618
m_calib.offsety = calib.scaley;
1719
m_calib.scalez = calib.offsetz;
1820
m_calib.offsetz = calib.scalez;
19-
21+
2022
svcCreateEvent(&m_event, RESET_ONESHOT);
21-
if(R_FAILED(mcuHidGetAccelerometerEventHandle(&m_irqevent))) svcBreak(USERBREAK_ASSERT);
23+
24+
if (R_FAILED(mcuHidGetAccelerometerEventHandle(&m_irqevent)))
25+
svcBreak(USERBREAK_ASSERT);
26+
2227
m_initialized = 1;
2328
}
2429
}
2530

26-
void Accelerometer::EnableOrDisableInterrupt(u8 explicitenable)
27-
{
28-
if(explicitenable != -1)
29-
{
30-
mcuHidEnableAccelerometerInterrupt(explicitenable);
31+
void Accelerometer::EnableOrDisableInterrupt(u8 explicitenable) {
32+
if (explicitenable != -1) {
33+
mcuHidEnableAccelerometerInterrupt(explicitenable);
3134
return;
3235
}
33-
34-
else if(m_refcount <= 0)
36+
37+
else if (m_refcount <= 0)
3538
mcuHidEnableAccelerometerInterrupt(0); // disable
3639
else
3740
mcuHidEnableAccelerometerInterrupt(1); // enable
3841
}
3942

40-
void Accelerometer::EnableAndIncreementRef()
41-
{
42-
if(!m_refcount)
43+
void Accelerometer::EnableAndIncreementRef() {
44+
if (!m_refcount)
4345
mcuHidEnableAccelerometerInterrupt(1); // enable
46+
4447
++m_refcount;
4548
}
4649

47-
void Accelerometer::DisableAndDecreementRef()
48-
{
50+
void Accelerometer::DisableAndDecreementRef() {
4951
--m_refcount;
50-
if(!m_refcount)
52+
53+
if (!m_refcount)
5154
mcuHidEnableAccelerometerInterrupt(0); // disable
5255
}
5356

54-
void Accelerometer::SetAccelerometerStatus(u8 enable)
55-
{
57+
void Accelerometer::SetAccelerometerStatus(u8 enable) {
5658
mcuHidEnableAccelerometer(enable);
5759
}
5860

59-
void Accelerometer::CalibrateVals(AccelerometerEntry *raw, AccelerometerEntry *final)
60-
{
61+
void Accelerometer::CalibrateVals(AccelerometerEntry *raw, AccelerometerEntry *final) {
6162
int16_t tmpx = ((raw->x - m_calib.offsetx) << 10) / (2 * m_calib.scalex);
6263
final->x = tmpx;
63-
if ( tmpx >= -930 )
64-
{
65-
if ( tmpx > 930 )
64+
65+
if (tmpx >= -930) {
66+
if (tmpx > 930)
6667
tmpx = 930;
67-
}
68-
else
69-
{
68+
} else {
7069
tmpx = -930;
7170
}
71+
7272
final->x = tmpx;
73-
73+
7474
int16_t tmpy = ((raw->y - m_calib.offsety) << 10) / (2 * m_calib.scaley);
7575
final->y = tmpy;
76-
if ( tmpy >= -930 )
77-
{
78-
if ( tmpy > 930 )
76+
77+
if (tmpy >= -930) {
78+
if (tmpy > 930)
7979
tmpy = 930;
80-
}
81-
else
82-
{
80+
} else {
8381
tmpy = -930;
8482
}
83+
8584
final->y = tmpy;
8685

8786
int16_t tmpz = ((raw->z - m_calib.offsetz) << 10) / (2 * m_calib.scalez);
8887
final->z = tmpz;
89-
if ( tmpz >= -930 )
90-
{
91-
if ( tmpz > 930 )
88+
89+
if (tmpz >= -930) {
90+
if (tmpz > 930)
9291
tmpz = 930;
93-
}
94-
else
95-
{
92+
} else {
9693
tmpz = -930;
9794
}
95+
9896
final->z = tmpz;
9997

10098
}
101-
void Accelerometer::Sampling()
102-
{
99+
100+
void Accelerometer::Sampling() {
103101
AccelerometerEntry rawvals;
104-
if(m_refcount > 0)
105-
{
102+
103+
if (m_refcount > 0) {
106104
uint32_t reason;
107105
Result ret = mcuHidGetEventReason(&reason);
108-
if(R_SUCCEEDED(ret) && (reason & 0x1000) != 0)
109-
{
106+
107+
if (R_SUCCEEDED(ret) && (reason & 0x1000) != 0) {
110108
ret = mcuHidReadAccelerometerValues(&rawvals);
111-
if(R_SUCCEEDED(ret))
112-
{
109+
110+
if (R_SUCCEEDED(ret)) {
113111
AccelerometerEntry calibvals;
114112
AccelerometerEntry finalvals;
115113
CalibrateVals(&rawvals, &calibvals);

‎source/Accelerometer.hpp

Lines changed: 29 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
#pragma once
22
#include "AccelerometerRing.hpp"
33

4-
struct AccelerometerCalibration
5-
{
4+
struct AccelerometerCalibration {
65
int16_t scalex;
76
int16_t offsetx;
87
int16_t scaley;
@@ -11,24 +10,32 @@ struct AccelerometerCalibration
1110
int16_t offsetz;
1211
};
1312

14-
class Accelerometer
15-
{
16-
public:
17-
void Initialize();
18-
void Sampling();
19-
void SetAccelerometerRing(AccelerometerRing *ring) { m_ring = ring; };
20-
Handle *GetEvent() { return &m_event; };
21-
Handle *GetIntrEvent() { return &m_irqevent; };
22-
void EnableOrDisableInterrupt(u8 explicitdisable = -1);
23-
void SetAccelerometerStatus(u8 enable);
24-
void EnableAndIncreementRef();
25-
void DisableAndDecreementRef();
26-
void CalibrateVals(AccelerometerEntry *raw, AccelerometerEntry *final);
27-
private:
28-
AccelerometerRing *m_ring = nullptr;
29-
AccelerometerCalibration m_calib;
30-
Handle m_event;
31-
Handle m_irqevent;
32-
uint8_t m_initialized = 0;
33-
int32_t m_refcount = 0;
13+
class Accelerometer {
14+
public:
15+
void Initialize();
16+
void Sampling();
17+
void SetAccelerometerRing(AccelerometerRing *ring) {
18+
m_ring = ring;
19+
};
20+
21+
Handle *GetEvent() {
22+
return &m_event;
23+
};
24+
25+
Handle *GetIntrEvent() {
26+
return &m_irqevent;
27+
};
28+
29+
void EnableOrDisableInterrupt(u8 explicitdisable = -1);
30+
void SetAccelerometerStatus(u8 enable);
31+
void EnableAndIncreementRef();
32+
void DisableAndDecreementRef();
33+
void CalibrateVals(AccelerometerEntry *raw, AccelerometerEntry *final);
34+
private:
35+
AccelerometerRing *m_ring = nullptr;
36+
AccelerometerCalibration m_calib;
37+
Handle m_event;
38+
Handle m_irqevent;
39+
uint8_t m_initialized = 0;
40+
int32_t m_refcount = 0;
3441
};

‎source/AccelerometerRing.cpp

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,21 @@
11
#include "AccelerometerRing.hpp"
22

3-
void AccelerometerRing::WriteToRing(AccelerometerEntry entry)
4-
{
3+
void AccelerometerRing::WriteToRing(AccelerometerEntry entry) {
54
uint32_t index = m_updatedindex;
6-
if(index == 7)
5+
6+
if (index == 7)
77
index = 0;
88
else
99
index++;
10+
1011
ExclusiveWrite((u16*)&m_entries[index].x, entry.x);
1112
ExclusiveWrite((u16*)&m_entries[index].y, entry.y);
1213
ExclusiveWrite((u16*)&m_entries[index].z, entry.z);
13-
if(index == 0) // When index is 0 we need to update tickcount
14-
{
14+
15+
if (index == 0) { // When index is 0 we need to update tickcount
1516
m_oldtickcount = m_tickcount;
1617
m_tickcount = svcGetSystemTick();
1718
}
19+
1820
ExclusiveWrite(&m_updatedindex, index);
1921
}

‎source/AccelerometerRing.hpp

Lines changed: 26 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -2,41 +2,39 @@
22
#include <3ds.h>
33
#include "exclusive_rw.hpp"
44

5-
struct AccelerometerEntry
6-
{
5+
struct AccelerometerEntry {
76
int16_t x;
87
int16_t y;
98
int16_t z;
109
};
10+
1111
static_assert(sizeof(AccelerometerEntry) == 6, "Size of AccelerometerEntry is invalid");
1212

13-
class AccelerometerRing
14-
{
15-
public:
16-
AccelerometerRing(){
17-
Reset();
18-
};
13+
class AccelerometerRing {
14+
public:
15+
AccelerometerRing() {
16+
Reset();
17+
};
1918

20-
void Reset()
21-
{
22-
m_tickcount = -1;
23-
m_oldtickcount = -1;
24-
m_updatedindex = -1;
25-
};
19+
void Reset() {
20+
m_tickcount = -1;
21+
m_oldtickcount = -1;
22+
m_updatedindex = -1;
23+
};
2624

27-
void SetRaw(AccelerometerEntry entry) {
28-
ExclusiveWrite((u16*)&m_rawentry.x, entry.x);
29-
ExclusiveWrite((u16*)&m_rawentry.y, entry.y);
30-
ExclusiveWrite((u16*)&m_rawentry.z, entry.z);
31-
}
25+
void SetRaw(AccelerometerEntry entry) {
26+
ExclusiveWrite((u16*)&m_rawentry.x, entry.x);
27+
ExclusiveWrite((u16*)&m_rawentry.y, entry.y);
28+
ExclusiveWrite((u16*)&m_rawentry.z, entry.z);
29+
}
3230

33-
void WriteToRing(AccelerometerEntry entry);
34-
private:
35-
int64_t m_tickcount = 0;
36-
int64_t m_oldtickcount = 0;
37-
int32_t m_updatedindex = 0;
38-
uint32_t padding;
39-
AccelerometerEntry m_rawentry;
40-
uint16_t padding2;
41-
AccelerometerEntry m_entries[8];
31+
void WriteToRing(AccelerometerEntry entry);
32+
private:
33+
int64_t m_tickcount = 0;
34+
int64_t m_oldtickcount = 0;
35+
int32_t m_updatedindex = 0;
36+
uint32_t padding;
37+
AccelerometerEntry m_rawentry;
38+
uint16_t padding2;
39+
AccelerometerEntry m_entries[8];
4240
};

0 commit comments

Comments
 (0)