Skip to content

Commit 78060f7

Browse files
tehnDewb
andauthored
add arc intensity (#1868)
* arc intensity * lua * typo * clang-format * docker update libmonome version --------- Co-authored-by: Michael Dewberry <[email protected]>
1 parent cf0f6be commit 78060f7

File tree

3 files changed

+13
-3
lines changed

3 files changed

+13
-3
lines changed

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ LABEL org.opencontainers.image.source=https://github.com/monome/norns
3737

3838
ENV LANG=C.UTF-8 \
3939
DEBIAN_FRONTEND=noninteractive \
40-
LIBMONOME_VERSION=1.4.7 \
40+
LIBMONOME_VERSION=1.4.9 \
4141
LIBGPIOD_VERSION=1.6.4 \
4242
SUPERCOLLIDER_VERSION=3.13.0 \
4343
SUPERCOLLIDER_PLUGINS_VERSION=3.13.0
@@ -143,4 +143,4 @@ USER we
143143

144144
WORKDIR /norns-build
145145
ENTRYPOINT ["/bin/sh", "-c"]
146-
CMD ["./waf configure --release && ./waf build --release"]
146+
CMD ["./waf configure --release && ./waf build --release"]

lua/core/arc.lua

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ for i=1,4 do
2828
all = vport.wrap_method('all'),
2929
refresh = vport.wrap_method('refresh'),
3030
segment = vport.wrap_method('segment'),
31+
intensity = vport.wrap_method('intensity'),
3132
}
3233
end
3334

@@ -140,6 +141,12 @@ function Arc:segment(ring, from, to, level)
140141
end
141142
end
142143

144+
--- intensity
145+
-- @tparam integer i : intensity [0, 15]
146+
function Arc:intensity(i)
147+
_norns.monome_intensity(self.dev, i)
148+
end
149+
143150
--- create device, returns object with handler and send
144151
-- @static
145152
function Arc.connect(n)

matron/src/device/device_monome.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,10 @@ void dev_monome_refresh(struct dev_monome *md) {
166166
void dev_monome_intensity(struct dev_monome *md, uint8_t i) {
167167
if (i > 15)
168168
i = 15;
169-
monome_led_intensity(md->m, i);
169+
if (md->type == DEVICE_MONOME_TYPE_ARC)
170+
monome_led_ring_intensity(md->m, i);
171+
else
172+
monome_led_intensity(md->m, i);
170173
}
171174

172175
//--------------------

0 commit comments

Comments
 (0)