Skip to content

Commit cb3063c

Browse files
committed
Merge branch 'develop'
2 parents 2dff6c0 + b93a861 commit cb3063c

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

examples/UnitUnified/UnitUltraSonicI2C/PlotToSerial/main/PlotToSerial.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ void loop()
6262
// Periodic
6363
Units.update();
6464
if (unit.updated()) {
65-
M5_LOGI("\n>Distance:%f Raw:%x", unit.distance(), unit.oldest().raw_distance());
65+
M5.Log.printf("Distance:%f Raw:%x\n", unit.distance(), unit.oldest().raw_distance());
6666

6767
lcd.fillRect(8, 8, 8 * 24, 16 * 1, TFT_BLACK);
6868
lcd.setCursor(8, 8 + 16 * 0);
@@ -73,7 +73,7 @@ void loop()
7373
unit.stopPeriodicMeasurement();
7474
Data d{};
7575
if (unit.measureSingleshot(d)) {
76-
M5_LOGI("Single: %.2f mm", d.distance());
76+
M5.Log.printf("Single: %.2f mm\n", d.distance());
7777
}
7878
unit.startPeriodicMeasurement(interval);
7979
}

library.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
"url": "https://github.com/m5stack/M5Unit-DISTANCE.git"
1212
},
1313
"dependencies": {
14-
"M5UnitUnified": "https://github.com/m5stack/M5UnitUnified.git"
14+
"m5stack/M5UnitUnified": ">=0.1.0"
1515
},
16-
"version": "0.0.1",
16+
"version": "0.1.0",
1717
"frameworks": [
1818
"arduino"
1919
],
@@ -27,4 +27,4 @@
2727
"docs/html"
2828
]
2929
}
30-
}
30+
}

library.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name=M5Unit-DISTANCE
2-
version=0.0.1
2+
version=0.1.0
33
author=M5Stack
44
maintainer=M5Stack
55
sentence=Library for M5Stack UNIT DISTANCE using M5UnitUnified

platformio.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ lib_ldf_mode = deep
1010
test_framework = googletest
1111
test_build_src = true
1212
lib_deps=m5stack/M5Unified
13-
m5stack/M5UnitUnified
13+
m5stack/M5UnitUnified@>=0.1.0
1414

1515
; --------------------------------
1616
[m5base]

src/unit/unit_RCWL9620.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ namespace unit {
3030
// class UnitRCWL9620
3131
const char UnitRCWL9620::name[] = "UnitRCWL9620";
3232
const types::uid_t UnitRCWL9620::uid{"UnitRCWL9620"_mmh3};
33-
const types::uid_t UnitRCWL9620::attr{0};
33+
const types::attr_t UnitRCWL9620::attr{attribute::AccessI2C};
3434

3535
bool UnitRCWL9620::begin()
3636
{

0 commit comments

Comments
 (0)