summaryrefslogtreecommitdiff
path: root/keyboard/hhkb_rn42
diff options
context:
space:
mode:
Diffstat (limited to 'keyboard/hhkb_rn42')
-rw-r--r--keyboard/hhkb_rn42/MEMO.txt523
-rw-r--r--keyboard/hhkb_rn42/PowerSave.txt13
-rw-r--r--keyboard/hhkb_rn42/hhkb_avr.h4
-rw-r--r--keyboard/hhkb_rn42/keymap_hasu.c24
-rw-r--r--keyboard/hhkb_rn42/matrix.c21
-rw-r--r--keyboard/hhkb_rn42/rn42/MEMO.txt255
-rw-r--r--keyboard/hhkb_rn42/rn42/RN42.txt362
-rw-r--r--keyboard/hhkb_rn42/rn42/battery.c20
-rw-r--r--keyboard/hhkb_rn42/rn42/main.c19
-rw-r--r--keyboard/hhkb_rn42/rn42/rn42.c31
-rw-r--r--keyboard/hhkb_rn42/rn42/rn42.h3
-rw-r--r--keyboard/hhkb_rn42/rn42/rn42_task.c374
12 files changed, 988 insertions, 661 deletions
diff --git a/keyboard/hhkb_rn42/MEMO.txt b/keyboard/hhkb_rn42/MEMO.txt
deleted file mode 100644
index 337dad6039..0000000000
--- a/keyboard/hhkb_rn42/MEMO.txt
+++ /dev/null
@@ -1,523 +0,0 @@
-Roving RN-42
-============
-
-Bug:
-- with Nexus5 keyboard and mouse are very laggy.
-
-- lose USB connection during power-down mode
- - USB initialize code in main() causes this - WRONG
- - Do not power-down during USB connection is active - DONE 11/11
- (USB_DeviceState == USB_DEVICE_Configured) is used to check USB connection
- matrix_power_down() matrix.c - 11/23
-
-Todo:
-
-Design:
-- remove MCU dependent power saving code from core/keyboard
- - it should be located in project matrix.c - DONE 11/23
-- HHKB matrix.c needs matrix_prev?
- - is_modified() is obsolete now. really needs?
-
-
-LUFA:
-USB connection check: state of USB deivce
-- USB_DeviceState:
- USB_Deivce_State_t { Unattached, Powered, Default, Addressed, Configured*, Suspended* }
-- USB_IsInitialized: state of LUFA core setup
- becomes true in USB_Init() USBController_AVR8.c
- becomes false in USB_Disable() USBController_AVR8.c
-- USB_VBUS_GetStatus(): state of VBUS(power/connection)
-- USB_Disable() detaches, disables all interrupts, controller, PLL, regulater.
-
-
-Power saving:
-- confirm suspend mode lufa.c: matrix_power_*, suspend_wakeup_condition
-- 8MHz clock
-- When not connected in a few minutes get into deep sleep to save battery life
-- CTS is needed for waking up from deep sleep? How deep sleep is activated?
-- firmware controlled 3.3V DC converter to switch on/off BT module
-- sleep MCU and BT module(keyboard is not used)
-- deep sleep MCU and BT module(keyboard is not used for long time)
-- deep sleep MCU and turn off BT module(keyboard is not used and not connected)
-- Battery ADC; switching, high resistance
- - switching gnd end of divider with PF4
- - high resistor 100K/1M?
- capacitor 10nF
- http://www.eevblog.com/forum/beginners/measuring-battery-voltage-without-consuming-current/
-- During USB suspend change clock source to internal RC from external Xtal(6.8)
-- FRZCLK: you can freeze clock for power saving. still WAKEUPI and VBUSTI interrupts are available while freezing.(21.7.3)
-- Suspend: Clear Suspend Bit, Freeze clock, disable PLL, MCU sleep(21.13)
-
-Improving:
-- BT LED; connecting, linked, sleeping, deep sleeping
-- Battry LED; blink(using timer?)
-- move rn42 to protocol directory when it becomes reusable stack
-- LUFA sendchar should be buffered and serial_uart.c buffur size is too large(256).
-- ADC resolution
- AVR120
- AVR32138
-
-Testing:
-- Factroy reset doesn't work; need to **test again** 10K pull-up is too high?
-- Lipo voltage ADC value is not stabilized
-- DCDC converter: squeaky inducter; try other inductors
-
-- Keymap layer bug: during space is pressed(mousekey) press Fn(HHKB) then release space before Fn, in result HHKB layer is locked(toggled) unintentionally.
-
-
-Done:
-- low battery alert(solid light) 09/04
-
-
-Power routing
--------------
-Current:
-(USB) +---(Lipo)
- | | |
- | | +------+ DPDT
- | | |Switch/-----------------------+
- | | +------+ |
- | +-------+ | |
- +-|Charger| | |
- | +-------+ | +---+ |
- | | |MCU| |
- | | +---+ |
- | | | |
- | | | |
-+--------------+ +-----+ +------+ +---/--+ +-----+
-|Power Selector|--|DC 5V|--|DC3.3V|---|Switch|----|RN-42|
-+--------------+ +-----+ +------+ +------+ +-----+
-USB Power is boosted unnecessarily, not harmful?
-
-Idea 1:
-(USB) +---(Lipo)
- | | |
- | | +------+ DPDT
- | | |Switch/----------+
- | | +------+ |
- | +-------+ | |
- +-|Charger| | |
- | +-------+ | +---+ |
- | +-----+ |MCU| |
- | |DC 5V| +---+ |
- | +-----+ | |
- | | | |
-+--------------+ | +---/--+ +------+ +-----+
-|Power Selector|-----+---|Switch|----|DC3.3V|-----|RN-42|
-+--------------+ +------+ +------+ +-----+
-To enable BT when USB powered it still needs to turn siwtch on, Lipo consumes quinscent current at 5V converter in vain.(Not good)
-
-Idea 2:
-(USB) +---(Lipo)
- | | |
- | | +------+
- | | |Switch|
- | | +------+
- | +-------+ |
- +-|Charger| |
- | +-------+ | +---+
- | +-----+ |MCU|----+ Controlled by firmware
- | |DC 5V| +---+ | On: Lipo powered
- | +-----+ | | Off: USB powered
- | | | |enable
-+--------------+ | +------+ +-----+
-|Power Selector|-----+---|DC3.3V|-----|RN-42|
-+--------------+ +------+ +-----+
-MCU can controlled power of RN-42 without hardware switch.
-When USB powered and switch is on Lipo consumes quinscent current at 5V converter in vain.(Not good)
-
-Idea 3:
-(USB) +---(Lipo)
- | | |
- | | +------+
- | | |Switch|SPST(or without)
- | | +------+
- | +-------+ |
- +-|Charger| |
- | +-------+ | +---+
- | | |MCU|----+ Controlled by firmware
- | | +---+ | On: Lipo powered
- | | | | Off: USB powered
- | | | |enable
-+--------------+ +-----+ +------+ +-----+
-|Power Selector|-|DC 5V|-|DC3.3V|-----|RN-42|
-+--------------+ +-----+ +------+ +-----+
-Switch is needed to save Lipo when not used because decent power saving is not available now. If firmware can turn off BT module completely and make MCU deep sleep the switch will be not even needed.
-
-
-
-
-
-DONE:
-- BT_INDICATOR LED turns on wrongly when touching line or pin. -- pull-up enabled on PF6/GPIO2 08/30
-- Lipo charger configuration: fast charge time: USB charger spec? -- used 2kohm
-- use LED of charger to alarm low battery. LED should be powered directly from Lipo? - cancel; powered from VUSB
-- Use RTS in serial_uart.c to resolve missing chars from help message of RN-42 - done
-- CTS/RTS lines are needed? just connect in loop back if no flow control is needed. - done
-- add IO pin to charger status CHRG; LED control(low) and detect charge status(input HiZ) 07.24
-- LINKED: add trace on PIO2 to PF6 07.24
-- Lipo voltage ADC sensing
-- Lipo charger MCP73831: needs capacitor 4.7uF *2
-- USB connection check - 07.01
-- BT on/off check: whether RX line is pulled up? - checking RTS 07.01
-- USB/BT switching BT is on -> BT, BT is off -> USB - 07.01
-- Under voltage lock out UVLO for protection of Lipo - Lipo has discharge protection at 3.100V 07.01
-- Power saving: HHKB scan, BT radio control - 9h with 850mAh, this is enough 07.01
-- Power selector doesn't work; Q4 MOSFET leaks from Lipo to USB power line. -- use Schottky instead 07/04
-
-
-
-TROUBLE SHOOT
--------------
-07/16 After fix of voltage dividor on GPIO6, had a trouble that it could not send a char to BT module, though could receive.
- Found R8 had wrong 1K resistor and changed to 10K, after that it can send to the module again. Not sure how it had sent with the wrong 1K before.
-
-07/18 On Linux, had an USB related trouble; keyobard or console didn't work for some reason. Changing PID cured this problem. Very annoying, took very long time before resolved it.
-
-
-
-Lipo
-----
-850mA lasts around 9 hours(07/28)
-
-Sparkfun Polymer Lithium Ion Battery 850mAh:
-https://www.sparkfun.com/products/341
-Lipo Cell spec:
-https://www.sparkfun.com/datasheets/Batteries/063048%20Li-polymer.pdf
-Protection spec:
-http://dlnmh9ip6v2uc.cloudfront.net/datasheets/Prototyping/BatteryProtection.pdf
- min typical max
- over-charge 4.255 4.280 4.305
- over-charge discover? 4.030 4.080 4.130
- over-discharge 2.827 2.900 2.973
- over-discharge discover 3.022 3.100 3.178
-
-ADC voltage monitor: voltage divider 10K+10K(0.5)
- ADC=V*0.5/2.56*1024
-
- V ADC
- ------------------
- 4.20 0x347(839)
- 3.10 0x26b(619)
-
-
-
-
-Configuration
--------------
-Ver 6.15 04/26/2013
-(c) Roving Networks
-***Settings***
-BTA=0006664B3AE3
-BTName=tmkBT-3AE3
-Baudrt(SW4)=115K
-Mode =DTR
-Authen=2
-Bonded=0
-Rem=000000000000
-***ADVANCED Settings***
-SrvName= keyboard/mouse
-SrvClass=0000
-DevClass=0000
-InqWindw=0100
-PagWindw=0100
-CfgTimer=255
-StatuStr=NULL
-HidFlags=3c
-DTRtimer=8
-KeySwapr=0
-***OTHER Settings***
-Profile= HID
-CfgChar= $
-SniffEna=8010
-LowPower=0
-TX Power=0
-IOPorts= 0
-IOValues=0
-Sleeptmr=0
-DebugMod=0
-RoleSwch=0
-
-
-
-Serial connection
------------------
-Serial line: 115200bps, 8bit, 1-stopbit, non-parity, no flow control
-SSP: 115200bps, 8bit, 1-stopbit, non-parity, no flow control(via Bluetooth)
-
-To enter command mode disconnect the module from host and type '$$$'.(you will see 'CMD')
-To exit type '---'(you will see 'END') and '+' to get local echo.
-
-
-
-Setting command mode
---------------------
-S-,tmkBT // Device name
-SS,keyboard/mouse // service name
-SM,4 // Auto Connect DTR mode
-SW,8010 // Sniff enable 0x10*0.625ms=10ms; 50ms is laggish and not much power save
-S~,6 // HID profile
-SH,003C // HID register
-SY,0004 // Transmit power
-
-
-
-
-Other options:
-SC,0000 // COD: 000005C0 (see HID spec/Bluegiga doc)
-SD,05C0 // bit 12-8 7 6 5-0
- // 00101 1 1 0
- // peripheral pointing keybaord joystick, gamepad, ...
-SM,6 // Pairing mode: auto connect
-SM,4 // Master mode: Connection can be controled with GPIO6
-
-
-
-
-HID profile
------------
-S~,6 HID profile
-S~,0 SPP profile
-R,1 reboot
-
-
-Apple iOS
----------
-Keyboard can be used with iPhone, but mouse cannot.
-To operate iOS with keyboard is not so useful, though.
-There may be iOS specific scancodes?
-
-
-HID flag register
------------------
-SH,0200
-GH
-
-10 0000 0000(0200) default
-00 0011 1000(0038) Combo
-|| | | |\_\____ number of paired devices to which the module can reconnect
-|| | | \_______ send out reports over UART (0xFF <len> <data>)
-|| \__\_________ descriptor type
-|\______________ toggle virtual keyboard on iOS when first connected
-\_______________ Force HID mode if GPIO11 is high on power-up
-
- Descriptor type:
- 0000: keybaord
- 0001: Game Pad
- 0010: Mouse
- 0011: Combo
- 0100: Joystick
- 1xxx: reserved
-
-
-Out report - Indicator
-----------------------
-0xFE 0x02 0x01 <LED_state>
-
-
-LED Status
-----------
-Configuring 10 times per sec
-Startup/configuration timer 2 times per sec
-Discoverable/Inquiring/Idle once per sec
-Connected solid on
-
-
-Pairing
--------
-First, host initiates pairing process and once it is done, auto connect will work thereafter.
-SM,3 Master mode
-SM,4 Auto Connect DTR Mode uses GPIO6 to make and break connection(Mode =DTR)
- confirm: auto connect works and control connection with GPIO6
-SM,5 Auto Connect ANY Mode (Mode =ANY)
- each time GPIO is set, make inquiry and connect to the first found device
-SM,6 automatically reconnect(Mode =Pair)
- confirm: auto connect works well but difficult to enter command mode.
-
-SR,Z removes all remote addresses for reconnecting.
- can be used to connect another host
-SR,I registers last inquiry address
-
-
-Fast data mode
---------------
-The module enters fast data mode after 'remote configuration timer' window is passed from power on.
-In this mode the module does not accept '$$$' to enter command mode.
-
-Power Management
-----------------
-Inquiry and Page window Idle or Active (3.1.1)
- Downside: delay in discovery or connection time
- SI, // set inquiry scan window(discovery) on/off duty?
- SJ, // set page scan window(connection)
- This reduces averaege power >20mA to 5mA(3mA in Sniff mode)
-
-Sniff mode Transmit
- Sniff mode is disabled by default and radio is active continuously when connected.(25-30mA)
- In Sniff mode the radio wakes up intermittently and sleeps in very low power mode.(2mA)
- SW,<val> // set interval timer(*0.625ms) 0000-7FFF
-
-Deep sleep Idle (3.1.2)
- In this mode the module shuts down completly and only draws about 300uA. To enable this set the most signifant bit(0x8000) of Sniff interaval timer.
- SW,8320 // deep sleep enable(interval=0x320*0.625=500ms)
- In normal sleep the firmware is still running in idle mode, and wakes up about 20 times per second to check ports, update LEDs, etc. During deep sleep, the firmware actually stops runnig some tasks and the LEDs only update about once per second.
- To wake from deep sleep there are three ways: (in worst case wake up takes 5ms)
- *send a charactor to the UART(first charactor will be lost)
- *toggle CTS low to high and wait 5ms
- *wake automatically every slot time(<val>*0.625ms)
- Once the radio is awake it stay active for exactly 1 second of inactivity and then sleeps again.
- Downside: latency and data loss
-
-Disable Output driver Idle or Active (3.1.3)
- S%,1000 // set all GPIO pins(0-11) to inputs.
-
-Lower Transmit Power Idle or Active (3.1.4)
- SY,<hex> // transmit power setting(takes effect after a power cycle and reboot)
- Downside: reducing effective range
-
-
-Optimizig for Latency
----------------------
-By default the firmware is optimized for throughput.
-SQ,16 // set latency bit
-SQ,0 // unset latency bit
-
-
-Configuration timer settings
-----------------------------
-Remote configuration is used for the module to be configured with various commands over Bluetooth(SPP profile only?).
-
-The module has remote configuration timer to allow remote configuration over Bluetooth after power up in Slave mode. In Master modes the remote configuration timer is set to 0(no remote configuration). (In Trigger Master mode the timer is used as an idle timer to break the connection after time expires with no charactors receive.)
- ST,0 // no remote, no local when connected
- ST,<1-252> // local and remote with timeout in seconds from power up
- ST,253 // local only without timeout
- ST,254 // remote only without timeout
- ST,255 // local and remote without timeout
-
-
-Android
--------
-3.7.1.5 Note: To connect with Android phone the modules must wake up 11ms every 2.5seconds.
-
-
-Commands
---------
-SC,
-SM,<val>
-SD,
-SP,<string> Pin code(alpahnumeric)
-SQ,<mask> Special configuration(GPIO, discovery mode, low latency, reboot, UART)
-SR,<hex> Store remote address
-SR,Z Erase all address
-SS,<string> Set service name(1-20)**
-ST,<val> Remote configuration timer(Master:0, Slave:0-255, Triger:as idle timer)
-SU,<val> UART baud rate
-SW,<val> low-power sniff mode** deep sleep and wake up every 625us * <val>
-SX,<0|1> bonding enable only acceps device that matches the stored address
-SY,<hex> power setting**
-SZ,<val> non-standard raw baud rate <val>=baud*0.004096
-S~,<val> Profile 0:SPP, 5:APL, 6:HID
-S-,<string> Device name -15 alphanumeric charactors
-S?,<0|1> role switch enable
-S$,<char> command mode char
-$|,<hex> low-power connect mode deep sleep/active(discoverable and connectable) cycle
-D display basic setting
-E display extended setting
-GB display the device's Bluetooth address
-GF display Bluetooth address of connected device
-GK show connection status
-GR show remote address for reconnecting
-G& show GPIO pin
-G<char> show stored setting
-+ toggle local echo on/off
-& show GPIO 3,4,6,7(DIP switch)
-C connect to stored remote address
-C,<address> connect last address
-CFI connect and go into fast data mode
-CFR connect and go into fast data mode
-CT,<address>,<val> connect to the address and disconnect after val?
-F,1 fast data mod:
-H display help
-I,<time>,<cod> inquiry scan with <cod>
-IN
-IQ scan
-IS inquiry scan with 001F00
-J hide pin code
-K, kill disconnects current connection
-L link quality
-M show modem signlal status
-O display other settings
-P,<car> pass through?
-Q quiet mode make the module not discoverable
-Q,0 discoverable and connectable
-Q,1 not discoverable and not connectable
-Q,2 not discoverable and connectable
-Q,? display current quiet mode
-R,1 reboot
-T,<0|1> pass received data while in command mode
-U,<baud>,<parity> change UART setting tentatively
-V display firmware version
-W wake from quiet mode enable discovery and connection
-Z deep sleep mode(<2mA)
-
-
-
-help
-----
-*** SET COMMANDS ***
-SA,<3,0> - Authentication
-SC,<hex> - Service Class
-SD,<hex> - Device Class
-SE,<1-16> - UUID
-SF,1 - Factory Defaults
-SH,<hex> - HID flags
-SI,<hex> - Inquiry Scan Window
-SJ,<hex> - Page Scan Window
-SL,<E,O,N> - Parity
-SM,<0-5> - Mode (0=slav,1=mstr,2=trig,3=auto,4=DTR,5=Any)
-SN,<name> - Name
-SO,<text> - conn/discon Status
-SP,<text> - Pin Code
-SR,<adr> - Remote Address
-SS,<text> - Service Name
-ST,<num> - Config Timer
-SU,<rate> - Baudrate
-SW,<hex> - Sniff Rate
-SX,<1,0> - Bonding
-SY,<hex> - TX power
-SZ,<num> - Raw Baudrate
-S~,<0-6> - Profile (0=SPP,1=DCE,2=DTE,3=MDM,4=D&S,6=HID
-S?,<0-1> - role switch
-S$,<char> - CMD mode char
-S@,<hex> - io port dir
-S&,<hex> - io port val
-S%,<hex> - io boot dir
-S^,<hex> - io boot val
-S*,<hex> - pio(8-11) set
-S|,<hex> - low power timers
-S+,<num> - DTR timer
-S=,<hex> - Key mapper
-S:,<num> - sleep timer
-*** DISPLAY ***
-D - Basic Settings
-E - Extended Settings
-G<X> - Stored setting
-GB - BT Address
-GF - BT Address of Last Connection
-GK - Connect Status
-G& - I/O Ports
-V - Firmare version
-*** OTHER ***
-C,<adr> - Connect
-F,1 - Fast Mode
-I,<time>,<cod> - Device Scan Inquiry
-J - Hide Pin Code
-K, - Kill (disconnect)
-L, - toggle local echo
-P,<text> - Pass Thru
-Q - Quiet (no discovery)
-R,1 - Reboot
-T,<0,1> - send data in CMD mode
-U,<rate>,<E,O,N> - Temp Uart Change
-Z - low power sleep
-& - Read switches
diff --git a/keyboard/hhkb_rn42/PowerSave.txt b/keyboard/hhkb_rn42/PowerSave.txt
index 943923c336..9aa89f4416 100644
--- a/keyboard/hhkb_rn42/PowerSave.txt
+++ b/keyboard/hhkb_rn42/PowerSave.txt
@@ -1,6 +1,19 @@
RN-42
=====
+
+12/11
+Power Comsumption
+MCU+HHKB
+--------
+Battery drive:
+ idle 18.9mA
+ active 35.8mA
+
+USB powered:
+ 40.0mA
+
+
HHKB key switch power control
-----------------------------
MOS FET Nch: BSS138 or IRLML6344T, either works and no apparent difference.
diff --git a/keyboard/hhkb_rn42/hhkb_avr.h b/keyboard/hhkb_rn42/hhkb_avr.h
index f007d7667a..0321977d11 100644
--- a/keyboard/hhkb_rn42/hhkb_avr.h
+++ b/keyboard/hhkb_rn42/hhkb_avr.h
@@ -53,9 +53,11 @@ static inline void KEY_POWER_OFF(void) {
DDRB = 0x00; PORTB = 0xFF; // change pins input with pull-up
DDRD |= (1<<4); PORTD &= ~(1<<4); // MOS FET switch off
}
+static inline bool KEY_POWER_STATE(void) { return PORTD & (1<<4); }
#else
static inline void KEY_POWER_ON(void) {}
static inline void KEY_POWER_OFF(void) {}
+static inline bool KEY_POWER_STATE(void) { return true; }
#endif
static inline void KEY_INIT(void)
{
@@ -73,7 +75,7 @@ static inline void KEY_INIT(void)
KEY_UNABLE();
KEY_PREV_OFF();
- KEY_POWER_ON();
+ KEY_POWER_OFF();
}
static inline void KEY_SELECT(uint8_t ROW, uint8_t COL)
{
diff --git a/keyboard/hhkb_rn42/keymap_hasu.c b/keyboard/hhkb_rn42/keymap_hasu.c
index 7b93789082..433f9cb270 100644
--- a/keyboard/hhkb_rn42/keymap_hasu.c
+++ b/keyboard/hhkb_rn42/keymap_hasu.c
@@ -47,7 +47,7 @@ const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = {
CAPS,NO, NO, NO, NO, NO, NO, NO, PSCR,SLCK,PAUS, UP, NO, BSPC, \
LCTL,VOLD,VOLU,MUTE,NO, NO, PAST,PSLS,HOME,PGUP,LEFT,RGHT,ENT, \
LSFT,NO, NO, NO, NO, NO, PPLS,PMNS,END, PGDN,DOWN,RSFT,TRNS, \
- LGUI,LALT, SPC, RALT,RGUI),
+ LGUI,LALT, TRNS, RALT,RGUI),
/* Layer 2: Vi mode[Slash]
* ,-----------------------------------------------------------.
@@ -66,7 +66,7 @@ const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = {
KEYMAP(GRV, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, INS, DEL, \
TAB, HOME,PGDN,UP, PGUP,END, HOME,PGDN,PGUP,END, NO, NO, NO, BSPC, \
LCTL,NO, LEFT,DOWN,RGHT,NO, LEFT,DOWN,UP, RGHT,NO, NO, ENT, \
- LSFT,NO, NO, NO, NO, NO, HOME,PGDN,PGUP,END, TRNS,RSFT,NO, \
+ LSFT,NO, NO, NO, NO, NO, HOME,PGDN,PGUP,END, FN2, RSFT,TRNS, \
LGUI,LALT, SPC, RALT,RGUI),
/* Layer 3: Mouse mode(IJKL)[Semicolon]
@@ -81,16 +81,16 @@ const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = {
* `-----------------------------------------------------------'
* |Gui |Alt | Mb1 |Fn |Fn |
* `--------------------------------------------'
- * Mc: Mouse Cursor / Mb: Mouse Button / Mw: Mouse Wheel8
+ * Mc: Mouse Cursor / Mb: Mouse Button / Mw: Mouse Wheel
*/
[3] = \
KEYMAP(GRV, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, INS, DEL, \
- FN8, NO, NO, NO, NO, NO, LEFT,WH_D,MS_U,WH_U,RGHT,FN9, FN10,FN8, \
- LCTL,ACL0,ACL1,ACL2,ACL2,NO, NO, MS_L,MS_D,MS_R,TRNS,NO, ENT, \
- LSFT,NO, NO, NO, NO, BTN3,BTN2,BTN1,FN9, FN10,NO, RSFT,NO, \
+ FN8, NO, NO, NO, NO, NO, NO, WH_D,MS_U,WH_U,RGHT,FN9, FN10,FN8, \
+ LCTL,ACL0,ACL1,ACL2,ACL2,NO, NO, MS_L,MS_D,MS_R,FN3, NO, ENT, \
+ LSFT,NO, NO, NO, NO, BTN3,BTN2,BTN1,FN9, FN10,NO, RSFT,TRNS, \
LGUI,LALT, BTN1, TRNS,TRNS),
- /* Layer 5: Mouse mode(IJKL)[Space]
+ /* Layer 4: Mouse mode(IJKL)[Space]
* ,-----------------------------------------------------------.
* |Esc| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|Ins|Del|
* |-----------------------------------------------------------|
@@ -102,13 +102,13 @@ const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = {
* `-----------------------------------------------------------'
* |Gui |Alt | Mb1 |Fn |Fn |
* `--------------------------------------------'
- * Mc: Mouse Cursor / Mb: Mouse Button / Mw: Mouse Wheel8
+ * Mc: Mouse Cursor / Mb: Mouse Button / Mw: Mouse Wheel
*/
[4] = \
KEYMAP(GRV, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, INS, DEL, \
- FN8, NO, NO, NO, NO, NO, LEFT,WH_D,MS_U,WH_U,RGHT,FN9, FN10,FN8, \
+ FN8, NO, NO, NO, NO, NO, NO, WH_D,MS_U,WH_U,RGHT,FN9, FN10,FN8, \
LCTL,VOLD,VOLU,MUTE,NO, NO, NO, MS_L,MS_D,MS_R,BTN1,NO, ENT, \
- LSFT,NO, NO, NO, NO, BTN3,BTN2,BTN1,FN9, FN10,NO, RSFT,NO, \
+ LSFT,NO, NO, NO, NO, BTN3,BTN2,BTN1,FN9, FN10,NO, RSFT,TRNS, \
LGUI,LALT, TRNS, TRNS,TRNS),
#if 0
@@ -127,7 +127,7 @@ const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = {
* Mc: Mouse Cursor / Mb: Mouse Button / Mw: Mouse Wheel
*/
KEYMAP(GRV, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, INS, DEL, \
- TAB, NO, NO, NO, NO, NO, LEFT,WH_D,WH_U,RGHT,NO, NO, NO, BSPC, \
+ TAB, NO, NO, NO, NO, NO, NO, WH_D,WH_U,RGHT,NO, NO, NO, BSPC, \
LCTL,NO, ACL0,ACL1,ACL2,NO, MS_L,MS_D,MS_U,MS_R,TRNS,QUOT,ENT, \
LSFT,NO, NO, NO, NO, BTN3,BTN2,BTN1,FN9, FN10,SLSH,RSFT,NO, \
LGUI,LALT, BTN1, RALT,TRNS),
@@ -147,7 +147,7 @@ const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = {
* Mc: Mouse Cursor / Mb: Mouse Button / Mw: Mouse Wheel
*/
KEYMAP(GRV, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, INS, DEL, \
- FN8, NO, NO, NO, NO, NO, LEFT,WH_D,WH_U,RGHT,NO, FN9, FN10,FN8, \
+ FN8, NO, NO, NO, NO, NO, NO, WH_D,WH_U,RGHT,NO, FN9, FN10,FN8, \
LCTL,NO, ACL0,ACL1,ACL2,NO, MS_L,MS_D,MS_U,MS_R,BTN1,NO, ENT, \
LSFT,NO, NO, NO, NO, BTN3,BTN2,BTN1,FN9, FN10,NO, RSFT,NO, \
LGUI,LALT, TRNS, RALT,RGUI),
diff --git a/keyboard/hhkb_rn42/matrix.c b/keyboard/hhkb_rn42/matrix.c
index c6c444ff52..fb96997944 100644
--- a/keyboard/hhkb_rn42/matrix.c
+++ b/keyboard/hhkb_rn42/matrix.c
@@ -35,7 +35,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// matrix power saving
#define MATRIX_POWER_SAVE 10000
static uint32_t matrix_last_modified = 0;
-static bool matrix_power = true;
// matrix state buffer(1:on, 0:off)
static matrix_row_t *matrix;
@@ -80,7 +79,8 @@ uint8_t matrix_scan(void)
matrix_prev = matrix;
matrix = tmp;
- matrix_power_up();
+ // power on
+ if (!KEY_POWER_STATE()) KEY_POWER_ON();
for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
for (uint8_t col = 0; col < MATRIX_COLS; col++) {
KEY_SELECT(row, col);
@@ -136,7 +136,14 @@ uint8_t matrix_scan(void)
}
if (matrix[row] ^ matrix_prev[row]) matrix_last_modified = timer_read32();
}
- matrix_power_down();
+ // power off
+ if (KEY_POWER_STATE() &&
+ (USB_DeviceState == DEVICE_STATE_Suspended ||
+ USB_DeviceState == DEVICE_STATE_Unattached ) &&
+ timer_elapsed32(matrix_last_modified) > MATRIX_POWER_SAVE) {
+ KEY_POWER_OFF();
+ suspend_power_down();
+ }
return 1;
}
@@ -176,16 +183,8 @@ void matrix_print(void)
}
void matrix_power_up(void) {
- if (matrix_power) return;
KEY_POWER_ON();
- matrix_power = true;
}
void matrix_power_down(void) {
- if (!matrix_power) return;
- // doesn't power save while USB connection is active
- if (USB_DeviceState == DEVICE_STATE_Configured) return;
- if (timer_elapsed32(matrix_last_modified) <= MATRIX_POWER_SAVE) return;
KEY_POWER_OFF();
- suspend_power_down(WDTO_15MS);
- matrix_power = false;
}
diff --git a/keyboard/hhkb_rn42/rn42/MEMO.txt b/keyboard/hhkb_rn42/rn42/MEMO.txt
new file mode 100644
index 0000000000..f772c4cb53
--- /dev/null
+++ b/keyboard/hhkb_rn42/rn42/MEMO.txt
@@ -0,0 +1,255 @@
+Memo of deveopment
+==================
+just memo, NOT WORTH READING
+
+Bug:
+- Factory Reset PIO4 doesn't work
+ - the reason is unclear - 12/08 NOT LOOK INTO ANY MORE
+ - WORKAROUND: use serial pins(3.3V, GND, RX and TX)
+ - SF,1 and R,1 to set factory defalult
+
+
+Todo:
+- LED cover and switch knob and new Slide Switch
+- RN42 auto configuration
+ - configure the module as HID device every time powering up
+ - this'll reduce work load of assembly
+
+- move rn42 to protocol directory when it becomes reusable stack
+
+- sendchar() in lufa.c no buffer
+ - no buffering. character lost can be caused.
+- LUFA sendchar should be buffered and serial_uart.c buffur size is too large(256).
+
+- BT operations
+ - disconnect
+ - new connection
+ - remove connection
+
+- sendchar() in lufa.c block loop - DONE 11/29
+ - block loop when powered with AC adapter
+ - FrameNumber is not updated when adapter powered
+
+Improving:
+- ADC resolution
+ AVR120
+ AVR32138
+ - Enhancing ADC resolution by oversampling
+ AVR121 http://www.atmel.com/images/doc8003.pdf
+ - disable digital input buffer DIDR(7.8.6)
+
+Design:
+- suspend.h - DONE 11/26
+ - remove argument from suspend_power_down() for backward compatitibility
+- remove MCU dependent power saving code from core/keyboard - DONE 11/23
+ - it should be located in project matrix.c
+- HHKB matrix.c needs matrix_prev?
+ - is_modified() is obsolete now. really needs?
+- ADC: removing AREF capacitor C10
+ - seems to be better while usb powered
+ - still bad while battery powered
+ http://electronics.stackexchange.com/questions/105849/avcc-and-capacitor-using-adc
+- ADC: smaller resistors for voltage dividor
+ - 1K + 1K: not improved. - 11/27
+
+
+LUFA:
+USB connection check: state of USB deivce
+- USB_DeviceState:
+ USB_Deivce_State_t { Unattached, Powered, Default, Addressed, Configured*, Suspended* }
+ Unattached: unpluged
+ Powered: pluged with power adapter
+ Default: enumerate process bigin
+ Addressed: addressed
+ Configured: enumerated
+ Suspended: suspended
+
+- USB_IsInitialized: state of LUFA core setup
+ becomes true in USB_Init() USBController_AVR8.c
+ becomes false in USB_Disable() USBController_AVR8.c
+- USB_VBUS_GetStatus(): state of VBUS(power/connection)
+- USB_Disable() detaches, disables all interrupts, controller, PLL, regulater.
+
+- When connect to power adapter
+ - event happened: CW or CSW or C or DDC
+ - USB state: not configured
+
+- USB evnets
+ - USB connect: CSWRWRW
+ - USB connect but fail to enumeration: CWRWRWRWS
+ - USB disconnect: D
+ - Power adapter connect: CW, CSW, C
+ - Power adapter disconnect: D
+
+
+Power saving:
+- Pro2 current consumption
+ - active: 138.2mA(no device on Hub)
+ - suspended: 30.9mA(WakeUp enabled DIPSW6)
+ - suspended: 0mA->46.0mA(WakeUp disabled DIPSW6)
+- Pro current consumption
+ - active: 54.0mA
+ - suspended: 40.5mA(WakeUp enabled DIPSW6)
+ - suspended: 0.3mA(WakeUp disabled DIPSW6)
+
+- RN42 3.3V
+ - disconnected(Idle): 5mA (config mode)
+ - connected(Active):
+ SW,0000: 23-26mA
+ SW,0010: 27-29mA worse than 0000 for unknown reason
+ SW,0020: 17-19mA mouse NG
+ SW,0030: 13-16mA laggy mouse NG
+ SW,0050: 10-13mA laggy mouse NG
+
+- matrix power saving
+ - power saving while externally powered and not while unpluged
+- confirm suspend mode lufa.c: matrix_power_*, suspend_wakeup_condition
+- 8MHz clock
+- When not connected in a few minutes get into deep sleep to save battery life
+- CTS is needed for waking up from deep sleep? How deep sleep is activated?
+- firmware controlled 3.3V DC converter to switch on/off BT module
+- sleep MCU and BT module(keyboard is not used)
+- deep sleep MCU and BT module(keyboard is not used for long time)
+- deep sleep MCU and turn off BT module(keyboard is not used and not connected)
+- Battery ADC; switching, high resistance
+ - switching gnd end of divider with PF4
+ - high resistor 100K/1M?
+ capacitor 10nF
+ http://www.eevblog.com/forum/beginners/measuring-battery-voltage-without-consuming-current/
+- During USB suspend change clock source to internal RC from external Xtal(6.8)
+- FRZCLK: you can freeze clock for power saving. still WAKEUPI and VBUSTI interrupts are available while freezing.(21.7.3)
+- Suspend: Clear Suspend Bit, Freeze clock, disable PLL, MCU sleep(21.13)
+- Voltage reference(8.1.1)
+ - to reduce power consumption while power down mode
+- unset ADEN before sleep(24.7)
+
+
+
+
+
+
+
+Lipo
+----
+850mA lasts around 9 hours(07/28)
+
+Sparkfun Polymer Lithium Ion Battery 850mAh:
+https://www.sparkfun.com/products/341
+Lipo Cell spec:
+https://www.sparkfun.com/datasheets/Batteries/063048%20Li-polymer.pdf
+Protection spec:
+http://dlnmh9ip6v2uc.cloudfront.net/datasheets/Prototyping/BatteryProtection.pdf
+ min typical max
+ over-charge 4.255 4.280 4.305
+ over-charge discover? 4.030 4.080 4.130
+ over-discharge 2.827 2.900 2.973
+ over-discharge discover 3.022 3.100 3.178
+
+ADC voltage monitor: voltage divider 10K+10K(0.5)
+ ADC=V*0.5/2.56*1024
+
+ V ADC
+ ------------------
+ 4.20 0x347(839)
+ 3.10 0x26b(619)
+
+
+
+
+TROUBLE SHOOT
+-------------
+07/16 After fix of voltage dividor on GPIO6, had a trouble that it could not send a char to BT module, though could receive.
+ Found R8 had wrong 1K resistor and changed to 10K, after that it can send to the module again. Not sure how it had sent with the wrong 1K before.
+
+07/18 On Linux, had an USB related trouble; keyobard or console didn't work for some reason. Changing PID cured this problem. Very annoying, took very long time before resolved it.
+
+12/07 rn42_rts() read 1 every time. R12 broke in open mode(no coductive), idk why, too much heat with soldering? and PF1 pin was not soldered.
+ It resolved with resoldering PF1 and new resistor on R12.
+
+
+
+
+Done:
+- low battery alert(solid light) 09/04
+- *** Rev.E BT test *** - DONE
+ - with MCP73832, new Schottky, tantalum caps - DONE 12/07
+ * MCP73832 doesn't leak from Vcc pin when unpluged and battery powered
+ 34mV vs 2.07V(MCP73831) at Vcc pin
+ MCP73832 doesn't need revese protection diode D5
+ * PMEG2010ER is very low VF while reverse current/voltage is high
+ VF=0.96 vs 1.98(RB160M-30TR)with Fluke 175
+ Anode of D11 is 680mV vs 20mV(RB160M-30TR)
+ 780mV is still low < 1.4V VBUS plugin detection(21.11)
+ this doesn't cause false VBUS detect
+ and 780mV on MCP73832 Vcc pin is also no problem.
+ D5 can be removed.
+ - ADC divider switching - DONE 12/07
+ * Drain and Source of Q4 Pch was reversed wrongly on Rev.E.
+
+ - reverse current from Lipo charger - DONE 12/07
+ * MCP73832 has no recverse current from Vcc pin unlike MCP73831
+
+
+- Rev.F design - DONE
+ - current measure point - DONE 12/08
+ - change value of cap 68->47 - DONE 12/08
+ - PPTC land pattern: no solder jumper, use 0Ohm resistor instead - CANCEL 12/08
+ - Q4 Pch FET: wrong Drain and Source - DONE 12/08
+ - D5 can be removed. - DONE 12/08
+
+
+
+- BT_INDICATOR LED turns on wrongly when touching line or pin. -- pull-up enabled on PF6/GPIO2 08/30
+- Lipo charger configuration: fast charge time: USB charger spec? -- used 2kohm
+- use LED of charger to alarm low battery. LED should be powered directly from Lipo? - cancel; powered from VUSB
+- Use RTS in serial_uart.c to resolve missing chars from help message of RN-42 - done
+- CTS/RTS lines are needed? just connect in loop back if no flow control is needed. - done
+- add IO pin to charger status CHRG; LED control(low) and detect charge status(input HiZ) 07.24
+- LINKED: add trace on PIO2 to PF6 07.24
+- Lipo voltage ADC sensing
+- Lipo charger MCP73831: needs capacitor 4.7uF *2
+- USB connection check - 07.01
+- BT on/off check: whether RX line is pulled up? - checking RTS 07.01
+- USB/BT switching BT is on -> BT, BT is off -> USB - 07.01
+- Under voltage lock out UVLO for protection of Lipo - Lipo has discharge protection at 3.100V 07.01
+- Power saving: HHKB scan, BT radio control - 9h with 850mAh, this is enough 07.01
+- Power selector doesn't work; Q4 MOSFET leaks from Lipo to USB power line. -- use Schottky instead 07/04
+
+- wrongly suspended when powered from adapter without USB connection - DONE
+ - suspend event may occur when plug into adapter
+ - and never wake until conected to real USB line
+ - without debug print via USB no problem; CSW(wake just after suspend as real USB line)
+ - seems like USB print causes this problem after suspended
+
+- lose USB connection during power-down mode - DONE
+ - USB initialize code in main() causes this - WRONG
+ - Do not power-down during USB connection is active - DONE 11/11
+ (USB_DeviceState == USB_DEVICE_Configured) is used to check USB connection
+ matrix_power_down() matrix.c - 11/23
+
+- with Nexus5 keyboard and mouse are very laggy.
+ Not confirmed. 01/15
+
+- switch BT host connections - CANCEL 01/15
+ - switch next connection
+ cannot switch connection with version 6.15 at least
+
+- When given power only from wall wart adapter - DONE? not confirmed 01/15
+ - it sleeps. it should not sleep
+ - Configured state without USB connection?
+
+- timer is slow while power down - DONE 11/26
+ - time out interrupt is lost while power down?
+ - interrupt of watchdog timer compensates timer counter(avr/suspend.c)
+
+- repeated CHARGING/FULL_CHARGED - No longer problem 01/15
+ - In LTC sharp pulses are observed.
+ - MCP has no pulse but still has a problem.
+ - needs more wait before read pin state? - NO
+
+- USB plug-in fails while BT - No longer problem 01/15
+ - it ends in suspend state
+ - maybe, not responsive to host enumeration process due to power-down.
+ - matrix_power_down() only when state is unattached - 11/26
+ - need to observe a while
+
diff --git a/keyboard/hhkb_rn42/rn42/RN42.txt b/keyboard/hhkb_rn42/rn42/RN42.txt
new file mode 100644
index 0000000000..ace30da4ed
--- /dev/null
+++ b/keyboard/hhkb_rn42/rn42/RN42.txt
@@ -0,0 +1,362 @@
+RN-42 Bluetooth Module Support
+==============================
+Bluetooth controller board works with HHKB Pro2, JP, Type-S and Type-S JP and it supports both USB and Bluetooth as keyboard output protocol. Bluetooth module Roving Networks/Microchip RN-42 is installed on the board.
+
+
+Limitations:
+- short battery life
+- connection switching
+ the module always connects to the last linked device. Remote address setting does not work as expected.
+- HHKB JP requires case modification for power switch and LEDs.
+ without switch power controlled by MCU? Probably using 3.3V regulator enable pin power of RN-42 can be controlled.
+- Wiress certification of RN-42
+ Japan, Korea, Taiwan, Europe, FCC, Canada
+ http://www.microchip.com/wwwproducts/Devices.aspx?product=RN42
+
+NOTE:
+- Lipo battery is not included. Cannot ship it from Japan due to regulations.
+
+Bugs:
+
+Todos:
+
+
+
+
+
+LED Status
+----------
+Configuring 10 times per sec
+Startup/configuration timer 2 times per sec
+Discoverable/Inquiring/Idle once per sec
+Connected solid on
+
+
+RN-42 Magic Command
+--------------------
+Magic key combination is 'LShift+RShift' by default in case of HHKB.
+
+Here is help.
+
+ ----- Bluetooth RN-42 Help -----
+ i: RN-42 info
+ b: battery voltage
+ Del: enter/exit RN-42 config mode
+ Slck: RN-42 initialize
+ p: pairing
+ u: toggle Force USB mode
+
+ RN-42 info: displays information of the module on console.
+ battery voltage: displays current voltage of battery and uptime.
+ RN-42 initialize: does factory reset and configures RN-42
+ pairing: enters Pairing mode.
+ toggle Force USB mode: switch between USB and Bluetooth
+
+
+RN-42 Config mode
+-----------------
+You can tune/operate RN-42 yourself with config(command) mode.
+
+1. hook up USB cable
+2. run `hid_listen` command in console
+3. turn on Bluetooth switch
+4. press LShift+RShift+Delete(Fn+~) you will see output like followings:
+
+ Entering config mode ...
+ CMD
+ v
+ Ver 6.15 04/26/2013
+ (c) Roving Networks
+
+5. do config with RN-42 commands. See documentations of RN-42.
+6. to exit also press LShift+RShift+Delete(Fn+~)
+
+ Exiting config mode ...
+ ---
+ END
+
+
+RN-42 Initial Configuration
+---------------------------
+RN-42 is configured as SPP device at factory reset, you need to configure it as HID device. This is needed just once first time.
+
+1. hook up USB cable
+2. run `hid_listen` command in console
+3. turn on Bluetooth switch
+4. press LShift+RShift+ScrLk(Fn+O) you will see output like followings:
+
+ Entering config mode ...
+ CMD
+ Ver 6.15 04/26/2013
+ (c) Roving Networks
+ ECHO ON
+ SF,1
+ AOK
+ S-,TmkBT
+ AOK
+ SS,Keyboard/Mouse
+ AOK
+ SM,4
+ AOK
+ SW,8000
+ AOK
+ S~,6
+ AOK
+ SH,003C
+ AOK
+ SY,FFF4
+ AOK
+ R,1
+ Reboot!
+ Exiting config mode ...
+
+5. output of command 'X' after cofiguration
+
+ Ver 6.15 04/26/2013
+ (c) Roving Networks
+ ***Settings***
+ BTA=00066667BBE9
+ BTName=TmkBT-BBE9
+ Baudrt(SW4)=115K
+ Mode =DTR
+ Authen=1
+ PinCod=1234
+ Bonded=0
+ Rem=NONE SET
+ ***ADVANCED Settings***
+ SrvName= Keyboard/Mouse
+ SrvClass=0000
+ DevClass=1F00
+ InqWindw=0100
+ PagWindw=0100
+ CfgTimer=255
+ StatuStr=NULL
+ HidFlags=3c
+ DTRtimer=8
+ KeySwapr=0
+ ***OTHER Settings***
+ Profile= HID
+ CfgChar= $
+ SniffEna=8000
+ LowPower=0
+ TX Power=fff4
+ IOPorts= 0
+ IOValues=0
+ Sleeptmr=0
+ DebugMod=0
+ RoleSwch=0
+
+
+Switch to USB mode
+------------------
+You can switch between USB and Bluetooth with pressing 'LShift+RShift+u'.
+
+
+Pairing mode
+------------
+This disconnects current connect and enter pairing mode.
+
+
+
+
+For deveropment
+===============
+
+RN-42 Serial Connection
+-----------------------
+UART: 115200bps, 8bit, 1-stopbit, non-parity, no flow control
+SSP: 115200bps, 8bit, 1-stopbit, non-parity, no flow control(via Bluetooth)
+
+To enter command mode disconnect the module from host and type '$$$'.(you will see 'CMD') and type '+' to get local echo. To exit type '---'(you will see 'END').
+
+
+RN-42 Commands
+--------------
+S-,tmkBT // Device name
+SS,keyboard/mouse // service name
+SM,4 // Auto Connect DTR mode
+SW,8010 // Sniff enable 0x10*0.625ms=10ms; 50ms is laggish and not much power save
+S~,6 // HID profile
+S~,0 // SPP profile
+SH,003C // HID register
+SY,0004 // Transmit power
+SC,0000 // COD: 000005C0 (see HID spec/Bluegiga doc)
+SD,05C0 // bit 12-8 7 6 5-0
+ // 00101 1 1 0
+ // peripheral pointing keybaord joystick, gamepad, ...
+SM,6 // Pairing mode: auto connect
+SM,4 // Master mode: Connection can be controled with GPIO6
+SF,1 // Factroy reset
+R,1 // reboot
+SR,Z // removes all remote addresses for reconnecting.
+ // can be used to connect another host
+SR,I // registers last inquiry address
+
+
+Operation Modes
+---------------
+SM,3 Auto Connect Master mode
+SM,4 Auto Connect DTR Mode uses GPIO6 to make and break connection(Mode =DTR)
+ confirm: auto connect works and control connection with GPIO6
+SM,5 Auto Connect ANY Mode (Mode =ANY)
+ each time GPIO is set, make inquiry and connect to the first found device
+SM,6 automatically reconnect(Mode =Pair)
+ confirm: auto connect works well but difficult to enter command mode.
+
+
+HID flag register
+-----------------
+SH,0200
+GH
+
+10 0000 0000(0200) default
+00 0011 1000(0038) Combo
+|| | | |\_\____ number of paired devices to which the module can reconnect
+|| | | \_______ send out reports over UART (0xFF <len> <data>)
+|| \__\_________ descriptor type
+|\______________ toggle virtual keyboard on iOS when first connected
+\_______________ Force HID mode if GPIO11 is high on power-up
+
+ Descriptor type:
+ 0000: keybaord
+ 0001: Game Pad
+ 0010: Mouse
+ 0011: Combo
+ 0100: Joystick
+ 1xxx: reserved
+
+
+Out report - Indicator
+----------------------
+0xFE 0x02 0x01 <LED_state>
+
+
+Apple iOS
+---------
+Keyboard can be used with iPhone, but mouse cannot.
+
+
+Android
+-------
+3.7.1.5 Note: To connect with Android phone the modules must wake up 11ms every 2.5seconds.
+
+
+Power Management
+----------------
+Inquiry and Page window Idle or Active (3.1.1)
+ Downside: delay in discovery or connection time
+ SI, // set inquiry scan window(discovery) on/off duty?
+ SJ, // set page scan window(connection)
+ This reduces averaege power >20mA to 5mA(3mA in Sniff mode)
+
+Sniff mode Transmit
+ Sniff mode is disabled by default and radio is active continuously when connected.(25-30mA)
+ In Sniff mode the radio wakes up intermittently and sleeps in very low power mode.(2mA)
+ SW,<val> // set interval timer(*0.625ms) 0000-7FFF
+
+Deep sleep Idle (3.1.2)
+ In this mode the module shuts down completly and only draws about 300uA. To enable this set the most signifant bit(0x8000) of Sniff interaval timer.
+ SW,8320 // deep sleep enable(interval=0x320*0.625=500ms)
+ In normal sleep the firmware is still running in idle mode, and wakes up about 20 times per second to check ports, update LEDs, etc. During deep sleep, the firmware actually stops runnig some tasks and the LEDs only update about once per second.
+ To wake from deep sleep there are three ways: (in worst case wake up takes 5ms)
+ *send a charactor to the UART(first charactor will be lost)
+ *toggle CTS low to high and wait 5ms
+ *wake automatically every slot time(<val>*0.625ms)
+ Once the radio is awake it stay active for exactly 1 second of inactivity and then sleeps again.
+ Downside: latency and data loss
+
+Disable Output driver Idle or Active (3.1.3)
+ S%,1000 // set all GPIO pins(0-11) to inputs.
+
+Lower Transmit Power Idle or Active (3.1.4)
+ SY,<hex> // transmit power setting(takes effect after a power cycle and reboot)
+ Downside: reducing effective range
+
+
+Optimizig for Latency
+---------------------
+By default the firmware is optimized for throughput.
+SQ,16 // set latency bit
+SQ,0 // unset latency bit
+
+
+Configuration timer settings
+----------------------------
+Remote configuration is used for the module to be configured with various commands over Bluetooth(SPP profile only?).
+
+The module has remote configuration timer to allow remote configuration over Bluetooth after power up in Slave mode. In Master modes the remote configuration timer is set to 0(no remote configuration). (In Trigger Master mode the timer is used as an idle timer to break the connection after time expires with no charactors receive.)
+ ST,0 // no remote, no local when connected
+ ST,<1-252> // local and remote with timeout in seconds from power up
+ ST,253 // local only without timeout
+ ST,254 // remote only without timeout
+ ST,255 // local and remote without timeout
+
+
+Commands
+--------
+S7, 7bit mode
+SA, Authenticaiton
+SB, Send break
+SC, Service class
+SD, Device class
+SM,<val> Operation mode
+SP,<string> Pin code(alpahnumeric)
+SQ,<mask> Special configuration(GPIO, discovery mode, low latency, reboot, UART)
+SR,<hex> Store remote address
+SR,Z Erase all address
+SS,<string> Set service name(1-20)**
+ST,<val> Remote configuration timer(Master:0, Slave:0-255, Triger:as idle timer)
+SU,<val> UART baud rate
+SW,<val> low-power sniff mode** deep sleep and wake up every 625us * <val>
+SX,<0|1> bonding enable only acceps device that matches the stored address
+SY,<hex> power setting**
+SZ,<val> non-standard raw baud rate <val>=baud*0.004096
+S~,<val> Profile 0:SPP, 5:APL, 6:HID
+S-,<string> Device name -15 alphanumeric charactors
+S?,<0|1> role switch enable
+S$,<char> command mode char
+$|,<hex> low-power connect mode deep sleep/active(discoverable and connectable) cycle
+D display basic setting
+E display extended setting
+GB display the device's Bluetooth address
+GF display Bluetooth address of connected device
+GK show connection status
+GR show remote address for reconnecting
+G& show GPIO pin
+G<char> show stored setting
++ toggle local echo on/off
+& show GPIO 3,4,6,7(DIP switch)
+C connect to stored remote address
+C,<address> connect last address
+CFI connect and go into fast data mode
+CFR connect and go into fast data mode
+CT,<address>,<val> connect to the address and disconnect after val?
+F,1 fast data mod:
+H display help
+I,<time>,<cod> inquiry scan with <cod>
+IN,<time>,<cod> inquiry scan with <cod>, return without BT name
+IR inquiry scan with 0055AA
+IS inquiry scan with 001F00
+J hide pin code
+K, kill disconnects current connection
+L link quality
+M show modem signlal status
+O display other settings
+P,<char> pass through?
+Q quiet mode make the module not discoverable
+Q,0 discoverable and connectable
+Q,1 not discoverable and not connectable
+Q,2 not discoverable and connectable
+Q,? display current quiet mode
+R,1 reboot
+T,<0|1> pass received data while in command mode
+U,<baud>,<parity> change UART setting tentatively
+V display firmware version
+W wake from quiet mode enable discovery and connection
+Z deep sleep mode(<2mA)
+
+
+Reset to Factory Default
+------------------------
+SF,1
+R,1
diff --git a/keyboard/hhkb_rn42/rn42/battery.c b/keyboard/hhkb_rn42/rn42/battery.c
index 0320e1baf1..7e868c9646 100644
--- a/keyboard/hhkb_rn42/rn42/battery.c
+++ b/keyboard/hhkb_rn42/rn42/battery.c
@@ -20,7 +20,10 @@ void battery_init(void)
// Ref:2.56V band-gap, Input:ADC0(PF0), Prescale:128(16MHz/128=125KHz)
ADMUX = (1<<REFS1) | (1<<REFS0);
ADCSRA = (1<<ADPS2) | (1<<ADPS1) | (1<<ADPS0);
- ADCSRA |= (1<<ADEN);
+ // digital input buffer disable(24.9.5)
+ DIDR0 = (1<<ADC0D) | (1<<ADC4D) | (1<<ADC7D);
+ DIDR1 = (1<<AIN0D);
+ DIDR2 = (1<<ADC8D) | (1<<ADC9D) | (1<<ADC11D) | (1<<ADC12D) | (1<<ADC13D);
// ADC disable voltate divider(PF4)
DDRF |= (1<<4);
@@ -88,23 +91,14 @@ uint16_t battery_voltage(void)
PORTF |= (1<<4);
volatile uint16_t bat;
- //ADCSRA |= (1<<ADEN);
-
- // discard first result
- ADCSRA |= (1<<ADSC);
- while (ADCSRA & (1<<ADSC)) ;
- bat = ADC;
-
- // discard second result
- ADCSRA |= (1<<ADSC);
- while (ADCSRA & (1<<ADSC)) ;
- bat = ADC;
+ ADCSRA |= (1<<ADEN);
+ _delay_ms(1); // wait for charging S/H capacitance
ADCSRA |= (1<<ADSC);
while (ADCSRA & (1<<ADSC)) ;
bat = ADC;
- //ADCSRA &= ~(1<<ADEN);
+ ADCSRA &= ~(1<<ADEN);
// ADC disable voltate divider(PF4)
DDRF |= (1<<4);
diff --git a/keyboard/hhkb_rn42/rn42/main.c b/keyboard/hhkb_rn42/rn42/main.c
index 43d887067d..83d9950388 100644
--- a/keyboard/hhkb_rn42/rn42/main.c
+++ b/keyboard/hhkb_rn42/rn42/main.c
@@ -17,8 +17,8 @@
static int8_t sendchar_func(uint8_t c)
{
- sendchar(c); // LUFA
xmit(c); // SUART
+ sendchar(c); // LUFA
return 0;
}
@@ -63,7 +63,7 @@ int main(void)
USB_USBTask();
#endif
}
- print("USB configured.\n");
+ print("\nUSB init\n");
rn42_init();
rn42_task_init();
@@ -82,10 +82,19 @@ int main(void)
sleep_led_init();
#endif
- print("Keyboard start.\n");
+ print("Keyboard start\n");
while (1) {
- while (USB_DeviceState == DEVICE_STATE_Suspended) {
- suspend_power_down(WDTO_120MS);
+ while (rn42_rts() && // RN42 is off
+ USB_DeviceState == DEVICE_STATE_Suspended) {
+ print("[s]");
+ matrix_power_down();
+ suspend_power_down();
+ suspend_power_down();
+ suspend_power_down();
+ suspend_power_down();
+ suspend_power_down();
+ suspend_power_down();
+ suspend_power_down();
if (USB_Device_RemoteWakeupEnabled && suspend_wakeup_condition()) {
USB_Device_SendRemoteWakeup();
}
diff --git a/keyboard/hhkb_rn42/rn42/rn42.c b/keyboard/hhkb_rn42/rn42/rn42.c
index 1565b4cf14..756285d7bb 100644
--- a/keyboard/hhkb_rn42/rn42/rn42.c
+++ b/keyboard/hhkb_rn42/rn42/rn42.c
@@ -4,6 +4,7 @@
#include "serial.h"
#include "rn42.h"
#include "print.h"
+#include "timer.h"
#include "wait.h"
@@ -47,11 +48,39 @@ void rn42_init(void)
serial_init();
}
+int16_t rn42_getc(void)
+{
+ return serial_recv2();
+}
+
+const char *rn42_gets(uint16_t timeout)
+{
+ static char s[24];
+ uint16_t t = timer_read();
+ uint8_t i = 0;
+ int16_t c;
+ while (i < 23 && timer_elapsed(t) < timeout) {
+ if ((c = rn42_getc()) != -1) {
+ if ((char)c == '\r') continue;
+ if ((char)c == '\n') break;
+ s[i++] = c;
+ }
+ }
+ s[i] = '\0';
+ return s;
+}
+
void rn42_putc(uint8_t c)
{
serial_send(c);
}
+void rn42_puts(char *s)
+{
+ while (*s)
+ serial_send(*s++);
+}
+
bool rn42_autoconnecting(void)
{
// GPIO6 for control connection(high: auto connect, low: disconnect)
@@ -97,7 +126,7 @@ bool rn42_linked(void)
// Hi-Z: Not powered
// High: Linked
// Low: Connecting
- return !rn42_rts() && PINF&(1<<6);
+ return PINF&(1<<6);
}
diff --git a/keyboard/hhkb_rn42/rn42/rn42.h b/keyboard/hhkb_rn42/rn42/rn42.h
index 5283a3648c..db6916fe86 100644
--- a/keyboard/hhkb_rn42/rn42/rn42.h
+++ b/keyboard/hhkb_rn42/rn42/rn42.h
@@ -7,7 +7,10 @@ host_driver_t rn42_driver;
host_driver_t rn42_config_driver;
void rn42_init(void);
+int16_t rn42_getc(void);
+const char *rn42_gets(uint16_t timeout);
void rn42_putc(uint8_t c);
+void rn42_puts(char *s);
bool rn42_autoconnecting(void);
void rn42_autoconnect(void);
void rn42_disconnect(void);
diff --git a/keyboard/hhkb_rn42/rn42/rn42_task.c b/keyboard/hhkb_rn42/rn42/rn42_task.c
index c3359ed506..5107fef483 100644
--- a/keyboard/hhkb_rn42/rn42/rn42_task.c
+++ b/keyboard/hhkb_rn42/rn42/rn42_task.c
@@ -1,4 +1,7 @@
#include <stdint.h>
+#include <string.h>
+#include <avr/pgmspace.h>
+#include <avr/eeprom.h>
#include "keycode.h"
#include "serial.h"
#include "host.h"
@@ -9,6 +12,7 @@
#include "print.h"
#include "debug.h"
#include "timer.h"
+#include "wait.h"
#include "command.h"
#include "battery.h"
@@ -34,39 +38,34 @@ void rn42_task_init(void)
void rn42_task(void)
{
int16_t c;
- if (config_mode) {
- // Config mode: print output from RN-42
- while ((c = serial_recv2()) != -1) {
- // without flow control it'll fail to receive data when flooded
- xprintf("%c", c);
- }
- } else {
- // Raw mode: interpret output report of LED state
- while ((c = serial_recv2()) != -1) {
- // LED Out report: 0xFE, 0x02, 0x01, <leds>
- // To get the report over UART set bit3 with SH, command.
- static enum {LED_INIT, LED_FE, LED_02, LED_01} state = LED_INIT;
- switch (state) {
- case LED_INIT:
- if (c == 0xFE) state = LED_FE;
- else state = LED_INIT;
- break;
- case LED_FE:
- if (c == 0x02) state = LED_02;
- else state = LED_INIT;
- break;
- case LED_02:
- if (c == 0x01) state = LED_01;
- else state = LED_INIT;
- break;
- case LED_01:
- dprintf("LED status: %02X\n", c);
- rn42_set_leds(c);
- state = LED_INIT;
- break;
- default:
- state = LED_INIT;
- }
+ // Raw mode: interpret output report of LED state
+ while ((c = rn42_getc()) != -1) {
+ // LED Out report: 0xFE, 0x02, 0x01, <leds>
+ // To get the report over UART set bit3 with SH, command.
+ static enum {LED_INIT, LED_FE, LED_02, LED_01} state = LED_INIT;
+ switch (state) {
+ case LED_INIT:
+ if (c == 0xFE) state = LED_FE;
+ else {
+ if (0x0 <= c && c <= 0x7f) xprintf("%c", c);
+ else xprintf(" %02X", c);
+ }
+ break;
+ case LED_FE:
+ if (c == 0x02) state = LED_02;
+ else state = LED_INIT;
+ break;
+ case LED_02:
+ if (c == 0x01) state = LED_01;
+ else state = LED_INIT;
+ break;
+ case LED_01:
+ dprintf("LED status: %02X\n", c);
+ rn42_set_leds(c);
+ state = LED_INIT;
+ break;
+ default:
+ state = LED_INIT;
}
}
@@ -96,18 +95,6 @@ void rn42_task(void)
battery_led(LED_CHARGER);
}
- static uint8_t prev_status = UNKNOWN;
- if (bs != prev_status) {
- prev_status = bs;
- switch (bs) {
- case FULL_CHARGED: xprintf("FULL_CHARGED\n"); break;
- case CHARGING: xprintf("CHARGING\n"); break;
- case DISCHARGING: xprintf("DISCHARGING\n"); break;
- case LOW_VOLTAGE: xprintf("LOW_VOLTAGE\n"); break;
- default: xprintf("UNKNOWN STATUS\n"); break;
- };
- }
-
/* every minute */
uint32_t t = timer_read32()/1000;
if (t%60 == 0) {
@@ -115,7 +102,7 @@ void rn42_task(void)
uint8_t h = t/3600;
uint8_t m = t%3600/60;
uint8_t s = t%60;
- xprintf("%02u:%02u:%02u\t%umV\n", h, m, s, v);
+ dprintf("%02u:%02u:%02u\t%umV\n", h, m, s, v);
/* TODO: xprintf doesn't work for this.
xprintf("%02u:%02u:%02u\t%umV\n", (t/3600), (t%3600/60), (t%60), v);
*/
@@ -124,7 +111,7 @@ void rn42_task(void)
/* Connection monitor */
- if (rn42_linked()) {
+ if (!rn42_rts() && rn42_linked()) {
status_led(true);
} else {
status_led(false);
@@ -136,70 +123,238 @@ void rn42_task(void)
/******************************************************************************
* Command
******************************************************************************/
+static host_driver_t *prev_driver = &rn42_driver;
+
+static void print_rn42(void)
+{
+ int16_t c;
+ while ((c = rn42_getc()) != -1) {
+ xprintf("%c", c);
+ }
+}
+
+static void clear_rn42(void)
+{
+ while (rn42_getc() != -1) ;
+}
+
+#define SEND_STR(str) send_str(PSTR(str))
+#define SEND_COMMAND(cmd) send_command(PSTR(cmd))
+
+static void send_str(const char *str)
+{
+ uint8_t c;
+ while ((c = pgm_read_byte(str++)))
+ rn42_putc(c);
+}
+
+static const char *send_command(const char *cmd)
+{
+ static const char *s;
+ send_str(cmd);
+ wait_ms(500);
+ s = rn42_gets(100);
+ xprintf("%s\r\n", s);
+ print_rn42();
+ return s;
+}
+
+static void enter_command_mode(void)
+{
+ prev_driver = host_get_driver();
+ clear_keyboard();
+ host_set_driver(&rn42_config_driver); // null driver; not to send a key to host
+ rn42_disconnect();
+ while (rn42_linked()) ;
+
+ print("Entering config mode ...\n");
+ wait_ms(1100); // need 1 sec
+ SEND_COMMAND("$$$");
+ wait_ms(600); // need 1 sec
+ print_rn42();
+ const char *s = SEND_COMMAND("v\r\n");
+ if (strncmp("v", s, 1) != 0) SEND_COMMAND("+\r\n"); // local echo on
+}
+
+static void exit_command_mode(void)
+{
+ print("Exiting config mode ...\n");
+ SEND_COMMAND("---\r\n"); // exit
+
+ rn42_autoconnect();
+ clear_keyboard();
+ host_set_driver(prev_driver);
+}
+
+static void init_rn42(void)
+{
+ // RN-42 configure
+ if (!config_mode) enter_command_mode();
+ SEND_COMMAND("SF,1\r\n"); // factory defaults
+ SEND_COMMAND("S-,TmkBT\r\n");
+ SEND_COMMAND("SS,Keyboard/Mouse\r\n");
+ SEND_COMMAND("SM,4\r\n"); // auto connect(DTR)
+ SEND_COMMAND("SW,8000\r\n"); // Sniff disable
+ SEND_COMMAND("S~,6\r\n"); // HID profile
+ SEND_COMMAND("SH,003C\r\n"); // combo device, out-report, 4-reconnect
+ SEND_COMMAND("SY,FFF4\r\n"); // transmit power -12
+ SEND_COMMAND("R,1\r\n");
+ if (!config_mode) exit_command_mode();
+}
+
+#if 0
+// Switching connections
+// NOTE: Remote Address doesn't work in the way manual says.
+// EEPROM address for link store
+#define RN42_LINK0 (uint8_t *)128
+#define RN42_LINK1 (uint8_t *)140
+#define RN42_LINK2 (uint8_t *)152
+#define RN42_LINK3 (uint8_t *)164
+static void store_link(uint8_t *eeaddr)
+{
+ enter_command_mode();
+ SEND_STR("GR\r\n"); // remote address
+ const char *s = rn42_gets(500);
+ if (strcmp("GR", s) == 0) s = rn42_gets(500); // ignore local echo
+ xprintf("%s(%d)\r\n", s, strlen(s));
+ if (strlen(s) == 12) {
+ for (int i = 0; i < 12; i++) {
+ eeprom_write_byte(eeaddr+i, *(s+i));
+ dprintf("%c ", *(s+i));
+ }
+ dprint("\r\n");
+ }
+ exit_command_mode();
+}
+
+static void restore_link(const uint8_t *eeaddr)
+{
+ enter_command_mode();
+ SEND_COMMAND("SR,Z\r\n"); // remove remote address
+ SEND_STR("SR,"); // set remote address from EEPROM
+ for (int i = 0; i < 12; i++) {
+ uint8_t c = eeprom_read_byte(eeaddr+i);
+ rn42_putc(c);
+ dprintf("%c ", c);
+ }
+ dprintf("\r\n");
+ SEND_COMMAND("\r\n");
+ SEND_COMMAND("R,1\r\n"); // reboot
+ exit_command_mode();
+}
+
+static const char *get_link(uint8_t * eeaddr)
+{
+ static char s[13];
+ for (int i = 0; i < 12; i++) {
+ uint8_t c = eeprom_read_byte(eeaddr+i);
+ s[i] = c;
+ }
+ s[12] = '\0';
+ return s;
+}
+#endif
+
+static void pairing(void)
+{
+ enter_command_mode();
+ SEND_COMMAND("SR,Z\r\n"); // remove remote address
+ SEND_COMMAND("R,1\r\n"); // reboot
+ exit_command_mode();
+}
+
bool command_extra(uint8_t code)
{
uint32_t t;
uint16_t b;
- static host_driver_t *prev_driver = &rn42_driver;
switch (code) {
case KC_H:
case KC_SLASH: /* ? */
print("\n\n----- Bluetooth RN-42 Help -----\n");
- print("Del: enter/exit config mode(auto_connect/disconnect)\n");
- print("i: RN-42 info\n");
- print("b: battery voltage\n");
+ print("i: RN-42 info\n");
+ print("b: battery voltage\n");
+ print("Del: enter/exit RN-42 config mode\n");
+ print("Slck: RN-42 initialize\n");
+#if 0
+ print("1-4: restore link\n");
+ print("F1-F4: store link\n");
+#endif
+ print("p: pairing\n");
if (config_mode) {
return true;
} else {
- print("u: Force USB mode\n");
+ print("u: toggle Force USB mode\n");
return false; // to display default command help
}
- case KC_DELETE:
- if (rn42_autoconnecting()) {
- prev_driver = host_get_driver();
- clear_keyboard();
- _delay_ms(500);
- host_set_driver(&rn42_config_driver); // null driver; not to send a key to host
- rn42_disconnect();
- print("\nRN-42: disconnect\n");
- print("Enter config mode\n");
- print("type $$$ to start and + for local echo\n");
- command_state = CONSOLE;
- config_mode = true;
- } else {
- rn42_autoconnect();
- print("\nRN-42: auto_connect\n");
- print("Exit config mode\n");
- command_state = ONESHOT;
- config_mode = false;
- //clear_keyboard();
- host_set_driver(prev_driver);
- }
+ case KC_P:
+ pairing();
return true;
- case KC_U:
- if (config_mode) return false;
- if (force_usb) {
- print("Auto mode\n");
- force_usb = false;
- } else {
- print("USB mode\n");
- force_usb = true;
- clear_keyboard();
- host_set_driver(&lufa_driver);
- }
+#if 0
+ /* Store link address to EEPROM */
+ case KC_F1:
+ store_link(RN42_LINK0);
return true;
+ case KC_F2:
+ store_link(RN42_LINK1);
+ return true;
+ case KC_F3:
+ store_link(RN42_LINK2);
+ return true;
+ case KC_F4:
+ store_link(RN42_LINK3);
+ return true;
+ /* Restore link address to EEPROM */
+ case KC_1:
+ restore_link(RN42_LINK0);
+ return true;
+ case KC_2:
+ restore_link(RN42_LINK1);
+ return true;
+ case KC_3:
+ restore_link(RN42_LINK2);
+ return true;
+ case KC_4:
+ restore_link(RN42_LINK3);
+ return true;
+#endif
case KC_I:
print("\n----- RN-42 info -----\n");
xprintf("protocol: %s\n", (host_get_driver() == &rn42_driver) ? "RN-42" : "LUFA");
xprintf("force_usb: %X\n", force_usb);
+ xprintf("rn42: %s\n", rn42_rts() ? "OFF" : (rn42_linked() ? "CONN" : "ON"));
xprintf("rn42_autoconnecting(): %X\n", rn42_autoconnecting());
- xprintf("rn42_linked(): %X\n", rn42_linked());
- xprintf("rn42_rts(): %X\n", rn42_rts());
xprintf("config_mode: %X\n", config_mode);
+ xprintf("USB State: %s\n",
+ (USB_DeviceState == DEVICE_STATE_Unattached) ? "Unattached" :
+ (USB_DeviceState == DEVICE_STATE_Powered) ? "Powered" :
+ (USB_DeviceState == DEVICE_STATE_Default) ? "Default" :
+ (USB_DeviceState == DEVICE_STATE_Addressed) ? "Addressed" :
+ (USB_DeviceState == DEVICE_STATE_Configured) ? "Configured" :
+ (USB_DeviceState == DEVICE_STATE_Suspended) ? "Suspended" : "?");
+ xprintf("battery: ");
+ switch (battery_status()) {
+ case FULL_CHARGED: xprintf("FULL"); break;
+ case CHARGING: xprintf("CHARG"); break;
+ case DISCHARGING: xprintf("DISCHG"); break;
+ case LOW_VOLTAGE: xprintf("LOW"); break;
+ default: xprintf("?"); break;
+ };
+ xprintf("\n");
+ xprintf("RemoteWakeupEnabled: %X\n", USB_Device_RemoteWakeupEnabled);
xprintf("VBUS: %X\n", USBSTA&(1<<VBUS));
- xprintf("battery_charging: %X\n", battery_charging());
- xprintf("battery_status: %X\n", battery_status());
+ t = timer_read32()/1000;
+ uint8_t d = t/3600/24;
+ uint8_t h = t/3600;
+ uint8_t m = t%3600/60;
+ uint8_t s = t%60;
+ xprintf("uptime: %02u %02u:%02u:%02u\n", d, h, m, s);
+#if 0
+ xprintf("LINK0: %s\r\n", get_link(RN42_LINK0));
+ xprintf("LINK1: %s\r\n", get_link(RN42_LINK1));
+ xprintf("LINK2: %s\r\n", get_link(RN42_LINK2));
+ xprintf("LINK3: %s\r\n", get_link(RN42_LINK3));
+#endif
return true;
case KC_B:
// battery monitor
@@ -210,24 +365,53 @@ bool command_extra(uint8_t code)
xprintf("%02u:", t%3600/60);
xprintf("%02u\n", t%60);
return true;
+ case KC_U:
+ if (config_mode) return false;
+ if (force_usb) {
+ print("Auto mode\n");
+ force_usb = false;
+ } else {
+ print("USB mode\n");
+ force_usb = true;
+ clear_keyboard();
+ host_set_driver(&lufa_driver);
+ }
+ return true;
+ case KC_DELETE:
+ /* RN-42 Command mode */
+ if (rn42_autoconnecting()) {
+ enter_command_mode();
+
+ command_state = CONSOLE;
+ config_mode = true;
+ } else {
+ exit_command_mode();
+
+ command_state = ONESHOT;
+ config_mode = false;
+ }
+ return true;
+ case KC_SCROLLLOCK:
+ init_rn42();
+ return true;
default:
if (config_mode)
return true;
else
- return false; // exec default command
+ return false; // yield to default command
}
return true;
}
+/*
+ * RN-42 Command mode
+ * sends charactors to the module
+ */
static uint8_t code2asc(uint8_t code);
bool command_console_extra(uint8_t code)
{
- switch (code) {
- default:
- rn42_putc(code2asc(code));
- return true;
- }
- return false;
+ rn42_putc(code2asc(code));
+ return true;
}
// convert keycode into ascii charactor