Update

Sebski123 · Nov 23, 2021 · 0c78f07 · 0c78f07
1 parent 8e8b3e7
commit 0c78f07
Show file tree

Hide file tree

Showing 32 changed files with 4,981 additions and 190 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,3 @@
+.vscode/
+*.fcstd1
+**/desktop.ini
diff --git a/Indkøbs-liste.gsheet b/Indkøbs-liste.gsheet
@@ -1 +1 @@
-{"url": "https://docs.google.com/open?id=1bJGVzlMOi4lhCe_lowgES_lc6zuVtLZEZH2xLKSR2NM", "doc_id": "1bJGVzlMOi4lhCe_lowgES_lc6zuVtLZEZH2xLKSR2NM", "email": "sebthomle@gmail.com"}
+{"":"WARNING! DO NOT EDIT THIS FILE! ANY CHANGES MADE WILL BE LOST!","doc_id":"1bJGVzlMOi4lhCe_lowgES_lc6zuVtLZEZH2xLKSR2NM","email":"sebthomle@gmail.com","resource_key":"","url":"https://docs.google.com/open?id=1bJGVzlMOi4lhCe_lowgES_lc6zuVtLZEZH2xLKSR2NM"}
diff --git a/Nyttige Links.gdoc b/Nyttige Links.gdoc
@@ -1 +1,7 @@
-{"url": "https://docs.google.com/open?id=1oN_BuAAReJqHGiVTUNumqnsOz3ZYzIR79be_z8TzHBY", "doc_id": "1oN_BuAAReJqHGiVTUNumqnsOz3ZYzIR79be_z8TzHBY", "email": "sebthomle@gmail.com"}
+{
+	// WARNING! DO NOT EDIT THIS FILE! ANY CHANGES MADE WILL BE LOST!
+	"doc_id" : "1oN_BuAAReJqHGiVTUNumqnsOz3ZYzIR79be_z8TzHBY",
+	"email" : "sebthomle@gmail.com",
+	"resource_key" : "",
+	"url" : "https://docs.google.com/open?id=1oN_BuAAReJqHGiVTUNumqnsOz3ZYzIR79be_z8TzHBY"
+}
diff --git a/TestMatrixDisplay/TestMatrixDisplay.ino b/TestMatrixDisplay/TestMatrixDisplay.ino
@@ -0,0 +1,49 @@
+//We always have to include the library
+#include "LedControl.h"
+
+/*
+ Now we need a LedControl to work with.
+ ***** These pin numbers will probably not work with your hardware *****
+ pin 12 is connected to the DataIn 
+ pin 11 is connected to the CLK 
+ pin 10 is connected to LOAD 
+ We have only a single MAX72XX.
+ */
+LedControl lc=LedControl(14,16,15,4);
+
+/* we always wait a bit between updates of the display */
+unsigned long delaytime=100;
+
+void setup() {
+
+  Serial.begin(9600);
+  /*
+   The MAX72XX is in power-saving mode on startup,
+   we have to do a wakeup call
+   */
+  lc.shutdown(0,false);
+  /* Set the brightness to a medium values */
+  lc.setIntensity(0,8);
+  /* and clear the display */
+  lc.clearDisplay(0);
+}
+
+/* 
+ This function will light up every Led on the matrix.
+*/
+void single() {
+  for(int row=0;row<8;row++) {
+    for(int col=0;col<8;col++) {
+      delay(delaytime);
+      lc.setLed(0,row,col,true);
+      Serial.print(row);
+      Serial.print("\t");
+      Serial.println(col);
+      delay(delaytime);
+    }
+  }
+}
+
+void loop() { 
+  single();
+}
diff --git a/TestMatrixDisplays/TestMatrixDisplays.ino b/TestMatrixDisplays/TestMatrixDisplays.ino
@@ -0,0 +1,73 @@
+//We always have to include the library
+#include "LedControl.h"
+
+
+
+int numOfBoards = 3;
+/*
+ Now we need a LedControl to work with.
+ ***** These pin numbers will probably not work with your hardware *****
+ pin 12 is connected to the DataIn 
+ pin 11 is connected to the CLK 
+ pin 10 is connected to LOAD 
+ We have only a single MAX72XX.
+ */
+LedControl lc=LedControl(14,16,15,numOfBoards);
+
+/* we always wait a bit between updates of the display */
+unsigned long delaytime=100/numOfBoards;
+
+
+void single(bool mode);
+
+void setup() {
+
+  Serial.begin(9600);
+
+
+  for (int i = 0; i < numOfBoards; i++){
+   /*
+   The MAX72XX is in power-saving mode on startup,
+   we have to do a wakeup call
+   */
+    lc.shutdown(i,false);
+    /* Set the brightness to a medium values */
+    lc.setIntensity(i,8);
+    /* and clear the display */
+    lc.clearDisplay(i);
+  }
+
+  Serial.print("board");
+  Serial.print("\t");
+  Serial.print("row");
+  Serial.print("\t");
+  Serial.println("col");
+}
+
+/* 
+ This function will light up every Led on the matrix.
+*/
+void single(bool mode) {
+  for(int board=0;board<numOfBoards;board++){
+    for(int row=0;row<8;row++) {
+      for(int col=0;col<8;col++) {
+        delay(delaytime);
+        lc.setLed(board,row,col,mode);
+        Serial.print(board);
+        Serial.print("\t");
+        Serial.print(row);
+        Serial.print("\t");
+        Serial.println(col);
+        delay(delaytime);
+      }
+    }
+  }
+}
+
+void loop() { 
+  lc.setLed(0,0,0,true);
+  delay(500);
+  lc.setLed(0,0,0,false);
+  delay(500);
+
+}
diff --git a/UR.FCStd b/UR.FCStd
diff --git a/UR_asm_hierarchy.html b/UR_asm_hierarchy.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <title>A2P assembly hierarchy visualization</title>
+</head>
+<body>
+<div class="mermaid">
+graph TD
+UR_Body_001(UR_Body_001<br>*FIXED*) -- plane --> UR_Glass_001
+UR_Body_001(UR_Body_001<br>*FIXED*) -- axial --> UR_Glass_001
+UR_Body_001(UR_Body_001<br>*FIXED*) -- axial --> UR_Glass_001
+UR_Glass_001
+</div>
+    <script src="https://unpkg.com/mermaid@7.1.2/dist/mermaid.js"></script>
+    <script>
+        mermaid.initialize({startOnLoad: true});
+    </script>
+</body></html>
diff --git a/wordclock-master/faceplate/OLD/face_07nov.ai b/wordclock-master/faceplate/OLD/face_07nov.ai
diff --git a/wordclock-master/faceplate/OLD/face_07nov2.svg b/wordclock-master/faceplate/OLD/face_07nov2.svg
diff --git a/wordclock-master/faceplate/OLD/face_11sep2_vector.ai b/wordclock-master/faceplate/OLD/face_11sep2_vector.ai
diff --git a/wordclock-master/faceplate/OLD/face_11sep2_vector.pdf b/wordclock-master/faceplate/OLD/face_11sep2_vector.pdf
diff --git a/wordclock-master/faceplate/OLD/face_11sep_vector.ai b/wordclock-master/faceplate/OLD/face_11sep_vector.ai
diff --git a/wordclock-master/faceplate/OLD/face_11sep_vector.pdf b/wordclock-master/faceplate/OLD/face_11sep_vector.pdf
diff --git a/.../faceplate/face_21jul_reference_image.png → ...eplate/OLD/face_21jul_reference_image.png b/.../faceplate/face_21jul_reference_image.png → ...eplate/OLD/face_21jul_reference_image.png
diff --git a/...ock-master/faceplate/face_21jul_vector.ai → ...master/faceplate/OLD/face_21jul_vector.ai b/...ock-master/faceplate/face_21jul_vector.ai → ...master/faceplate/OLD/face_21jul_vector.ai
diff --git a/...ck-master/faceplate/face_21jul_vector.pdf → ...aster/faceplate/OLD/face_21jul_vector.pdf b/...ck-master/faceplate/face_21jul_vector.pdf → ...aster/faceplate/OLD/face_21jul_vector.pdf
diff --git a/...ck-master/faceplate/face_PijuannaClock.ai → ...aster/faceplate/OLD/face_PijuannaClock.ai b/...ck-master/faceplate/face_PijuannaClock.ai → ...aster/faceplate/OLD/face_PijuannaClock.ai
diff --git a/...k-master/faceplate/face_PijuannaClock.png → ...ster/faceplate/OLD/face_PijuannaClock.png b/...k-master/faceplate/face_PijuannaClock.png → ...ster/faceplate/OLD/face_PijuannaClock.png
diff --git a/...ter/faceplate/face_PijuannaClockBlack.png → ...faceplate/OLD/face_PijuannaClockBlack.png b/...ter/faceplate/face_PijuannaClockBlack.png → ...faceplate/OLD/face_PijuannaClockBlack.png
diff --git a/wordclock-master/faceplate/OLD/rect2781.png b/wordclock-master/faceplate/OLD/rect2781.png
diff --git a/wordclock-master/faceplate/OLD/rect27812.png b/wordclock-master/faceplate/OLD/rect27812.png
diff --git a/wordclock-master/faceplate/face_07nov2.ai b/wordclock-master/faceplate/face_07nov2.ai
diff --git a/wordclock-master/faceplate/face_07nov2.png b/wordclock-master/faceplate/face_07nov2.png
diff --git a/wordclock-master/faceplate/face_07nov2.psd b/wordclock-master/faceplate/face_07nov2.psd
diff --git a/wordclock-master/faceplate/face_07nov2ForCutting.ai b/wordclock-master/faceplate/face_07nov2ForCutting.ai
diff --git a/wordclock-master/firmware/pijuanaclock/.vscode/c_cpp_properties.json b/wordclock-master/firmware/pijuanaclock/.vscode/c_cpp_properties.json
@@ -3,14 +3,22 @@
         {
             "name": "Win32",
             "includePath": [
-                "${workspaceFolder}/**"
+                "C:\\Users\\sebth\\AppData\\Local\\Arduino15\\packages\\MiniCore\\hardware\\avr\\2.0.5\\**",
+                "D:\\Program Files (x86)\\Arduino\\tools\\**",
+                "D:\\Program Files (x86)\\Arduino\\hardware\\arduino\\avr\\**",
+                "C:\\Users\\sebth\\AppData\\Local\\Arduino15\\packages\\esp8266\\tools\\**",
+                "C:\\Users\\sebth\\AppData\\Local\\Arduino15\\packages\\esp8266\\hardware\\esp8266\\2.5.2\\**",
+                "${workspaceFolder}/**",
+                "C:\\Users\\sebth\\AppData\\Local\\Arduino15\\packages\\arduino\\hardware\\avr\\1.8.3\\**",
+                "C:\\Users\\sebth\\AppData\\Local\\Arduino15\\packages\\arduino\\tools\\**"
             ],
             "defines": [
                 "_DEBUG",
                 "UNICODE",
                 "_UNICODE"
             ],
-            "intelliSenseMode": "msvc-x64"
+            "intelliSenseMode": "msvc-x64",
+            "forcedInclude": []
         }
     ],
     "version": 4

