carlossless
diff --git a/‎.astylerc
Lines changed: 19 additions & 0 deletions b/‎.astylerc
Lines changed: 19 additions & 0 deletions
diff --git a/‎.github/workflows/build.yml
Lines changed: 28 additions & 0 deletions b/‎.github/workflows/build.yml
Lines changed: 28 additions & 0 deletions
diff --git a/‎LICENSE
Lines changed: 339 additions & 0 deletions b/‎LICENSE
Lines changed: 339 additions & 0 deletions
diff --git a/‎Makefile
Lines changed: 16 additions & 3 deletions b/‎Makefile
Lines changed: 16 additions & 3 deletions
diff --git a/‎README.md
Lines changed: 14 additions & 64 deletions b/‎README.md
Lines changed: 14 additions & 64 deletions
diff --git a/‎docs/nuphy-air60.md
Lines changed: 76 additions & 0 deletions b/‎docs/nuphy-air60.md
Lines changed: 76 additions & 0 deletions
diff --git a/‎flake.lock
Lines changed: 10 additions & 9 deletions b/‎flake.lock
Lines changed: 10 additions & 9 deletions
diff --git a/‎flake.nix
Lines changed: 21 additions & 16 deletions b/‎flake.nix
Lines changed: 21 additions & 16 deletions
diff --git a/‎src/clock.c
Lines changed: 13 additions & 17 deletions b/‎src/clock.c
Lines changed: 13 additions & 17 deletions
diff --git a/‎src/clock.h
Lines changed: 2 additions & 2 deletions b/‎src/clock.h
Lines changed: 2 additions & 2 deletions
@@ -0,0 +1,19 @@
+# @file Astyle code automatic formatting settings
+# @see http://astyle.sourceforge.net/astyle.html#_General_Information
+
+--style=otbs
+--indent=spaces=4
+--indent-switches
+--indent-preproc-block
+--indent-preproc-define
+--indent-col1-comments
+--break-blocks
+--pad-oper
+--pad-header
+--align-pointer=name
+--align-reference=name
+--convert-tabs
+--max-code-length=100
+--break-after-logical
+--mode=c
+--lineend=linux
@@ -0,0 +1,28 @@
+
+name: "Build"
+on: [pull_request, push]
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - uses: cachix/install-nix-action@v22
+      with:
+        github_access_token: ${{ secrets.GITHUB_TOKEN }}
+    - name: Build release
+      run: nix develop --command make all
+    - name: Archive code coverage results
+      uses: actions/upload-artifact@v3
+      with:
+        name: firmware.hex
+        path: bin/main.hex
+
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - uses: cachix/install-nix-action@v22
+      with:
+        github_access_token: ${{ secrets.GITHUB_TOKEN }}
+    - name: Build release
+      run: nix develop --command bash -c "! astyle --project -n --dry-run src/*.{h,c} | grep '^Formatted'"
@@ -12,14 +12,27 @@ FAMILY = mcs51
 PROC = mcs51
 
 FREQ_SYS ?= 24000000
-XRAM_SIZE ?= 0x0400
+XRAM_SIZE ?= 0x1000
 XRAM_LOC ?= 0x0000
 CODE_SIZE ?= 0xf000 # 61440 bytes (leaving the remaining 4096 for bootloader)
 
+SMK_VERSION ?= alpha
+
+# Ease backup & restore process by keeping same vid & pid as nuphy-air60
+USB_VID ?= 0x05ac
+USB_PID ?= 0x024f
+
 CFLAGS := -V -mmcs51 --model-small \
 	--xram-size $(XRAM_SIZE) --xram-loc $(XRAM_LOC) \
 	--code-size $(CODE_SIZE) \
-	-I$(ROOT_DIR)../include -DFREQ_SYS=$(FREQ_SYS) -DWATCHDOG_ENABLE=1
+	--std-c2x \
+	-I$(ROOT_DIR)../include \
+	-DDEBUG=1 \
+	-DFREQ_SYS=$(FREQ_SYS) \
+	-DWATCHDOG_ENABLE=1 \
+	-DUSB_VID=$(USB_VID) \
+	-DUSB_PID=$(USB_PID) \
+	-DSMK_VERSION=$(SMK_VERSION)
 LFLAGS := $(CFLAGS)
 
 AFLAGS= -plosgff
@@ -35,7 +48,7 @@ clean:
 	rm -rf $(BINDIR) $(OBJDIR)
 
 flash: $(BINDIR)/main.hex
-	$(FLASHER) $<
+	$(FLASHER) $(BINDIR)/main.hex
 
 $(OBJDIR)/%.rel: $(SRCDIR)/%.c
 	@mkdir -p $(@D)
 
@@ -1,73 +1,23 @@
-# SH68F90A / BYK916 / NuPhy Air60 Experiments
+# SMK - Small (device) Mechanical Keyboard Firmware
 
