Skip to content

Commit 014e175

Browse files
tk-kingtk-king
committed
Merged nicla and nano firmwares
1 parent e55ec13 commit 014e175

Some content is hidden

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

60 files changed

+10542
-0
lines changed

‎LICENSE.txt

+661
Large diffs are not rendered by default.

‎examples/App/App.ino

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
/*
2+
* Use this sketch if you want to control nicla over BLE in combination with edge-ml.
3+
*/
4+
5+
#include "Arduino.h"
6+
#include "Edge_ML.h"
7+
8+
// Set DEBUG to true in order to enable debug print
9+
#define DEBUG false
10+
11+
void setup()
12+
{
13+
#if DEBUG
14+
Serial.begin(115200);
15+
edge_ml.debug(Serial);
16+
#endif
17+
18+
edge_ml.begin();
19+
}
20+
21+
void loop()
22+
{
23+
// Update and then sleep
24+
edge_ml.update();
25+
}

‎library.properties

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
name=EdgeML_Arduino
2+
version=1.0.0
3+
author=edge-ml
4+
maintainer=edge-ml <[email protected]>
5+
sentence=Library to use the Nicla Sense ME and BLE Nano 33 with edge-ml.
6+
paragraph=Connects to edge-ml over Web Bluetooth.
7+
category=Sensors
8+
url=https://github.com/edge-ml/EdgeML-Arduino
9+
architectures=mbed_nicla, mbed_nano
10+
includes=Edge_ML.h
11+
depends=ArduinoBLE, Arduino_APDS9960, Arduino_LPS22HB, Arduino_HTS221, Arduino_LSM9DS1

‎src/Edge_ML.h

+60
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
/*#ifndef Edge_ML_BASE_H_
2+
#define Edge_ML_BASE_H_
3+
4+
#if defined(ARDUINO_NICLA)
5+
#warning "Using Nicla Sense ME"
6+
#include<nicla/Edge_ML.h>
7+
#else
8+
#warning "Using Ble33Nano"
9+
#include<ble33nano/Edge_ML_Nano.h>
10+
//#else
11+
// #error “This library only supports the BLE33Nano and the Nicla Sense ME.”
12+
#endif
13+
#endif*/
14+
15+
#ifndef Edge_ML_BASE_H_
16+
#define Edge_ML_BASE_H_
17+
18+
#if defined(ARDUINO_NICLA)
19+
#warning "Using Nicla Sense ME"
20+
#include<nicla/Edge_ML_Nicla.h>>
21+
#else
22+
#warning "Using Ble33Nano"
23+
#include<ble33nano/Edge_ML_Nano.h>
24+
#endif
25+
26+
class Edge_ML {
27+
public:
28+
Edge_ML() {
29+
#if defined(ARDUINO_NICLA)
30+
Edge_ML_Nicla();
31+
#else
32+
Edge_ML_Nano();
33+
#endif
34+
}
35+
bool begin() {
36+
#if defined(ARDUINO_NICLA)
37+
edge_ml_nicla.begin();
38+
#else
39+
edge_ml_nano.begin();
40+
#endif
41+
}
42+
void update() {
43+
#if defined(ARDUINO_NICLA)
44+
edge_ml_nicla.update();
45+
#else
46+
edge_ml_nano.update();
47+
#endif
48+
}
49+
void debug(Stream &stream) {
50+
#if defined(ARDUINO_NICLA)
51+
edge_ml_nicla.debug(stream);
52+
#else
53+
edge_ml_nano.debug(stream);
54+
#endif
55+
}
56+
};
57+
58+
extern Edge_ML edge_ml;
59+
60+
#endif

‎src/ble33nano/BLEHandler_Nano.cpp

