changes

code/Makefile

@@ -0,0 +1,59 @@
+TARGET  = main
+SRCS   := $(shell find -name '*.c')
+FILES   = $(SRCS:%.c=%) #main uart avrIOhelper/io-helper #uart#hier alle c-Datein reinschreiben, trennung durch "  " und ohne .c-Endung
+MCU     = atmega328p 
+PROGC	= m328p
+CC      = avr-gcc
+#TOOL    = stk500 -P /dev/ttyUSB0
+#TOOL    = atmelice_isp
+TOOL    = avrispmkii
+#TOOL    = usbasp-clone
+
+BUILDDIR = Builds
+
+DEFINES = -DF_CPU=2000000UL -DLCD_PORT=PORTD -DLCD_DDR=DDRD -DLCD_RS=4 -DLCD_RW=7 -DLCD_EN=5 -DLCD_D0=0 -DLCD_D1=1 -DLCD_D2=2 -DLCD_D3=3
+
+CFLAGS  =-mmcu=$(MCU) -O2 -Wall -Wpedantic $(DEFINES) -std=c99 -ffunction-sections -fdata-sections -Ii2c_peter
+LDFLAGS =-mmcu=$(MCU) -Wl,--gc-sections
+
+LDFILES = $(foreach FILE,$(FILES),$(BUILDDIR)/$(FILE).o)
+
+all: clean $(BUILDDIR)/$(TARGET).elf
+
+$(BUILDDIR)/%.o: %.c
+	mkdir -p $(dir $@)
+	$(CC) $(CFLAGS) -c $< -o $(BUILDDIR)/$*.o
+
+$(BUILDDIR)/$(TARGET).elf: $(LDFILES)
+	mkdir -p $(dir $@)
+	$(CC) $(LDFLAGS) $(LDFILES) -o $(BUILDDIR)/$(TARGET).elf
+
+$(BUILDDIR)/$(TARGET).hex : $(BUILDDIR)/$(TARGET).elf
+	 avr-objcopy -j .data -j .text -O ihex $< $@
+
+fuse: 
+	avrdude -p $(PROGC) -c $(TOOL) -U lfuse:w:0xE8:m -U hfuse:w:0xD1:m
+
+load: $(BUILDDIR)/$(TARGET).hex
+	avrdude -p $(PROGC) -c $(TOOL) -U flash:w:$(BUILDDIR)/$(TARGET).hex -v -B 125kHz
+
+program: clean load
+
+reset:
+	avrdude -p $(PROGC) -c $(TOOL)
+	
+size: $(BUILDDIR)/$(TARGET).elf
+	avr-size -C --mcu=$(MCU) $(BUILDDIR)/$(TARGET).elf
+
+.PHONY=clean
+clean:
+	rm -rf $(BUILDDIR)
+
+
+#Fuse m1284p external Osz. Long startuptime
+#  avrdude -c usbasp-clone -p m1284p -U lfuse:w:0xff:m -U hfuse:w:0xd9:m -U efuse:w:0xff:m
+
+#Fuse m1284p internal Osz. Long startuptime
+#  avrdude -c usbasp-clone -p m1284p -U lfuse:w:0xe2:m -U hfuse:w:0xd9:m -U efuse:w:0xff:m
+
+

code/i2c_peter/i2cmaster.h

