From: Jan Michel <j.michel@gsi.de>
Date: Mon, 27 Apr 2020 11:57:02 +0000 (+0200)
Subject: working magnet warner code
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=3f337e749276d86a199aaabe49d9f35911c230b0;p=avr.git

working magnet warner code
---

diff --git a/sensors/MagnetWarner/MagnetSensor.c b/sensors/MagnetWarner/MagnetSensor.c
index c1a8ed5..8db226b 100644
--- a/sensors/MagnetWarner/MagnetSensor.c
+++ b/sensors/MagnetWarner/MagnetSensor.c
@@ -1,6 +1,7 @@
 #include "MagnetSensor.h"
 //#define CHIP_OLD 1
-
+#define LED_RED_ON()     PORTC |= (1<<PC2)
+#define LED_RED_OFF()    PORTC &= ~(1<<PC2)
 uint8_t InitMagSensor(uint8_t Addr, uint16_t* Tref, float* SensX, float* SensY, float* SensZ, uint8_t *TC_Enabled)
 {
     
@@ -75,10 +76,10 @@ uint8_t InitMagSensor(uint8_t Addr, uint16_t* Tref, float* SensX, float* SensY,
 }
 
 
-void MeasureMagSens(uint8_t Addr, uint16_t Tref, float* SensX, float* SensY, float* SensZ, const uint8_t TC_Enabled, int16_t* Meas){
+void MeasureMagSens(uint8_t Addr, uint16_t Tref, float* SensX, float* SensY, float* SensZ, const uint8_t TC_Enabled, float* Meas){
     uint8_t MagData[9] = {255,255,255,255,255,255,255,255,255};
     char    s[30];
-//     char    SerNum[10];
+    char    SerNum[10];
     char    Num[2];
     sprintf(Num,"%1u",Addr-12);
 
@@ -90,8 +91,8 @@ void MeasureMagSens(uint8_t Addr, uint16_t Tref, float* SensX, float* SensY, flo
     sprintf(s,"Status %02u 0x%x: 0x%x",SERIALNUM,Addr,status_1);
     uputsnl(s);
 #endif    
-    _delay_ms(100);
-
+//     _delay_ms(100);    
+sleep_mode();
     uint8_t testdata2 = 0x4F;// Read Measured Values
     twi_writeTo(Addr, &testdata2, 1, 1, true);
     twi_readFrom(Addr,MagData, 9, true);
@@ -120,14 +121,14 @@ void MeasureMagSens(uint8_t Addr, uint16_t Tref, float* SensX, float* SensY, flo
 	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[0] = ((float)xMag*(*SensX));
+        Meas[1] = ((float)yMag*(*SensY));
+        Meas[2] = ((float)zMag*(*SensZ));
         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);
+#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);
@@ -137,7 +138,7 @@ void MeasureMagSens(uint8_t Addr, uint16_t Tref, float* SensX, float* SensY, flo
 	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
+// 	uputs("ERR Mag ");sprintf(SerNum,"%2u ",SERIALNUM);uputs(SerNum);uputs(Num);uputsnl(" NO");  // ERROR INFORMATION FOR EPICS
 #endif
     } else {
 #ifdef USE_UART              
diff --git a/sensors/MagnetWarner/MagnetSensor.h b/sensors/MagnetWarner/MagnetSensor.h
index 07696eb..050e42e 100644
--- a/sensors/MagnetWarner/MagnetSensor.h
+++ b/sensors/MagnetWarner/MagnetSensor.h
@@ -1,6 +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);
+void MeasureMagSens(uint8_t Addr, uint16_t Tref, float* SensX, float* SensY, float* SensZ, const uint8_t TC_Enabled,float* 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
index 0e1338d..b918830 100644
--- a/sensors/MagnetWarner/Makefile
+++ b/sensors/MagnetWarner/Makefile
@@ -29,7 +29,7 @@ DEBUG = stabs
 CSTANDARD = -std=gnu99
 
 # Place -D or -U options here
-CDEFS = -DF_CPU=1000000
+CDEFS = -DF_CPU=2000000
 
 # Place -I options here
 CINCS =
diff --git a/sensors/MagnetWarner/main.c b/sensors/MagnetWarner/main.c
index 1c916b7..3a904a1 100644
--- a/sensors/MagnetWarner/main.c
+++ b/sensors/MagnetWarner/main.c
@@ -11,8 +11,7 @@ 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<<PC1)
@@ -22,6 +21,9 @@ volatile uint8_t mode = 0;
 
 
 ISR(TIMER2_OVF_vect) {
+//   LED_RED_ON();
+//   _delay_us(10);
+//   LED_RED_OFF();
 }    
 
 
@@ -33,13 +35,14 @@ int main(void) {
     float SensX;
     float SensY;
     float SensZ;
-    int16_t Meas[4];
-
+    float Meas[4];
+    float sum, diffsum, basesum;
+    uint8_t first = 1;
     
     //For CLK setting
     CLKPR = (1<<CLKPCE);  // No prescale
-    CLKPR = 0x03; //prescaler 8 = 1 MHz
-    
+    CLKPR = 0x02; //prescaler 4 = 2 MHz
+    OSCCAL = 0x58;
     //Just LED
     DDRC  = 0b00000110;
     PORTC = 0b00000000;
@@ -47,10 +50,10 @@ int main(void) {
     SMCR = (3 << SM0) | (1 << SE); //select power-save and enable sleep
     MCUCR = (1 << BODS) | (1 << BODSE); //BOD off in sleep
     MCUCR = (1 << BODS) | (0 << BODSE); //BOD off in sleep
-    PRR  = (1 << PRTIM0) | (1 << PRTIM1) | (1 << PRSPI) | (1 << PRADC) | (0 << PRUSART0) | (0 << PRTIM2); //disable what is not needed
+    PRR  = (1 << PRTIM1) | (1 << PRTIM0) | (1 << PRSPI) | (1 << PRADC) | (0 << PRUSART0) | (0 << PRTIM2); //disable what is not needed
     
     TCCR2A = 0; //normal, no pin connection
-    TCCR2B = (6 << CS20); //prescaler 256 -> 32kHz, 256 cnts = 0.5 Hz
+    TCCR2B = (5 << CS20); //prescaler 1024 -> 1kHz, 256 cnts = 8 Hz
     TIMSK2 = (1 << TOIE2); //overflow interrupt
     ASSR   = (1 << AS2); //asynchronous mode
     
@@ -85,102 +88,29 @@ int main(void) {
 #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();
-    };
+      sum = abs(Meas[0]) + abs(Meas[1]) + abs(Meas[2]);
+      
+      if(first) {basesum = sum; first = 0;}
+      else {
+        diffsum = abs(sum - basesum);
+        if(diffsum > 500) {
+          LED_RED_ON();
+          _delay_us(200);
+          LED_RED_OFF();
+          }
+        else {
+          LED_GREEN_ON();
+          _delay_us(200);
+          LED_GREEN_OFF();
+          }
+        sleep_mode();
+        sleep_mode();
+        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
index 27adc12..094d2d5 100644
--- a/sensors/MagnetWarner/main.h
+++ b/sensors/MagnetWarner/main.h
@@ -8,6 +8,10 @@
 #ifndef MAIN_H_
 #define MAIN_H_
 
+
+// #define USE_UART
+#define USE_BME
+
 //#define SERIALNUM 0
 
 #include <avr/io.h>
@@ -28,12 +32,12 @@
 #include <avr/sleep.h>
 
 
-#ifndef F_CPU
-#define F_CPU 8000000
-#endif
+// #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 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