-A repository to test various features of the Sinowealth SH68F90A 8051-based microcontroller (also labeled as BYK916) on the [NuPhy Air60](https://nuphy.com/products/air60) keyboard.
+This is a keyboard firmware similar to [QMK](https://github.com/qmk/qmk_firmware), but targeting 8051-based devices like the Sinowealth SH68F90A (labeled as BYK916). It's aimed to be at least partially compatible with QMK configurations.
 
-## Features
+The S (Small) in SMK comes from this firmware using [SDCC](https://sdcc.sourceforge.net/) to build itself.
 
-### MCU
+## ⚠️ WARNING ⚠️
 
-- [x] 3.3V LDO
-- [x] CPU Clock (use 24Mhz as SYSCLK)
-- [x] GPIO
-- [x] UART
-    - [x] Transmit
-    - [ ] Receive
-- [x] PWM
-- [ ] SPI
-- [ ] USB
+This firmware is still highly experimental, so be cautious when trying to use it or extend it.
 
-### Keyboard
+You can very easily end up with a bricked device if the written firmware can't jump back into ISP mode, so before testing or modifying it, it's best to have a full dump of your stock firmware and a tool (like the Sinolink) that can write it back.
 
-- [x] ISP (jump)
-- [x] Key Scan
-- [x] RGB Matrix
-- [ ] USB HID
-- [ ] Wireless
+## Supported Devices
 
-## Code Options
+| Keyboard | MCU | ISP | USB | Wireless | Details |
+| -------- | --- | --- | --- | -------- | ------- |
+| [NuPhy Air60 v1](https://nuphy.com/products/air60) | SH68F90A / BYK916 | ✅ | ✅ | TBD | [Details](docs/nuphy-air60.md) |
 
-All code uses the following code options for SH68F90A
+## Acknowledgements
 
-```
-Code Option String: A4E063C00F000088
-Code Option Number: 0x8800000fc063e0a4
-
-Byte 0 - A4
-OP_OSCDRIVE 2 - 4MHz crystal or 8~12MHz crystal with external capacitance(C1=C2)<20pF
-OP_RST 1 - P0.2 used as IO pin
-OP_WMT 0 - longest warm up time
-OP_SCMEN 1 - Disable SCM
-OP_OSCRFB 0 - 150K
-
-Byte 1 - E0
-OP_LVREN 1 - Enable LVR function
-OP_LVRLEVEL 3 - 2.1V LVR level4
-OP_SCM 0 - SCM is invalid in warm up period
-OP_OSC2SEL 0 - OSC2 select 12M RC
-OP_IOV1 0 - P7.1/P7.2/P7.3/P7.4 input/output level is VUSB(5V)
-OP_IOV0 0 - P5.5/P5.6 input/output level is VUSB(5V)
-
-Byte 2 - 63
-OP_SCMSEL 3 - 8MHz
-OP_OSC 3 - Oscillator1 is internal 128KHz RC, oscillator2 is internal 24MHz RC
-
-Byte 3 - C0
-OP_ISP 1 - Disable ISP function
-OP_ISPPIN 1 - Enter ISP mode only when P6.3 and P6.4 are connected to GND, simultaneously
-OP_WDT 0 - Enable WDT function
-OP_WDTPD 0 - Disable WDT function in Power-Down mode
-
-Byte 4 - 0F
-OP_SINK1 3 - Port6[5:0] sink ability largest mode(380mA)
-OP_SINK0 3 - P4.7/Port7[7:5] sink ability largest mode(50mA)
-
-Byte 5 - 00
-OP_BOPTP 0 - (1+21%)tr min
-OP_BOPTN 0 - (1+21%)tf min
-
-Byte 6 - 00
-Unused
-
-Byte 7 - 88
-OP_ISPSIZE 8 - 0Bytes
-```
+* [libfx2](https://github.com/whitequark/libfx2)
+* [LUFA](https://github.com/abcminiuser/lufa)
+* [QMK](https://github.com/qmk/qmk_firmware)
@@ -0,0 +1,76 @@
+# NuPhy Air60 Support 
+
+## MCU
+
+- [x] 3.3V LDO
+- [x] CPU Clock (use 24Mhz as SYSCLK)
+- [x] GPIO
+- [x] UART
+    - [x] Transmit
+    - [ ] Receive
+- [x] PWM
+- [x] USB
+- [ ] SPI
+
+## Keyboard
+
+- [x] ISP (jump)
+- [x] Key Scan
+- [x] RGB Matrix
+    - [ ] Debouncing
+- [x] USB HID
+    - [x] USB Keyboard
+    - [ ] Status LEDs
+    - [ ] Extra Keys (System / Consumer)
+    - [ ] NKRO
+- [~] QMK Compatibility
+    - [~] Layouts
+- [ ] Wireless
+
+## Code Options
+
+This firmware requires the following (stock) code options for SH68F90A
+
+```
+Code Option String: A4E063C00F000088
+Code Option Number: 0x8800000fc063e0a4
+
+Byte 0 - A4
+OP_OSCDRIVE 2 - 4MHz crystal or 8~12MHz crystal with external capacitance(C1=C2)<20pF
+OP_RST 1 - P0.2 used as IO pin
+OP_WMT 0 - longest warm up time
+OP_SCMEN 1 - Disable SCM
+OP_OSCRFB 0 - 150K
+
+Byte 1 - E0
+OP_LVREN 1 - Enable LVR function
+OP_LVRLEVEL 3 - 2.1V LVR level4
+OP_SCM 0 - SCM is invalid in warm up period
+OP_OSC2SEL 0 - OSC2 select 12M RC
+OP_IOV1 0 - P7.1/P7.2/P7.3/P7.4 input/output level is VUSB(5V)
+OP_IOV0 0 - P5.5/P5.6 input/output level is VUSB(5V)
+
+Byte 2 - 63
+OP_SCMSEL 3 - 8MHz
+OP_OSC 3 - Oscillator1 is internal 128KHz RC, oscillator2 is internal 24MHz RC
+
+Byte 3 - C0
+OP_ISP 1 - Disable ISP function
+OP_ISPPIN 1 - Enter ISP mode only when P6.3 and P6.4 are connected to GND, simultaneously
+OP_WDT 0 - Enable WDT function
+OP_WDTPD 0 - Disable WDT function in Power-Down mode
+
+Byte 4 - 0F
+OP_SINK1 3 - Port6[5:0] sink ability largest mode(380mA)
+OP_SINK0 3 - P4.7/Port7[7:5] sink ability largest mode(50mA)
+
+Byte 5 - 00
+OP_BOPTP 0 - (1+21%)tr min
+OP_BOPTN 0 - (1+21%)tf min
+
+Byte 6 - 00
+Unused
+
+Byte 7 - 88
+OP_ISPSIZE 8 - 0Bytes
+```
@@ -1,24 +1,29 @@
 {
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05";
+    nixpkgs.url = "github:carlossless/nixpkgs/fixups"; # latest patches to get astyle 4.3.10 & sdcc 4.3.0 working
     utils.url = "github:numtide/flake-utils";
-    sinowealth-kb-tool.url = "github:carlossless/sinowealth-kb-tool";
+    sinowealth-kb-tool.url = "github:carlossless/sinowealth-kb-tool/noodle";
   };
 
   outputs = { self, nixpkgs, utils, sinowealth-kb-tool }:
     utils.lib.eachDefaultSystem (
-      system: let pkgs = nixpkgs.legacyPackages.${system}; in
-        {
-          devShells.default = pkgs.mkShell {
-            buildInputs = with pkgs; [
-              sdcc
-              gnumake
-              binutils
-              astyle
-              sinowealth-kb-tool.packages."${system}".default
-              uhubctl
-            ];
-          };
-        }
-      );
+      system:
+      let
+        pkgs = import nixpkgs {
+          inherit system;
+        };
+      in
+      {
+        devShells.default = pkgs.mkShell {
+          buildInputs = with pkgs; [
+            sdcc
+            gnumake
+            binutils
+            astyle
+            sinowealth-kb-tool.packages."${system}".default
+            uhubctl
+          ];
+        };
+      }
+    );
 }
@@ -1,24 +1,20 @@
 #include "clock.h"
 #include "sh68f90a.h"
 #include "delay.h"
+#include "watchdog.h"
 
-#define _SYSCLK_DIV 0 // no SYSCLK division (CLKS)
-#define _HRCCLK_EN (1 << 3) // enable HRCCLK (HFON)
-#define _CLK_SRC (1 << 2) // use OSCSCLK as SYSCLK (FS)
-
-// PLL also necessary for USB peripheral
-#define _PLL_EN (1 << 1) // enables PLL, necessary for HRCCLK (PLLON)
-#define _OSCS_SRC (1 << 0) // PLL divided by two acts as OSCSCLK (PLLFS)
-
-#define CLKCON_INIT (_SYSCLK_DIV|_HRCCLK_EN|_CLK_SRC)
-#define PLLCON_INIT (_PLL_EN|_OSCS_SRC)
-
+/** \brief sets up HRCCLK and uses it as SYSCLK
+ *
+ */
 void clock_init()
 {
-    CLKCON = (CLKCON_INIT & _HRCCLK_EN);  // init HRCCLK
-    delay_us(350); // unsure about span and if necessary
-    PLLCON = (PLLCON_INIT & _PLL_EN); // init PLL
-    delay_us(533); // unsure about span and if necessary
-    PLLCON = PLLCON_INIT; // switch OSCSCLK
-    CLKCON = CLKCON_INIT; // use HRCCLK as SYSCLK
+    CLKCON = _HFON; // enable HRCCLK
+    PLLCON = _PLLON; // init PLL
+
+    while (!(PLLCON & _PLLSTA)) { // wait for PLL to lock phase
+        CLR_WDT();
+    }
+
+    PLLCON |= _PLLFS; // switch OSCSCLK
+    CLKCON |= _FS; // use HRCCLK as SYSCLK
 }
@@ -1,5 +1,5 @@
-#ifndef _CLOCK_H_
-#define _CLOCK_H_
+#ifndef CLOCK_H
+#define CLOCK_H
 
 void clock_init();