diff --git a/wordclock-master/firmware/pijuanaclock/.vscode/ipch/1bbbc90a44e8fab6/mmap_address.bin b/wordclock-master/firmware/pijuanaclock/.vscode/ipch/1bbbc90a44e8fab6/mmap_address.bin
diff --git a/wordclock-master/firmware/pijuanaclock/.vscode/ipch/8d986cb0a4ce76eb/mmap_address.bin b/wordclock-master/firmware/pijuanaclock/.vscode/ipch/8d986cb0a4ce76eb/mmap_address.bin
diff --git a/wordclock-master/firmware/pijuanaclock/brightness.cpp b/wordclock-master/firmware/pijuanaclock/brightness.cpp
@@ -40,16 +40,16 @@ void setBrightnessAuto()
 
   // Read ambient light sensor
   int lightReading = analogRead(PIN_LDR); // 0 to 1023
-  Serial.print(F("lightReading="));Serial.println(lightReading);
+  //Serial.print(F("lightReading="));Serial.println(lightReading);
   lightReading += currentHysteresis; // Add the current hysteresis value to the reading (this has the same effect as moving the thresholds)
 
-  Serial.print(F("lightReading+hyster="));Serial.println(lightReading);
+  //Serial.print(F("lightReading+hyster="));Serial.println(lightReading);
   lightReading = constrain(lightReading, LOWER_BOUND, UPPER_BOUND);