@@ -0,0 +1,178 @@
+#ifndef _I2CMASTER_H
+#define _I2CMASTER_H
+/************************************************************************* 
+* Title:    C include file for the I2C master interface 
+*           (i2cmaster.S or twimaster.c)
+* Author:   Peter Fleury <pfleury@gmx.ch>
+* File:     $Id: i2cmaster.h,v 1.12 2015/09/16 09:27:58 peter Exp $
+* Software: AVR-GCC 4.x
+* Target:   any AVR device
+* Usage:    see Doxygen manual
+**************************************************************************/
+
+/**
+ @file
+ @defgroup pfleury_ic2master I2C Master library
+ @code #include <i2cmaster.h> @endcode
+  
+ @brief I2C (TWI) Master Software Library
+
+ Basic routines for communicating with I2C slave devices. This single master 
+ implementation is limited to one bus master on the I2C bus. 
+
+ This I2c library is implemented as a compact assembler software implementation of the I2C protocol 
+ which runs on any AVR (i2cmaster.S) and as a TWI hardware interface for all AVR with built-in TWI hardware (twimaster.c).
+ Since the API for these two implementations is exactly the same, an application can be linked either against the
+ software I2C implementation or the hardware I2C implementation.
+
+ Use 4.7k pull-up resistor on the SDA and SCL pin.
+ 
+ Adapt the SCL and SDA port and pin definitions and eventually the delay routine in the module 
+ i2cmaster.S to your target when using the software I2C implementation ! 
+ 
+ Adjust the  CPU clock frequence F_CPU in twimaster.c or in the Makfile when using the TWI hardware implementaion.
+
+ @note 
+    The module i2cmaster.S is based on the Atmel Application Note AVR300, corrected and adapted 
+    to GNU assembler and AVR-GCC C call interface.
+    Replaced the incorrect quarter period delays found in AVR300 with 
+    half period delays. 
+    
+ @author Peter Fleury pfleury@gmx.ch  http://tinyurl.com/peterfleury
+ @copyright (C) 2015 Peter Fleury, GNU General Public License Version 3
+ 
+ @par API Usage Example
+  The following code shows typical usage of this library, see example test_i2cmaster.c
+
+ @code
+
+ #include <i2cmaster.h>
+
+
+ #define Dev24C02  0xA2      // device address of EEPROM 24C02, see datasheet
+
+ int main(void)
+ {
+     unsigned char ret;
+
+     i2c_init();                             // initialize I2C library
+
+     // write 0x75 to EEPROM address 5 (Byte Write) 
+     i2c_start_wait(Dev24C02+I2C_WRITE);     // set device address and write mode
+     i2c_write(0x05);                        // write address = 5
+     i2c_write(0x75);                        // write value 0x75 to EEPROM
+     i2c_stop();                             // set stop conditon = release bus
+
+
+     // read previously written value back from EEPROM address 5 
+     i2c_start_wait(Dev24C02+I2C_WRITE);     // set device address and write mode
+
+     i2c_write(0x05);                        // write address = 5
+     i2c_rep_start(Dev24C02+I2C_READ);       // set device address and read mode
+
+     ret = i2c_readNak();                    // read one byte from EEPROM
+     i2c_stop();
+
+     for(;;);
+ }
+ @endcode
+
+*/
+
+
+/**@{*/
+
+#if (__GNUC__ * 100 + __GNUC_MINOR__) < 304
+#error "This library requires AVR-GCC 3.4 or later, update to newer AVR-GCC compiler !"
+#endif
+
+#include <avr/io.h>
+
+/** defines the data direction (reading from I2C device) in i2c_start(),i2c_rep_start() */
+#define I2C_READ    1
+
+/** defines the data direction (writing to I2C device) in i2c_start(),i2c_rep_start() */
+#define I2C_WRITE   0
+
+
+/**
+ @brief initialize the I2C master interace. Need to be called only once 
+ @return none
+ */
+extern void i2c_init(void);
+
+
+/** 
+ @brief Terminates the data transfer and releases the I2C bus 
+ @return none
+ */
+extern void i2c_stop(void);
+
+
+/** 
+ @brief Issues a start condition and sends address and transfer direction 
+  
+ @param    addr address and transfer direction of I2C device
+ @retval   0   device accessible 
+ @retval   1   failed to access device 
+ */
+extern unsigned char i2c_start(unsigned char addr);
+
+
+/**
+ @brief Issues a repeated start condition and sends address and transfer direction 
+
+ @param   addr address and transfer direction of I2C device
+ @retval  0 device accessible
+ @retval  1 failed to access device
+ */
+extern unsigned char i2c_rep_start(unsigned char addr);
+
+
+/**
+ @brief Issues a start condition and sends address and transfer direction 
+   
+ If device is busy, use ack polling to wait until device ready 
+ @param    addr address and transfer direction of I2C device
+ @return   none
+ */
+extern void i2c_start_wait(unsigned char addr);
+
+ 
+/**
+ @brief Send one byte to I2C device
+ @param    data  byte to be transfered
+ @retval   0 write successful
+ @retval   1 write failed
+ */
+extern unsigned char i2c_write(unsigned char data);
+
+
+/**
+ @brief    read one byte from the I2C device, request more data from device 
+ @return   byte read from I2C device
+ */
+extern unsigned char i2c_readAck(void);
+
+/**
+ @brief    read one byte from the I2C device, read is followed by a stop condition 
+ @return   byte read from I2C device
+ */
+extern unsigned char i2c_readNak(void);
+
+/** 
+ @brief    read one byte from the I2C device
+ 
+ Implemented as a macro, which calls either @ref i2c_readAck or @ref i2c_readNak
+ 
+ @param    ack 1 send ack, request more data from device<br>
+               0 send nak, read is followed by a stop condition 
+ @return   byte read from I2C device
+ */
+extern unsigned char i2c_read(unsigned char ack);
+#define i2c_read(ack)  (ack) ? i2c_readAck() : i2c_readNak(); 
+
+
+
+/**@}*/
+#endif

code/i2c_peter/twimaster.c

