Browse Source

Switch matrix to definitive switch

master
Dashie der otter 2 months ago
parent
commit
bc2d32e6bd
Signed by: dashie <rhaamo@leloop.org> GPG Key ID: C2D57B325840B755
12 changed files with 12891 additions and 1461 deletions
  1. +10166
    -0
      SamacSys/SamacSys_Parts.3dshapes/NE555DR.stp
  2. +13
    -0
      SamacSys/SamacSys_Parts.dcm
  3. +55
    -0
      SamacSys/SamacSys_Parts.lib
  4. +27
    -0
      SamacSys/SamacSys_Parts.pretty/FSM4JSMATR.kicad_mod
  5. +38
    -0
      SamacSys/SamacSys_Parts.pretty/NE555DR.kicad_mod
  6. +1
    -0
      fp-lib-table
  7. +2489
    -1397
      keyboard.sch
  8. +77
    -63
      mcu.sch
  9. +23
    -0
      otter-calc-cache.lib
  10. BIN
      otter-calc.pdf
  11. +1
    -1
      otter-calc.pro
  12. +1
    -0
      sym-lib-table

+ 10166
- 0
SamacSys/SamacSys_Parts.3dshapes/NE555DR.stp
File diff suppressed because it is too large
View File


+ 13
- 0
SamacSys/SamacSys_Parts.dcm View File

@@ -0,0 +1,13 @@
EESchema-DOCLIB Version 2.0
#
$CMP FSM4JSMAATR
D TE CONNECTIVITY / ALCOSWITCH - FSM4JSMAATR - TACTILE SWITCH, SPST-NO, 0.05A, 24V, SMD
F http://www.te.com/commerce/DocumentDelivery/DDEController?Action=showdoc&DocId=Customer+Drawing%7F2-1437565-7%7FV%7Fpdf%7FEnglish%7FENG_CD_2-1437565-7_V.pdf%7F1571563-4
$ENDCMP
#
$CMP NE555DR
D Single Precision Timer
F http://www.ti.com/lit/ds/symlink/ne555.pdf
$ENDCMP
#
#End Doc Library

+ 55
- 0
SamacSys/SamacSys_Parts.lib View File

