prevent multi include

also make buffer void*

controller/.gitignore

@@ -0,0 +1 @@
+controller

controller/README.md

@@ -0,0 +1,22 @@
+# Controller
+## links
+* https://www.kernel.org/doc/Documentation/i2c/dev-interface
+* https://forum.arduino.cc/t/solved-cannot-get-correct-i2c-data-from-atmega8-into-raspberry-pi/1368337
+
+## PINs
+* interal = physical = usage
+* 5 = 29 = reset peripheral devices
+* 0 = 10 = I2C SDA
+* 1 = 9 = I2C SCL
+
+## I2C
+* somehow the buildin I2C does not work anymore (maybe already damaged?)
+* add additional bus by using GPIOs:
+```
+$ fgrep i2c /boot/firmware/config.txt 
+dtparam=i2c_arm=on
+dtoverlay=i2c-gpio,bus=7,i2c_gpio_sda=10,i2c_gpio_scl=9
+```
+
+## commands
+* reset peripheral devices: `gpioset gpiochip0 5=0`

controller/build.sh

@@ -0,0 +1 @@
+gcc -o controller ringbuffer.c controller.c -li2c

controller/controller.c

@@ -0,0 +1,236 @@
+#define RINGBUFFER_THREAD_SAFE
+
+#include <linux/i2c-dev.h>
+#include <i2c/smbus.h>
+#include <sys/ioctl.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <errno.h>
+#include <string.h>
+#include <stdint.h>
+#include <stdarg.h>
+#include <stdlib.h>
+
+#include "global.h"
+#ifndef RINGBUFFER_H
+#include "ringbuffer.h"
+#endif
+
+#define IIC_DEVICE "/dev/i2c-7"
+#define BUFFER_BLOCKS 128
+
+#define HEADING_SIM_UP "sim/autopilot/heading_up"
+#define HEADING_SIM_DOWN "sim/autopilot/heading_down"
+#define ALTITUDE_SIM_UP "sim/autopilot/altitude_up"
+#define ALTITUDE_SIM_DOWN "sim/autopilot/altitude_down"
+#define AIRSPEED_SIM_UP "sim/autopilot/airspeed_up"
+#define AIRSPEED_SIM_DOWN "sim/autopilot/airspeed_down"
+
+#define ERROR_IIC_OPEN "open failed"
+
+struct ringBuffer i2cDataRead;
+struct ringBuffer i2cDataWrite;
+
+struct blockData {
+  char data[DATA_SIZE];
+  int triggerBit;
+};
+
+struct device {
+  uint8_t address;       // I2C address of device
+  char *name;         // name of this device
+  char name1[3];      // first name to send on init of device
+  char *highCommand1; // command to use if TRIGGER_BIT_1 is set and HIGH_BIT_1 is set
+  char *lowCommand1;  // command to use if TRIGGER_BIT_1 is set and HIGH_BIT_1 is not set
+  int rrefRefresh1;   // refresh rate of subscribing rref
+  char *rref1;        // rref to subscribe to
+  char name2[3];      // second name to send on init of device
+  char *highCommand2; // command to use if TRIGGER_BIT_2 is set and HIGH_BIT_2 is set
+  char *lowCommand2;  // command to use if TRIGGER_BIT_2 is set and HIGH_BIT_2 is not set
+  int rrefRefresh2;   // refresh rate of subscribing rref
+  char *rref2;        // rref to subscribe to
+};
+
+struct rrefSubscription {
+  uint8_t address;
+  uint8_t triggerBit;
+};
+
+const struct device devices[] = {
+  {
+    0x08,
+    "Heading Speed",
+    {'H', 'D', 'G'},
+    HEADING_SIM_UP,
+    HEADING_SIM_DOWN,
+    200,
+    "sim/cockpit/autopilot/heading_mag",
+    {'S', 'P', 'D'},
+    AIRSPEED_SIM_UP,
+    AIRSPEED_SIM_DOWN,
+    200,
+    "sim/cockpit/autopilot/airspeed"
+  }
+};
+const int numDevices = sizeof(devices) / sizeof(struct device);
+struct rrefSubscription *rrefSubscriptions;
+
+void _log(char *format, ...) {
+  va_list args;
+  va_start(args, format);
+  vprintf(format, args);
+  va_end(args);
+}
+
+int setI2CAddress(int i2c, uint8_t address) {
+  if (ioctl(i2c, I2C_SLAVE, address) < 0) {
+    _log("setting i2c address 0x%02X failed\n", address);
+    return 0;
+  } else {
+    return 1;
+  }
+}
+
+void sendI2CInit(int i2c, struct device d) {
+  _log("Sending init to %s\n", d.name);
+  
+  int bufLen = 1 + 1 + sizeof(d.name1) + 1 + sizeof(d.name2);
+  char buf[bufLen];
+  int i = 0;
+  buf[i++] = DATA_RESET_BYTE;
+  buf[i++] = DATA_INIT_BYTE_1;
+  buf[i++] = d.name1[0];
+  buf[i++] = d.name1[1];
+  buf[i++] = d.name1[2];
+  buf[i++] = DATA_INIT_BYTE_2;
+  buf[i++] = d.name2[0];
+  buf[i++] = d.name2[1];
+  buf[i++] = d.name2[2];
+
+  setI2CAddress(i2c, d.address);
+  i2c_smbus_write_block_data(i2c, 0, bufLen, buf);
+}
+
+void sendI2CData(int i2c, struct device d, uint8_t triggerBit, char *data, uint8_t dataLen) {
+  int bufLen = 1 + 1 + 1 + dataLen;
+  char buf[bufLen];
+  int i = 0;
+  buf[i++] = DATA_BYTE;
+  buf[i++] = triggerBit;
+  buf[i++] = dataLen;
+  for (int j = 0; j < dataLen; j++) {
+    buf[i++] = data[j];
+  }
+
+  setI2CAddress(i2c, d.address);
+  i2c_smbus_write_block_data(i2c, 0, bufLen, buf);
+}
+
+int tempCounter = 0;
+int tempGauge = 0;
+void* mqttHandler(void* arg) {
+  struct blockData *block = malloc(sizeof(struct blockData));
+
+  while (1) {
+    sprintf(block->data, "%03d", tempCounter);
+    block->triggerBit = TRIGGER_BIT_1;
+    ringBufferWrite(&i2cDataWrite, block);
+    tempCounter++;
+    sleep(1);
+  }
+
+  free(block);
+}
+
+void* i2cHandler(void* arg) {
+  int i2c, tmp, buzy;
+  __s32 i2cResponse;
+  struct blockData *block = malloc(sizeof(struct blockData));
+
+  i2c = open(IIC_DEVICE, O_RDWR);
+  if (i2c < 0) {
+    _log("Unable to open I2C device %s\n", IIC_DEVICE);
+  }
+
+  while (1) {
+    buzy = 0;
+    for (int i = 0; i < numDevices; i++) {
+      setI2CAddress(i2c, devices[i].address);
+      i2cResponse = i2c_smbus_read_byte_data(i2c, 0);
+      if (i2cResponse < 0) {
+        _log("I2C read from device %s failed: %s (%d)\n", devices[i].name, strerror(errno), errno);
+        continue;
+      }
+
+      if (i2cResponse == DATA_RESET_BYTE) {
+        sendI2CInit(i2c, devices[i]);
+        buzy = 1;
+      } else if (i2cResponse == DATA_STOP_BYTE) {
+        // expect no forther data from device
+        // send data to device
+        do {
+          tmp = ringBufferRead(&i2cDataWrite, block);
+          if (tmp == 0) {
+            // we got something to send
+            sendI2CData(i2c, devices[i], block->triggerBit, block->data, 3);
+            buzy = 1;
+          }
+        } while (tmp == 0);
+        continue;
+      } else {
+        // real data
+        _log("data: 0x%02x\n", i2cResponse);
+        if (i2cResponse & TRIGGER_BIT_2) {
+          if (i2cResponse & HIGH_BIT_2) {
+            tempGauge++;
+            if (tempGauge > 999) {
+              tempGauge = 999;
+            }
+          } else {
+            tempGauge--;
+            if (tempGauge < 0) {
+              tempGauge = 0;
+            }
+          }
+          sprintf(block->data, "%03d", tempGauge);
+          block->triggerBit = TRIGGER_BIT_2;
+          ringBufferWrite(&i2cDataWrite, block);
+        }
+        buzy = 1;
+      }
+    }
+
+    if (buzy == 0) {
+      usleep(50 * 1000);
+    }
+  }
+
+  close(i2c);
+  free(block);
+  pthread_exit(NULL);
+}
+
+int main() {
+  pthread_t i2cThread, mqttThread;
+
+  // create the ring buffers for i2c devices
+  ringBufferCreate(BUFFER_BLOCKS, sizeof(struct blockData), &i2cDataRead);
+  ringBufferCreate(BUFFER_BLOCKS, sizeof(struct blockData), &i2cDataWrite);
+
+  // alloc
+  rrefSubscriptions = calloc(sizeof(struct device), numDevices);
+
+  // start and join threads
+  pthread_create(&i2cThread, NULL, i2cHandler, NULL);
+  pthread_create(&mqttThread, NULL, mqttHandler, NULL);
+  pthread_join(i2cThread, NULL);
+  pthread_join(mqttThread, NULL);
+
+  // free resources
+  free(rrefSubscriptions);
+  ringBufferDestroy(&i2cDataRead);
+  ringBufferDestroy(&i2cDataWrite);
+
+  return 0;
+}

