aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Added warning dialog for importing keysAlex Fong2016-05-052-0/+29
| | |
| * | Refactoring: Removed PassphraseChangeParcel and placed its functionality ↵Alex Fong2016-05-0517-206/+173
| | | | | | | | | | | | into ChangeUnlockParcel.
| * | Removed unrequired code, standardized terms used.Alex Fong2016-05-053-32/+15
| | |
| * | Refactored code to use functions already present in code, reduced liberties ↵Alex Fong2016-05-052-28/+29
| | | | | | | | | | | | | | | | | | | | | taken when modifying functions. Todo: Fix indentation for error messages
| * | (WIP) Change password when key is stripped #1692Alex Fong2016-05-0420-73/+346
|/ / | | | | | | | | | | | | | | | | | | | | Approach: Find the first unstripped secret key and use it for passphrase verification All unstripped keys will have their passphrase changed to new passphrase, if possible. Current Progress: Changing the passphrase of keys works fine. Refactoring to combine "modifySecretKeyring" and newly added method, "modifyKeyRingPassword" may be possible if given the go-ahead.
* | api: add a comment explaining use of wrapperBundleVincent Breitmoser2016-05-041-0/+1
| |
* | api: ACTION_GET_KEY selects by any subkey, rather than just master key idVincent Breitmoser2016-05-041-1/+2
| |
* | Merge pull request #1850 from nmikhailov/masterDominik Schürmann2016-05-011-2/+2
|\ \ | | | | | | Fix rotation crash in CreateSecurityTokenWaitFragment #1849
| * | Fix rotation crash in CreateSecurityTokenWaitFragmentNikita Mikhailov2016-05-011-2/+2
|/ /
* | Fix error codes for ykneo-openpgp 1.0.11Dominik Schürmann2016-04-302-27/+52
| |
* | Remove lefover commentDominik Schürmann2016-04-301-1/+1
| |
* | Fix animation in manage keys for security tokensDominik Schürmann2016-04-309-30/+47
| |
* | Improve security_token_error_iso_dep_not_supportedDominik Schürmann2016-04-301-1/+1
| |
* | Fix german title from transifexDominik Schürmann2016-04-301-1/+1
| |
* | Fix createUserIdDominik Schürmann2016-04-291-1/+1
| |
* | Merge pull request #1819 from 007durgesh219/Issue#1817Dominik Schürmann2016-04-297-24/+32
|\ \ | | | | | | Fix Crash when no encryption subkey is available, Issue #1817
| * | Fix Crash when no encryption subkey is available, Issue #1817Durgesh2016-04-147-24/+32
| | | | | | | | | | | | Signed-off-by: Durgesh <007durgesh219@gmail.com>
* | | Merge branch 'LuboViluda-master'Dominik Schürmann2016-04-293-4/+76
|\ \ \
| * | | Use proper ImportKeysProxyActivity to scan QR CodesDominik Schürmann2016-04-292-7/+8
| | | |
| * | | Merge branch 'master' of https://github.com/LuboViluda/open-keychain into ↵Dominik Schürmann2016-04-293-4/+75
|/| | | | | | | | | | | | | | | LuboViluda-master
| * | | unnecesary code removedLubo Viluda2016-04-122-7/+0
| | | | | | | | | | | | | | | | | | | | - setContentView removed - R.layout.redirect_import_keys_activity.xml removed
| * | | Unnecesary code removed and string repairedLubo Viluda2016-04-124-11/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Unnecesary import from RedirectImportKeyActivity.java removed - ..\value-w820dp\dimens.xml was unnecesary - \..value\dimens.xml unnecasary line - string sources repaired
| * | | Activity renamedLubo Viluda2016-04-041-2/+2
| | | | | | | | | | | | | | | | Activity renamed from startScanActivity to startQrCodeCaptureActivity
| * | | Changed activity during RedirectKeysActivityLubo Viluda2016-04-041-6/+1
| | | | | | | | | | | | | | | | QrCodeCaptureActivity is open instead ImportKeysActivity
| * | | Theme changeLubo Viluda2016-03-242-2/+1
| | | | | | | | | | | | | | | | Theme.Keychain.Transparet is used
| * | | upgrade of Redirect import activityLubo Viluda2016-03-245-98/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | -> RedirectImportActivity is transparent now -> some poinlessly data removed -> String moved into sources -> xml for activity simplified
| * | | #1661 - Don't expose CertifyActivityLubo Viluda2016-03-206-5/+156
| | | | | | | | | | | | | | | | | | | | | | | | | | | | *Add new activity - RedirectImportKeysActivity, which prompts user to use Openkeychain directly *Add intent filter for the activity *Change intent filter for CertifyActivity
* | | | Use StringBuilder.append() according to lintDominik Schürmann2016-04-291-2/+6
| | | |
* | | | Re-enable move-to-card option, improve stringsDominik Schürmann2016-04-295-96/+88
| | | |
* | | | Merge branch '007durgesh219-Issue#925'Dominik Schürmann2016-04-293-1/+36
|\ \ \ \
| * | | | Include only add button in dropdown widthDominik Schürmann2016-04-291-2/+2
| | | | |
| * | | | Merge branch 'Issue#925' of https://github.com/007durgesh219/open-keychain ↵Dominik Schürmann2016-04-293-1/+36
|/| | | | | | | | | | | | | | | | | | | into 007durgesh219-Issue#925
| * | | | Add + button besides TokenAutoComplete, Issue #925Durgesh2016-04-143-1/+36
| | |/ / | |/| | | | | | | | | | Signed-off-by: Durgesh <007durgesh219@gmail.com>
* | | | Merge pull request #1816 from fiaxh/no_name_choose_emailDominik Schürmann2016-04-294-9/+49
|\ \ \ \ | | | | | | | | | | Correctly handle keys only having an email address
| * | | | Better handle user_id sidecases while splittingfiaxh2016-04-123-5/+45
| | | | |
| * | | | Use email field to match email in KeychainProviderfiaxh2016-04-121-4/+4
| | | | | | | | | | | | | | | | | | | | fixes #1699
* | | | | Merge pull request #1831 from fiaxh/key_creation_flexibleDominik Schürmann2016-04-297-85/+67
|\ \ \ \ \ | | | | | | | | | | | | Handle user input on key creation more generously
| * | | | | Handle user input on key creation more generouslyfiaxh2016-04-157-85/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow empty name and do not regex-check email fixes #1825
* | | | | | Merge pull request #1832 from 007durgesh219/WrongCachedFileEncryptDominik Schürmann2016-04-291-0/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix Wrong file encrypted from cached input
| * | | | | | Fix Wrong file encrypted from cached inputDurgesh2016-04-151-0/+2
| | |_|/ / / | |/| | | | | | | | | | | | | | | | Signed-off-by: Durgesh <007durgesh219@gmail.com>
* | | | | | Fix travisDominik Schürmann2016-04-291-0/+1
| | | | | |
* | | | | | Update more librariesDominik Schürmann2016-04-293-43/+44
| | | | | |
* | | | | | Update build config, gitignore after testingDominik Schürmann2016-04-292-20/+10
| | | | | |
* | | | | | Update build tools for travisDominik Schürmann2016-04-291-0/+1
| | | | | |
* | | | | | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2016-04-296-43/+91
|\ \ \ \ \ \
| * | | | | | api: allow caching of sessionKey in OpenPgpDecryptResultVincent Breitmoser2016-04-296-43/+91
| | | | | | |
* | | | | | | Update libraries, add proguard filters to be under 64K limitDominik Schürmann2016-04-294-69/+68
|/ / / / / /
* | | | | | Version 3.9.5Dominik Schürmann2016-04-291-2/+2
| | | | | |
* | | | | | New translations from transifexDominik Schürmann2016-04-2960-660/+2222
| | | | | |
* | | | | | Fix stringsDominik Schürmann2016-04-181-2/+2
| | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2026-01-01 05:31:34 +0000
pe `cd Documents/qmk_firmware`. If you extracted the file from a zip, then it may be named `qmk_firmware-master` instead. 3. To confirm that you're in the correct location, you can display the contents of your current folder using the `dir` command on Windows, or the `ls` command on Linux or Mac. You should see several files, including `readme.md` and a `quantum` folder. From here, you need to navigate to the appropriate folder under `keyboards/`. For example, if you're building for a Planck, run `cd keyboards/planck`. 4. Once you're in the correct keyboard-specific folder, run the `make` command. This should output a lot of information about the build process. More information about the `make` command can be found below. # Customizing your keymap In every keymap folder, the following files are recommended: * `config.h` - the options to configure your keymap * `keymap.c` - all of your keymap code, required * `Makefile` - the features of QMK that are enabled, required to run `make` in your keymap folder * `readme.md` - a description of your keymap, how others might use it, and explanations of features ## The `make` command The `make` command is how you compile the firmware into a .hex file, which can be loaded by a dfu programmer (like dfu-progammer via `make dfu`) or the [Teensy loader](https://www.pjrc.com/teensy/loader.html) (only used with Teensys). You can run `make` from the root (`/`), your keyboard folder (`/keyboards/<keyboard>/`), or your keymap folder (`/keyboards/<keyboard>/keymaps/<keymap>/`) if you have a `Makefile` there (see the example [here](/doc/keymap_makefile_example.mk)). By default, this will generate a `<keyboard>_<keymap>.hex` file in whichever folder you run `make` from. These files are ignored by git, so don't worry about deleting them when committing/creating pull requests. Below are some definitions that will be useful: * The "root" (`/`) folder is the qmk_firmware folder, in which are `doc`, `keyboard`, `quantum`, etc. * The "keyboard" folder is any keyboard project's folder, like `/keyboards/planck`. * The "keymap" folder is any keymap's folder, like `/keyboards/planck/keymaps/default`. Below is a list of the useful `make` commands in QMK: * `make` - builds your keyboard and keymap depending on which folder you're in. This defaults to the "default" layout (unless in a keymap folder), and Planck keyboard in the root folder * `make keyboard=<keyboard>` - specifies the keyboard (only to be used in root) * `make keymap=<keymap>` - specifies the keymap (only to be used in root and keyboard folder - not needed when in keymap folder) * `make clean` - cleans the `.build` folder, ensuring that everything is re-built * `make dfu` - (requires dfu-programmer) builds and flashes the keymap to your keyboard once placed in reset/dfu mode (button or press `KC_RESET`). This does not work for Teensy-based keyboards like the ErgoDox EZ. * `keyboard=` and `keymap=` are compatible with this * `make all-keyboards` - builds all keymaps for all keyboards and outputs status of each (use in root) * `make all-keyboards-default` - builds all default keymaps for all keyboards and outputs status of each (use in root) * `make all-keymaps [keyboard=<keyboard>]` - builds all of the keymaps for whatever keyboard folder you're in, or specified by `<keyboard>` * `make all-keyboards-*`, `make all-keyboards-default-*` and `make all-keymaps-* [keyboard=<keyboard>]` - like the normal "make-all-*" commands, but the last string aftter the `-` (for example clean) is passed to the keyboard make command. Other, less useful functionality: * `make COLOR=false` - turns off color output * `make SILENT=true` - turns off output besides errors/warnings * `make VERBOSE=true` - outputs all of the avr-gcc stuff (not interesting) ## The `Makefile` There are 3 different `make` and `Makefile` locations: * root (`/`) * keyboard (`/keyboards/<keyboard>/`) * keymap (`/keyboards/<keyboard>/keymaps/<keymap>/`) The root contains the code used to automatically figure out which keymap or keymaps to compile based on your current directory and commandline arguments. It's considered stable, and shouldn't be modified. The keyboard one will contain the MCU set-up and default settings for your keyboard, and shouldn't be modified unless you are the producer of that keyboard. The keymap Makefile can be modified by users, and is optional. It is included automatically if it exists. You can see an example [here](/doc/keymap_makefile_example.mk) - the last few lines are the most important. The settings you set here will override any defaults set in the keyboard Makefile. **It is required if you want to run `make` in the keymap folder.** ### Makefile options Set the variables to `no` to disable them, and `yes` to enable them. `BOOTMAGIC_ENABLE` This allows you to hold a key and the salt key (space by default) and have access to a various EEPROM settings that persist over power loss. It's advised you keep this disabled, as the settings are often changed by accident, and produce confusing results that makes it difficult to debug. It's one of the more common problems encountered in help sessions. `MOUSEKEY_ENABLE` This gives you control over cursor movements and clicks via keycodes/custom functions. `EXTRAKEY_ENABLE` This allows you to use the system and audio control key codes. `CONSOLE_ENABLE` This allows you to print messages that can be read using [`hid_listen`](https://www.pjrc.com/teensy/hid_listen.html). Add this to your `Makefile`, and set it to `yes`. Then put `println`, `printf`, etc. in your keymap or anywhere in the `qmk` source. Finally, open `hid_listen` and enjoy looking at your printed messages. `COMMAND_ENABLE` TODO `SLEEP_LED_ENABLE` Enables your LED to breath while your computer is sleeping. Timer1 is being used here. This feature is largely unused and untested, and needs updating/abstracting. `NKRO_ENABLE` This allows for n-key rollover (default is 6) to be enabled. It is off by default, but can be forced by adding `#define FORCE_NKRO` to your config.h. `BACKLIGHT_ENABLE` This enables your backlight on Timer1 and ports B5, B6, or B7 (for now). You can specify your port by putting this in your `config.h`: #define BACKLIGHT_PIN B7 `MIDI_ENABLE` This enables MIDI sending and receiving with your keyboard. To enter MIDI send mode, you can use the keycode `MI_ON`, and `MI_OFF` to turn it off. This is a largely untested feature, but more information can be found in the `quantum/quantum.c` file. `UNICODE_ENABLE` This allows you to send unicode symbols via `UC(<unicode>)` in your keymap. Only codes up to 0x7FFF are currently supported. `BLUETOOTH_ENABLE` This allows you to interface with a Bluefruit EZ-key to send keycodes wirelessly. It uses the D2 and D3 pins. `AUDIO_ENABLE`