@@ -0,0 +1,202 @@
+/*************************************************************************
+* Title:    I2C master library using hardware TWI interface
+* Author:   Peter Fleury <pfleury@gmx.ch>  http://jump.to/fleury
+* File:     $Id: twimaster.c,v 1.4 2015/01/17 12:16:05 peter Exp $
+* Software: AVR-GCC 3.4.3 / avr-libc 1.2.3
+* Target:   any AVR device with hardware TWI 
+* Usage:    API compatible with I2C Software Library i2cmaster.h
+**************************************************************************/
+#include <inttypes.h>
+#include <compat/twi.h>
+
+#include <i2cmaster.h>
+
+
+/* define CPU frequency in hz here if not defined in Makefile */
+#ifndef F_CPU
+#define F_CPU 4000000UL
+#endif
+
+/* I2C clock in Hz */
+#define SCL_CLOCK  100000L
+
+
+/*************************************************************************
+ Initialization of the I2C bus interface. Need to be called only once
+*************************************************************************/
+void i2c_init(void)
+{
+  /* initialize TWI clock: 100 kHz clock, TWPS = 0 => prescaler = 1 */
+  
+  TWSR = 0;                         /* no prescaler */
+  TWBR = ((F_CPU/SCL_CLOCK)-16)/2;  /* must be > 10 for stable operation */
+
+}/* i2c_init */
+
+
+/*************************************************************************	
+  Issues a start condition and sends address and transfer direction.
+  return 0 = device accessible, 1= failed to access device
+*************************************************************************/
+unsigned char i2c_start(unsigned char address)
+{
+    uint8_t   twst;
+
+	// send START condition
+	TWCR = (1<<TWINT) | (1<<TWSTA) | (1<<TWEN);
+
+	// wait until transmission completed
+	while(!(TWCR & (1<<TWINT)));
+
+	// check value of TWI Status Register. Mask prescaler bits.
+	twst = TW_STATUS & 0xF8;
+	if ( (twst != TW_START) && (twst != TW_REP_START)) return 1;
+
+	// send device address
+	TWDR = address;
+	TWCR = (1<<TWINT) | (1<<TWEN);
+
+	// wail until transmission completed and ACK/NACK has been received
+	while(!(TWCR & (1<<TWINT)));
+
+	// check value of TWI Status Register. Mask prescaler bits.
+	twst = TW_STATUS & 0xF8;
+	if ( (twst != TW_MT_SLA_ACK) && (twst != TW_MR_SLA_ACK) ) return 1;
+
+	return 0;
+
+}/* i2c_start */
+
+
+/*************************************************************************
+ Issues a start condition and sends address and transfer direction.
+ If device is busy, use ack polling to wait until device is ready
+ 
+ Input:   address and transfer direction of I2C device
+*************************************************************************/
+void i2c_start_wait(unsigned char address)
+{
+    uint8_t   twst;
+
+
+    while ( 1 )
+    {
+	    // send START condition
+	    TWCR = (1<<TWINT) | (1<<TWSTA) | (1<<TWEN);
+    
+    	// wait until transmission completed
+    	while(!(TWCR & (1<<TWINT)));
+    
+    	// check value of TWI Status Register. Mask prescaler bits.
+    	twst = TW_STATUS & 0xF8;
+    	if ( (twst != TW_START) && (twst != TW_REP_START)) continue;
+    
+    	// send device address
+    	TWDR = address;
+    	TWCR = (1<<TWINT) | (1<<TWEN);
+    
+    	// wail until transmission completed
+    	while(!(TWCR & (1<<TWINT)));
+    
+    	// check value of TWI Status Register. Mask prescaler bits.
+    	twst = TW_STATUS & 0xF8;
+    	if ( (twst == TW_MT_SLA_NACK )||(twst ==TW_MR_DATA_NACK) ) 
+    	{    	    
+    	    /* device busy, send stop condition to terminate write operation */
+	        TWCR = (1<<TWINT) | (1<<TWEN) | (1<<TWSTO);
+	        
+	        // wait until stop condition is executed and bus released
+	        while(TWCR & (1<<TWSTO));
+	        
+    	    continue;
+    	}
+    	//if( twst != TW_MT_SLA_ACK) return 1;
+    	break;
+     }
+
+}/* i2c_start_wait */
+
+
+/*************************************************************************
+ Issues a repeated start condition and sends address and transfer direction 
+
+ Input:   address and transfer direction of I2C device
+ 
+ Return:  0 device accessible
+          1 failed to access device
+*************************************************************************/
+unsigned char i2c_rep_start(unsigned char address)
+{
+    return i2c_start( address );
+
+}/* i2c_rep_start */
+
+
+/*************************************************************************
+ Terminates the data transfer and releases the I2C bus
+*************************************************************************/
+void i2c_stop(void)
+{
+    /* send stop condition */
+	TWCR = (1<<TWINT) | (1<<TWEN) | (1<<TWSTO);
+	
+	// wait until stop condition is executed and bus released
+	while(TWCR & (1<<TWSTO));
+
+}/* i2c_stop */
+
+
+/*************************************************************************
+  Send one byte to I2C device
+  
+  Input:    byte to be transfered
+  Return:   0 write successful 
+            1 write failed
+*************************************************************************/
+unsigned char i2c_write( unsigned char data )
+{	
+    uint8_t   twst;
+    
+	// send data to the previously addressed device
+	TWDR = data;
+	TWCR = (1<<TWINT) | (1<<TWEN);
+
+	// wait until transmission completed
+	while(!(TWCR & (1<<TWINT)));
+
+	// check value of TWI Status Register. Mask prescaler bits
+	twst = TW_STATUS & 0xF8;
+	if( twst != TW_MT_DATA_ACK) return 1;
+	return 0;
+
+}/* i2c_write */
+
+
+/*************************************************************************
+ Read one byte from the I2C device, request more data from device 
+ 
+ Return:  byte read from I2C device
+*************************************************************************/
+unsigned char i2c_readAck(void)
+{
+	TWCR = (1<<TWINT) | (1<<TWEN) | (1<<TWEA);
+	while(!(TWCR & (1<<TWINT)));    
+
+    return TWDR;
+
+}/* i2c_readAck */
+
+
+/*************************************************************************
+ Read one byte from the I2C device, read is followed by a stop condition 
+ 
+ Return:  byte read from I2C device
+*************************************************************************/
+unsigned char i2c_readNak(void)
+{
+	TWCR = (1<<TWINT) | (1<<TWEN);
+	while(!(TWCR & (1<<TWINT)));
+	
+    return TWDR;
+
+}/* i2c_readNak */

