Skip to content

Commit 669015d

Browse files
ctrlVntctrlVnt
authored
Merge branch 'main' into dust-sensor
2 parents 5046655 + 2536408 commit 669015d

8 files changed

Lines changed: 644 additions & 15 deletions

File tree

‎.github/actions/screenshot-android/action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ runs:
2828
sudo udevadm trigger --name-match=kvm
2929
3030
- name: Cache AVD
31-
uses: actions/cache@v5
31+
uses: actions/cache@v6
3232
id: avd-cache
3333
with:
3434
path: |

‎assets/images/ccs811.jpg‎

81.4 KB
Loading

‎lib/communication/sensors/ccs811.dart‎

Lines changed: 129 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,129 @@
1+
import 'dart:async';
2+
import 'package:pslab/communication/peripherals/i2c.dart';
3+
import 'package:pslab/communication/science_lab.dart';
4+
import 'package:pslab/others/logger_service.dart';
5+
6+
class CCS811 {
7+
static const String tag = "CCS811";
8+
static const int address = 0x5A;
9+
10+
static const int algResultData = 0x02;
11+
static const int hwId = 0x20;
12+
static const int fwBootVersion = 0x23;
13+
static const int fwAppVersion = 0x24;
14+
static const int measMode = 0x01;
15+
static const int hwVersion = 0x21;
16+
static const int appStart = 0xF4;
17+
18+
static const int driveMode1Sec = 0x01;
19+
20+
final I2C i2c;
21+
22+
CCS811._(this.i2c);
23+
24+
static Future<CCS811> create(I2C i2c, ScienceLab scienceLab) async {
25+
final ccs811 = CCS811._(i2c);
26+
if (scienceLab.isConnected()) {
27+
await ccs811._initialize();
28+
}
29+
return ccs811;
30+
}
31+
32+
Future<void> _initialize() async {
33+
try {
34+
await _fetchID();
35+
await _appStart();
36+
await Future.delayed(const Duration(milliseconds: 100));
37+
await _disableInterrupt();
38+
await _setMeasMode();
39+
} catch (e) {
40+
logger.e("$tag Error initializing: $e");
41+
rethrow;
42+
}
43+
}
44+
45+
Future<void> _setMeasMode() async {
46+
int config = (1 << 2) | (driveMode1Sec << 4);
47+
await i2c.write(address, [config], measMode);
48+
}
49+
50+
Future<void> _disableInterrupt() async {
51+
int config = (1 << 2) | (3 << 4);
52+
await i2c.write(address, [config], measMode);
53+
}
54+
55+
Future<void> _fetchID() async {
56+
try {
57+
List<int> hwIdData = await i2c.readBulk(address, hwId, 1);
58+
await Future.delayed(const Duration(milliseconds: 20));
59+
60+
List<int> hwVerData = await i2c.readBulk(address, hwVersion, 1);
61+
await Future.delayed(const Duration(milliseconds: 20));
62+
63+
List<int> bootVerData = await i2c.readBulk(address, fwBootVersion, 2);
64+
await Future.delayed(const Duration(milliseconds: 20));
65+
66+
List<int> appVerData = await i2c.readBulk(address, fwAppVersion, 2);
67+
await Future.delayed(const Duration(milliseconds: 20));
68+
69+
if (hwIdData.isNotEmpty) {
70+
logger.d("$tag Hardware ID: ${hwIdData[0] & 0xFF}");
71+
}
72+
if (hwVerData.isNotEmpty) {
73+
logger.d("$tag Hardware Version: ${hwVerData[0] & 0xFF}");
74+
}
75+
if (bootVerData.length >= 2) {
76+
logger
77+
.d("$tag Boot Version: ${(bootVerData[0] << 8) | bootVerData[1]}");
78+
}
79+
if (appVerData.length >= 2) {
80+
logger.d("$tag App Version: ${(appVerData[0] << 8) | appVerData[1]}");
81+
}
82+
} catch (e) {
83+
logger.e("$tag Error fetching IDs: $e");
84+
}
85+
}
86+
87+
Future<void> _appStart() async {
88+
await i2c.write(address, [], appStart);
89+
}
90+
91+
String _decodeError(int error) {
92+
String e = "";
93+
if ((error & 1) > 0) e += ", Invalid register address ID";
94+
if ((error & (1 << 1)) > 0) e += ", Invalid mailbox ID";
95+
if ((error & (1 << 2)) > 0) e += ", Unsupported mode to MEAS_MODE";
96+
if ((error & (1 << 3)) > 0) {
97+
e += ", Resistance measurement max range reached";
98+
}
99+
if ((error & (1 << 4)) > 0) e += ", Heater current out of range";
100+
if ((error & (1 << 5)) > 0) e += ", Heater voltage applied incorrectly";
101+
102+
return e.isNotEmpty ? "Error: ${e.substring(2)}" : "Unknown error";
103+
}
104+
105+
Future<Map<String, int>> getRawData() async {
106+
try {
107+
List<int> data = await i2c.readBulk(address, algResultData, 8);
108+
if (data.length < 8) {
109+
throw Exception("Expected 8 bytes but got ${data.length}");
110+
}
111+
112+
int eCO2 = ((data[0] & 0xFF) << 8) | (data[1] & 0xFF);
113+
int tvoc = ((data[2] & 0xFF) << 8) | (data[3] & 0xFF);
114+
int errorId = data[5] & 0xFF;
115+
116+
if (errorId > 0) {
117+
logger.e("$tag ${_decodeError(errorId)}");
118+
}
119+
120+
return {
121+
'eCO2': eCO2,
122+
'TVOC': tvoc,
123+
};
124+
} catch (e) {
125+
logger.e("$tag Error getting raw data: $e");
126+
rethrow;
127+
}
128+
}
129+
}

