• Projects's avatar
    Merged branch 'mcattin_mec_dev' · e61afc6d
    Projects authored
    Conflicts:
    	.gitignore
    	doc/icons/icons.svg
    	hw/block_diagram/block_diagram.svg
    	hw/freewatch_v1/freewatch_v1.cmp
    	hw/freewatch_v1/freewatch_v1.kicad_pcb
    	hw/freewatch_v1/freewatch_v1.net
    	hw/freewatch_v1/freewatch_v1.pro
    	hw/freewatch_v1/mcu_display.sch
    	hw/freewatch_v1/periph_sensors.sch
    	hw/freewatch_v1/usb_power.sch
    	mec/sketch/components_placement.fcstd
    e61afc6d
.gitignore 107 Bytes