code/main.c

@@ -0,0 +1,237 @@
+#include <avr/io.h>
+#include <avr/interrupt.h>
+#include <util/delay.h>
+#include "avr-hd44780/lcd.h"
+#include "i2c_peter/i2cmaster.h"
+#include <avr/eeprom.h>
+#include <avr/wdt.h>
+
+uint8_t pgm = 0;
+uint8_t pvw = 0;
+
+typedef struct {
+    uint8_t cam;
+    uint8_t front_enabled;
+    uint8_t pvw_enabled;
+} settings_t;
+
+uint8_t setting_limits[sizeof(settings_t)] = {
+    32,
+    2,
+    2
+};
+
+volatile union{
+    settings_t settings;
+    uint8_t arr[sizeof(settings_t)];
+} menu;
+
+void* EEMEM settings_saved;
+
+volatile uint8_t menu_state = 0;
+volatile uint8_t update = 1;
+
+#define SDI_SHIELD_ADDR 0xDC
+
+#define VF_BACK_PVW_TALLY_PIN 0
+#define VF_BACK_PGM_TALLY_PIN 1
+#define LENS_PGM_TALLY_PIN 2
+#define VF_FRONT_PGM_TALLY_PIN 3
+
+void enc_init(){
+    PORTC |= (1<<2) | (1 << 3);
+    _delay_ms(10);
+    PCMSK1 |= (1<<PCINT10);
+    PCICR |= (1<<PCIE1);
+}
+
+void btn_init(){
+    PORTB |= 1<<6; //PullUp
+    PCMSK0 |= (1<<PCINT6);
+    PCICR |= (1<<PCIE0);
+}
+
+void sdi_shield_write(uint16_t addr, uint8_t val){
+    i2c_start_wait(SDI_SHIELD_ADDR + I2C_WRITE);     // set device address and write mode
+    i2c_write(addr & 0xFF);
+    i2c_write(addr >> 8);
+    i2c_write(val);
+    i2c_stop();
+}
+
+uint8_t sdi_shield_read(uint16_t addr){
+    i2c_start_wait(SDI_SHIELD_ADDR + I2C_WRITE);     // set device address and write mode
+    i2c_write(addr & 0xFF);
+    i2c_write(addr >> 8);
+    i2c_rep_start(SDI_SHIELD_ADDR + I2C_READ);       // set device address and read mode
+    uint8_t data = i2c_readNak();
+    i2c_stop();
+    return data;
+}
+
+int main(void){
+    DDRB |= 1<<VF_BACK_PVW_TALLY_PIN;
+    DDRB |= 1<<VF_BACK_PGM_TALLY_PIN;
+    DDRB |= 1<<LENS_PGM_TALLY_PIN;
+    DDRB |= 1<<VF_FRONT_PGM_TALLY_PIN;
+
+    DDRD |= 1<<7; //enable backlight
+
+    wdt_enable(WDTO_2S);
+
+    eeprom_read_block(menu.arr, &settings_saved, sizeof(settings_t));
+    if(menu.settings.cam > setting_limits[0])
+	menu.settings.cam = 0;
+    enc_init();
+    btn_init();
+
+    lcd_init();
+    lcd_on();
+    lcd_clear();
+
+    i2c_init();                             // initialize I2C library
+
+    DDRC |= 1<<1;
+    PORTB |= (1<<VF_BACK_PGM_TALLY_PIN);
+
+    //lcd_printf("scan: ");
+
+    //for(uint8_t i=0; i<255; i++){
+    //    uint8_t res = i2c_start(i);
+    //    i2c_stop();
+    //    if(!res)
+    //        lcd_printf("%x ", i);
+    //}
+
+    _delay_ms(100);
+
+    lcd_printf("sdishield: ");
+    i2c_start_wait(SDI_SHIELD_ADDR + I2C_WRITE);     // set device address and write mode
+    i2c_write(0x00);
+    i2c_write(0x00);
+    i2c_rep_start(SDI_SHIELD_ADDR + I2C_READ);       // set device address and read mode
+    for(uint8_t i = 0; i < 4; i++){
+        unsigned char ret = i2c_readAck();                    // read one byte from EEPROM
+        lcd_printf("%c", ret);
+    }
+    unsigned char hw0 = i2c_readAck();                    // read one byte from EEPROM
+    unsigned char hw1 = i2c_readAck();                    // read one byte from EEPROM
+
+    unsigned char fw0 = i2c_readAck();
+    unsigned char fw1 = i2c_readNak();
+
+    i2c_stop();
+
+    lcd_set_cursor(0,1);
+    lcd_printf("hw: %d.%d", hw0, hw1);
+    lcd_printf(" fw: %d.%d", fw0, fw1);
+
+    DDRC |= 1<<0;
+    PORTB |= (1<<VF_BACK_PVW_TALLY_PIN);
+    PORTB |= (1<<VF_FRONT_PGM_TALLY_PIN);
+
+    _delay_ms(500);
+    lcd_clear();
+
+    // Turn LEDs off
+    DDRC &= ~(1<<0);
+    DDRC &= ~(1<<1);
+    PORTB &= ~(1<<VF_FRONT_PGM_TALLY_PIN);
+    PORTB &= ~(1<<VF_BACK_PVW_TALLY_PIN);
+
+    
+    wdt_enable(WDTO_60MS);
+
+    sei();
+
+    while(1){
+	wdt_reset();
+
+	sdi_shield_write(0x5000, 1);
+	uint8_t data_length = sdi_shield_read(0x5001);
+	if(data_length){
+	    uint8_t tally = sdi_shield_read(0x5100 + menu.settings.cam);
+	    pgm = !!(tally & (1<<0));
+	    pvw = !!(tally & (1<<1));
+	}
+
+	if(pgm){
+	    DDRC |= 1<<1;
+	    if(menu.settings.front_enabled){
+		PORTB |= (1<<LENS_PGM_TALLY_PIN);
+		PORTB |= (1<<VF_FRONT_PGM_TALLY_PIN);
+	    }
+	    PORTB |= (1<<VF_BACK_PGM_TALLY_PIN);
+	}
+	else{
+	    DDRC &= ~(1<<1);
+	    PORTB &= ~(1<<VF_BACK_PGM_TALLY_PIN);
+	}
+	if((!pgm != !menu.settings.front_enabled)){
+	    PORTB &= ~(1<<LENS_PGM_TALLY_PIN);
+	    PORTB &= ~(1<<VF_FRONT_PGM_TALLY_PIN);
+	}
+
+	if(pvw & menu.settings.pvw_enabled){
+	    DDRC |= 1<<0;
+	    PORTB |= (1<<VF_BACK_PVW_TALLY_PIN);
+	}
+	if(!pvw | !menu.settings.pvw_enabled){
+	    DDRC &= ~(1<<0);
+	    PORTB &= ~(1<<VF_BACK_PVW_TALLY_PIN);
+	}
+
+	if(update){
+	    update = 0;
+	    lcd_set_cursor(0,0);
+	    lcd_printf("cam: %d  ", menu.settings.cam+1);
+	    lcd_set_cursor(0,1);
+	    lcd_printf("front: %d pvw: %d", menu.settings.front_enabled, menu.settings.pvw_enabled);
+
+	    switch(menu_state){
+		case 1:
+		    lcd_set_cursor(5,0);
+		    break;
+		case 2:
+		    lcd_set_cursor(7, 1);
+		    break;
+		case 3:
+		    lcd_set_cursor(14,1);
+		    break;
+	    }
+	    if(menu_state){
+		lcd_enable_cursor();
+		lcd_enable_blinking();
+	    }else{
+		lcd_disable_cursor();
+		lcd_disable_blinking();
+	    }
+	}
+    }
+
+}
+
+ISR(PCINT0_vect){
+    if(!(PINB & (1<<6))){
+	menu_state=(menu_state+1)%4;
+
+	if(!menu_state)
+	    eeprom_update_block(menu.arr, &settings_saved, sizeof(settings_t));
+
+	update=1;
+    }
+}
+
+ISR(PCINT1_vect){
+    if(menu_state){
+	uint8_t dir = PINC & (1<<2)?1:-1;
+
+	if(PINC & (1<<3))
+	    menu.arr[menu_state-1]-=dir;
+	else
+	    menu.arr[menu_state-1]+=dir;
+	menu.arr[menu_state-1]%=setting_limits[menu_state-1];
+
+	update=1;
+    }
+}

