Skip to content

Commit 9d00907

Browse files
committed
Ikoka Stick: Move to unified code naming conventions
1 parent 7b3a0bb commit 9d00907

File tree

4 files changed

+11
-16
lines changed

4 files changed

+11
-16
lines changed

variants/ikoka_stick_nrf/ikoka_stick_nrf_board.cpp renamed to variants/ikoka_stick_nrf/IkokaStickNRFBoard.cpp

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,26 @@
11
#ifdef XIAO_NRF52
22

33
#include <Arduino.h>
4-
#include "ikoka_stick_nrf_board.h"
4+
#include "IkokaStickNRFBoard.h"
55

66
#include <bluefruit.h>
77
#include <Wire.h>
88

99
static BLEDfu bledfu;
1010

11-
static void connect_callback(uint16_t conn_handle)
12-
{
11+
static void connect_callback(uint16_t conn_handle) {
1312
(void)conn_handle;
1413
MESH_DEBUG_PRINTLN("BLE client connected");
1514
}
1615

17-
static void disconnect_callback(uint16_t conn_handle, uint8_t reason)
18-
{
16+
static void disconnect_callback(uint16_t conn_handle, uint8_t reason) {
1917
(void)conn_handle;
2018
(void)reason;
2119

2220
MESH_DEBUG_PRINTLN("BLE client disconnected");
2321
}
2422

25-
void ikoka_stick_nrf_board::begin() {
23+
void IkokaStickNRFBoard::begin() {
2624
// for future use, sub-classes SHOULD call this from their begin()
2725
startup_reason = BD_STARTUP_NORMAL;
2826

@@ -50,7 +48,7 @@ void ikoka_stick_nrf_board::begin() {
5048
delay(10); // give sx1262 some time to power up
5149
}
5250

53-
bool ikoka_stick_nrf_board::startOTAUpdate(const char* id, char reply[]) {
51+
bool IkokaStickNRFBoard::startOTAUpdate(const char *id, char reply[]) {
5452
// Config the peripheral connection with maximum bandwidth
5553
// more SRAM required by SoftDevice
5654
// Note: All config***() function must be called before begin()
@@ -91,9 +89,6 @@ bool ikoka_stick_nrf_board::startOTAUpdate(const char* id, char reply[]) {
9189

9290
strcpy(reply, "OK - started");
9391
return true;
94-
95-
96-
return false;
9792
}
9893

9994
#endif

variants/ikoka_stick_nrf/ikoka_stick_nrf_board.h renamed to variants/ikoka_stick_nrf/IkokaStickNRFBoard.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
#ifdef XIAO_NRF52
77

8-
class ikoka_stick_nrf_board : public mesh::MainBoard {
8+
class IkokaStickNRFBoard : public mesh::MainBoard {
99
protected:
1010
uint8_t startup_reason;
1111

@@ -46,15 +46,15 @@ class ikoka_stick_nrf_board : public mesh::MainBoard {
4646
return (adcvalue * ADC_MULTIPLIER * AREF_VOLTAGE) / 4.096;
4747
}
4848

49-
const char* getManufacturerName() const override {
49+
const char *getManufacturerName() const override {
5050
return MANUFACTURER_STRING;
5151
}
5252

5353
void reboot() override {
5454
NVIC_SystemReset();
5555
}
5656

57-
bool startOTAUpdate(const char* id, char reply[]) override;
57+
bool startOTAUpdate(const char *id, char reply[]) override;
5858
};
5959

6060
#endif

variants/ikoka_stick_nrf/target.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#include "target.h"
33
#include <helpers/ArduinoHelpers.h>
44

5-
ikoka_stick_nrf_board board;
5+
IkokaStickNRFBoard board;
66

77
#ifdef DISPLAY_CLASS
88
DISPLAY_CLASS display;

variants/ikoka_stick_nrf/target.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#define RADIOLIB_STATIC_ONLY 1
44
#include <RadioLib.h>
55
#include <helpers/radiolib/RadioLibWrappers.h>
6-
#include <ikoka_stick_nrf_board.h>
6+
#include <IkokaStickNRFBoard.h>
77
#include <helpers/radiolib/CustomSX1262Wrapper.h>
88
#include <helpers/AutoDiscoverRTCClock.h>
99
#include <helpers/ArduinoHelpers.h>
@@ -16,7 +16,7 @@
1616
extern MomentaryButton user_btn;
1717
#endif
1818

19-
extern ikoka_stick_nrf_board board;
19+
extern IkokaStickNRFBoard board;
2020
extern WRAPPER_CLASS radio_driver;
2121
extern AutoDiscoverRTCClock rtc_clock;
2222
extern EnvironmentSensorManager sensors;

0 commit comments

Comments
 (0)