Working again

Author: shepmaster

Cargo.lock

@@ -9,11 +9,11 @@ debug = true
 lto = true
 opt-level = "z"
 
-[dependencies.embrio-executor]
-git = "https://github.com/Nemo157/embrio-rs/"
+# [dependencies.embrio-executor]
+# path = "./embrio-rs/embrio-executor"
 
-[dependencies.embrio-async]
-git = "https://github.com/Nemo157/embrio-rs/"
+# [dependencies.embrio-async]
+# path = "./embrio-rs/embrio-async"
 
 [dependencies.ruduino]
 path = "./ruduino"

Cargo.toml

@@ -1,12 +1,12 @@
-COMPILED:=avr-atmega328p/release/blink.elf
+COMPILED:=target/avr-atmega328p-new/release/blink.elf
 HEX:=blink.hex
-SERIAL_PORT:=/dev/cu.usbmodem143201
+SERIAL_PORT:=/dev/cu.usbmodem14301
 
 all: ${HEX}
 
 .PHONY: ${COMPILED}
 ${COMPILED}:
-	xargo build --target ${PWD}/avr-atmega328p --release
+	cargo +local build -Z build-std=core --target avr-atmega328p-new.json --release
 
 # Convert binary to an Intel HEX file for upload
 ${HEX}: ${COMPILED}

Makefile

@@ -0,0 +1,41 @@
+{
+  "arch": "avr",
+  "data-layout": "e-P1-p:16:8-i8:8-i16:8-i32:8-i64:8-f32:8-f64:8-n8-a:8",
+  "env": "",
+  "executables": true,
+  "_X_REMOVED_is-builtin": true,
+  "linker-flavor": "gcc",
+  "linker-is-gnu": true,
+  "llvm-target": "avr-unknown-unknown",
+  "os": "unknown",
+  "pre-link-args": {
+    "gcc": [
+      "-Wl,--as-needed"
+    ]
+  },
+  "target-c-int-width": "16",
+  "target-endian": "little",
+  "target-pointer-width": "16",
+  "vendor": "unknown",
+
+  "COMMENT": "THE FOLLOWING WERE ADDED",
+
+  "exe-suffix": ".elf",
+  "cpu": "atmega328p",
+
+  "COMMENT": "This is probably vestigial",
+  "no-builtins": true,
+
+  "linker": "avr-gcc",
+  "target-env": "gnu",
+  "pre-link-args": {
+    "gcc": [
+      "-mmcu=atmega328p",
+      "-nostartfiles",
+      "-T",
+      "./linker-script",
+      "./interrupt_vector.S",
+      "./initialize_memory.S"
+    ]
+  }
+}