Skip to content

Commit

Permalink
Merge pull request #10 from cakeslob/develop
Browse files Browse the repository at this point in the history
Develop into main
  • Loading branch information
cakeslob authored Jul 12, 2023
2 parents 293f78c + e9b63fb commit 6f49906
Show file tree
Hide file tree
Showing 378 changed files with 39,054 additions and 221 deletions.
38 changes: 38 additions & 0 deletions Firmware/ConfigSamples/OCTOPUS/config.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"Board": "BIGTREETECH OCTOPUS",
"Modules":[
{
"Thread": "Servo",
"Type": "Reset Pin",
"Comment": "Reset pin",
"Pin": "PC_15"
},
{
"Thread": "Base",
"Type": "Stepgen",
"Comment": "X - Joint 0 step generator",
"Joint Number": 0,
"Step Pin": "PF_13",
"Direction Pin": "PF_12",
"Enable Pin": "PF_14"
},
{
"Thread": "Base",
"Type": "Stepgen",
"Comment": "Y - Joint 1 step generator",
"Joint Number": 1,
"Step Pin": "PG_0",
"Direction Pin": "PG_1",
"Enable Pin": "PF_15"
},
{
"Thread": "Base",
"Type": "Stepgen",
"Comment": "Z - Joint 2 step generator",
"Joint Number": 2,
"Step Pin": "PF_11",
"Direction Pin": "PG_3",
"Enable Pin": "PG_5"
}
]
}
152 changes: 152 additions & 0 deletions Firmware/ConfigSamples/OCTOPUS_ENDER3/config.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,152 @@
{
"Board": "BIGTREETECH OCTOPUS",
"Modules":[
{
"Thread": "Servo",
"Type": "Reset Pin",
"Comment": "Reset pin",
"Pin": "PC_15"
},
{
"Thread": "Base",
"Type": "Stepgen",
"Comment": "X DRIVER0 - Joint 0 step generator",
"Joint Number": 0,
"Step Pin": "PF_13",
"Direction Pin": "PF_12",
"Enable Pin": "PF_14"
},
{
"Thread": "Base",
"Type": "Stepgen",
"Comment": "Y DRIVER1 - Joint 1 step generator",
"Joint Number": 1,
"Step Pin": "PG_0",
"Direction Pin": "PG_1",
"Enable Pin": "PF_15"
},
{
"Thread": "Base",
"Type": "Stepgen",
"Comment": "Z DRIVER2 - Joint 2 step generator",
"Joint Number": 2,
"Step Pin": "PF_11",
"Direction Pin": "PG_3",
"Enable Pin": "PG_5"
},
{
"Thread": "Base",
"Type": "Stepgen",
"Comment": "E0 DRIVER3 - Joint 3 step generator",
"Joint Number": 3,
"Step Pin": "PG_4",
"Direction Pin": "PC_1",
"Enable Pin": "PA_0"
},
{
"Thread": "Servo",
"Type": "Digital Pin",
"Comment": "X min DIAG0",
"Pin": "PG_6",
"Mode": "Input",
"Data Bit": 0
},
{
"Thread": "Servo",
"Type": "Digital Pin",
"Comment": "X max DIAG4",
"Pin": "PG_12",
"Mode": "Input",
"Data Bit": 1
},
{
"Thread": "Servo",
"Type": "Digital Pin",
"Comment": "Y min DIAG1",
"Pin": "PG_9",
"Mode": "Input",
"Data Bit": 2
},
{
"Thread": "Servo",
"Type": "Digital Pin",
"Comment": "Y max DIAG5",
"Pin": "PG_13",
"Mode": "Input",
"Data Bit": 3
},
{
"Thread": "Servo",
"Type": "Digital Pin",
"Comment": "Z min DIAG2",
"Pin": "PG_10",
"Mode": "Input",
"Data Bit": 4
},
{
"Thread": "Servo",
"Type": "Digital Pin",
"Comment": "Z max DIAG6",
"Pin": "PG_14",
"Mode": "Input",
"Data Bit": 5
},
{
"Thread": "Servo",
"Type": "Temperature",
"Comment": "Heated Bed tenperature sensor",
"PV[i]": 0,
"Sensor": "Thermistor",
"Thermistor":
{
"Pin": "PF_3",
"beta": 3990,
"r0": 100000,
"t0": 25
}
},
{
"Thread": "Servo",
"Type": "PWM",
"Comment": "Bed heater PWM",
"SP[i]": 0,
"PWM Pin": "PA_1"
},
{
"Thread": "Servo",
"Type": "Temperature",
"Comment": "Ext 0 temperature sensor",
"PV[i]": 1,
"Sensor": "Thermistor",
"Thermistor":
{
"Pin": "PF_4",
"beta": 3990,
"r0": 100000,
"t0": 25
}
},
{
"Thread": "Servo",
"Type": "PWM",
"Comment": "Ext0 heater PWM",
"SP[i]": 1,
"PWM Pin": "PA_2"
},
{
"Thread": "Servo",
"Type": "PWM",
"Comment": "Ext0 part cooling fan PWM FAN0",
"SP[i]": 2,
"PWM Max": 128,
"PWM Pin": "PA_8"
},
{
"Thread": "Base",
"Type": "RCServo",
"Comment": "RC servo for probe bltouch according to marlin",
"SP[i]": 3,
"Servo Pin": "PB_6"
}
]
}
15 changes: 5 additions & 10 deletions Firmware/ConfigSamples/SKRv14_TMC2209/config.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,8 @@
},
{
"Thread": "On load",
"Type": "TMC stepper",
"Type": "TMC2209",
"Comment": "X - Joint 0 TMC driver",
"Driver": "2209",
"RX pin": "1.10",
"RSense": 0.11,
"Current": 800,
Expand All @@ -39,9 +38,8 @@
},
{
"Thread": "On load",
"Type": "TMC stepper",
"Type": "TMC2209",
"Comment": "Y - Joint 1 TMC driver",
"Driver": "2209",
"RX pin": "1.9",
"RSense": 0.11,
"Current": 800,
Expand All @@ -60,9 +58,8 @@
},
{
"Thread": "On load",
"Type": "TMC stepper",
"Type": "TMC2209",
"Comment": "Z - Joint 2 TMC driver",
"Driver": "2209",
"RX pin": "1.8",
"RSense": 0.11,
"Current": 800,
Expand All @@ -81,9 +78,8 @@
},
{
"Thread": "On load",
"Type": "TMC stepper",
"Type": "TMC2209",
"Comment": "E0 - Joint 3 TMC driver",
"Driver": "2209",
"RX pin": "1.4",
"RSense": 0.11,
"Current": 800,
Expand All @@ -102,9 +98,8 @@
},
{
"Thread": "On load",
"Type": "TMC stepper",
"Type": "TMC2209",
"Comment": "E1 - Joint 4 TMC driver",
"Driver": "2209",
"RX pin": "1.1",
"RSense": 0.11,
"Current": 800,
Expand Down
47 changes: 8 additions & 39 deletions Firmware/ConfigSamples/SKRv2/config.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,12 @@
"Pin": "PC_4"
},
{
"Thread": "On load",
"Type": "Motor Power",
"Comment": "Enable motor power SKR2",
"Pin": "PC_13"
},
{
"Thread": "Base",
"Type": "Stepgen",
"Comment": "X - Joint 0 step generator",
Expand All @@ -34,36 +40,7 @@
"Direction Pin": "PA_8",
"Enable Pin": "PD_1"
},
{
"Thread": "Base",
"Type": "Stepgen",
"Comment": "E0 - Joint 3 step generator",
"Joint Number": 3,
"Step Pin": "PD_15",
"Direction Pin": "PD_14",
"Enable Pin": "PC_7"
},
{
"Thread": "Servo",
"Type": "Temperature",
"Comment": "Extruder tenperature sensor",
"PV[i]": 0,
"Sensor": "Thermistor",
"Thermistor":
{
"Pin": "0.23",
"beta": 3990,
"r0": 100000,
"t0": 25
}
},
{
"Thread": "Base",
"Type": "RCServo",
"Comment": "RC servo for probe",
"SP[i]": 3,
"Servo Pin": "2.0"
},

