Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package io.silverspoon;

import io.silverspoon.device.OneWireTemperatureSensor;
import io.silverspoon.device.SPITemperatureSensor;
import io.silverspoon.device.TemperatureSensor;

import org.apache.camel.Consumer;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
Expand All @@ -24,6 +24,7 @@ public class TemperatureEndpoint extends DefaultEndpoint {
private String type = null;

private final String W1_DIR = System.getProperty("w1.devices", "/sys/bus/w1/devices/");
private final String SPI_MOSI_PIN = System.getProperty("SPI_MOSI", "P1_19");

private List<TemperatureSensor> sensors = new ArrayList<TemperatureSensor>();
private static final Logger LOG = Logger.getLogger(TemperatureEndpoint.class);
Expand Down Expand Up @@ -57,7 +58,6 @@ public void setType(String type) {
}

private void loadSensors() {
// Load sensors (currently only w1 is supported)
switch (type) {
case "w1":
loadW1Sensors();
Expand All @@ -73,14 +73,13 @@ private void loadSensors() {
}
}

private void loadSPISensors() {
private void loadI2cSensors() {
// TODO:
throw new UnsupportedOperationException("Not implemented, yet.");
}

private void loadI2cSensors() {
// TODO:
throw new UnsupportedOperationException("Not implemented, yet.");
private void loadSPISensors() {
sensors.add(new SPITemperatureSensor(SPI_MOSI_PIN));
}

private void loadW1Sensors() {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
package io.silverspoon.device;

import java.io.IOException;
import java.util.List;

import io.silverspoon.bulldog.core.gpio.DigitalOutput;
import io.silverspoon.bulldog.core.io.bus.spi.SpiBus;
import io.silverspoon.bulldog.core.io.bus.spi.SpiConnection;
import io.silverspoon.bulldog.core.platform.Board;
import io.silverspoon.bulldog.core.platform.Platform;
import io.silverspoon.bulldog.devices.sensors.*;

/**
* Represents SPI Temperature Sensor and reads its values.
*
* @author <a href="mailto:[email protected]">Matej Perejda</a>
*/
public class SPITemperatureSensor implements TemperatureSensor {

private final Board board;
private String SPI_MOSI;

private List<SpiBus> spiBuses;
private SpiBus spiBus;
private DigitalOutput output;
private SpiConnection connection;
private LM74TemperatureSensor temperatureSensorLM74;

/**
* Constructor
*
* @param pin
* sets SPI MOSI pin defined by environment variable named "SPI_MOSI".
* Default pin: "P1_19"
*/
public SPITemperatureSensor(String pin) {
this.SPI_MOSI = pin;
// init board
board = Platform.createBoard();
}

@Override
public float readTemperature() throws IOException {
spiBuses = board.getSpiBuses();

spiBus = spiBuses.get(0);

output = board.getPin(SPI_MOSI).as(DigitalOutput.class);

connection = spiBus.createSpiConnection(output);

temperatureSensorLM74 = new LM74TemperatureSensor(connection, output);

return temperatureSensorLM74.readTemperature();
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ public class TemperatureComponentTest extends CamelTestSupport {

@Produce(uri = "direct:start")
protected ProducerTemplate template;


// TODO: create test for SPI

@Test
public void testTemperature() throws Exception {
resultEndpoint.expectedMinimumMessageCount(1);
Expand Down