controller/global.h

@@ -0,0 +1,11 @@
+#define DATA_STOP_BYTE 0x00
+#define DATA_INIT_BYTE_1 0x01
+#define DATA_INIT_BYTE_2 0x02
+#define DATA_BYTE 0x03
+#define DATA_RESET_BYTE 0xFF
+#define TRIGGER_BIT_1 1
+#define HIGH_BIT_1 2
+#define TRIGGER_BIT_2 4
+#define HIGH_BIT_2 8
+#define I2C_ADDRESS_START 0x08
+#define DATA_SIZE 8

controller/ringbuffer.c

@@ -0,0 +1,75 @@
+#ifndef RINGBUFFER_H
+#include "ringbuffer.h"
+#endif
+
+void _ringBufferIncReader(struct ringBuffer *buf) {
+  buf->reader += buf->blockSize;
+  if (buf->reader >= buf->buffer + buf->blocks * buf->blockSize) {
+    buf->reader = buf->buffer;
+  }
+}
+
+void _ringBufferIncWriter(struct ringBuffer *buf) {
+  buf->writer += buf->blockSize;
+  if (buf->writer == buf->buffer + buf->blocks * buf->blockSize) {
+    buf->writer = buf->buffer;
+  }
+
+  if (buf->writer == buf->reader) {
+    // we incremented the writer and now it is equal to reader
+    // this means, the writer is overtaking the reader
+    // so push the reader forward, even if we are
+    // loosing data but this is how ring buffers work, eh?
+    _ringBufferIncReader(buf);
+  }
+}
+
+void ringBufferCreate(int blocks, size_t blockSize, struct ringBuffer *out) {
+  out->buffer = malloc(blocks * blockSize);
+  out->blocks = blocks;
+  out->blockSize = blockSize;
+  out->reader = out->buffer;
+  out->writer = out->buffer;
+#ifdef RINGBUFFER_THREAD_SAFE
+  pthread_mutex_init(&out->mutex, NULL);
+#endif
+}
+
+void ringBufferDestroy(struct ringBuffer *buf) {
+  free(buf->buffer);
+#ifdef RINGBUFFER_THREAD_SAFE
+  pthread_mutex_destroy(&buf->mutex);
+#endif
+}
+
+int ringBufferRead(struct ringBuffer *buf, void *out) {
+#ifdef RINGBUFFER_THREAD_SAFE
+  pthread_mutex_lock(&buf->mutex);
+#endif
+  if (buf->reader != buf->writer) {
+    // we have data to read
+    memcpy(out, buf->reader, buf->blockSize);
+    _ringBufferIncReader(buf);
+#ifdef RINGBUFFER_THREAD_SAFE
+    pthread_mutex_unlock(&buf->mutex);
+#endif
+    return 0;
+  } else {
+    // nothing to read
+#ifdef RINGBUFFER_THREAD_SAFE
+    pthread_mutex_unlock(&buf->mutex);
+#endif
+    return 1;
+  }
+}
+
+void ringBufferWrite(struct ringBuffer *buf, void *in) {
+#ifdef RINGBUFFER_THREAD_SAFE
+  pthread_mutex_lock(&buf->mutex);
+#endif
+  memcpy(buf->writer, in, buf->blockSize);
+  _ringBufferIncWriter(buf);
+#ifdef RINGBUFFER_THREAD_SAFE
+  pthread_mutex_unlock(&buf->mutex);
+#endif
+}

