From 2a8e794741cd8fb4a5e312bee2abf3547bc4326e Mon Sep 17 00:00:00 2001
From: Eggert Jung <eggert.s.jung@wischhof13.de>
Date: Tue, 1 Sep 2020 05:12:54 +0200
Subject: [PATCH] measure supply voltage

---
 newcode/main.c  |  4 +++-
 newcode/pt100.c | 20 +++++++++++++-------
 newcode/pt100.h |  2 +-
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/newcode/main.c b/newcode/main.c
index 56a2f5f..9b4623c 100644
--- a/newcode/main.c
+++ b/newcode/main.c
@@ -46,14 +46,16 @@ void io_setup(void){
 void modbusGet(void) {
 	if (modbusGetBusState() & (1<<ReceiveCompleted))
     {
+        PORTD.OUTSET = 1 << 5;
         switch(rxbuffer[1]) {
             case fcReadHoldingRegisters: ;
-                modbusExchangeRegisters((uint16_t*)ch_values, 0, 18);
+                modbusExchangeRegisters((uint16_t*)ch_values, 0, 20);
                 break;
             default:
                 modbusSendException(ecIllegalFunction);
                 break;
         }
+        PORTD.OUTCLR = 1 << 5;
     }
 }
 
diff --git a/newcode/pt100.c b/newcode/pt100.c
index 5477737..2f152e6 100644
--- a/newcode/pt100.c
+++ b/newcode/pt100.c
@@ -5,7 +5,7 @@
 #include "pt100.h"
 
 uint16_t adc_buffer[AVRG];
-volatile float ch_values[9];
+volatile float ch_values[10];
 
 void adc_init(void){
     ADCA.CTRLB = ADC_FREERUN_bm;
@@ -70,15 +70,21 @@ ISR(DMA_CH0_vect){
     ADCA.CTRLB = 0; // stop ADC
 
     uint8_t old_pin = pin;
-    pin=(pin+1)%9;
-    ADCA.CH0.MUXCTRL = pin << ADC_CH_MUXPOS_gp; // give MUX time to switch during averaging
+    pin=(pin+1)%10;
+    ADCA.CH0.MUXCTRL = pin << ADC_CH_MUXPOS_gp; // give MUX time to switch during calculation
     float temp = avrg(adc_buffer, AVRG);
-
     temp = temp - ADC_0V_COUNT;
     temp = (temp)/ (4096-ADC_0V_COUNT) * ADC_MAX_VOLT;
-    temp = (temp * REF_OHMS)/(SUPPLY_VOLTS - temp);
-    temp = (temp-100)/0.3927; //pt100 formula
-    ch_values[old_pin] = temp;
+
+    if(old_pin <= 8){ /* pt100 temperature channels */
+        temp = (temp * REF_OHMS)/(SUPPLY_VOLTS - temp);
+        temp = (temp-100)/0.3927; //pt100 formula
+        ch_values[old_pin] = temp;
+    }
+    if(old_pin == 9){ /* 24V supply voltage measurement */
+        // resistor devider 33k and 1k
+        ch_values[old_pin] = temp * 34;
+    }
 
     DMA.CH0.TRIGSRC = DMA_CH_TRIGSRC_ADCA_CH0_gc;
     ADCA.CTRLB = ADC_FREERUN_bm; // start ADC again
diff --git a/newcode/pt100.h b/newcode/pt100.h
index 9f0e13a..f94c5f5 100644
--- a/newcode/pt100.h
+++ b/newcode/pt100.h
@@ -8,7 +8,7 @@
 #define ADC_0V_COUNT 170
 #define ADC_MAX_VOLT 1.95
 
-extern volatile float ch_values[9];
+extern volatile float ch_values[10];
 
 void adc_init(void);
 void dma_init(void);