bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Support for newer Wire library

Browse Source
This commit is contained in:
Scott Lahteine 2016-06-27 12:51:50 -07:00
parent ddb386c139
commit 0c24e0e445
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Marlin/dac_mcp4728.cpp
View File

@ -43,9 +43,9 @@ void mcp4728_init() {
Wire.begin(); Wire.begin();
Wire.requestFrom(int(DAC_DEV_ADDRESS), 24); Wire.requestFrom(int(DAC_DEV_ADDRESS), 24);
while(Wire.available()) { while(Wire.available()) {
int deviceID = Wire.receive(); int deviceID = Wire.read();
int hiByte = Wire.receive(); int hiByte = Wire.read();
int loByte = Wire.receive(); int loByte = Wire.read();
int isEEPROM = (deviceID & 0B00001000) >> 3; int isEEPROM = (deviceID & 0B00001000) >> 3;
int channel = (deviceID & 0B00110000) >> 4; int channel = (deviceID & 0B00110000) >> 4;
@ -70,10 +70,10 @@ uint8_t mcp4728_analogWrite(uint8_t channel, uint16_t value) {
*/ */
uint8_t mcp4728_eepromWrite() { uint8_t mcp4728_eepromWrite() {
Wire.beginTransmission(DAC_DEV_ADDRESS); Wire.beginTransmission(DAC_DEV_ADDRESS);
Wire.send(SEQWRITE); Wire.write(SEQWRITE);
for (uint8_t channel=0; channel <= 3; channel++) { for (uint8_t channel=0; channel <= 3; channel++) {
Wire.send(DAC_STEPPER_VREF << 7 | 0 << 5 | DAC_STEPPER_GAIN << 4 | highByte(mcp4728_values[channel])); Wire.write(DAC_STEPPER_VREF << 7 | 0 << 5 | DAC_STEPPER_GAIN << 4 | highByte(mcp4728_values[channel]));
Wire.send(lowByte(mcp4728_values[channel])); Wire.write(lowByte(mcp4728_values[channel]));
} }
return Wire.endTransmission(); return Wire.endTransmission();
} }
@ -83,7 +83,7 @@ uint8_t mcp4728_eepromWrite() {
*/ */
uint8_t mcp4728_setVref_all(uint8_t value) { uint8_t mcp4728_setVref_all(uint8_t value) {
Wire.beginTransmission(DAC_DEV_ADDRESS); Wire.beginTransmission(DAC_DEV_ADDRESS);
Wire.send(VREFWRITE | value << 3 | value << 2 | value << 1 | value); Wire.write(VREFWRITE | value << 3 | value << 2 | value << 1 | value);
return Wire.endTransmission(); return Wire.endTransmission();
} }
/** /**
@ -91,7 +91,7 @@ uint8_t mcp4728_setVref_all(uint8_t value) {
*/ */
uint8_t mcp4728_setGain_all(uint8_t value) { uint8_t mcp4728_setGain_all(uint8_t value) {
Wire.beginTransmission(DAC_DEV_ADDRESS); Wire.beginTransmission(DAC_DEV_ADDRESS);
Wire.send(GAINWRITE | value << 3 | value << 2 | value << 1 | value); Wire.write(GAINWRITE | value << 3 | value << 2 | value << 1 | value);
return Wire.endTransmission(); return Wire.endTransmission();
} }
@ -120,8 +120,8 @@ uint16_t mcp4728_getVout(uint8_t channel) {
uint8_t mcp4728_fastWrite() { uint8_t mcp4728_fastWrite() {
Wire.beginTransmission(DAC_DEV_ADDRESS); Wire.beginTransmission(DAC_DEV_ADDRESS);
for (uint8_t channel=0; channel <= 3; channel++) { for (uint8_t channel=0; channel <= 3; channel++) {
Wire.send(highByte(mcp4728_values[channel])); Wire.write(highByte(mcp4728_values[channel]));
Wire.send(lowByte(mcp4728_values[channel])); Wire.write(lowByte(mcp4728_values[channel]));
} }
return Wire.endTransmission(); return Wire.endTransmission();
} }
@ -131,7 +131,7 @@ uint8_t mcp4728_fastWrite() {
*/ */
uint8_t mcp4728_simpleCommand(byte simpleCommand) { uint8_t mcp4728_simpleCommand(byte simpleCommand) {
Wire.beginTransmission(GENERALCALL); Wire.beginTransmission(GENERALCALL);
Wire.send(simpleCommand); Wire.write(simpleCommand);
return Wire.endTransmission(); return Wire.endTransmission();
} }

2
Marlin/dac_mcp4728.h
View File

@ -31,9 +31,7 @@
#include "Configuration_adv.h" #include "Configuration_adv.h"
#if ENABLED(DAC_STEPPER_CURRENT) #if ENABLED(DAC_STEPPER_CURRENT)
#include "WProgram.h"
#include "Wire.h" #include "Wire.h"
//#include <Wire.h>
#define defaultVDD 5000 #define defaultVDD 5000
#define BASE_ADDR 0x60 #define BASE_ADDR 0x60