{
"Thread": "Servo",
"Type": "Digital Pin",
Expand Down Expand Up @@ -111,15 +88,7 @@
"Pin": "PC_15",
"Mode": "Input",
"Data Bit": 5
},
{
"Thread": "Servo",
"Type": "Switch",
"Comment": "Extruder fan switch",
"Pin": "PB_7",
"Mode": "On",
"PV[i]": 0,
"SP": 25.5

}
]
}
21 changes: 11 additions & 10 deletions Firmware/ConfigSamples/SKRv2_TMC2209/config.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@
"Type": "Reset Pin",
"Comment": "Reset pin",
"Pin": "PC_4"
},
{
"Thread": "On load",
"Type": "Motor Power",
"Comment": "Enable motor power SKR2",
"Pin": "PC_13"
},
{
"Thread": "Base",
Expand All @@ -18,9 +24,8 @@
},
{
"Thread": "On load",
"Type": "TMC stepper",
"Type": "TMC2209",
"Comment": "X - Joint 0 TMC driver",
"Driver": "2209",
"RX pin": "PE_0",
"RSense": 0.11,
"Current": 800,
Expand All @@ -39,9 +44,8 @@
},
{
"Thread": "On load",
"Type": "TMC stepper",
"Type": "TMC2209",
"Comment": "Y - Joint 1 TMC driver",
"Driver": "2209",
"RX pin": "PD_3",
"RSense": 0.11,
"Current": 800,
Expand All @@ -60,9 +64,8 @@
},
{
"Thread": "On load",
"Type": "TMC stepper",
"Type": "TMC2209",
"Comment": "Z - Joint 2 TMC driver",
"Driver": "2209",
"RX pin": "PD_0",
"RSense": 0.11,
"Current": 800,
Expand All @@ -81,9 +84,8 @@
},
{
"Thread": "On load",
"Type": "TMC stepper",
"Type": "TMC2209",
"Comment": "E0 - Joint 3 TMC driver",
"Driver": "2209",
"RX pin": "PC_6",
"RSense": 0.11,
"Current": 800,
Expand All @@ -102,9 +104,8 @@
},
{
"Thread": "On load",
"Type": "TMC stepper",
"Type": "TMC2209",
"Comment": "E1 - Joint 4 TMC driver",
"Driver": "2209",
"RX pin": "PD_12",
"RSense": 0.11,
"Current": 800,
Expand Down
Loading

0 comments on commit 6f49906

Please sign in to comment.