+173
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,173 @@
1+
//
2+
// Created by Dylan Ray Roodt on 30.10.2021.
3+
//
4+
5+
#include "BLEHandler_Nano.h"
6+
7+
#include "Arduino.h"
8+
#include "ArduinoBLE.h"
9+
#include "SensorProvider.h"
10+
#include <cstdint>
11+
12+
const char deviceIdentifier_Nano[] = "NANO";
13+
const char deviceGeneration_Nano[] = "1.0.0";
14+
15+
// Sensor Data channels
16+
BLEService sensorService_Nano("34c2e3bb-34aa-11eb-adc1-0242ac120002");
17+
auto sensorDataUuid_Nano = "34c2e3bc-34aa-11eb-adc1-0242ac120002";
18+
auto sensorConfigUuid_Nano = "34c2e3bd-34aa-11eb-adc1-0242ac120002";
19+
BLECharacteristic sensorDataCharacteristic_Nano(sensorDataUuid_Nano, (BLERead | BLENotify), sizeof(SensorDataPacket));
20+
BLECharacteristic sensorConfigCharacteristic_Nano(sensorConfigUuid_Nano, BLEWrite, sizeof(SensorConfigurationPacket));
21+
22+
// Device information channels
23+
BLEService deviceInfoService_Nano("45622510-6468-465a-b141-0b9b0f96b468");
24+
auto deviceIdentifierUuid_Nano = "45622511-6468-465a-b141-0b9b0f96b468";
25+
auto deviceGenerationUuid_Nano = "45622512-6468-465a-b141-0b9b0f96b468";
26+
BLECharacteristic deviceIdentifierCharacteristic_Nano(deviceIdentifierUuid_Nano, BLERead, sizeof(deviceIdentifier_Nano));
27+
BLECharacteristic deviceGenerationCharacteristic_Nano(deviceGenerationUuid_Nano, BLERead, sizeof(deviceGeneration_Nano));
28+
29+
Stream* BLEHandler_Nano::_debug = nullptr;
30+
31+
BLEHandler_Nano::BLEHandler_Nano() {
32+
}
33+
34+
// Sensor channel
35+
void BLEHandler_Nano::receivedSensorConfig(BLEDevice central, BLECharacteristic characteristic)
36+
{
37+
SensorConfigurationPacket data;
38+
characteristic.readValue(&data, sizeof(data));
39+
if (_debug) {
40+
_debug->println("configuration received: ");
41+
_debug->print("data: ");
42+
_debug->println(data.sensorId);
43+
_debug->println(data.sampleRate);
44+
_debug->println(data.latency);
45+
}
46+
47+
sensorProvider.configureSensor(data);
48+
}
49+
50+
51+
bool BLEHandler_Nano::begin() {
52+
if (!BLE.begin()) {
53+
if (_debug) _debug->println("BLE already active");
54+
55+
return false;
56+
}
57+
bleActive = true;
58+
59+
// Code for name
60+
String address = BLE.address();
61+
String name;
62+
int length;
63+
64+
address.toUpperCase();
65+
length = address.length();
66+
67+
name = (String)deviceIdentifier_Nano + "-";
68+
name += address[length - 5];
69+
name += address[length - 4];
70+
name += address[length - 2];
71+
name += address[length - 1];
72+
73+
BLE.setLocalName(name.c_str());
74+
BLE.setDeviceName(name.c_str());
75+
76+
if (_debug) {
77+
_debug->println("BLEHandler_Nano Begin: ");
78+
_debug->print("address = ");
79+
_debug->println(address);
80+
_debug->print("name = ");
81+
_debug->println(name);
82+
}
83+
84+
// Sensor channel
85+
BLE.setAdvertisedService(sensorService_Nano);
86+
sensorService_Nano.addCharacteristic(sensorConfigCharacteristic_Nano);
87+
sensorService_Nano.addCharacteristic(sensorDataCharacteristic_Nano);
88+
BLE.addService(sensorService_Nano);
89+
sensorConfigCharacteristic_Nano.setEventHandler(BLEWritten, receivedSensorConfig);
90+
91+
// Device information
92+
BLE.setAdvertisedService(deviceInfoService_Nano);
93+
deviceInfoService_Nano.addCharacteristic(deviceIdentifierCharacteristic_Nano);
94+
deviceInfoService_Nano.addCharacteristic(deviceGenerationCharacteristic_Nano);
95+
BLE.addService(deviceInfoService_Nano);
96+
deviceIdentifierCharacteristic_Nano.writeValue(deviceIdentifier_Nano);
97+
deviceGenerationCharacteristic_Nano.writeValue(deviceGeneration_Nano);
98+
99+
//
100+
BLE.advertise();
101+
return true;
102+
}
103+
104+
void BLEHandler_Nano::end() {
105+
if (_debug) _debug->println("BLE End");
106+
bleActive = false;
107+
BLE.end();
108+
}
109+
110+
void BLEHandler_Nano::update() {
111+
BLE.poll();
112+
}
113+
114+
void BLEHandler_Nano::send(int ID, int *data) {
115+
// send list of int data as in int16 2 bytes each
116+
// first element is length of array
117+
if (sensorDataCharacteristic_Nano.subscribed()) {
118+
SensorDataPacket package{};
119+
int16_t value;
120+
int length = data[0];
121+
package.sensorId = ID;
122+
package.size = 2 + 4 + length * 2;
123+
package.millis = millis();
124+
125+
for (int i=0; i<length; i++) {
126+
value = (int16_t)data[i + 1];
127+
write_int16_at_pos(value, package.data, i * 2);
128+
}
129+
130+
sensorDataCharacteristic_Nano.writeValue(&package, sizeof(SensorDataPacket));
131+
}
132+
}
133+
134+
void BLEHandler_Nano::send(int ID, float *data) {
135+
// send list of float data floats 4 bytes each
136+
// first element is length of array (just convert to int)
137+
if (sensorDataCharacteristic_Nano.subscribed()) {
138+
SensorDataPacket package{};
139+
int length = (int)data[0];
140+
package.sensorId = ID;
141+
package.size = 2 + 4 + length * 4;
142+
package.millis = millis();
143+
144+
for (int i=0; i<length; i++) {
145+
write_float_at_pos(data[i + 1], package.data, i * 4);
146+
}
147+
148+
sensorDataCharacteristic_Nano.writeValue(&package, sizeof(SensorDataPacket));
149+
}
150+
}
151+
152+
void BLEHandler_Nano::poll(unsigned long timeout) {
153+
BLE.poll(timeout);
154+
}
155+
156+
void BLEHandler_Nano::write_int16_at_pos(int16_t value, uint8_t *data, int pos) {
157+
data[pos] = value & 0x000000ff;
158+
data[pos+1] = (value & 0x0000ff00) >> 8;
159+
}
160+
161+
void BLEHandler_Nano::write_float_at_pos(float value, uint8_t *data, int pos) {
162+
int length = sizeof(float);
163+
for(int i = 0; i < length; i++){
164+
data[pos+i] = ((uint8_t*)&value)[i];
165+
}
166+
}
167+
168+
void BLEHandler_Nano::debug(Stream &stream) {
169+
_debug = &stream;
170+
//BLE.debug(stream); // Problems with Debug
171+
}
172+
173+
BLEHandler_Nano bleHandler_Nano;