‎lib/l10n/app_en.arb‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -773,5 +773,14 @@
773773
"sensorDescVL53L0X": "Time-of-Flight (ToF) Laser Distance",
774774
"mightNotConnected" : "might not be connected.",
775775
"hmc5883l" : "HMC5883L",
776-
"gauss" : "Gauss"
776+
"gauss" : "Gauss",
777+
"i2cError" : "Check I2C wiring.",
778+
"ccs811" : "CCS811",
779+
"eco2" : "eCO2",
780+
"tvoc" : "TVOC",
781+
"ppb" : "ppb",
782+
"concentrationPpm" : "Concentration (PPM)",
783+
"gasSensorConfig" : "Gas Sensor Configurations",
784+
"gasSensorPeriodHint" : "Enter update period (100 - 5000 ms)",
785+
"mq135" : "MQ-135"
777786
}

‎lib/providers/barometer_state_provider.dart‎

Lines changed: 33 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ class BarometerStateProvider extends ChangeNotifier {
4444
bool get isRecording => _isRecording;
4545
bool get isPlayingBack => _isPlayingBack;
4646
bool get isPlaybackPaused => _isPlaybackPaused;
47+
int? _playbackStartTimestamp;
4748

4849
StreamSubscription? _barometerSubscription;
4950

@@ -60,10 +61,12 @@ class BarometerStateProvider extends ChangeNotifier {
6061

6162
Position? currentPosition;
6263
StreamSubscription? _locationStream;
64+
int _currentUpdatePeriod = 1000;
6365

6466
BarometerStateProvider(this._configProvider) {
6567
_configProvider.addListener(_onConfigChanged);
6668
_currentSensorType = _configProvider.config.activeSensor;
69+
_currentUpdatePeriod = _configProvider.config.updatePeriod;
6770
}
6871

6972
Future<void> _startGeoLocationUpdates() async {
@@ -101,11 +104,16 @@ class BarometerStateProvider extends ChangeNotifier {
101104
}
102105

103106
void _onConfigChanged() {
107+
if (_isPlayingBack) return;
108+
104109
final newSensorType = _configProvider.config.activeSensor;
105-
if (_currentSensorType != newSensorType) {
106-
logger
107-
.d("Sensor type changed from $_currentSensorType to $newSensorType");
110+
final newUpdatePeriod = _configProvider.config.updatePeriod;
111+
112+
if (_currentSensorType != newSensorType ||
113+
_currentUpdatePeriod != newUpdatePeriod) {
108114
_currentSensorType = newSensorType;
115+
_currentUpdatePeriod = newUpdatePeriod;
116+
109117
_reinitializeSensors();
110118
}
111119
}
@@ -141,14 +149,16 @@ class BarometerStateProvider extends ChangeNotifier {
141149

142150
try {
143151
_startTime = DateTime.now().millisecondsSinceEpoch / 1000.0;
144-
_timeTimer = Timer.periodic(const Duration(seconds: 1), (timer) {
145-
_currentTime =
146-
(DateTime.now().millisecondsSinceEpoch / 1000.0) - _startTime;
147-
if (_sensorAvailable) {
152+
_timeTimer = Timer.periodic(
153+
Duration(milliseconds: _currentUpdatePeriod),
154+
(timer) {
155+
_currentTime =
156+
(DateTime.now().millisecondsSinceEpoch / 1000.0) - _startTime;
157+
148158
_updateData();
149-
}
150-
notifyListeners();
151-
});
159+
notifyListeners();
160+
},
161+
);
152162

153163
if (_currentSensorType == 'In-built Sensor') {
154164
_initializeBuiltInSensor();
@@ -170,7 +180,12 @@ class BarometerStateProvider extends ChangeNotifier {
170180

171181
_barometerSubscription = barometerEventStream().listen(
172182
(BarometerEvent event) {
173-
_currentPressure = event.pressure / 1013.25;
183+
double pressure = event.pressure / 1013.25;
184+
final limit = _currentLimit;
185+
if (limit != null && pressure > limit) {
186+
pressure = limit;
187+
}
188+
_currentPressure = pressure;
174189
_currentAltitude = _pressureToAltitude(_currentPressure);
175190
_currentTemperature = 0.0;
176191

@@ -281,7 +296,8 @@ class BarometerStateProvider extends ChangeNotifier {
281296
}
282297

283298
void startPlayback(List<List<dynamic>> data) {
284-
if (data.length <= 1) return;
299+
if (data.length <= 2) return;
300+
_playbackStartTimestamp = int.tryParse(data[2][0].toString())?.toInt();
285301

286302
_isPlayingBack = true;
287303
_isPlaybackPaused = false;
@@ -315,7 +331,10 @@ class BarometerStateProvider extends ChangeNotifier {
315331
if (currentRow.length > 3) {
316332
_currentAltitude = double.tryParse(currentRow[3].toString());
317333
}
318-
_currentTime = (_playbackIndex - 1).toDouble();
334+
final timestamp = int.tryParse(currentRow[0].toString())?.toInt();
335+
if (timestamp != null && _playbackStartTimestamp != null) {
336+
_currentTime = (timestamp - _playbackStartTimestamp!) / 1000.0;
337+
}
319338
_updateData();
320339
_playbackIndex++;
321340
notifyListeners();
@@ -359,6 +378,7 @@ class BarometerStateProvider extends ChangeNotifier {
359378
Future<void> stopPlayback() async {
360379
_isPlayingBack = false;
361380
_isPlaybackPaused = false;
381+
_playbackStartTimestamp = null;
362382
_playbackTimer?.cancel();
363383
_playbackData = null;
364384
_playbackIndex = 0;

0 commit comments

Comments
 (0)