@@ -0,0 +1,55 @@
EESchema-LIBRARY Version 2.4
#encoding utf-8
#
# FSM4JSMAATR
#
DEF FSM4JSMAATR S 0 30 Y Y 1 F N
F0 "S" 1050 300 50 H V L CNN
F1 "FSM4JSMAATR" 1050 200 50 H V L CNN
F2 "FSM4JSMATR" 1050 100 50 H I L CNN
F3 "http://www.te.com/commerce/DocumentDelivery/DDEController?Action=showdoc&DocId=Customer+Drawing%7F2-1437565-7%7FV%7Fpdf%7FEnglish%7FENG_CD_2-1437565-7_V.pdf%7F1571563-4" 1050 0 50 H I L CNN
F4 "TE CONNECTIVITY / ALCOSWITCH - FSM4JSMAATR - TACTILE SWITCH, SPST-NO, 0.05A, 24V, SMD" 1050 -100 50 H I L CNN "Description"
F5 "TE Connectivity" 1050 -300 50 H I L CNN "Manufacturer_Name"
F6 "FSM4JSMAATR" 1050 -400 50 H I L CNN "Manufacturer_Part_Number"
F7 "FSM4JSMAATR" 1050 -500 50 H I L CNN "Arrow Part Number"
F8 "https://www.arrow.com/en/products/fsm4jsmaatr/te-connectivity" 1050 -600 50 H I L CNN "Arrow Price/Stock"
F9 "506-FSM4JSMAATR" 1050 -700 50 H I L CNN "Mouser Part Number"
F10 "https://www.mouser.co.uk/ProductDetail/TE-Connectivity-PB/FSM4JSMAATR?qs=BaILwcusPn8tfgWWpzI4xg%3D%3D" 1050 -800 50 H I L CNN "Mouser Price/Stock"
DRAW
S 200 50 400 -150 0 1 0 N
X 1 1 600 0 200 L 50 50 0 0 P
X 2 2 600 -100 200 L 50 50 0 0 P
X 3 3 0 0 200 R 50 50 0 0 P
X 4 4 0 -100 200 R 50 50 0 0 P
ENDDRAW
ENDDEF
#
# NE555DR
#
DEF NE555DR IC 0 30 Y Y 1 F N
F0 "IC" 1050 600 50 H V L CNN
F1 "NE555DR" 1050 500 50 H V L CNN
F2 "SOIC127P600X175-8N" 1050 400 50 H I L CNN
F3 "http://www.ti.com/lit/ds/symlink/ne555.pdf" 1050 300 50 H I L CNN
F4 "Single Precision Timer" 1050 200 50 H I L CNN "Description"
F5 "1.75" 1050 100 50 H I L CNN "Height"
F6 "Texas Instruments" 1050 0 50 H I L CNN "Manufacturer_Name"
F7 "NE555DR" 1050 -100 50 H I L CNN "Manufacturer_Part_Number"
F8 "595-NE555DR" 1050 -200 50 H I L CNN "Mouser Part Number"
F9 "https://www.mouser.com/Search/Refine.aspx?Keyword=595-NE555DR" 1050 -300 50 H I L CNN "Mouser Price/Stock"
F10 "1218414" 1050 -400 50 H I L CNN "RS Part Number"
F11 "http//uk.rs-online.com/web/p/products/1218414" 1050 -500 50 H I L CNN "RS Price/Stock"
DRAW
P 5 0 1 6 200 400 1000 400 1000 -800 200 -800 200 400 N
X GND 1 600 -1000 200 U 50 50 0 0 B
X TRIG 2 0 -400 200 R 50 50 0 0 B
X OUT 3 1200 -200 200 L 50 50 0 0 B
X ~RESET 4 0 0 200 R 50 50 0 0 B
X CONT 5 500 600 200 D 50 50 0 0 B
X THRES 6 0 -300 200 R 50 50 0 0 B
X DISCH 7 0 -100 200 R 50 50 0 0 B
X VCC 8 700 600 200 D 50 50 0 0 B
ENDDRAW
ENDDEF
#
#End Library

+ 27
- 0
SamacSys/SamacSys_Parts.pretty/FSM4JSMATR.kicad_mod View File

@@ -0,0 +1,27 @@
(module "FSM4JSMATR" (layer F.Cu)
(descr "FSM4JSMATR")
(tags "Switch")
(attr smd)
(fp_text reference S** (at -0.278 -0.163) (layer F.SilkS)
(effects (font (size 1.27 1.27) (thickness 0.254)))
)
(fp_text user %R (at -0.278 -0.163) (layer F.Fab)
(effects (font (size 1.27 1.27) (thickness 0.254)))
)
(fp_text value "FSM4JSMATR" (at -0.278 -0.163) (layer F.SilkS) hide
(effects (font (size 1.27 1.27) (thickness 0.254)))
)
(fp_line (start -3 -3) (end 3 -3) (layer F.Fab) (width 0.254))
(fp_line (start 3 -3) (end 3 3) (layer F.Fab) (width 0.254))
(fp_line (start 3 3) (end -3 3) (layer F.Fab) (width 0.254))
(fp_line (start -3 3) (end -3 -3) (layer F.Fab) (width 0.254))
(fp_line (start -3 -3) (end 3 -3) (layer F.SilkS) (width 0.254))
(fp_line (start 3 -3) (end 3 3) (layer F.SilkS) (width 0.254))
(fp_line (start 3 3) (end -3 3) (layer F.SilkS) (width 0.254))
(fp_line (start -3 3) (end -3 -3) (layer F.SilkS) (width 0.254))
(fp_circle (center 3.092 -6.305) (end 3.092 -6.216) (layer F.SilkS) (width 0.254))
(pad 1 smd rect (at 2.25 -4.55 0) (size 1.4 2.1) (layers F.Cu F.Paste F.Mask))
(pad 2 smd rect (at 2.25 4.55 0) (size 1.4 2.1) (layers F.Cu F.Paste F.Mask))
(pad 3 smd rect (at -2.25 -4.55 0) (size 1.4 2.1) (layers F.Cu F.Paste F.Mask))
(pad 4 smd rect (at -2.25 4.55 0) (size 1.4 2.1) (layers F.Cu F.Paste F.Mask))
)