‎src/ble33nano/BLEHandler_Nano.h

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
//
2+
// Created by Dylan Ray Roodt on 30.10.2021.
3+
//
4+
5+
#ifndef BLEHANDLER_H_NANO
6+
#define BLEHANDLER_H_NANO
7+
8+
#include "Arduino.h"
9+
#include "ArduinoBLE.h"
10+
#include "ble33nano/sensors/SensorTypes.h"
11+
const int BUFFER_SIZE = 5;
12+
13+
class BLEHandler_Nano {
14+
public:
15+
BLEHandler_Nano();
16+
bool begin();
17+
void update();
18+
19+
void send(int ID, int *data);
20+
void send(int ID, float *data);
21+
22+
void poll(unsigned long timeout);
23+
void end();
24+
25+
static void debug(Stream &stream);
26+
27+
bool bleActive = false;
28+
29+
private:
30+
static Stream *_debug;
31+
void static receivedSensorConfig(BLEDevice central, BLECharacteristic characteristic);
32+
void write_int16_at_pos(int16_t value, uint8_t *data, int pos);
33+
void write_float_at_pos(float value, uint8_t *data, int pos);
34+
};
35+
36+
extern BLEHandler_Nano bleHandler_Nano;
37+
#endif //BLEHANDLER_H_NANO

‎src/ble33nano/Edge_ML_Nano.cpp

+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
//
2+
// Created by Dylan Ray Roodt on 30.10.2021.
3+
//
4+
#include "Edge_ML_Nano.h"
5+
6+
Edge_ML_Nano::Edge_ML_Nano() {
7+
// Init
8+
}
9+
10+
bool Edge_ML_Nano::begin() {
11+
if (_debug) _debug->println("Begin Ard_Sense");
12+
13+
// Begin sensors
14+
bleHandler_Nano.begin();
15+
sensorProvider.begin();
16+
17+
if (_debug) _debug->println("End Begin \n");
18+
return true;
19+
}
20+
21+
void Edge_ML_Nano::update() {
22+
// Update logic
23+
sensorProvider.update();
24+
bleHandler_Nano.update();
25+
}
26+
27+
void Edge_ML_Nano::debug(Stream &stream)
28+
{
29+
_debug = &stream;
30+
bleHandler_Nano.debug(stream);
31+
sensorProvider.debug(stream);
32+
33+
_debug->println("Debugger Active");
34+
}
35+
36+
Edge_ML_Nano edge_ml_nano;

‎src/ble33nano/Edge_ML_Nano.h

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
//
2+
// Created by Dylan Ray Roodt on 30.10.2021.
3+
//
4+
5+
#ifndef EDGE_ML_NANO
6+
#define EDGE_ML_NANO
7+
8+
#include "BLEHandler_Nano.h"
9+
#include "SensorProvider.h"
10+
11+
class Edge_ML_Nano {
12+
public:
13+
Edge_ML_Nano();
14+
bool begin();
15+
void update();
16+
17+
void debug(Stream &stream);
18+
private:
19+
Stream *_debug;
20+
};
21+
22+
23+
24+
extern Edge_ML_Nano edge_ml_nano;
25+
26+
#endif //EDGE_ML_NANO

0 commit comments

Comments
 (0)