From: Jan Michel Date: Sun, 12 Apr 2020 12:19:14 +0000 (+0200) Subject: add first version of MagnetWarner code X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=ee5260088a62cf481eaccb28da5d3c41957a88d4;p=avr.git add first version of MagnetWarner code --- diff --git a/sensors/MagnetWarner/MagnetSensor.c b/sensors/MagnetWarner/MagnetSensor.c new file mode 100644 index 0000000..c1a8ed5 --- /dev/null +++ b/sensors/MagnetWarner/MagnetSensor.c @@ -0,0 +1,224 @@ +#include "MagnetSensor.h" +//#define CHIP_OLD 1 + +uint8_t InitMagSensor(uint8_t Addr, uint16_t* Tref, float* SensX, float* SensY, float* SensZ, uint8_t *TC_Enabled) +{ + + // Write register command, AH = 0x00, AL = 0x5C, Hall plate spinning rate = DEFAULT, GAIN_SEL = 5(0x60, 0x00, 0x5C, 0x00) + // Address register, (0x00 << 2) + uint8_t txBuffer[4] = {0x60,0x00,0x5C,0x00}; + uint8_t status;uint8_t status2; + uint8_t ReadReg[3]; + uint8_t Gain,Res_x,Res_y,Res_z; +// char s[30]; + + // Read temperature compensation + txBuffer[0] = 0x50; //read in MagSensor + txBuffer[1] = 0x04; //Register 0x1 (shiftet to left by 2 Bits) + twi_writeTo(Addr, txBuffer, 2,1, true); + twi_readFrom(Addr, &ReadReg[0], 3, true); + *TC_Enabled = (ReadReg[1] & 0x4 ) >> 2; + + // Write reg addr 0x0 (hall config...) + txBuffer[0] = 0x60; //write in MagSensor + txBuffer[1] = 0x00; //Upper Byte + txBuffer[2] = 0x5C; //Lower Byte + txBuffer[3] = 0x00; //Register Address (shiftet to left by 2 Bits) + status2 = twi_writeTo(Addr, txBuffer, 4,1, true); + twi_readFrom(Addr, &status, 1, true); + + // Write register command, AH = 0x02, AL = 0xB4, RES for magnetic measurement = 1(0x60, 0x02, 0xB4, 0x08) + // Address register, (0x02 << 2) + txBuffer[1] = 0x02; + txBuffer[2] = 0xB4; + txBuffer[3] = 0x08; + twi_writeTo(Addr,txBuffer,4,1,true); + twi_readFrom(Addr, &status, 1, true); + + txBuffer[0] = 0x50;//Read in MagSensor + txBuffer[1] = 0x90;//Address of register (shiftet to left by 2 Bits) + twi_writeTo(Addr,txBuffer,2,1,true); + twi_readFrom(Addr, ReadReg, 3, true); + uint16_t T_ref = ReadReg[1]<<8 | ReadReg[2]; + //sprintf(s,"0x%x 0x%x",ReadReg[0], T_ref); + //uputsnl(s); + *Tref = T_ref; + //Read Gain; + txBuffer[1] = 0x00; + twi_writeTo(Addr,txBuffer,2,1,true); + twi_readFrom(Addr, ReadReg, 3, true); + + Gain = (ReadReg[2] & 0x70) >>4; + + //Read Resolution; + txBuffer[1] = 0x08; //Read Gain; + twi_writeTo(Addr,txBuffer,2,1,true); + twi_readFrom(Addr, ReadReg, 3, true); + + Res_x = (ReadReg[1] & 0x6) >>1; + Res_y = ((ReadReg[1] & 0x1) << 1)|((ReadReg[2] & 0x80) >>7); + Res_z = (ReadReg[2] & 0x60) >>5; + + *SensX = SensitivityXY(Gain,Res_x); + *SensY = SensitivityXY(Gain,Res_y); + *SensZ = SensitivityZ(Gain,Res_z); + + ////////////////////OFFSET_X + /* txBuffer[0] = 0x60; + txBuffer[1] = 0xee; + txBuffer[2] = 0xee; + txBuffer[3] = 0x10; + twi_writeTo(Addr,txBuffer,4,1,true); + twi_readFrom(Addr, &status, 1, true);*/ + /////////////////////////////////////// + return status2; +} + + +void MeasureMagSens(uint8_t Addr, uint16_t Tref, float* SensX, float* SensY, float* SensZ, const uint8_t TC_Enabled, int16_t* Meas){ + uint8_t MagData[9] = {255,255,255,255,255,255,255,255,255}; + char s[30]; +// char SerNum[10]; + char Num[2]; + sprintf(Num,"%1u",Addr-12); + + uint8_t dataTest = 0x3F; // Start Single Measurement + twi_writeTo(Addr,&dataTest,1,1, true); + uint8_t status_1; + twi_readFrom(Addr, &status_1, 1, true); +#ifdef USE_UART + sprintf(s,"Status %02u 0x%x: 0x%x",SERIALNUM,Addr,status_1); + uputsnl(s); +#endif + _delay_ms(100); + + uint8_t testdata2 = 0x4F;// Read Measured Values + twi_writeTo(Addr, &testdata2, 1, 1, true); + twi_readFrom(Addr,MagData, 9, true); + + if (MagData[0] == 3) { + uint16_t tMag = (uint16_t)( MagData[1] * 256 + MagData[2]); + int16_t xMag; + int16_t yMag; + int16_t zMag; + if (TC_Enabled) { + /* + uint16_t u_xMag = MagData[3] * 256 + MagData[4]; + uint16_t u_yMag = MagData[5] * 256 + MagData[6]; + uint16_t u_zMag = MagData[7] * 256 + MagData[8]; + xMag = u_xMag ^ 0x8000; + yMag = u_yMag ^ 0x8000; + zMag = u_zMag ^ 0x8000;*/ + xMag = (MagData[3] ^ 0x80) * 256 + MagData[4]; + yMag = (MagData[5] ^ 0x80) * 256 + MagData[6]; + zMag = (MagData[7] ^ 0x80) * 256 + MagData[8]; + } else { + xMag = MagData[3] * 256 + MagData[4]; + yMag = MagData[5] * 256 + MagData[6]; + zMag = MagData[7] * 256 + MagData[8]; + } + int16_t temp_temp = (uint16_t)(tMag) - (uint16_t)(Tref); + float Temperature = 35.0 + (temp_temp/45.2); + + Meas[0] = xMag; + Meas[1] = yMag; + Meas[2] = zMag; + Meas[3] = temp_temp*22.12 + 35; //Millikelvin +#ifdef USE_UART + uputs("M");sprintf(SerNum,"_%02u_",SERIALNUM);uputs(SerNum);uputs(Num);uputs("_T "); + sprintf(s,"%4.2f",Temperature); + uputsnl(s); + uputs("M");sprintf(SerNum,"_%02u_",SERIALNUM);uputs(SerNum);uputs(Num);uputs("_X "); + sprintf(s,"%4.3f",((float)xMag*(*SensX))); //muT + uputsnl(s); + uputs("M");sprintf(SerNum,"_%02u_",SERIALNUM);uputs(SerNum);uputs(Num);uputs("_Y "); + sprintf(s,"%4.3f",((float)yMag*(*SensY))); //muT + uputsnl(s); + uputs("M");sprintf(SerNum,"_%02u_",SERIALNUM);uputs(SerNum);uputs(Num);uputs("_Z "); + sprintf(s,"%4.3f",((float)zMag*(*SensZ))); //muT + uputsnl(s); + uputs("ERR Mag ");sprintf(SerNum,"%2u ",SERIALNUM);uputs(SerNum);uputs(Num);uputsnl(" NO"); // ERROR INFORMATION FOR EPICS +#endif + } else { +#ifdef USE_UART + uputs("ERR Mag ");sprintf(SerNum,"%2u ",SERIALNUM);uputs(SerNum);uputs(Num);uputsnl(" CONNECTION"); +#endif + } +} + +float SensitivityXY(uint8_t Gain, uint8_t Res){ + float Sens =0.805; + /*if (Gain != 0) { + for (int i=1; i<=Gain;i++){ + if (i<3) { + logVal = 1; + } else if (i<5) { + logVal = 2; + } else { + logVal = 3; + } + Sens = roundf((Sens - 0.161/((float)logVal)) * 1000) / 1000; + } + sprintf(s,"LOG: %f",Sens); + uputsnl(s); + }*/ + + +#ifdef CHIP_OLD + switch(Gain) { + case 0: Sens=0.805; break; + case 1: Sens=0.644; break; + case 2: Sens=0.483; break; + case 3: Sens=0.403; break; + case 4: Sens=0.322; break; + case 5: Sens=0.268; break; + case 6: Sens=0.215; break; + default: Sens=0.161; break; + } +#else + switch(Gain) { + case 0: Sens=0.751; break; + case 1: Sens=0.601; break; + case 2: Sens=0.451; break; + case 3: Sens=0.376; break; + case 4: Sens=0.3002; break; + case 5: Sens=0.250; break; + case 6: Sens=0.200; break; + default: Sens=0.150; break; + } + +#endif + + + return Sens*(float)pow(2,Res); +} + +float SensitivityZ(uint8_t Gain, uint8_t Res){ + float Sens =0.805; +#ifdef CHIP_OLD + switch(Gain) { + case 0: Sens=1.468; break; + case 1: Sens=1.174; break; + case 2: Sens=0.881; break; + case 3: Sens=0.734; break; + case 4: Sens=0.587; break; + case 5: Sens=0.489; break; + case 6: Sens=0.391; break; + default: Sens=0.294; break; + } +#else + switch(Gain) { + case 0: Sens=1.210; break; + case 1: Sens=0.968; break; + case 2: Sens=0.726; break; + case 3: Sens=0.605; break; + case 4: Sens=0.484; break; + case 5: Sens=0.403; break; + case 6: Sens=0.323; break; + default: Sens=0.242; break; + } +#endif + + + return Sens*(float)pow(2,Res); +} diff --git a/sensors/MagnetWarner/MagnetSensor.h b/sensors/MagnetWarner/MagnetSensor.h new file mode 100644 index 0000000..07696eb --- /dev/null +++ b/sensors/MagnetWarner/MagnetSensor.h @@ -0,0 +1,6 @@ +#include "main.h" + +uint8_t InitMagSensor(uint8_t Addr, uint16_t* Tref, float *SensX, float* SensY, float *SensZ, uint8_t *TC_Enabled); +void MeasureMagSens(uint8_t Addr, uint16_t Tref, float* SensX, float* SensY, float* SensZ, const uint8_t TC_Enabled,int16_t* Meas); +float SensitivityXY(uint8_t Gain, uint8_t Res); +float SensitivityZ(uint8_t Gain, uint8_t Res); diff --git a/sensors/MagnetWarner/Makefile b/sensors/MagnetWarner/Makefile new file mode 100644 index 0000000..0e1338d --- /dev/null +++ b/sensors/MagnetWarner/Makefile @@ -0,0 +1,247 @@ +# Hey Emacs, this is a -*- makefile -*- + +# AVR-GCC Makefile template, derived from the WinAVR template (which +# is public domain), believed to be neutral to any flavor of "make" +# (GNU make, BSD make, SysV make) + + +#MCU = atmega168p +MCU = atmega328p +FORMAT = ihex +TARGET = main +SRC = $(TARGET).c ../MagneticFieldSensor/uart/uart.c ../MagneticFieldSensor/twi/twi.c MagnetSensor.c ../MagneticFieldSensor/BME280.c +ASRC = +OPT = 2 + +# Name of this Makefile (used for "make depend"). +MAKEFILE = Makefile + +# Debugging format. +# Native formats for AVR-GCC's -g are stabs [default], or dwarf-2. +# AVR (extended) COFF requires stabs, plus an avr-objcopy run. +DEBUG = stabs + +# Compiler flag to set the C Standard level. +# c89 - "ANSI" C +# gnu89 - c89 plus GCC extensions +# c99 - ISO C99 standard (not yet fully implemented) +# gnu99 - c99 plus GCC extensions +CSTANDARD = -std=gnu99 + +# Place -D or -U options here +CDEFS = -DF_CPU=1000000 + +# Place -I options here +CINCS = + + +CDEBUG = -g$(DEBUG) +CWARN = -Wall -Wstrict-prototypes +CTUNING = -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enums -Wl,--relax +#CEXTRA = -Wa,-adhlns=$(<:.c=.lst) +CFLAGS = $(CDEBUG) $(CDEFS) $(CINCS) -O$(OPT) $(CWARN) $(CSTANDARD) $(CEXTRA) $(CTUNING) -DSERIALNUM=$(SNUM) + + +#ASFLAGS = -Wa,-adhlns=$(<:.S=.lst),-gstabs + + +#Additional libraries. + +# Minimalistic printf version +PRINTF_LIB_MIN = -Wl,-u,vfprintf -lprintf_min + +# Floating point printf version (requires MATH_LIB = -lm below) +PRINTF_LIB_FLOAT = -Wl,-u,vfprintf -lprintf_flt + +PRINTF_LIB = + +# Minimalistic scanf version +SCANF_LIB_MIN = -Wl,-u,vfscanf -lscanf_min + +# Floating point + %[ scanf version (requires MATH_LIB = -lm below) +SCANF_LIB_FLOAT = -Wl,-u,vfscanf -lscanf_flt + +SCANF_LIB = + +MATH_LIB = -lm + +# External memory options + +# 64 KB of external RAM, starting after internal RAM (ATmega128!), +# used for variables (.data/.bss) and heap (malloc()). +#EXTMEMOPTS = -Wl,--section-start,.data=0x801100,--defsym=__heap_end=0x80ffff + +# 64 KB of external RAM, starting after internal RAM (ATmega128!), +# only used for heap (malloc()). +#EXTMEMOPTS = -Wl,--defsym=__heap_start=0x801100,--defsym=__heap_end=0x80ffff + +EXTMEMOPTS = + +#LDMAP = $(LDFLAGS) -Wl,-Map=$(TARGET).map,--cref +LDFLAGS = $(EXTMEMOPTS) $(LDMAP) $(PRINTF_LIB_FLOAT) $(SCANF_LIB) $(MATH_LIB) + + +# Programming support using avrdude. Settings and variables. + +#AVRDUDE_PROGRAMMER = dragon_isp +AVRDUDE_PROGRAMMER = avrisp2 +AVRDUDE_PORT = usb + +AVRDUDE_WRITE_FLASH = -U flash:w:$(TARGET).hex +#AVRDUDE_WRITE_EEPROM = -U eeprom:w:$(TARGET).eep + + +# Uncomment the following if you want avrdude's erase cycle counter. +# Note that this counter needs to be initialized first using -Yn, +# see avrdude manual. +#AVRDUDE_ERASE_COUNTER = -y + +# Uncomment the following if you do /not/ wish a verification to be +# performed after programming the device. +AVRDUDE_NO_VERIFY = -V + +# Increase verbosity level. Please use this when submitting bug +# reports about avrdude. See +# to submit bug reports. +#AVRDUDE_VERBOSE = -v -v + +AVRDUDE_BASIC = -p $(MCU) -P $(AVRDUDE_PORT) -c $(AVRDUDE_PROGRAMMER) +AVRDUDE_FLAGS = $(AVRDUDE_BASIC) $(AVRDUDE_NO_VERIFY) $(AVRDUDE_VERBOSE) $(AVRDUDE_ERASE_COUNTER) + +# Philipp Klaus: In this project, we need to use a slower bit +# 2017-12-13 clock in order to flash the firmware properly: +AVRDUDE_FLAGS += -B 5 + + +CC = avr-gcc +OBJCOPY = avr-objcopy +OBJDUMP = avr-objdump +SIZE = avr-size +NM = avr-nm +AVRDUDE = avrdude +REMOVE = rm -f +MV = mv -f + +# Define all object files. +OBJ = $(SRC:.c=.o) $(ASRC:.S=.o) + +# Define all listing files. +LST = $(ASRC:.S=.lst) $(SRC:.c=.lst) + +# Combine all necessary flags and optional flags. +# Add target processor to flags. +ALL_CFLAGS = -mmcu=$(MCU) -I. $(CFLAGS) +ALL_ASFLAGS = -mmcu=$(MCU) -I. -x assembler-with-cpp $(ASFLAGS) + + +# Default target. +all: build + +build: elf hex eep + +elf: $(TARGET).elf +hex: $(TARGET).hex +eep: $(TARGET).eep +lss: $(TARGET).lss +sym: $(TARGET).sym + + +# Program the device. +program: $(TARGET).hex $(TARGET).eep + $(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH) $(AVRDUDE_WRITE_EEPROM) + + +size: + $(SIZE) -C --mcu=$(MCU) $(TARGET).elf + +# Convert ELF to COFF for use in debugging / simulating in AVR Studio or VMLAB. +COFFCONVERT=$(OBJCOPY) --debugging \ +--change-section-address .data-0x800000 \ +--change-section-address .bss-0x800000 \ +--change-section-address .noinit-0x800000 \ +--change-section-address .eeprom-0x810000 + + +coff: $(TARGET).elf + $(COFFCONVERT) -O coff-avr $(TARGET).elf $(TARGET).cof + + +extcoff: $(TARGET).elf + $(COFFCONVERT) -O coff-ext-avr $(TARGET).elf $(TARGET).cof + + +.SUFFIXES: .elf .hex .eep .lss .sym + +.elf.hex: + $(OBJCOPY) -O $(FORMAT) -R .eeprom $< $@ + +.elf.eep: + -$(OBJCOPY) -j .eeprom --set-section-flags=.eeprom="alloc,load" \ + --change-section-lma .eeprom=0 -O $(FORMAT) $< $@ + +# Create extended listing file from ELF output file. +.elf.lss: + $(OBJDUMP) -h -S $< > $@ + +# Create a symbol table from ELF output file. +.elf.sym: + $(NM) -n $< > $@ + + + +# Link: create ELF output file from object files. +$(TARGET).elf: $(OBJ) + $(CC) $(ALL_CFLAGS) $(OBJ) --output $@ $(LDFLAGS) + + +# Compile: create object files from C source files. +.c.o: + $(CC) -c $(ALL_CFLAGS) $< -o $@ + + +# Compile: create assembler files from C source files. +.c.s: + $(CC) -S $(ALL_CFLAGS) $< -o $@ + + +# Assemble: create object files from assembler source files. +.S.o: + $(CC) -c $(ALL_ASFLAGS) $< -o $@ + + + +# Target: clean project. +clean: + $(REMOVE) $(TARGET).hex $(TARGET).eep $(TARGET).cof $(TARGET).elf \ + $(TARGET).map $(TARGET).sym $(TARGET).lss \ + $(OBJ) $(LST) $(SRC:.c=.s) $(SRC:.c=.d) + +depend: + if grep '^# DO NOT DELETE' $(MAKEFILE) >/dev/null; \ + then \ + sed -e '/^# DO NOT DELETE/,$$d' $(MAKEFILE) > \ + $(MAKEFILE).$$$$ && \ + $(MV) $(MAKEFILE).$$$$ $(MAKEFILE); \ + fi + echo '# DO NOT DELETE THIS LINE -- make depend depends on it.' \ + >> $(MAKEFILE); \ + $(CC) -M -mmcu=$(MCU) $(CDEFS) $(CINCS) $(SRC) $(ASRC) >> $(MAKEFILE) + +.PHONY: all build elf hex eep lss sym program coff extcoff clean depend program_bootloader program_arduino program_leo + +program_bootloader: all + dfu-programmer $(MCU) erase && dfu-programmer $(MCU) flash $(TARGET).hex && dfu-programmer $(MCU) start + +program_dragon: all + avrdude -p$(MCU) -cdragon_isp -Pusb -B 5 -Uflash:w:$(TARGET).hex:i + +program_avrisp2: all + avrdude -p$(MCU) -cavrisp2 -Pusb -B 5 -Uflash:w:$(TARGET).hex:i + +#program: all -> See line 145! + +program_leo: all + avrdude -patmega32u4 -cavr109 -P/dev/ttyACM0 -b57600 -D -Uflash:w:$(TARGET).hex:i + +fuses: + $(AVRDUDE) $(AVRDUDE_FLAGS) -U lfuse:w:0x46:m -U hfuse:w:0xd9:m -U efuse:w:0xff:m diff --git a/sensors/MagnetWarner/main.c b/sensors/MagnetWarner/main.c new file mode 100644 index 0000000..1c916b7 --- /dev/null +++ b/sensors/MagnetWarner/main.c @@ -0,0 +1,186 @@ +/* + * main.c + * + * Created on: 07.03.2017 + * Author: Adrian Weber + */ +#include "main.h" +#define uart_maxstrlen 40 //Definiere maximale Laenge für Empfang +volatile uint8_t uart_str_complete = 0; +volatile uint8_t uart_str_count = 0; +volatile char uart_string[uart_maxstrlen+1] = ""; +volatile uint8_t mode = 0; + +#define USE_UART +#define USE_BME + + +#define LED_GREEN_ON() PORTC |= (1< 32kHz, 256 cnts = 0.5 Hz + TIMSK2 = (1 << TOIE2); //overflow interrupt + ASSR = (1 << AS2); //asynchronous mode + + //Init UART +#ifdef USE_UART + uinit(); +#endif + sei(); + + //Init I2C/TWI + twi_init(); + + //Init Magnetic field Sensor + Status[0] = InitMagSensor(ADDR_MAG_0, &TRef, &SensX, &SensY, &SensZ, &TC_Enabled); + +#ifdef USE_BME + BME280 bme280; + bme280.settings.commInterface = I2C_MODE; + bme280.settings.I2CAddress = ADDR_ENV; + bme280.settings.runMode = 3; //Normal mode + bme280.settings.tStandby = 0; + bme280.settings.filter = 1; + bme280.settings.tempOverSample = 1; + bme280.settings.pressOverSample = 4; + bme280.settings.humidOverSample = 4; + + Status[1] = InitBME(&bme280); +#endif +#ifdef USE_UART + sprintf(s,"%u", Status[0]); + uputs(s); +#endif + + while(1) { + LED_GREEN_ON(); +// _delay_ms(1); + MeasureMagSens(ADDR_MAG_0, TRef, &SensX, &SensY, &SensZ, TC_Enabled, &Meas[0]); + LED_GREEN_OFF(); + sleep_mode(); + }; + +// _delay_ms(300); +// uint8_t Command[5]; +// uint8_t I2C_Address = 0; +// uint8_t status[7]; +// uint8_t status2; +// uint8_t ReadReg[3] = {0x1,0x3,0x5}; +// while (1) +// { +// +// if (mode == 0) { +// // normal running mode +// if (Status[0] == 0) { MeasureMagSens(ADDR_MAG_0, TRef[0], &SensX[0], &SensY[0], &SensZ[0], TC_Enabled[0]);} +// else { uputs("ERR Mag ");sprintf(SerNum,"%2u ",SERIALNUM);uputs(SerNum); uputsnl("0 NO_DEVICE"); } +// #if MULTISENSE == 0 +// if (Status[1] == 0) { MeasureMagSens(ADDR_MAG_1, TRef[1], &SensX[1], &SensY[1], &SensZ[1], TC_Enabled[1]);} +// else { uputs("ERR Mag ");sprintf(SerNum,"%2u ",SERIALNUM);uputs(SerNum); uputsnl("1 NO_DEVICE"); } +// if (Status[2] == 0) { MeasureMagSens(ADDR_MAG_2, TRef[2], &SensX[2], &SensY[2], &SensZ[2], TC_Enabled[2]);} +// else { uputs("ERR Mag ");sprintf(SerNum,"%2u ",SERIALNUM);uputs(SerNum); uputsnl("2 NO_DEVICE"); } +// if (Status[3] == 0) { MeasureMagSens(ADDR_MAG_3, TRef[3], &SensX[3], &SensY[3], &SensZ[3], TC_Enabled[3]);} +// else { uputs("ERR Mag ");sprintf(SerNum,"%2u ",SERIALNUM);uputs(SerNum); uputsnl("3 NO_DEVICE"); } +// #endif +// #if MULTISENSE == 1 +// char Temp[30]; char Pres[30]; char Hum[30]; +// sprintf(Temp,"%3.2f",readTempC(&bme280)); +// sprintf(Pres,"%6.3f",readFloatPressure(&bme280)); +// sprintf(Hum,"%4.3f",readFloatHumidity(&bme280)); +// uputs("Temp: ");uputs(Temp);uputs(" Pres: ");uputs(Pres);uputs(" Humid: ");uputsnl(Hum); +// +// uint32_t lum = TSL2591_getFullLuminosity(&tsl); +// uint16_t ir = lum >> 16; +// uint16_t full = lum & 0xFFFF; +// +// uputs("Bright: "); +// sprintf(s,"%u",full); uputs(s); +// uputs(" / "); +// sprintf(s,"%u",ir); uputsnl(s); +// #endif +// _delay_ms(500); +// } else {// CONFIG MODE +// //Setting: I2C Address, Mode, RegAddr, Data Byte Low, Data byte high. +// +// } +// +// //} +// } + //cli(); + return 0; +} + +/* +ISR(USART_RX_vect) +{ + unsigned char buffer = UDR0; + if (buffer != 10 && buffer != 13 && uart_str_count<(uart_maxstrlen-1)){ + uart_string[uart_str_count] = buffer; + uart_str_count++; + uart_str_complete = 0; + } else { + uart_string[uart_str_count] = '\0'; + uart_str_complete = 1; + + } +} + + +int strToInt(char *str){ + uint32_t Command = 0; + while( *str ){ + Command*=10; + Command+= (((uint32_t) *str++) - 48); + } + + return (int) Command; +} + +int strToHexInt(char *str){ + uint32_t Command = 0; + while( *str ){ + Command*=16; + if ((uint32_t) *str >47 && (uint32_t) *str < 58 ) { + Command+= (((uint32_t) *str++) - 48); + } else if ((uint32_t) *str >64 && (uint32_t) *str < 71 ) { + Command+= (((uint32_t) *str++) - 55); + } else if ((uint32_t) *str >96 && (uint32_t) *str < 103 ) { + Command+= (((uint32_t) *str++) - 87); + } + } + + return (int) Command; +} +*/ + diff --git a/sensors/MagnetWarner/main.h b/sensors/MagnetWarner/main.h new file mode 100644 index 0000000..27adc12 --- /dev/null +++ b/sensors/MagnetWarner/main.h @@ -0,0 +1,53 @@ +/* + * main.h + * + * Created on: 07.03.2017 + * Author: Adrian Weber + */ + +#ifndef MAIN_H_ +#define MAIN_H_ + +//#define SERIALNUM 0 + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "../MagneticFieldSensor/uart/uart.h" +#include "MagnetSensor.h" +#include "../MagneticFieldSensor/BME280.h" +#include "../MagneticFieldSensor/twi/twi.h" +#include +#include +#include + + +#ifndef F_CPU +#define F_CPU 8000000 +#endif + +# define USART_BAUDRATE 19200 +# define BAUD_PRESCALE (unsigned int)(1.0 * F_CPU / USART_BAUDRATE / 16 - 0.5); + +#define ADDR_MAG_0 0x0C +#define ADDR_MAG_1 0x0D +#define ADDR_MAG_2 0x0E +#define ADDR_MAG_3 0x0F + + +#define ADDR_ENV 0x76 + +#define MULTISENSE 1 //0: 4 magnetic sensors, 1: 1x magnetic, environment + +#ifndef __AVR_ATmega168P__ +#define __AVR_ATmega168P__ +#endif /* MAIN_H_ */ + + +#endif