Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Added i2c bridge sketch
  • Loading branch information
loredan committed Mar 29, 2020
1 parent 02d734b commit 57d11c5
Show file tree
Hide file tree
Showing 13 changed files with 485 additions and 23 deletions.
Expand Up @@ -12,7 +12,7 @@ int LOGIC = LOGIC_DEFAULT;
int PZDET = PZDET_DEFAULT;
int Debug = 0;
long voltMeterConstant = VM_CONST_DEFAULT;
uint8_t pP_i2c_address = 0x80;
uint8_t pP_i2c_address = 0x10;

/*------------------------------------------------*/
void eraseEEPROM() {
Expand Down
45 changes: 23 additions & 22 deletions firmware/AVR-Source/Pyr0_Piezo_Sensor_v2.x.x/src/pP_i2c.cpp
Expand Up @@ -7,10 +7,16 @@
uint8_t command;
uint16_t value;

void i2cInit() {
Wire.begin(pP_i2c_address);
Wire.onRequest(i2cReply);
Wire.onReceive(i2cInput);
void i2cWrite(int data) {
Wire.write(data >> 8);
Wire.write(data);
}

void i2cWrite(long data) {
Wire.write(data >> 24);
Wire.write(data >> 16);
Wire.write(data >> 8);
Wire.write(data);
}

void i2cReportConfig() {
Expand All @@ -33,25 +39,9 @@ void i2cReportState() {
i2cWrite(PZ_STATE);
}

void i2cWrite(int data) {
Wire.write(data >> 24);
Wire.write(data >> 16);
Wire.write(data >> 8);
Wire.write(data);
}

void i2cWrite(long data) {
Wire.write(data >> 56);
Wire.write(data >> 48);
Wire.write(data >> 40);
Wire.write(data >> 32);
Wire.write(data >> 24);
Wire.write(data >> 16);
Wire.write(data >> 8);
Wire.write(data);
}

void i2cReply() {
Serial.print("Requested ");
Serial.println(command);
switch (command) {
case CMD_CONFIG:
case CMD_ERASE:
Expand Down Expand Up @@ -79,6 +69,11 @@ void i2cInput(int bytesReceived) {
}
}

Serial.print("Command ");
Serial.print(command);
Serial.print(" ");
Serial.println(value);

// Parse commands and apply changes or actions
switch (command) {
case CMD_GAIN_F:
Expand Down Expand Up @@ -119,3 +114,9 @@ void i2cInput(int bytesReceived) {
return;
}
}

void i2cInit() {
Wire.begin(pP_i2c_address);
Wire.onRequest(i2cReply);
Wire.onReceive(i2cInput);
}
3 changes: 3 additions & 0 deletions firmware/AVR-Source/Pyr0_Piezo_i2c_Bridge/.clang-format
@@ -0,0 +1,3 @@
BasedOnStyle: LLVM
ColumnLimit: 200
AllowShortFunctionsOnASingleLine: false
7 changes: 7 additions & 0 deletions firmware/AVR-Source/Pyr0_Piezo_i2c_Bridge/.gitignore
@@ -0,0 +1,7 @@
.pio
.vscode/.browse.c_cpp.db*
.vscode/c_cpp_properties.json
.vscode/launch.json
.vscode/ipch
.vscode/settings.json
.travis.yml
@@ -0,0 +1,7 @@
{
// See http://go.microsoft.com/fwlink/?LinkId=827846
// for the documentation about the extensions.json format
"recommendations": [
"platformio.platformio-ide"
]
}
39 changes: 39 additions & 0 deletions firmware/AVR-Source/Pyr0_Piezo_i2c_Bridge/include/README
@@ -0,0 +1,39 @@

This directory is intended for project header files.

A header file is a file containing C declarations and macro definitions
to be shared between several project source files. You request the use of a
header file in your project source file (C, C++, etc) located in `src` folder
by including it, with the C preprocessing directive `#include'.

```src/main.c

#include "header.h"

int main (void)
{
...
}
```

Including a header file produces the same results as copying the header file
into each source file that needs it. Such copying would be time-consuming
and error-prone. With a header file, the related declarations appear
in only one place. If they need to be changed, they can be changed in one
place, and programs that include the header file will automatically use the
new version when next recompiled. The header file eliminates the labor of
finding and changing all the copies as well as the risk that a failure to
find one copy will result in inconsistencies within a program.

In C, the usual convention is to give header files names that end with `.h'.
It is most portable to use only letters, digits, dashes, and underscores in
header file names, and at most one dot.

Read more about using header files in official GCC documentation:

* Include Syntax
* Include Operation
* Once-Only Headers
* Computed Includes

https://gcc.gnu.org/onlinedocs/cpp/Header-Files.html
46 changes: 46 additions & 0 deletions firmware/AVR-Source/Pyr0_Piezo_i2c_Bridge/lib/README
@@ -0,0 +1,46 @@

This directory is intended for project specific (private) libraries.
PlatformIO will compile them to static libraries and link into executable file.

The source code of each library should be placed in a an own separate directory
("lib/your_library_name/[here are source files]").

For example, see a structure of the following two libraries `Foo` and `Bar`:

|--lib
| |
| |--Bar
| | |--docs
| | |--examples
| | |--src
| | |- Bar.c
| | |- Bar.h
| | |- library.json (optional, custom build options, etc) https://docs.platformio.org/page/librarymanager/config.html
| |
| |--Foo
| | |- Foo.c
| | |- Foo.h
| |
| |- README --> THIS FILE
|
|- platformio.ini
|--src
|- main.c

and a contents of `src/main.c`:
```
#include <Foo.h>
#include <Bar.h>

int main (void)
{
...
}

```

PlatformIO Library Dependency Finder will find automatically dependent
libraries scanning project source files.

More information about PlatformIO Library Dependency Finder
- https://docs.platformio.org/page/librarymanager/ldf.html
14 changes: 14 additions & 0 deletions firmware/AVR-Source/Pyr0_Piezo_i2c_Bridge/platformio.ini
@@ -0,0 +1,14 @@
; PlatformIO Project Configuration File
;
; Build options: build flags, source filter
; Upload options: custom upload port, speed and extra flags
; Library options: dependencies, extra library storages
; Advanced options: extra scripting
;
; Please visit documentation for the other options and examples
; https://docs.platformio.org/page/projectconf.html

[env:uno]
platform = atmelavr
board = uno
framework = arduino
73 changes: 73 additions & 0 deletions firmware/AVR-Source/Pyr0_Piezo_i2c_Bridge/src/i2c.cpp
@@ -0,0 +1,73 @@
#include "i2c.h"
#include "Wire.h"
#include "Arduino.h"

uint16_t read16() {
return Wire.read() << 8 | Wire.read();
}

uint32_t read32() {
return (uint32_t)Wire.read() << 24 | (uint32_t)Wire.read() << 16 | Wire.read() << 8 | Wire.read();
}

void write(uint8_t cmd) {
Wire.beginTransmission(ADDRESS);
Wire.write(cmd);
Wire.endTransmission();
}

void write(uint8_t cmd, uint16_t value) {
Wire.beginTransmission(ADDRESS);
Wire.write(cmd);
Wire.write(value >> 8);
Wire.write(value);
Wire.endTransmission();
}

void write(uint8_t cmd, uint32_t value) {
Wire.beginTransmission(ADDRESS);
Wire.write(cmd);
Wire.write(value >> 24);
Wire.write(value >> 16);
Wire.write(value >> 8);
Wire.write(value);
Wire.endTransmission();
}

config_t requestConfig() {
Wire.beginTransmission(ADDRESS);
Wire.write(CMD_CONFIG);
Wire.endTransmission();

uint8_t bytes = Wire.requestFrom(ADDRESS, 255);
Serial.println(bytes);

config_t config;
config.GAIN_FACTOR = read16();
config.followerThrs = read16();
config.compThrs = read16();
config.LOOP_DUR = read16();
config.TRG_DUR = read16();
config.Hyst = read16();
config.LOGIC = read16();
config.PZDET = read16();
config.voltMeterConstant = read32();
config.version = Wire.readString();

return config;
}

state_t requestState() {
Wire.beginTransmission(ADDRESS);
Wire.write(CMD_STATE);
Wire.endTransmission();

uint8_t bytes = Wire.requestFrom(ADDRESS, 10);

state_t state;
state.Vin = read16();
state.VComp = read16();
state.VFol = read16();
state.ERR_STATE = read16();
state.PZ_STATE = read16();
}
49 changes: 49 additions & 0 deletions firmware/AVR-Source/Pyr0_Piezo_i2c_Bridge/src/i2c.h
@@ -0,0 +1,49 @@
#ifndef I2C
#define I2C

#define ADDRESS 0x10

#define CMD_GAIN_F 0x00
#define CMD_VFOL 0x01
#define CMD_VCOMP 0x02
#define CMD_LOOP_D 0x03
#define CMD_TRG_D 0x04
#define CMD_HYST 0x05
#define CMD_LOGIC 0x06
#define CMD_PZDET 0x07
#define CMD_CONST 0x08
#define CMD_CONFIG 0x09
#define CMD_ERASE 0x0a
#define CMD_STATE 0x0b

#include "WString.h"

typedef struct {
uint16_t GAIN_FACTOR;
uint16_t followerThrs;
uint16_t compThrs;
uint16_t LOOP_DUR;
uint16_t TRG_DUR;
uint16_t Hyst;
uint16_t LOGIC;
uint16_t PZDET;
uint32_t voltMeterConstant;
String version;
} config_t;

typedef struct {
uint16_t Vin;
uint16_t VComp;
uint16_t VFol;
uint16_t ERR_STATE;
uint16_t PZ_STATE;
} state_t;

void write(uint8_t cmd);
void write(uint8_t cmd, uint16_t value);
void write(uint8_t cmd, uint32_t value);

config_t requestConfig();
state_t requestState();

#endif
21 changes: 21 additions & 0 deletions firmware/AVR-Source/Pyr0_Piezo_i2c_Bridge/src/main.cpp
@@ -0,0 +1,21 @@
#define ARDUINO_AVR_ATmega328PB

#include <Arduino.h>
#include <Wire.h>

#include "pP_serial.h"

void setup() {
Serial.begin(9600);
Serial.println("Initializing Pyr0-Piezo i2c Bridge...");

Wire.begin();
}

void loop() {
serialInput();

if (serialIncoming) {
updateParams();
}
}

0 comments on commit 57d11c5

Please sign in to comment.