Skip to content

Commit be54578

Browse files
vonsiebvonsieb
committed
Changed the name of bool error defined as global variable that was causing trouble on some platforms
1 parent 2dd9f3e commit be54578

File tree

10 files changed

+28
-41
lines changed

10 files changed

+28
-41
lines changed

‎examples/gen3/gen3.ino

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ MagAlphaGen3 magalpha;
1111
double angle_real;
1212
uint16_t zero, bct, angle_raw;
1313
uint8_t register_value[2];
14-
bool error;
14+
bool crc_error;
1515

1616
void setup() {
1717

@@ -73,8 +73,8 @@ void loop() {
7373
angle_raw = magalpha.readAngleRaw16();
7474
Serial.print("Angle raw (16 bits) = ");
7575
Serial.println(angle_raw, HEX);
76-
angle_raw = magalpha.readAngleRaw(&error);
77-
if(error) {
76+
angle_raw = magalpha.readAngleRaw(&crc_error);
77+
if(crc_error) {
7878
Serial.println("An error occured during readAngleRaw");
7979
} else {
8080
Serial.print("readAngleRaw succeded, Angle raw (16 bits) = ");

‎examples/gen4/gen4.ino

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ MagAlphaGen4 magalpha;
1111
double angle_real;
1212
uint16_t zero, bct, angle_raw;
1313
uint8_t register_value[2];
14-
bool error;
14+
bool crc_error;
1515

1616
void setup() {
1717

@@ -91,8 +91,8 @@ void loop() {
9191
angle_raw = magalpha.readAngleRaw16();
9292
Serial.print("Angle raw (16 bits) = ");
9393
Serial.println(angle_raw, HEX);
94-
angle_raw = magalpha.readAngleRaw(&error);
95-
if(error) {
94+
angle_raw = magalpha.readAngleRaw(&crc_error);
95+
if(crc_error) {
9696
Serial.println("An error occured during readAngleRaw");
9797
} else {
9898
Serial.print("readAngleRaw succeded, Angle raw (16 bits) = ");

‎examples/gen6/gen6.ino

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ MagAlphaGen6 magalpha;
1111
double angle_real, speed;
1212
uint16_t zero, bct, angle_raw, turn;
1313
uint8_t register_value[2];
14-
bool error;
14+
bool crc_error;
1515

1616
void setup() {
1717

@@ -96,8 +96,8 @@ void loop() {
9696
angle_raw = magalpha.readAngleRaw16();
9797
Serial.print("Angle raw (16 bits) = ");
9898
Serial.println(angle_raw, HEX);
99-
angle_raw = magalpha.readAngleRaw(&error);
100-
if(error) {
99+
angle_raw = magalpha.readAngleRaw(&crc_error);
100+
if(crc_error) {
101101
Serial.println("An error occured during readAngleRaw");
102102
} else {
103103
Serial.print("readAngleRaw succeded, Angle raw (16 bits) = ");

‎examples/gen7/gen7.ino

+3-18
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ MagAlphaGen7 magalpha;
1111
double angle_real, speed;
1212
uint16_t zero, angle_raw, turn;
1313
uint8_t register_value[2];
14-
bool error;
14+
bool crc_error;
1515

1616
void setup() {
1717

@@ -35,21 +35,6 @@ void loop() {
3535
register_value[0] = magalpha.readRegister(0);
3636
register_value[0] = magalpha.writeRegister(0, 0x00);
3737

38-
/*
39-
uint16_t readAngleRaw16(bool *error, bool *inversion, bool isShortRead=false);
40-
uint16_t readAngleCounter(uint16_t *angle, bool *error, bool *inversion);
41-
uint16_t readAngleSpeed(uint16_t *angle, bool *error, bool *inversion);
42-
uint16_t readAngleMultiturn(uint16_t *angle, bool *error, bool *inversion);
43-
uint16_t readAngleTemperature(uint16_t *angle, bool *error, bool *inversion);
44-
uint8_t readRegister(uint8_t address, bool *error, bool *inversion);
45-
uint16_t readRegisterBurst(uint8_t address, uint8_t readbackValueArray[], uint16_t numberOfRegister, bool *error, bool *inversion);
46-
uint8_t writeRegister(uint8_t address, uint8_t value, bool *error, bool *inversion, bool *wrongHandshaking);
47-
void writeRegisterBurst(uint8_t address, uint8_t valueArray[], uint16_t numberOfRegister, bool *error, bool *inversion, bool *wrongHandshaking);
48-
void setCrcCheckSetting(bool enable);
49-
uint16_t appendCrc4(uint16_t data);
50-
void checkCrc4(uint16_t readData, uint16_t *computedCrc, bool *errorDetected, bool *inversionDetected);
51-
*/
52-
5338
// Read & Write registers in burst mode
5439
register_value[0] = 0x55;
5540
register_value[1] = 0xAA;
@@ -104,8 +89,8 @@ void loop() {
10489
angle_raw = magalpha.readAngleRaw16();
10590
Serial.print("Angle raw (16 bits) = ");
10691
Serial.println(angle_raw, HEX);
107-
angle_raw = magalpha.readAngleRaw(&error);
108-
if(error) {
92+
angle_raw = magalpha.readAngleRaw(&crc_error);
93+
if(crc_error) {
10994
Serial.println("An error occured during readAngleRaw");
11095
} else {
11196
Serial.print("readAngleRaw succeded, Angle raw (16 bits) = ");

‎examples/gen8/gen8.ino

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ MagAlphaGen8 magalpha;
1111
double angle_real, speed;
1212
uint16_t zero, angle_raw, turn;
1313
uint8_t register_value[2];
14-
bool error;
14+
bool crc_error;
1515

1616
void setup() {
1717

@@ -89,8 +89,8 @@ void loop() {
8989
angle_raw = magalpha.readAngleRaw16();
9090
Serial.print("Angle raw (16 bits) = ");
9191
Serial.println(angle_raw, HEX);
92-
angle_raw = magalpha.readAngleRaw(&error);
93-
if(error) {
92+
angle_raw = magalpha.readAngleRaw(&crc_error);
93+
if(crc_error) {
9494
Serial.println("An error occured during readAngleRaw");
9595
} else {
9696
Serial.print("readAngleRaw succeded, Angle raw (16 bits) = ");

‎examples/legacy/edit-magalpha-config/edit-magalpha-config.ino

+3-3
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,11 @@ void loop() {
4848
Serial.println(angleRaw8, DEC);
4949

5050
//Read the angle (16-bit raw angle value) and check the parity bit to detect possible communication error
51-
bool error;
52-
angleRaw16 = magAlpha.readAngleRaw(&error);
51+
bool crc_error;
52+
angleRaw16 = magAlpha.readAngleRaw(&crc_error);
5353
Serial.print(" magAlpha.readAngleRaw16(&error) = ");
5454
Serial.print(angleRaw16, DEC);
55-
if (error == true){
55+
if (crc_error){
5656
Serial.print("\t => Communication error detected");
5757
}
5858
else{

‎examples/legacy/read-magalpha-angle-and-error/read-magalpha-angle-and-error.ino

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ void setup() {
1919
void loop() {
2020
// put your main code here, to run repeatedly:
2121
uint16_t angleRaw16;
22-
bool error;
22+
bool crc_error;
2323
//Read the angle
24-
angleRaw16 = magAlpha.readAngleRaw(&error);
24+
angleRaw16 = magAlpha.readAngleRaw(&crc_error);
2525
Serial.print(angleRaw16, DEC);
26-
if (error){
26+
if (crc_error){
2727
Serial.print("\t => Communication Error Detected");
2828
}
2929
else{

‎examples/legacy/read-magalpha-angle-with-ssi-and-error/read-magalpha-angle-with-ssi-and-error.ino

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include <MagAlphaBase.h>
1+
#include <MagAlpha.h>
22

33
//Check https://www.arduino.cc/en/reference/SPI for SPI signals connections
44
//Connect SSI SSCK to SPI SCLK signal
@@ -20,11 +20,11 @@ void setup() {
2020
void loop() {
2121
// put your main code here, to run repeatedly:
2222
uint16_t angleRaw16;
23-
bool error;
23+
bool crc_error;
2424
//Read the angle
25-
angleRaw16 = magAlphaSsi.readAngleRaw(&error);
25+
angleRaw16 = magAlphaSsi.readAngleRaw(&crc_error);
2626
Serial.print(angleRaw16, DEC);
27-
if (error){
27+
if (crc_error){
2828
Serial.print("\t => Communication Error Detected");
2929
}
3030
else{

‎examples/legacy/read-magalpha-angle-with-ssi/read-magalpha-angle-with-ssi.ino

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include <MagAlphaBase.h>
1+
#include <MagAlpha.h>
22

33
//Check https://www.arduino.cc/en/reference/SPI for SPI signals connections
44
//Connect SSI SSCK to SPI SCLK signal

‎src/MagAlpha.h

+2
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
#define MA_SPI_MODE_0 SPI_MODE0
2424
#define MA_SPI_MODE_3 SPI_MODE3
2525

26+
#include "MagAlphaBase.h"
27+
2628
/*====================================================================================*/
2729
/*========================== MagAlphaGen3 Legacy =====================================*/
2830
/*====================================================================================*/

0 commit comments

Comments
 (0)