-  Serial.print(F("constrained lightReading="));Serial.println(lightReading);
+  //Serial.print(F("constrained lightReading="));Serial.println(lightReading);
 
   // lightReading -> bright mapping
   int bright = map(lightReading, LOWER_BOUND, UPPER_BOUND, 0, 15);
-  Serial.print(F("bright="));Serial.println(bright);
+  //Serial.print(F("bright="));Serial.println(bright);
 
   if (bright != brightness)
   {
@@ -60,5 +60,3 @@ void setBrightnessAuto()
     setBrightness(bright);
   }
 }
-
-
diff --git a/wordclock-master/firmware/pijuanaclock/display.h b/wordclock-master/firmware/pijuanaclock/display.h
@@ -10,8 +10,8 @@
 #include "LedControl.h" // MAX7219 - LED matrix drivers - http://playground.arduino.cc/Main/LedControl
 
 // Pins to led drivers
-#define pinData  14  // A0 (used as digital pin)
-#define pinLoad  15  // A1 (used as digital pin)
+#define pinData  8  // A0 (used as digital pin)
+#define pinLoad  7  // A1 (used as digital pin)
 #define pinClock 16  // A2 (used as digital pin)
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{"url": "https://docs.google.com/open?id=1bJGVzlMOi4lhCe_lowgES_lc6zuVtLZEZH2xLKSR2NM", "doc_id": "1bJGVzlMOi4lhCe_lowgES_lc6zuVtLZEZH2xLKSR2NM", "email": "sebthomle@gmail.com"}
		{"":"WARNING! DO NOT EDIT THIS FILE! ANY CHANGES MADE WILL BE LOST!","doc_id":"1bJGVzlMOi4lhCe_lowgES_lc6zuVtLZEZH2xLKSR2NM","email":"sebthomle@gmail.com","resource_key":"","url":"https://docs.google.com/open?id=1bJGVzlMOi4lhCe_lowgES_lc6zuVtLZEZH2xLKSR2NM"}