Add local changesHEADmaster

55 files changed, 9 insertions, 31 deletions

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
index f576b93..f576b93 100644
--- a/hardware/PCB_Project.PrjPcb
+++ b/olsndot/PCB_Project.PrjPcb
diff --git a/hardware/PCB_Project.PrjPcbStructure b/olsndot/PCB_Project.PrjPcbStructure
index 059a547..059a547 100644
--- a/hardware/PCB_Project.PrjPcbStructure
+++ b/olsndot/PCB_Project.PrjPcbStructure
diff --git a/hardware/Project Outputs for olsndot.zip b/olsndot/Project Outputs for olsndot.zip
index 8d7c25e..8d7c25e 100644
--- a/hardware/Project Outputs for olsndot.zip
+++ b/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
index b2dd38f..b2dd38f 100644
--- a/hardware/Project Outputs for olsndot/Status Report.Txt
+++ b/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
index 824e2e9..824e2e9 100644
--- a/hardware/Project Outputs for olsndot/led_drv-macro.APR_LIB
+++ b/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
index ff8f7c1..ff8f7c1 100644
--- a/hardware/Project Outputs for olsndot/led_drv.DRR
+++ b/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
index 2514661..2514661 100644
--- a/hardware/Project Outputs for olsndot/led_drv.EXTREP
+++ b/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
index c0bc3d4..c0bc3d4 100644
--- a/hardware/Project Outputs for olsndot/led_drv.GBL
+++ b/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
index 241d0b6..241d0b6 100644
--- a/hardware/Project Outputs for olsndot/led_drv.GBO
+++ b/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
index 89e4c9b..89e4c9b 100644
--- a/hardware/Project Outputs for olsndot/led_drv.GBP
+++ b/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
index 47534a0..47534a0 100644
--- a/hardware/Project Outputs for olsndot/led_drv.GBS
+++ b/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
index 62c5693..62c5693 100644
--- a/hardware/Project Outputs for olsndot/led_drv.GKO
+++ b/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
index 62c5693..62c5693 100644
--- a/hardware/Project Outputs for olsndot/led_drv.GM1
+++ b/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
index fe3fa0c..fe3fa0c 100644
--- a/hardware/Project Outputs for olsndot/led_drv.GTL
+++ b/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
index 8d5a26f..8d5a26f 100644
--- a/hardware/Project Outputs for olsndot/led_drv.GTO
+++ b/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
index 99c48c6..99c48c6 100644
--- a/hardware/Project Outputs for olsndot/led_drv.GTP
+++ b/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
index 25612d2..25612d2 100644
--- a/hardware/Project Outputs for olsndot/led_drv.GTS
+++ b/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
index 0798a5f..0798a5f 100644
--- a/hardware/Project Outputs for olsndot/led_drv.LDP
+++ b/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
index eb6c8d8..eb6c8d8 100644
--- a/hardware/Project Outputs for olsndot/led_drv.REP
+++ b/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
index e96f1d3..e96f1d3 100644
--- a/hardware/Project Outputs for olsndot/led_drv.RUL
+++ b/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
index 1ff7f0b..1ff7f0b 100644
--- a/hardware/Project Outputs for olsndot/led_drv.TXT
+++ b/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
index f28f82b..f28f82b 100644
--- a/hardware/Project Outputs for olsndot/led_drv.apr
+++ b/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
index 2a4e037..2a4e037 100644
--- a/hardware/Project Outputs for olsndot/outputs.PDF
+++ b/olsndot/Project Outputs for olsndot/outputs.PDF
diff --git a/hardware/bom.ods b/olsndot/bom.ods
index 69c5fe4..69c5fe4 100644
--- a/hardware/bom.ods
+++ b/olsndot/bom.ods
diff --git a/hardware/components.PcbLib b/olsndot/components.PcbLib
index fbd1670..fbd1670 100644
--- a/hardware/components.PcbLib
+++ b/olsndot/components.PcbLib
diff --git a/hardware/components.SchLib b/olsndot/components.SchLib
index b8c5bf6..b8c5bf6 100644
--- a/hardware/components.SchLib
+++ b/olsndot/components.SchLib
diff --git a/hardware/gerbers.zip b/olsndot/gerbers.zip
index 254d73c..254d73c 100644
--- a/hardware/gerbers.zip
+++ b/olsndot/gerbers.zip
diff --git a/hardware/graphics/hanekawa-export.svg b/olsndot/graphics/hanekawa-export.svg
index 4cad86b..4cad86b 100644
--- a/hardware/graphics/hanekawa-export.svg
+++ b/olsndot/graphics/hanekawa-export.svg
diff --git a/hardware/graphics/hanekawa-export2.svg b/olsndot/graphics/hanekawa-export2.svg
index 45a0708..45a0708 100644
--- a/hardware/graphics/hanekawa-export2.svg
+++ b/olsndot/graphics/hanekawa-export2.svg
diff --git a/hardware/graphics/hanekawa-large-silk.zip b/olsndot/graphics/hanekawa-large-silk.zip
index a339a1c..a339a1c 100644
--- a/hardware/graphics/hanekawa-large-silk.zip
+++ b/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
index 46c9622..46c9622 100644
--- a/hardware/graphics/hanekawa-large-silk/curveexport/0000-0000.csv
+++ b/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
index aa44096..aa44096 100644
--- a/hardware/graphics/hanekawa-large-silkscreen.html
+++ b/olsndot/graphics/hanekawa-large-silkscreen.html
diff --git a/hardware/graphics/hanekawa-large-solder.zip b/olsndot/graphics/hanekawa-large-solder.zip
index 7c3b625..7c3b625 100644
--- a/hardware/graphics/hanekawa-large-solder.zip
+++ b/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
index a6a1e17..a6a1e17 100644
--- a/hardware/graphics/hanekawa-large-solder/curveexport/0000-0000.csv
+++ b/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
index 74739ad..74739ad 100644
--- a/hardware/graphics/hanekawa-large-soldermask.html
+++ b/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
index 097c775..097c775 100644
--- a/hardware/graphics/hanekawa-out/curveexport/0000-0000.csv
+++ b/olsndot/graphics/hanekawa-out/curveexport/0000-0000.csv
diff --git a/hardware/graphics/hanekawa-prod.svg b/olsndot/graphics/hanekawa-prod.svg
index 79e9def..79e9def 100644
--- a/hardware/graphics/hanekawa-prod.svg
+++ b/olsndot/graphics/hanekawa-prod.svg
diff --git a/hardware/graphics/hanekawa-prod2.svg b/olsndot/graphics/hanekawa-prod2.svg
index da45aba..da45aba 100644
--- a/hardware/graphics/hanekawa-prod2.svg
+++ b/olsndot/graphics/hanekawa-prod2.svg
diff --git a/hardware/graphics/hanekawa-prod3.svg b/olsndot/graphics/hanekawa-prod3.svg
index cad5e3d..cad5e3d 100644
--- a/hardware/graphics/hanekawa-prod3.svg
+++ b/olsndot/graphics/hanekawa-prod3.svg
diff --git a/hardware/graphics/hanekawa-silk.zip b/olsndot/graphics/hanekawa-silk.zip
index 70644f2..70644f2 100644
--- a/hardware/graphics/hanekawa-silk.zip
+++ b/olsndot/graphics/hanekawa-silk.zip
diff --git a/hardware/graphics/hanekawa-silkscreen.html b/olsndot/graphics/hanekawa-silkscreen.html
index e5918c4..e5918c4 100644
--- a/hardware/graphics/hanekawa-silkscreen.html
+++ b/olsndot/graphics/hanekawa-silkscreen.html
diff --git a/hardware/graphics/hanekawa-solder.zip b/olsndot/graphics/hanekawa-solder.zip
index 0c76dd7..0c76dd7 100644
--- a/hardware/graphics/hanekawa-solder.zip
+++ b/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
index 546bc2d..546bc2d 100644
--- a/hardware/graphics/hanekawa-solder/curveexport/0000-0000.csv
+++ b/olsndot/graphics/hanekawa-solder/curveexport/0000-0000.csv
diff --git a/hardware/graphics/hanekawa-soldermask.html b/olsndot/graphics/hanekawa-soldermask.html
index 014c31a..014c31a 100644
--- a/hardware/graphics/hanekawa-soldermask.html
+++ b/olsndot/graphics/hanekawa-soldermask.html
diff --git a/hardware/graphics/hanekawa.svg b/olsndot/graphics/hanekawa.svg
index cd64223..cd64223 100644
--- a/hardware/graphics/hanekawa.svg
+++ b/olsndot/graphics/hanekawa.svg
diff --git a/hardware/led_drv.PcbDoc b/olsndot/led_drv.PcbDoc
index 3d72e51..3d72e51 100644
--- a/hardware/led_drv.PcbDoc
+++ b/olsndot/led_drv.PcbDoc
diff --git a/hardware/main.SchDoc b/olsndot/main.SchDoc
index dcf9e62..dcf9e62 100644
--- a/hardware/main.SchDoc
+++ b/olsndot/main.SchDoc
diff --git a/hardware/olsndot.IntLib b/olsndot/olsndot.IntLib
index ef248ef..ef248ef 100644
--- a/hardware/olsndot.IntLib
+++ b/olsndot/olsndot.IntLib
diff --git a/hardware/olsndot.PrjPcb b/olsndot/olsndot.PrjPcb
index 1d9f902..1d9f902 100644
--- a/hardware/olsndot.PrjPcb
+++ b/olsndot/olsndot.PrjPcb
diff --git a/hardware/olsndot.PrjPcbStructure b/olsndot/olsndot.PrjPcbStructure
index 059a547..059a547 100644
--- a/hardware/olsndot.PrjPcbStructure
+++ b/olsndot/olsndot.PrjPcbStructure
diff --git a/hardware/outputs.OutJob b/olsndot/outputs.OutJob
index fef6808..fef6808 100644
--- a/hardware/outputs.OutJob
+++ b/olsndot/outputs.OutJob