diff --git a/bluefnorf/main.c b/bluefnorf/main.c index 540b41b..4c18306 100644 --- a/bluefnorf/main.c +++ b/bluefnorf/main.c @@ -15,26 +15,11 @@ #include "usb.h" -int main(void) -{ - int i = 0; - // const char* line; - - // Clock Setup +int main(void) { rcc_clock_setup_in_hse_8mhz_out_72mhz(); - - // Initialize USB usb_serial_init(); - while (1) { - /* - if( i % 100000 == 0 ) { - // Read ADC - printf("Fnord 42 :: %d %d\r\n", _adc_samples[0], _adc_samples[1]); - } - */ - - i++; + while (42) { } } diff --git a/bluefnorf/usb.c b/bluefnorf/usb.c index 00f363d..688fc89 100644 --- a/bluefnorf/usb.c +++ b/bluefnorf/usb.c @@ -63,8 +63,8 @@ static const struct usb_endpoint_descriptor comm_endp[] = {{ .bDescriptorType = USB_DT_ENDPOINT, .bEndpointAddress = 0x83, .bmAttributes = USB_ENDPOINT_ATTR_INTERRUPT, - .wMaxPacketSize = 16, - .bInterval = 255, + .wMaxPacketSize = 64, + .bInterval = 1, }}; static const struct usb_endpoint_descriptor data_endp[] = {{ @@ -74,13 +74,6 @@ static const struct usb_endpoint_descriptor data_endp[] = {{ .bmAttributes = USB_ENDPOINT_ATTR_BULK, .wMaxPacketSize = 64, .bInterval = 1, -}, { - .bLength = USB_DT_ENDPOINT_SIZE, - .bDescriptorType = USB_DT_ENDPOINT, - .bEndpointAddress = 0x82, - .bmAttributes = USB_ENDPOINT_ATTR_BULK, - .wMaxPacketSize = 64, - .bInterval = 1, }}; static const struct usb_interface_descriptor comm_iface[] = {{ @@ -105,7 +98,7 @@ static const struct usb_interface_descriptor data_iface[] = {{ .bDescriptorType = USB_DT_INTERFACE, .bInterfaceNumber = 1, .bAlternateSetting = 0, - .bNumEndpoints = 2, + .bNumEndpoints = 1, .bInterfaceClass = USB_CLASS_DATA, .bInterfaceSubClass = 0, .bInterfaceProtocol = 0, @@ -139,7 +132,7 @@ static const struct usb_config_descriptor config = { static const char *usb_strings[] = { "Chaos Computer Club Berlin e.V.", "bluefnorf", - "bf1", + "bf2", }; diff --git a/doc/Spectrum Measurement.ipynb b/doc/Spectrum Measurement.ipynb index 516321b..c02ab63 100644 --- a/doc/Spectrum Measurement.ipynb +++ b/doc/Spectrum Measurement.ipynb @@ -3659,7 +3659,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.6.5" + "version": "3.6.8" } }, "nbformat": 4, diff --git a/enclosure/rails/rs485_base.scad b/enclosure/rails/rs485_base.scad index 2b5afe5..5c2984d 100644 --- a/enclosure/rails/rs485_base.scad +++ b/enclosure/rails/rs485_base.scad @@ -1,12 +1,12 @@ eps=0.01; -nut_dia = 5.3; +nut_dia = 5.4; nut_depth=5.5; bx=71.12; by=35.56; -w=8; +w=10; h=5; s=30; d=w; diff --git a/hardware/PCB_Project.PrjPcb b/olsndot/PCB_Project.PrjPcb similarity index 100% rename from hardware/PCB_Project.PrjPcb rename to olsndot/PCB_Project.PrjPcb diff --git a/hardware/PCB_Project.PrjPcbStructure b/olsndot/PCB_Project.PrjPcbStructure similarity index 100% rename from hardware/PCB_Project.PrjPcbStructure rename to olsndot/PCB_Project.PrjPcbStructure diff --git a/hardware/Project Outputs for olsndot.zip b/olsndot/Project Outputs for olsndot.zip similarity index 100% rename from hardware/Project Outputs for olsndot.zip rename to olsndot/Project Outputs for olsndot.zip diff --git a/hardware/Project Outputs for olsndot/Status Report.Txt b/olsndot/Project Outputs for olsndot/Status Report.Txt similarity index 100% rename from hardware/Project Outputs for olsndot/Status Report.Txt rename to olsndot/Project Outputs for olsndot/Status Report.Txt diff --git a/hardware/Project Outputs for olsndot/led_drv-macro.APR_LIB b/olsndot/Project Outputs for olsndot/led_drv-macro.APR_LIB similarity index 100% rename from hardware/Project Outputs for olsndot/led_drv-macro.APR_LIB rename to olsndot/Project Outputs for olsndot/led_drv-macro.APR_LIB diff --git a/hardware/Project Outputs for olsndot/led_drv.DRR b/olsndot/Project Outputs for olsndot/led_drv.DRR similarity index 100% rename from hardware/Project Outputs for olsndot/led_drv.DRR rename to olsndot/Project Outputs for olsndot/led_drv.DRR diff --git a/hardware/Project Outputs for olsndot/led_drv.EXTREP b/olsndot/Project Outputs for olsndot/led_drv.EXTREP similarity index 100% rename from hardware/Project Outputs for olsndot/led_drv.EXTREP rename to olsndot/Project Outputs for olsndot/led_drv.EXTREP diff --git a/hardware/Project Outputs for olsndot/led_drv.GBL b/olsndot/Project Outputs for olsndot/led_drv.GBL similarity index 100% rename from hardware/Project Outputs for olsndot/led_drv.GBL rename to olsndot/Project Outputs for olsndot/led_drv.GBL diff --git a/hardware/Project Outputs for olsndot/led_drv.GBO b/olsndot/Project Outputs for olsndot/led_drv.GBO similarity index 100% rename from hardware/Project Outputs for olsndot/led_drv.GBO rename to olsndot/Project Outputs for olsndot/led_drv.GBO diff --git a/hardware/Project Outputs for olsndot/led_drv.GBP b/olsndot/Project Outputs for olsndot/led_drv.GBP similarity index 100% rename from hardware/Project Outputs for olsndot/led_drv.GBP rename to olsndot/Project Outputs for olsndot/led_drv.GBP diff --git a/hardware/Project Outputs for olsndot/led_drv.GBS b/olsndot/Project Outputs for olsndot/led_drv.GBS similarity index 100% rename from hardware/Project Outputs for olsndot/led_drv.GBS rename to olsndot/Project Outputs for olsndot/led_drv.GBS diff --git a/hardware/Project Outputs for olsndot/led_drv.GKO b/olsndot/Project Outputs for olsndot/led_drv.GKO similarity index 100% rename from hardware/Project Outputs for olsndot/led_drv.GKO rename to olsndot/Project Outputs for olsndot/led_drv.GKO diff --git a/hardware/Project Outputs for olsndot/led_drv.GM1 b/olsndot/Project Outputs for olsndot/led_drv.GM1 similarity index 100% rename from hardware/Project Outputs for olsndot/led_drv.GM1 rename to olsndot/Project Outputs for olsndot/led_drv.GM1 diff --git a/hardware/Project Outputs for olsndot/led_drv.GTL b/olsndot/Project Outputs for olsndot/led_drv.GTL similarity index 100% rename from hardware/Project Outputs for olsndot/led_drv.GTL rename to olsndot/Project Outputs for olsndot/led_drv.GTL diff --git a/hardware/Project Outputs for olsndot/led_drv.GTO b/olsndot/Project Outputs for olsndot/led_drv.GTO similarity index 100% rename from hardware/Project Outputs for olsndot/led_drv.GTO rename to olsndot/Project Outputs for olsndot/led_drv.GTO diff --git a/hardware/Project Outputs for olsndot/led_drv.GTP b/olsndot/Project Outputs for olsndot/led_drv.GTP similarity index 100% rename from hardware/Project Outputs for olsndot/led_drv.GTP rename to olsndot/Project Outputs for olsndot/led_drv.GTP diff --git a/hardware/Project Outputs for olsndot/led_drv.GTS b/olsndot/Project Outputs for olsndot/led_drv.GTS similarity index 100% rename from hardware/Project Outputs for olsndot/led_drv.GTS rename to olsndot/Project Outputs for olsndot/led_drv.GTS diff --git a/hardware/Project Outputs for olsndot/led_drv.LDP b/olsndot/Project Outputs for olsndot/led_drv.LDP similarity index 100% rename from hardware/Project Outputs for olsndot/led_drv.LDP rename to olsndot/Project Outputs for olsndot/led_drv.LDP diff --git a/hardware/Project Outputs for olsndot/led_drv.REP b/olsndot/Project Outputs for olsndot/led_drv.REP similarity index 100% rename from hardware/Project Outputs for olsndot/led_drv.REP rename to olsndot/Project Outputs for olsndot/led_drv.REP diff --git a/hardware/Project Outputs for olsndot/led_drv.RUL b/olsndot/Project Outputs for olsndot/led_drv.RUL similarity index 100% rename from hardware/Project Outputs for olsndot/led_drv.RUL rename to olsndot/Project Outputs for olsndot/led_drv.RUL diff --git a/hardware/Project Outputs for olsndot/led_drv.TXT b/olsndot/Project Outputs for olsndot/led_drv.TXT similarity index 100% rename from hardware/Project Outputs for olsndot/led_drv.TXT rename to olsndot/Project Outputs for olsndot/led_drv.TXT diff --git a/hardware/Project Outputs for olsndot/led_drv.apr b/olsndot/Project Outputs for olsndot/led_drv.apr similarity index 100% rename from hardware/Project Outputs for olsndot/led_drv.apr rename to olsndot/Project Outputs for olsndot/led_drv.apr diff --git a/hardware/Project Outputs for olsndot/outputs.PDF b/olsndot/Project Outputs for olsndot/outputs.PDF similarity index 100% rename from hardware/Project Outputs for olsndot/outputs.PDF rename to olsndot/Project Outputs for olsndot/outputs.PDF diff --git a/hardware/bom.ods b/olsndot/bom.ods similarity index 100% rename from hardware/bom.ods rename to olsndot/bom.ods diff --git a/hardware/components.PcbLib b/olsndot/components.PcbLib similarity index 100% rename from hardware/components.PcbLib rename to olsndot/components.PcbLib diff --git a/hardware/components.SchLib b/olsndot/components.SchLib similarity index 100% rename from hardware/components.SchLib rename to olsndot/components.SchLib diff --git a/hardware/gerbers.zip b/olsndot/gerbers.zip similarity index 100% rename from hardware/gerbers.zip rename to olsndot/gerbers.zip diff --git a/hardware/graphics/hanekawa-export.svg b/olsndot/graphics/hanekawa-export.svg similarity index 100% rename from hardware/graphics/hanekawa-export.svg rename to olsndot/graphics/hanekawa-export.svg diff --git a/hardware/graphics/hanekawa-export2.svg b/olsndot/graphics/hanekawa-export2.svg similarity index 100% rename from hardware/graphics/hanekawa-export2.svg rename to olsndot/graphics/hanekawa-export2.svg diff --git a/hardware/graphics/hanekawa-large-silk.zip b/olsndot/graphics/hanekawa-large-silk.zip similarity index 100% rename from hardware/graphics/hanekawa-large-silk.zip rename to olsndot/graphics/hanekawa-large-silk.zip diff --git a/hardware/graphics/hanekawa-large-silk/curveexport/0000-0000.csv b/olsndot/graphics/hanekawa-large-silk/curveexport/0000-0000.csv similarity index 100% rename from hardware/graphics/hanekawa-large-silk/curveexport/0000-0000.csv rename to olsndot/graphics/hanekawa-large-silk/curveexport/0000-0000.csv diff --git a/hardware/graphics/hanekawa-large-silkscreen.html b/olsndot/graphics/hanekawa-large-silkscreen.html similarity index 100% rename from hardware/graphics/hanekawa-large-silkscreen.html rename to olsndot/graphics/hanekawa-large-silkscreen.html diff --git a/hardware/graphics/hanekawa-large-solder.zip b/olsndot/graphics/hanekawa-large-solder.zip similarity index 100% rename from hardware/graphics/hanekawa-large-solder.zip rename to olsndot/graphics/hanekawa-large-solder.zip diff --git a/hardware/graphics/hanekawa-large-solder/curveexport/0000-0000.csv b/olsndot/graphics/hanekawa-large-solder/curveexport/0000-0000.csv similarity index 100% rename from hardware/graphics/hanekawa-large-solder/curveexport/0000-0000.csv rename to olsndot/graphics/hanekawa-large-solder/curveexport/0000-0000.csv diff --git a/hardware/graphics/hanekawa-large-soldermask.html b/olsndot/graphics/hanekawa-large-soldermask.html similarity index 100% rename from hardware/graphics/hanekawa-large-soldermask.html rename to olsndot/graphics/hanekawa-large-soldermask.html diff --git a/hardware/graphics/hanekawa-out/curveexport/0000-0000.csv b/olsndot/graphics/hanekawa-out/curveexport/0000-0000.csv similarity index 100% rename from hardware/graphics/hanekawa-out/curveexport/0000-0000.csv rename to olsndot/graphics/hanekawa-out/curveexport/0000-0000.csv diff --git a/hardware/graphics/hanekawa-prod.svg b/olsndot/graphics/hanekawa-prod.svg similarity index 100% rename from hardware/graphics/hanekawa-prod.svg rename to olsndot/graphics/hanekawa-prod.svg diff --git a/hardware/graphics/hanekawa-prod2.svg b/olsndot/graphics/hanekawa-prod2.svg similarity index 100% rename from hardware/graphics/hanekawa-prod2.svg rename to olsndot/graphics/hanekawa-prod2.svg diff --git a/hardware/graphics/hanekawa-prod3.svg b/olsndot/graphics/hanekawa-prod3.svg similarity index 100% rename from hardware/graphics/hanekawa-prod3.svg rename to olsndot/graphics/hanekawa-prod3.svg diff --git a/hardware/graphics/hanekawa-silk.zip b/olsndot/graphics/hanekawa-silk.zip similarity index 100% rename from hardware/graphics/hanekawa-silk.zip rename to olsndot/graphics/hanekawa-silk.zip diff --git a/hardware/graphics/hanekawa-silkscreen.html b/olsndot/graphics/hanekawa-silkscreen.html similarity index 100% rename from hardware/graphics/hanekawa-silkscreen.html rename to olsndot/graphics/hanekawa-silkscreen.html diff --git a/hardware/graphics/hanekawa-solder.zip b/olsndot/graphics/hanekawa-solder.zip similarity index 100% rename from hardware/graphics/hanekawa-solder.zip rename to olsndot/graphics/hanekawa-solder.zip diff --git a/hardware/graphics/hanekawa-solder/curveexport/0000-0000.csv b/olsndot/graphics/hanekawa-solder/curveexport/0000-0000.csv similarity index 100% rename from hardware/graphics/hanekawa-solder/curveexport/0000-0000.csv rename to olsndot/graphics/hanekawa-solder/curveexport/0000-0000.csv diff --git a/hardware/graphics/hanekawa-soldermask.html b/olsndot/graphics/hanekawa-soldermask.html similarity index 100% rename from hardware/graphics/hanekawa-soldermask.html rename to olsndot/graphics/hanekawa-soldermask.html diff --git a/hardware/graphics/hanekawa.svg b/olsndot/graphics/hanekawa.svg similarity index 100% rename from hardware/graphics/hanekawa.svg rename to olsndot/graphics/hanekawa.svg diff --git a/hardware/led_drv.PcbDoc b/olsndot/led_drv.PcbDoc similarity index 100% rename from hardware/led_drv.PcbDoc rename to olsndot/led_drv.PcbDoc diff --git a/hardware/main.SchDoc b/olsndot/main.SchDoc similarity index 100% rename from hardware/main.SchDoc rename to olsndot/main.SchDoc diff --git a/hardware/olsndot.IntLib b/olsndot/olsndot.IntLib similarity index 100% rename from hardware/olsndot.IntLib rename to olsndot/olsndot.IntLib diff --git a/hardware/olsndot.PrjPcb b/olsndot/olsndot.PrjPcb similarity index 100% rename from hardware/olsndot.PrjPcb rename to olsndot/olsndot.PrjPcb diff --git a/hardware/olsndot.PrjPcbStructure b/olsndot/olsndot.PrjPcbStructure similarity index 100% rename from hardware/olsndot.PrjPcbStructure rename to olsndot/olsndot.PrjPcbStructure diff --git a/hardware/outputs.OutJob b/olsndot/outputs.OutJob similarity index 100% rename from hardware/outputs.OutJob rename to olsndot/outputs.OutJob