Commit f62e3219 authored by Jake Read's avatar Jake Read
Browse files

arduino.h -> Arduino.h, and bugfix for bus-head circuit module update, RE/DE pin swap

parent 85699669
This diff is collapsed.
......@@ -28,6 +28,8 @@ You should be able to do `platformio: build` from VSCode's little internal comma
Build also works with `ctrl + alt + b`
#### Configuring Motor Firmware
In `src/main.cpp` for the stepper motor firmware, you'll find this little snippet:
```cpp
......@@ -41,6 +43,15 @@ In `src/main.cpp` for the stepper motor firmware, you'll find this little snippe
These are motor-specific settings. The selection above is for an updated Z motor with less current scaling than what was originally flashed in the kits (the C_SCALE value). You'll need to swap these around when you flash different motors.
#### Configuring PSU Breakout (Bus Head) Firmware
In 'src/config.h' for the psu-breakout (osape-smoothieroll-head) firmware, you need to do the following:
- if the circuit module (https://gitlab.cba.mit.edu/jakeread/ucbus-module) on the psu-breakout (https://gitlab.cba.mit.edu/jakeread/ucbus-psu-breakout) **has a surface mount JTAG connctor** - leave the file as is, like this:
- `#define IS_OG_CLANK`
- if the module **has a through-hole JTAG connector**, comment this line out
- `//#define IS_OG_CLANK`
#### Build Errors
Platformio does not like long project directories: if you get errors for missing files, try moving the project folder higher up the path tree.
......
......@@ -15,7 +15,7 @@ is; no warranty is provided, and users accept all liability.
#ifndef UCBUS_DROP_H_
#define UCBUS_DROP_H_
#include <arduino.h>
#include <Arduino.h>
#include "indicators.h"
#include "dip_ucbus_config.h"
......
......@@ -15,7 +15,7 @@ no warranty is provided, and users accept all liability.
#ifndef OSAP_H_
#define OSAP_H_
#include <arduino.h>
#include <Arduino.h>
#include "ts.h"
#include "vport.h"
#include "./drivers/indicators.h"
......
......@@ -12,7 +12,7 @@ Copyright is retained and must be preserved. The work is provided as is;
no warranty is provided, and users accept all liability.
*/
#include <arduino.h>
#include <Arduino.h>
// -------------------------------------------------------- Routing (Packet) Keys
......
......@@ -15,7 +15,7 @@ no warranty is provided, and users accept all liability.
#ifndef VPORT_H_
#define VPORT_H_
#include <arduino.h>
#include <Arduino.h>
#include "./utils/syserror.h"
class VPort {
......
......@@ -15,7 +15,7 @@ no warranty is provided, and users accept all liability.
#ifndef VPORT_USBSERIAL_H_
#define VPORT_USBSERIAL_H_
#include <arduino.h>
#include <Arduino.h>
#include "vport.h"
#include "./utils/cobs.h"
#include "./drivers/indicators.h"
......
......@@ -15,7 +15,7 @@ no warranty is provided, and users accept all liability.
#ifndef UTIL_COBS_H_
#define UTIL_COBS_H_
#include <arduino.h>
#include <Arduino.h>
size_t cobsEncode(uint8_t *src, size_t len, uint8_t *dest);
......
#ifndef SYSERROR_H_
#define SYSERROR_H_
#include <arduino.h>
#include <Arduino.h>
#include "./drivers/indicators.h"
#include "./utils/cobs.h"
#include "./osap/ts.h"
......
......@@ -15,7 +15,7 @@ is; no warranty is provided, and users accept all liability.
#ifndef DACS_H_
#define DACS_H_
#include <arduino.h>
#include <Arduino.h>
#include "indicators.h"
#include "utils/syserror.h"
......
......@@ -15,7 +15,7 @@ is; no warranty is provided, and users accept all liability.
#ifndef STEP_A4950_H_
#define STEP_A4950_H_
#include <arduino.h>
#include <Arduino.h>
#include "dacs.h"
#include "indicators.h"
......
......@@ -15,7 +15,7 @@ is; no warranty is provided, and users accept all liability.
#ifndef UCBUS_DROP_H_
#define UCBUS_DROP_H_
#include <arduino.h>
#include <Arduino.h>
#include "indicators.h"
#include "dip_ucbus_config.h"
......
......@@ -19,11 +19,11 @@ union chunk_float64 {
double f;
};
#define BUS_DROP 1 // Z: 1, YL: 2, X: 3, YR: 4
#define AXIS_PICK 2 // Z: 2, Y: 1, X: 0
#define BUS_DROP 4 // Z: 1, YL: 2, X: 3, YR: 4
#define AXIS_PICK 1 // Z: 2, Y: 1, X: 0
#define AXIS_INVERT false // Z: false, YL: true, YR: false, X: false
#define SPU 3200.0F // always positive! Z: 3200, XY: 400
#define C_SCALE 0.1F // 0-1, floating: initial holding current to motor, 0-2.5A
#define SPU 400.0F // always positive! Z: 3200, XY: 400
#define C_SCALE 0.2F // 0-1, floating: initial holding current to motor, 0-2.5A
#define TICKS_PER_PACKET 20.0F // always 20.0F
void setup() {
......
......@@ -15,7 +15,7 @@ no warranty is provided, and users accept all liability.
#ifndef OSAP_H_
#define OSAP_H_
#include <arduino.h>
#include <Arduino.h>
#include "ts.h"
#include "vport.h"
#include "./drivers/indicators.h"
......
......@@ -12,7 +12,7 @@ Copyright is retained and must be preserved. The work is provided as is;
no warranty is provided, and users accept all liability.
*/
#include <arduino.h>
#include <Arduino.h>
// -------------------------------------------------------- Routing (Packet) Keys
......
......@@ -15,7 +15,7 @@ no warranty is provided, and users accept all liability.
#ifndef VPORT_H_
#define VPORT_H_
#include <arduino.h>
#include <Arduino.h>
#include "./utils/syserror.h"
class VPort {
......
......@@ -15,7 +15,7 @@ no warranty is provided, and users accept all liability.
#ifndef VPORT_USBSERIAL_H_
#define VPORT_USBSERIAL_H_
#include <arduino.h>
#include <Arduino.h>
#include "vport.h"
#include "./utils/cobs.h"
#include "./drivers/indicators.h"
......
......@@ -15,7 +15,7 @@ no warranty is provided, and users accept all liability.
#ifndef UTIL_COBS_H_
#define UTIL_COBS_H_
#include <arduino.h>
#include <Arduino.h>
size_t cobsEncode(uint8_t *src, size_t len, uint8_t *dest);
......
#ifndef SYSERROR_H_
#define SYSERROR_H_
#include <arduino.h>
#include <Arduino.h>
#include "./drivers/indicators.h"
#include "./utils/cobs.h"
#include "./osap/ts.h"
......
#ifndef CONFIG_H_
#define CONFIG_H_
#define IS_OG_CLANK
#endif
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment