From 42633c8ae4dfea9645c28790e28c089283933510 Mon Sep 17 00:00:00 2001
From: jaxter184 <jaxter184@gmail.com>
Date: Sat, 5 Dec 2020 19:20:32 -0600
Subject: [PATCH] Fix 16bit timer patch

---
 patch/timer/attiny84.yaml             |  2 +-
 patch/timer/dev/16bit-tiny84-tc1.yaml | 30 ---------------------------
 patch/timer/dev/16bit.yaml            |  4 ++--
 3 files changed, 3 insertions(+), 33 deletions(-)
 delete mode 100644 patch/timer/dev/16bit-tiny84-tc1.yaml

diff --git a/patch/timer/attiny84.yaml b/patch/timer/attiny84.yaml
index f04b576..1550fc0 100644
--- a/patch/timer/attiny84.yaml
+++ b/patch/timer/attiny84.yaml
@@ -11,4 +11,4 @@ TC0:
 
 TC1:
   _include:
-    - "dev/16bit-tiny84-tc1.yaml"
+    - "dev/16bit.yaml"
diff --git a/patch/timer/dev/16bit-tiny84-tc1.yaml b/patch/timer/dev/16bit-tiny84-tc1.yaml
deleted file mode 100644
index 7033632..0000000
--- a/patch/timer/dev/16bit-tiny84-tc1.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-TCCR?A:
-  _modify:
-    COM??:
-      _write_constraint: enum
-  COM??:
-    _replace_enum:
-        DISCONNECTED:  [0, "Normal port operation, OCix disconnected"]
-        MATCH_TOGGLE:  [1, "Toggle OCix on Compare Match (Might depend on WGM)"]
-        MATCH_CLEAR:   [2, "Clear OCix on Compare Match (If PWM is enabled, OCix is set at BOTTOM)"]
-        MATCH_SET:     [3, "Set OCix on Compare Match (If PWM is enabled, OCix is cleared at BOTTOM)"]
-
-TCCR?B:
-  _modify:
-    CS?:
-      _write_constraint: enum
-  CS?:
-    _replace_enum:
-      NO_CLOCK:      [0, "No clock source (Timer/Counter stopped)"]
-      DIRECT:        [1, "Running, No Prescaling"]
-      PRESCALE_8:    [2, "Running, CLK/8"]
-      PRESCALE_64:   [3, "Running, CLK/64"]
-      PRESCALE_256:  [4, "Running, CLK/256"]
-      PRESCALE_1024: [5, "Running, CLK/1024"]
-      EXT_FALLING:   [6, "Running, ExtClk Tx Falling Edge"]
-      EXT_RISING:    [7, "Running, ExtClk Tx Rising Edge"]
-
-TCCR?C:
-  _modify:
-    FOC??:
-      access: write-only
diff --git a/patch/timer/dev/16bit.yaml b/patch/timer/dev/16bit.yaml
index 33846c5..d719df8 100644
--- a/patch/timer/dev/16bit.yaml
+++ b/patch/timer/dev/16bit.yaml
@@ -10,8 +10,8 @@ TCCR?A:
     _replace_enum:
         DISCONNECTED:  [0, "Normal port operation, OCix disconnected"]
         MATCH_TOGGLE:  [1, "Toggle OCix on Compare Match (Might depend on WGM)"]
-        MATCH_CLEAR:   [2, "Clear OCix on Compare Match (If PWM is enabled, OCix is set at TOP)"]
-        MATCH_SET:     [3, "Set OCix on Compare Match (If PWM is enabled, OCix is cleared at TOP)"]
+        MATCH_CLEAR:   [2, "Clear OCix on Compare Match (If PWM is enabled, OCix is set at BOTTOM)"]
+        MATCH_SET:     [3, "Set OCix on Compare Match (If PWM is enabled, OCix is cleared at BOTTOM)"]
 
 TCCR?B:
   _modify:
-- 
2.49.0