controller/ringbuffer.h

@@ -0,0 +1,25 @@
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
+
+#ifdef RINGBUFFER_THREAD_SAFE
+#include <pthread.h>
+#endif
+
+#define RINGBUFFER_H
+
+struct ringBuffer {
+  void *buffer;
+  int blocks;
+  size_t blockSize;
+  void *reader;
+  void *writer;
+#ifdef RINGBUFFER_THREAD_SAFE
+  pthread_mutex_t mutex;
+#endif
+};
+
+void ringBufferCreate(int blocks, size_t blockSize, struct ringBuffer *out);
+void ringBufferDestroy(struct ringBuffer *buf);
+int ringBufferRead(struct ringBuffer *buf, void *out);
+void ringBufferWrite(struct ringBuffer *buf, void *in);

master/global.h

@@ -1,10 +0,0 @@
-#define DATA_STOP_BYTE 0x00
-#define DATA_INIT_BYTE_1 0x01
-#define DATA_INIT_BYTE_2 0x02
-#define DATA_BYTE 0x03
-#define DATA_RESET_BYTE 0xFF
-#define TRIGGER_BIT_1 1
-#define HIGH_BIT_1 2
-#define TRIGGER_BIT_2 4
-#define HIGH_BIT_2 8
-#define I2C_ADDRESS_START 0x08