pcb/tallySdoAdapter.kicad_prl

@@ -3,10 +3,12 @@
     "active_layer": 37,
     "active_layer_preset": "All Layers",
     "auto_track_width": true,
+    "hidden_netclasses": [],
     "hidden_nets": [],
     "high_contrast_mode": 0,
     "net_color_mode": 1,
     "opacity": {
+      "images": 0.6,
       "pads": 1.0,
       "tracks": 1.0,
       "vias": 1.0,
@@ -65,6 +67,12 @@
     "visible_layers": "fffffff_ffffffff",
     "zone_display_mode": 0
   },
+  "git": {
+    "repo_password": "",
+    "repo_type": "",
+    "repo_username": "",
+    "ssh_key": ""
+  },
   "meta": {
     "filename": "tallySdoAdapter.kicad_prl",
     "version": 3

pcb/tallySdoAdapter.kicad_pro

@@ -1,7 +1,11 @@
 {
   "board": {
+    "3dviewports": [],
     "design_settings": {
       "defaults": {
+        "apply_defaults_to_fp_fields": false,
+        "apply_defaults_to_fp_shapes": false,
+        "apply_defaults_to_fp_text": false,
         "board_outline_line_width": 0.09999999999999999,
         "copper_line_width": 0.19999999999999998,
         "copper_text_italic": false,
@@ -33,9 +37,9 @@
         "other_text_thickness": 0.15,
         "other_text_upright": false,
         "pads": {
-          "drill": 0.762,
+          "drill": 1.4,
-          "height": 1.524,
+          "height": 2.4,
-          "width": 1.524
+          "width": 2.4
         },
         "silk_line_width": 0.15,
         "silk_text_italic": false,
@@ -93,20 +97,26 @@
       "rule_severities": {
         "annular_width": "error",
         "clearance": "error",
+        "connection_width": "warning",
         "copper_edge_clearance": "error",
+        "copper_sliver": "warning",
         "courtyards_overlap": "error",
         "diff_pair_gap_out_of_range": "error",
         "diff_pair_uncoupled_length_too_long": "error",
         "drill_out_of_range": "error",
         "duplicate_footprints": "warning",
         "extra_footprint": "warning",
+        "footprint": "error",
         "footprint_type_mismatch": "error",
         "hole_clearance": "error",
         "hole_near_hole": "error",
         "invalid_outline": "error",
+        "isolated_copper": "warning",
         "item_on_disabled_layer": "error",
         "items_not_allowed": "error",
         "length_out_of_range": "error",
+        "lib_footprint_issues": "warning",
+        "lib_footprint_mismatch": "warning",
         "malformed_courtyard": "error",
         "microvia_drill_out_of_range": "error",
         "missing_courtyard": "ignore",
@@ -116,9 +126,14 @@
         "padstack": "error",
         "pth_inside_courtyard": "ignore",
         "shorting_items": "error",
+        "silk_edge_clearance": "warning",
         "silk_over_copper": "warning",
         "silk_overlap": "warning",
         "skew_out_of_range": "error",
+        "solder_mask_bridge": "error",
+        "starved_thermal": "error",
+        "text_height": "warning",
+        "text_thickness": "warning",
         "through_hole_pad_without_hole": "error",
         "too_many_vias": "error",
         "track_dangling": "warning",
@@ -127,7 +142,6 @@
         "unconnected_items": "error",
         "unresolved_variable": "error",
         "via_dangling": "warning",
-        "zone_has_empty_net": "error",
         "zones_intersect": "error"
       },
       "rules": {
@@ -135,26 +149,100 @@
         "allow_microvias": false,
         "max_error": 0.005,
         "min_clearance": 0.0,
+        "min_connection": 0.0,
         "min_copper_edge_clearance": 0.0,
         "min_hole_clearance": 0.25,
         "min_hole_to_hole": 0.25,
         "min_microvia_diameter": 0.19999999999999998,
         "min_microvia_drill": 0.09999999999999999,
+        "min_resolved_spokes": 2,
         "min_silk_clearance": 0.0,
+        "min_text_height": 0.7999999999999999,
+        "min_text_thickness": 0.08,
         "min_through_hole_diameter": 0.3,
         "min_track_width": 0.19999999999999998,
         "min_via_annular_width": 0.049999999999999996,
         "min_via_diameter": 0.39999999999999997,
         "solder_mask_clearance": 0.0,
         "solder_mask_min_width": 0.0,
+        "solder_mask_to_copper_clearance": 0.0,
         "use_height_for_length_calcs": true
       },
+      "teardrop_options": [
+        {
+          "td_onpadsmd": true,
+          "td_onroundshapesonly": false,
+          "td_ontrackend": false,
+          "td_onviapad": true
+        }
+      ],
+      "teardrop_parameters": [
+        {
+          "td_allow_use_two_tracks": true,
+          "td_curve_segcount": 0,
+          "td_height_ratio": 1.0,
+          "td_length_ratio": 0.5,
+          "td_maxheight": 2.0,
+          "td_maxlen": 1.0,
+          "td_on_pad_in_zone": false,
+          "td_target_name": "td_round_shape",
+          "td_width_to_size_filter_ratio": 0.9
+        },
+        {
+          "td_allow_use_two_tracks": true,
+          "td_curve_segcount": 0,
+          "td_height_ratio": 1.0,
+          "td_length_ratio": 0.5,
+          "td_maxheight": 2.0,
+          "td_maxlen": 1.0,
+          "td_on_pad_in_zone": false,
+          "td_target_name": "td_rect_shape",
+          "td_width_to_size_filter_ratio": 0.9
+        },
+        {
+          "td_allow_use_two_tracks": true,
+          "td_curve_segcount": 0,
+          "td_height_ratio": 1.0,
+          "td_length_ratio": 0.5,
+          "td_maxheight": 2.0,
+          "td_maxlen": 1.0,
+          "td_on_pad_in_zone": false,
+          "td_target_name": "td_track_end",
+          "td_width_to_size_filter_ratio": 0.9
+        }
+      ],
       "track_widths": [
         0.0,
         0.35,
         0.5,
         1.5
       ],
+      "tuning_pattern_settings": {
+        "diff_pair_defaults": {
+          "corner_radius_percentage": 100,
+          "corner_style": 1,
+          "max_amplitude": 1.0,
+          "min_amplitude": 0.1,
+          "single_sided": false,
+          "spacing": 0.6
+        },
+        "diff_pair_skew_defaults": {
+          "corner_radius_percentage": 100,
+          "corner_style": 1,
+          "max_amplitude": 1.0,
+          "min_amplitude": 0.1,
+          "single_sided": false,
+          "spacing": 0.6
+        },
+        "single_track_defaults": {
+          "corner_radius_percentage": 100,
+          "corner_style": 1,
+          "max_amplitude": 1.0,
+          "min_amplitude": 0.1,
+          "single_sided": false,
+          "spacing": 0.6
+        }
+      },
       "via_dimensions": [
         {
           "diameter": 0.0,
@@ -168,7 +256,15 @@
       "zones_allow_external_fillets": false,
       "zones_use_no_outline": true
     },
-    "layer_presets": []
+    "ipc2581": {
+      "dist": "",
+      "distpn": "",
+      "internal_id": "",
+      "mfg": "",
+      "mpn": ""
+    },
+    "layer_presets": [],
+    "viewports": []
   },
   "boards": [],
   "cvpcb": {
@@ -352,18 +448,23 @@
     "rule_severities": {
       "bus_definition_conflict": "error",
       "bus_entry_needed": "error",
-      "bus_label_syntax": "error",
       "bus_to_bus_conflict": "error",
       "bus_to_net_conflict": "error",
+      "conflicting_netclasses": "error",
       "different_unit_footprint": "error",
       "different_unit_net": "error",
       "duplicate_reference": "error",
       "duplicate_sheet_names": "error",
+      "endpoint_off_grid": "warning",
       "extra_units": "error",
       "global_label_dangling": "warning",
       "hier_label_mismatch": "error",
       "label_dangling": "error",
       "lib_symbol_issues": "warning",
+      "missing_bidi_pin": "warning",
+      "missing_input_pin": "warning",
+      "missing_power_pin": "error",
+      "missing_unit": "warning",
       "multiple_net_names": "warning",
       "net_not_bus_member": "warning",
       "no_connect_connected": "warning",
@@ -373,6 +474,7 @@
       "pin_to_pin": "error",
       "power_pin_not_driven": "error",
       "similar_labels": "warning",
+      "simulation_model_issue": "ignore",
       "unannotated": "error",
       "unit_value_mismatch": "error",
       "unresolved_variable": "error",
@@ -390,7 +492,7 @@
   "net_settings": {
     "classes": [
       {
-        "bus_width": 12.0,
+        "bus_width": 12,
         "clearance": 0.3,
         "diff_pair_gap": 0.25,
         "diff_pair_via_gap": 0.25,
@@ -404,10 +506,10 @@
         "track_width": 0.35,
         "via_diameter": 1.8,
         "via_drill": 0.9,
-        "wire_width": 6.0
+        "wire_width": 6
       },
       {
-        "bus_width": 19.68503937007874,
+        "bus_width": 19,
         "clearance": 0.4,
         "diff_pair_gap": 0.25,
         "diff_pair_via_gap": 0.25,
@@ -416,24 +518,15 @@
         "microvia_diameter": 0.3,
         "microvia_drill": 0.1,
         "name": "Leistungssignal",
-        "nets": [
-          "GLUE_RED",
-          "LED_GREEN",
-          "LED_RED",
-          "X4",
-          "X5",
-          "X6",
-          "X7"
-        ],
         "pcb_color": "rgba(0, 0, 0, 0.000)",
         "schematic_color": "rgb(255, 216, 0)",
         "track_width": 0.4,
         "via_diameter": 1.8,
         "via_drill": 0.9,
-        "wire_width": 15.748031496062993
+        "wire_width": 15
       },
       {
-        "bus_width": 27.559055118110237,
+        "bus_width": 27,
         "clearance": 0.3,
         "diff_pair_gap": 0.25,
         "diff_pair_via_gap": 0.25,
@@ -442,23 +535,15 @@
         "microvia_diameter": 0.3,
         "microvia_drill": 0.1,
         "name": "Spannungversorgung",
-        "nets": [
-          "+12V",
-          "+5V",
-          "GND",
-          "LCD_BL",
-          "Net-(D5-Pad1)",
-          "Net-(R1-Pad2)"
-        ],
         "pcb_color": "rgba(0, 0, 0, 0.000)",
         "schematic_color": "rgb(255, 0, 0)",
         "track_width": 0.7,
         "via_diameter": 1.8,
         "via_drill": 0.9,
-        "wire_width": 19.68503937007874
+        "wire_width": 19
       },
       {
-        "bus_width": 12.0,
+        "bus_width": 12,
         "clearance": 0.2,
         "diff_pair_gap": 0.25,
         "diff_pair_via_gap": 0.25,
@@ -467,34 +552,151 @@
         "microvia_diameter": 0.3,
         "microvia_drill": 0.1,
         "name": "iopko0",
-        "nets": [],
         "pcb_color": "rgba(0, 0, 0, 0.000)",
         "schematic_color": "rgba(0, 0, 0, 0.000)",
         "track_width": 0.35,
         "via_diameter": 1.8,
         "via_drill": 0.9,
-        "wire_width": 6.0
+        "wire_width": 6
       }
     ],
     "meta": {
-      "version": 2
+      "version": 3
     },
-    "net_colors": null
+    "net_colors": null,
+    "netclass_assignments": null,
+    "netclass_patterns": [
+      {
+        "netclass": "Leistungssignal",
+        "pattern": "GLUE_RED"
+      },
+      {
+        "netclass": "Leistungssignal",
+        "pattern": "LED_GREEN"
+      },
+      {
+        "netclass": "Leistungssignal",
+        "pattern": "LED_RED"
+      },
+      {
+        "netclass": "Leistungssignal",
+        "pattern": "X4"
+      },
+      {
+        "netclass": "Leistungssignal",
+        "pattern": "X5"
+      },
+      {
+        "netclass": "Leistungssignal",
+        "pattern": "X6"
+      },
+      {
+        "netclass": "Leistungssignal",
+        "pattern": "X7"
+      },
+      {
+        "netclass": "Spannungversorgung",
+        "pattern": "+12V"
+      },
+      {
+        "netclass": "Spannungversorgung",
+        "pattern": "+5V"
+      },
+      {
+        "netclass": "Spannungversorgung",
+        "pattern": "GND"
+      },
+      {
+        "netclass": "Spannungversorgung",
+        "pattern": "LCD_BL"
+      },
+      {
+        "netclass": "Spannungversorgung",
+        "pattern": "Net-(D5-Pad1)"
+      },
+      {
+        "netclass": "Spannungversorgung",
+        "pattern": "Net-(R1-Pad2)"
+      }
+    ]
   },
   "pcbnew": {
     "last_paths": {
       "gencad": "",
       "idf": "",
       "netlist": "",
+      "plot": "",
+      "pos_files": "",
       "specctra_dsn": "",
-      "step": "",
+      "step": "tallySdoAdapter.step",
+      "svg": "",
       "vrml": ""
     },
     "page_layout_descr_file": ""
   },
   "schematic": {
     "annotate_start_num": 0,
+    "bom_fmt_presets": [],
+    "bom_fmt_settings": {
+      "field_delimiter": ",",
+      "keep_line_breaks": false,
+      "keep_tabs": false,
+      "name": "CSV",
+      "ref_delimiter": ",",
+      "ref_range_delimiter": "",
+      "string_delimiter": "\""
+    },
+    "bom_presets": [],
+    "bom_settings": {
+      "exclude_dnp": false,
+      "fields_ordered": [
+        {
+          "group_by": false,
+          "label": "Reference",
+          "name": "Reference",
+          "show": true
+        },
+        {
+          "group_by": true,
+          "label": "Value",
+          "name": "Value",
+          "show": true
+        },
+        {
+          "group_by": false,
+          "label": "Datasheet",
+          "name": "Datasheet",
+          "show": true
+        },
+        {
+          "group_by": false,
+          "label": "Footprint",
+          "name": "Footprint",
+          "show": true
+        },
+        {
+          "group_by": false,
+          "label": "Qty",
+          "name": "${QUANTITY}",
+          "show": true
+        },
+        {
+          "group_by": true,
+          "label": "DNP",
+          "name": "${DNP}",
+          "show": true
+        }
+      ],
+      "filter_string": "",
+      "group_symbols": true,
+      "name": "Grouped By Value",
+      "sort_asc": true,
+      "sort_field": "Reference"
+    },
+    "connection_grid_size": 50.0,
     "drawing": {
+      "dashed_lines_dash_length_ratio": 12.0,
+      "dashed_lines_gap_length_ratio": 3.0,
       "default_line_thickness": 6.0,
       "default_text_size": 50.0,
       "field_names": [],
@@ -505,6 +707,11 @@
       "intersheets_ref_suffix": "",
       "junction_size_choice": 3,
       "label_size_ratio": 0.375,
+      "operating_point_overlay_i_precision": 3,
+      "operating_point_overlay_i_range": "~A",
+      "operating_point_overlay_v_precision": 3,
+      "operating_point_overlay_v_range": "~V",
+      "overbar_offset_ratio": 1.23,
       "pin_symbol_size": 25.0,
       "text_offset_ratio": 0.15
     },
@@ -526,7 +733,12 @@
     "page_layout_descr_file": "",
     "plot_directory": "",
     "spice_adjust_passive_values": false,
+    "spice_current_sheet_as_root": false,
     "spice_external_command": "spice \"%I\"",
+    "spice_model_current_sheet_as_root": true,
+    "spice_save_all_currents": false,
+    "spice_save_all_dissipations": false,
+    "spice_save_all_voltages": false,
     "subpart_first_id": 65,
     "subpart_id_separator": 0
   },