+ 38
- 0
SamacSys/SamacSys_Parts.pretty/NE555DR.kicad_mod View File

@@ -0,0 +1,38 @@
(module SOIC127P600X175-8N (layer F.Cu)
(descr "D (R-PDSO-G8)")
(tags "Integrated Circuit")
(attr smd)
(fp_text reference IC** (at 0 0) (layer F.SilkS)
(effects (font (size 1.27 1.27) (thickness 0.254)))
)
(fp_text value SOIC127P600X175-8N (at 0 0)(layer F.SilkS) hide
(effects (font (size 1.27 1.27) (thickness 0.254)))
)
(fp_line (start -3.725 -2.75) (end 3.725 -2.75) (layer Dwgs.User) (width 0.05))
(fp_line (start 3.725 -2.75) (end 3.725 2.75) (layer Dwgs.User) (width 0.05))
(fp_line (start 3.725 2.75) (end -3.725 2.75) (layer Dwgs.User) (width 0.05))
(fp_line (start -3.725 2.75) (end -3.725 -2.75) (layer Dwgs.User) (width 0.05))
(fp_line (start -1.95 -2.45) (end 1.95 -2.45) (layer Dwgs.User) (width 0.1))
(fp_line (start 1.95 -2.45) (end 1.95 2.45) (layer Dwgs.User) (width 0.1))
(fp_line (start 1.95 2.45) (end -1.95 2.45) (layer Dwgs.User) (width 0.1))
(fp_line (start -1.95 2.45) (end -1.95 -2.45) (layer Dwgs.User) (width 0.1))
(fp_line (start -1.95 -1.18) (end -0.68 -2.45) (layer Dwgs.User) (width 0.1))
(fp_line (start -1.6 -2.45) (end 1.6 -2.45) (layer F.SilkS) (width 0.2))
(fp_line (start 1.6 -2.45) (end 1.6 2.45) (layer F.SilkS) (width 0.2))
(fp_line (start 1.6 2.45) (end -1.6 2.45) (layer F.SilkS) (width 0.2))
(fp_line (start -1.6 2.45) (end -1.6 -2.45) (layer F.SilkS) (width 0.2))
(fp_line (start -3.475 -2.58) (end -1.95 -2.58) (layer F.SilkS) (width 0.2))
(pad 1 smd rect (at -2.712 -1.905 90) (size 0.65 1.525) (layers F.Cu F.Paste))
(pad 2 smd rect (at -2.712 -0.635 90) (size 0.65 1.525) (layers F.Cu F.Paste))
(pad 3 smd rect (at -2.712 0.635 90) (size 0.65 1.525) (layers F.Cu F.Paste))
(pad 4 smd rect (at -2.712 1.905 90) (size 0.65 1.525) (layers F.Cu F.Paste))
(pad 5 smd rect (at 2.712 1.905 90) (size 0.65 1.525) (layers F.Cu F.Paste))
(pad 6 smd rect (at 2.712 0.635 90) (size 0.65 1.525) (layers F.Cu F.Paste))
(pad 7 smd rect (at 2.712 -0.635 90) (size 0.65 1.525) (layers F.Cu F.Paste))
(pad 8 smd rect (at 2.712 -1.905 90) (size 0.65 1.525) (layers F.Cu F.Paste))
(model "G:\\ECAD\\KiCAD\\SamacSys_Parts.3dshapes\\NE555DR.stp"
(at(xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate(xyz 0 0 0))
)
)

+ 1
- 0
fp-lib-table View File

@@ -1,3 +1,4 @@
(fp_lib_table
(lib (name d_mps)(type KiCad)(uri ${KIPRJMOD}/KiCad_libraries/d_mps.pretty)(options "")(descr ""))
(lib (name SamacSys_Parts)(type KiCad)(uri ${KIPRJMOD}/SamacSys/SamacSys_Parts.pretty)(options "")(descr ""))
)

+ 2489
- 1397
keyboard.sch
File diff suppressed because it is too large
View File


+ 77
- 63
mcu.sch View File

@@ -1276,62 +1276,62 @@ Text GLabel 15050 3050 2 39 Input ~ 0
USB_VBUS
Text Notes 13100 5300 0 39 ~ 0
USART6_TX
Text GLabel 10900 2150 3 39 Input ~ 0
Text GLabel 12750 1300 3 39 Input ~ 0
BAT_INT
$Comp
L Device:R R12
U 1 1 6021C497
P 10900 2000
F 0 "R12" V 10693 2000 50 0000 C CNN
F 1 "10k" V 10784 2000 50 0000 C CNN
F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" V 10830 2000 50 0001 C CNN
F 3 "~" H 10900 2000 50 0001 C CNN
1 10900 2000
P 12750 1150
F 0 "R12" V 12543 1150 50 0000 C CNN
F 1 "10k" V 12634 1150 50 0000 C CNN
F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" V 12680 1150 50 0001 C CNN
F 3 "~" H 12750 1150 50 0001 C CNN
1 12750 1150
1 0 0 -1
$EndComp
$Comp
L power:+3.3V #PWR0139
U 1 1 6021C91D
P 10900 1850
F 0 "#PWR0139" H 10900 1700 50 0001 C CNN
F 1 "+3.3V" H 10915 2023 50 0000 C CNN
F 2 "" H 10900 1850 50 0001 C CNN
F 3 "" H 10900 1850 50 0001 C CNN
1 10900 1850
P 12750 1000
F 0 "#PWR0139" H 12750 850 50 0001 C CNN
F 1 "+3.3V" H 12765 1173 50 0000 C CNN
F 2 "" H 12750 1000 50 0001 C CNN
F 3 "" H 12750 1000 50 0001 C CNN
1 12750 1000
1 0 0 -1
$EndComp
Text GLabel 10300 2150 3 39 Input ~ 0
Text GLabel 12150 1300 3 39 Input ~ 0
BAT_SDA
Text GLabel 10600 2150 3 39 Input ~ 0
Text GLabel 12450 1300 3 39 Input ~ 0
BAT_SCL
$Comp
L Device:R R11
U 1 1 602407FE
P 10600 2000
F 0 "R11" V 10393 2000 50 0000 C CNN
F 1 "10k" V 10484 2000 50 0000 C CNN
F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" V 10530 2000 50 0001 C CNN
F 3 "~" H 10600 2000 50 0001 C CNN
1 10600 2000
P 12450 1150
F 0 "R11" V 12243 1150 50 0000 C CNN
F 1 "10k" V 12334 1150 50 0000 C CNN
F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" V 12380 1150 50 0001 C CNN
F 3 "~" H 12450 1150 50 0001 C CNN
1 12450 1150
1 0 0 -1
$EndComp
$Comp
L Device:R R10
U 1 1 6024B53D
P 10300 2000
F 0 "R10" V 10093 2000 50 0000 C CNN
F 1 "10k" V 10184 2000 50 0000 C CNN
F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" V 10230 2000 50 0001 C CNN
F 3 "~" H 10300 2000 50 0001 C CNN
1 10300 2000
P 12150 1150
F 0 "R10" V 11943 1150 50 0000 C CNN
F 1 "10k" V 12034 1150 50 0000 C CNN
F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" V 12080 1150 50 0001 C CNN
F 3 "~" H 12150 1150 50 0001 C CNN
1 12150 1150
1 0 0 -1
$EndComp
Wire Wire Line
10300 1850 10600 1850
Connection ~ 10900 1850
Connection ~ 10600 1850
12150 1000 12450 1000
Connection ~ 12750 1000
Connection ~ 12450 1000
Wire Wire Line
10600 1850 10900 1850
12450 1000 12750 1000
$Comp
L power:+3.3V #PWR0142
U 1 1 602AF871
@@ -2566,19 +2566,8 @@ Wire Wire Line
10700 10500 11750 10500
Text Notes 10550 10900 0 39 ~ 0
R VF=1.8-2.4 FC=30\nG VF=2.8-3.9 FC=20\nB VF=2.8-3.9 FC=20\nSupply=3.3
Text GLabel 11350 1450 2 50 Input ~ 0
Text GLabel 10850 1450 2 50 Input ~ 0
KB_WAKEUP
$Comp
L Switch:SW_Push SW7
U 1 1 5F9751F4
P 10350 1450
F 0 "SW7" H 10350 1735 50 0000 C CNN
F 1 "on" H 10350 1644 50 0000 C CNN
F 2 "Button_Switch_THT:SW_PUSH_6mm" H 10350 1650 50 0001 C CNN
F 3 "~" H 10350 1650 50 0001 C CNN
1 10350 1450
1 0 0 -1
$EndComp
Text Notes 9650 3500 0 59 ~ 0
internal i2c:\n6BH - Battery charger\nBA/BB or 28/29 - Touch display\n20 - Keyboard matrix output
$Comp
@@ -2606,12 +2595,12 @@ $EndComp
$Comp
L Device:R R26
U 1 1 5FA5B33C
P 10700 1000
F 0 "R26" H 10630 954 50 0000 R CNN
F 1 "10k" H 10630 1045 50 0000 R CNN
F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" V 10630 1000 50 0001 C CNN
F 3 "~" H 10700 1000 50 0001 C CNN
1 10700 1000
P 10650 1000
F 0 "R26" H 10580 954 50 0000 R CNN
F 1 "10k" H 10580 1045 50 0000 R CNN
F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" V 10580 1000 50 0001 C CNN
F 3 "~" H 10650 1000 50 0001 C CNN
1 10650 1000
-1 0 0 1
$EndComp
$Comp
@@ -2627,22 +2616,8 @@ F 3 "~" H 10350 750 50 0001 C CNN
$EndComp
Wire Wire Line
10000 1450 10050 1450
Wire Wire Line
10550 1450 10700 1450
Wire Wire Line
10500 750 10700 750
Wire Wire Line
10700 750 10700 850
Wire Wire Line
10700 1150 10700 1450
Connection ~ 10700 1450
Wire Wire Line
10700 1450 11350 1450
Wire Wire Line
10050 1450 10050 1150
Connection ~ 10050 1450
Wire Wire Line
10050 1450 10150 1450
Wire Wire Line
10050 850 10050 750
Wire Wire Line
@@ -2661,4 +2636,43 @@ NoConn ~ 15050 8650
NoConn ~ 15050 8750
NoConn ~ 15050 3950
NoConn ~ 12750 6750
$Comp
L SamacSys_Parts:FSM4JSMAATR SW7
U 1 1 5F9A03CF
P 10050 1750
F 0 "SW7" H 10350 2000 50 0000 C CNN
F 1 "on" H 10350 1900 50 0000 C CNN
F 2 "SamacSys_Parts:FSM4JSMATR" H 11100 1850 50 0001 L CNN
F 3 "http://www.te.com/commerce/DocumentDelivery/DDEController?Action=showdoc&DocId=Customer+Drawing%7F2-1437565-7%7FV%7Fpdf%7FEnglish%7FENG_CD_2-1437565-7_V.pdf%7F1571563-4" H 11100 1750 50 0001 L CNN
F 4 "TE CONNECTIVITY / ALCOSWITCH - FSM4JSMAATR - TACTILE SWITCH, SPST-NO, 0.05A, 24V, SMD" H 11100 1650 50 0001 L CNN "Description"
F 5 "" H 11100 1550 50 0001 L CNN "Height"
F 6 "TE Connectivity" H 11100 1450 50 0001 L CNN "Manufacturer_Name"
F 7 "FSM4JSMAATR" H 11100 1350 50 0001 L CNN "Manufacturer_Part_Number"
F 8 "FSM4JSMAATR" H 11100 1250 50 0001 L CNN "Arrow Part Number"
F 9 "https://www.arrow.com/en/products/fsm4jsmaatr/te-connectivity" H 11100 1150 50 0001 L CNN "Arrow Price/Stock"
F 10 "506-FSM4JSMAATR" H 11100 1050 50 0001 L CNN "Mouser Part Number"
F 11 "https://www.mouser.co.uk/ProductDetail/TE-Connectivity-PB/FSM4JSMAATR?qs=BaILwcusPn8tfgWWpzI4xg%3D%3D" H 11100 950 50 0001 L CNN "Mouser Price/Stock"
1 10050 1750
1 0 0 -1
$EndComp
Wire Wire Line
10050 1450 10050 1750
Connection ~ 10050 1450
Connection ~ 10050 1750
Wire Wire Line
10050 1750 10050 1850
Wire Wire Line
10650 1850 10650 1750
Wire Wire Line
10650 1450 10850 1450
Connection ~ 10650 1750
Wire Wire Line
10650 1750 10650 1450
Wire Wire Line
10650 1150 10650 1450
Connection ~ 10650 1450
Wire Wire Line
10500 750 10650 750
Wire Wire Line
10650 750 10650 850
$EndSCHEMATC

+ 23
- 0
otter-calc-cache.lib View File

@@ -957,6 +957,29 @@ X EP 7 100 -300 100 U 50 50 1 1 P
ENDDRAW
ENDDEF
#
# SamacSys_Parts_FSM4JSMAATR
#
DEF SamacSys_Parts_FSM4JSMAATR S 0 30 Y Y 1 F N
F0 "S" 1050 300 50 H V L CNN
F1 "SamacSys_Parts_FSM4JSMAATR" 1050 200 50 H V L CNN
F2 "FSM4JSMATR" 1050 100 50 H I L CNN
F3 "http://www.te.com/commerce/DocumentDelivery/DDEController?Action=showdoc&DocId=Customer+Drawing%7F2-1437565-7%7FV%7Fpdf%7FEnglish%7FENG_CD_2-1437565-7_V.pdf%7F1571563-4" 1050 0 50 H I L CNN
F4 "TE CONNECTIVITY / ALCOSWITCH - FSM4JSMAATR - TACTILE SWITCH, SPST-NO, 0.05A, 24V, SMD" 1050 -100 50 H I L CNN "Description"
F5 "TE Connectivity" 1050 -300 50 H I L CNN "Manufacturer_Name"
F6 "FSM4JSMAATR" 1050 -400 50 H I L CNN "Manufacturer_Part_Number"
F7 "FSM4JSMAATR" 1050 -500 50 H I L CNN "Arrow Part Number"
F8 "https://www.arrow.com/en/products/fsm4jsmaatr/te-connectivity" 1050 -600 50 H I L CNN "Arrow Price/Stock"
F9 "506-FSM4JSMAATR" 1050 -700 50 H I L CNN "Mouser Part Number"
F10 "https://www.mouser.co.uk/ProductDetail/TE-Connectivity-PB/FSM4JSMAATR?qs=BaILwcusPn8tfgWWpzI4xg%3D%3D" 1050 -800 50 H I L CNN "Mouser Price/Stock"
DRAW
S 200 50 400 -150 0 1 0 N
X 1 1 600 0 200 L 50 50 0 0 P
X 2 2 600 -100 200 L 50 50 0 0 P
X 3 3 0 0 200 R 50 50 0 0 P
X 4 4 0 -100 200 R 50 50 0 0 P
ENDDRAW
ENDDEF
#
# Switch_SW_Push
#
DEF Switch_SW_Push SW 0 40 N N 1 F N


BIN
otter-calc.pdf View File


+ 1
- 1
otter-calc.pro View File

@@ -1,4 +1,4 @@
update=ven. 09 oct. 2020 22:41:04
update=sam. 24 oct. 2020 15:50:46
version=1
last_client=kicad
[general]


+ 1
- 0
sym-lib-table View File

@@ -3,4 +3,5 @@
(lib (name d_mps)(type Legacy)(uri ${KIPRJMOD}/KiCad_libraries/d_mps.lib)(options "")(descr ""))
(lib (name d_st)(type Legacy)(uri ${KIPRJMOD}/KiCad_libraries/d_st.lib)(options "")(descr ""))
(lib (name d_ti)(type Legacy)(uri ${KIPRJMOD}/KiCad_libraries/d_ti.lib)(options "")(descr ""))
(lib (name SamacSys_Parts)(type Legacy)(uri ${KIPRJMOD}/SamacSys/SamacSys_Parts.lib)(options "")(descr ""))
)

Loading…
Cancel
Save