master/global.h

@@ -0,0 +1 @@
+../controller/global.h

master/master.ino

@@ -18,10 +18,12 @@
 #define MQTT_LOG_TOPIC "/xplane/meta/log"
 #define MQTT_SIM_VALUE_TOPIC "/xplane/rref/#"
 #define MQTT_SIM_VALUE_SUBSCRIBE_TOPIC_PREFIX "/xplane/rref/"
-#define MQTT_SIM_VALUE_SUBSCRIBE_TOPIC "/xplane/rref"
+#define MQTT_SIM_VALUE_SUBSCRIBE_TOPIC "/xplane/meta/rref"
 
 #define MQTT_KEEPALIVE_INTERVAL_MS 15000
 
+#define SLAVE_RESET_PIN 7
+
 struct device {
   byte address;       // I2C address of device
   char *name;         // name of this device
@@ -68,6 +70,8 @@ EthernetClient client;
 MqttClient mqttClient(client);
 
 void onMqttMessage(int messageSize) {
+  Serial.println("Received MQTT message");
+  
   // assume, that we always receive topic beginning with MQTT_SIM_VALUE_SUBSCRIBE_TOPIC_PREFIX
   // otherwise, this will _HORRIBLY_ fail
 
@@ -113,22 +117,19 @@ void subscribeRrefs(struct device *d, int deviceNo) {
   // subscribe no 1
   sprintf(subscribeMsg, "%03d %03d %s", deviceNo + 1, d->rrefRefresh1, d->rref1); // subscription no is index-1 based
   sendMqttMessage(MQTT_SIM_VALUE_SUBSCRIBE_TOPIC, 1, subscribeMsg);
-  rrefSubscriptions[deviceNo] = { d->address, TRIGGER_BIT_1 };
+  rrefSubscriptions[deviceNo * 2] = { d->address, TRIGGER_BIT_1 };
   
   // subscribe no 2
   sprintf(subscribeMsg, "%03d %03d %s", deviceNo + 2, d->rrefRefresh2, d->rref2); // subscription no is index-1 based
   sendMqttMessage(MQTT_SIM_VALUE_SUBSCRIBE_TOPIC, 1, subscribeMsg);
-  rrefSubscriptions[deviceNo + 1] = { d->address, TRIGGER_BIT_2 };
-}
-
-void initializeDevices() {
-  for (int i = 0; i < numDevices; i++) {
-    sendI2CInit(devices[i]);
-    subscribeRrefs(&devices[i], i);
-  }
+  rrefSubscriptions[(deviceNo * 2) + 1] = { d->address, TRIGGER_BIT_2 };
 }
 
 void setup() {
+  // setup slave reset pin and pull it down for a reset
+  pinMode(SLAVE_RESET_PIN, OUTPUT);
+  digitalWrite(SLAVE_RESET_PIN, LOW);
+  
   // start the Ethernet connection:
   if (Ethernet.begin(mac) == 0) {
     Serial.println("Failed to configure Ethernet using DHCP");
@@ -159,10 +160,12 @@ void setup() {
   mqttClient.subscribe(MQTT_SIM_VALUE_TOPIC);
   mqttClient.setKeepAliveInterval(MQTT_KEEPALIVE_INTERVAL_MS);
 
+  // switch on the slaves and give them a moment to boot
+  digitalWrite(SLAVE_RESET_PIN, HIGH);
+  delay(5000);
+
   // start I2C
   Wire.begin();
-
-  initializeDevices();
 }
 
 void loop() {
@@ -180,6 +183,7 @@ void loop() {
         // device needs initialization
         sendMqttMessage(MQTT_LOG_TOPIC, 2, "got reset byte from ", devices[i].name);
         sendI2CInit(devices[i]);
+        subscribeRrefs(&devices[i], i);
       } else {
         // handle as payload
         if (data & TRIGGER_BIT_1) {

rotator/README.md

@@ -2,6 +2,11 @@
 * two rotators
 * two displays
 
+## required libraries
+* https://github.com/adafruit/Adafruit_SSD1306/
+* https://github.com/adafruit/Adafruit-GFX-Library
+* https://github.com/adafruit/Adafruit_BusIO
+
 ## PINs
 * IDE = Physical = Usage
 * x = 1 = reset (connecto to master)

rotator/global.h

@@ -1 +1 @@
-../master/global.h
+../controller/global.h

rotator/rotator.ino

@@ -20,7 +20,7 @@
 
 #define VALUE_BUFFER 30
 
-#define SKIP_ROTARY_INPUTS 40
+#define SKIP_ROTARY_INPUTS 50
 
 #define INTERNAL_STATE_UNKNOWN 0
 #define INTERNAL_STATE_INITIALIZED 1
@@ -51,6 +51,11 @@ uint8_t lastClk = HIGH;
 byte valueBuffer[VALUE_BUFFER] = { 0 };
 uint8_t readerPos, writerPos = 0;
 
+// ringbuffer of display data
+struct {
+  
+}
+
 void addValue(uint8_t value) {
   valueBuffer[writerPos++] = value;
 

simulatesimulator/.gitignore

@@ -1 +1,2 @@
 main
+stress

simulatesimulator/build.sh

@@ -1 +1,2 @@
 gcc -o main mqtt.c -lmosquitto main.c
+gcc -o stress mqtt.c -lmosquitto stress.c

simulatesimulator/stress.c

@@ -0,0 +1,114 @@
+#include <unistd.h>
+#include <stdio.h>
+#include <mosquitto.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "mqtt.h"
+#include "config.h"
+
+#define MAX_AIRSPEED 385
+#define MAX_MQTT_PAYLOAD_SIZE 512
+#define LOOPS 1000000
+
+struct mosquitto *mqtt;
+
+int airspeed = 100;
+int heading = 0;
+
+void onMessage(struct mosquitto *mqtt, void *obj, const struct mosquitto_message *message) {
+	char *mqttTopic;
+	char mqttPayload[MAX_MQTT_PAYLOAD_SIZE];
+
+	if (strcmp(message->topic, "/xplane/meta/rref") == 0) {
+		//requestRrefFromXPlane(message);
+	} else if (strcmp(message->topic, "/xplane/meta/cmnd") == 0) {
+		mqttTopic = NULL;
+		memset(mqttPayload, 0, sizeof(mqttPayload));
+
+		printf("CMD: %s\n", (char *)message->payload);
+		if (strcmp((char *)message->payload, "sim/autopilot/airspeed_up") == 0) {
+			airspeed++;
+			if (airspeed > MAX_AIRSPEED) {
+				airspeed = MAX_AIRSPEED;
+			} else {
+				// airspeed changed
+				mqttTopic = "/xplane/rref/2";
+				sprintf(mqttPayload, "%03d", airspeed);
+			}
+			printf("Airspeed: %d\n", airspeed);
+		} else if (strcmp((char *)message->payload, "sim/autopilot/airspeed_down") == 0) {
+			airspeed--;
+			if (airspeed < 0) {
+				airspeed = 0;
+			} else {
+				mqttTopic = "/xplane/rref/2";
+				sprintf(mqttPayload, "%03d", airspeed);
+			}
+			printf("Airspeed: %d\n", airspeed);
+		} else if (strcmp((char *)message->payload, "sim/autopilot/heading_up") == 0) {
+			heading++;
+			if (heading > 360) {
+				heading = 1;
+			}
+			mqttTopic = "/xplane/rref/1";
+			sprintf(mqttPayload, "%03d", heading);
+			printf("Heading: %d\n", heading);
+		} else if (strcmp((char *)message->payload, "sim/autopilot/heading_down") == 0) {
+			heading--;
+			if (heading < 0) {
+				heading = 359;
+			}
+			mqttTopic = "/xplane/rref/1";
+			sprintf(mqttPayload, "%03d", heading);
+			printf("Heading: %d\n", heading);
+		} else {
+			printf("unkown command %s\n", (char *)message->payload);
+		}
+
+		if (mqttTopic != NULL && mqttPayload != NULL) {
+			sendMqtt(mqtt, mqttTopic, mqttPayload, strlen(mqttPayload));
+		}
+	} else if (strcmp(message->topic, "/xplane/meta/log") == 0) {
+		printf("Log: %s\n", (char *)message->payload);
+	} else {
+		fprintf(stderr, "Unknown topic %s\n", message->topic);
+	}
+}
+
+int loop = 0;
+int main() {
+	char mqttPayload[MAX_MQTT_PAYLOAD_SIZE];
+
+	mqtt = connectMqtt(MQTT_USER1, MQTT_PASS, onMessage);
+	if (mqtt == NULL) {
+		return -1;
+	}
+
+	recvMqtt(mqtt, "/xplane/meta/cmnd");
+
+	while (1) {
+		loop++;
+		if (loop > LOOPS) {
+			sprintf(mqttPayload, "%03d", heading);
+			sendMqtt(mqtt, "/xplane/rref/1", mqttPayload, strlen(mqttPayload));
+			sprintf(mqttPayload, "%03d", airspeed);
+			sendMqtt(mqtt, "/xplane/rref/2", mqttPayload, strlen(mqttPayload));
+
+			heading++;
+			if (heading >= 360) {
+				heading = 0;
+			}
+
+			airspeed++;
+			if (airspeed >= MAX_AIRSPEED) {
+				airspeed = 100;
+			}
+			loop = 0;
+		}
+
+		mosquitto_loop(mqtt, 0, 1);
+	}
+
+	disconnectMqtt(mqtt);
+}