1.1 --- a/bsp.h Sun May 19 21:42:23 2013 +0000
1.2 +++ b/bsp.h Tue May 21 15:23:53 2013 +0000
1.3 @@ -3,97 +3,33 @@
1.4
1.5 #include <ubb/ubb.h>
1.6
1.7 -/* Pin assignments (74HC4052):
1.8 - *
1.9 - * Sniffer UBB 74HC4052 #1 74HC4052 #2 10K Resistor M74HC595B1R EM027AS012
1.10 - * ------- ---- ----------- ----------- ------------ ----------- ----------
1.11 - * DAT2 DAT2 13 (1Z)
1.12 - * CD DAT3 3 (2Z)
1.13 - * CMD CMD 10 (S0) 10 (S0) IN OUT 10 (SCLR#)
1.14 - * VCC VDD 16 (VCC) 16 (VCC) 16 (VCC) 2 (3V3)
1.15 - * CLK CLK 3 (SCK)
1.16 - * GND GND 8 (GND) 8 (GND) 8 (GND) 1 (GND)
1.17 - * DAT0 DAT0 13 (1Z)
1.18 - * DAT1 DAT1 3 (2Z)
1.19 - *
1.20 - * Multiplexer pin selection:
1.21 - *
1.22 - * {Z}Y{S1/S0}
1.23 - *
1.24 - * 1Z with S1=0, S0=0 => 1Y0 (output 1, channel 0)
1.25 - * 2Z with S1=0, S0=0 => 2Y0 (output 2, channel 0)
1.26 - *
1.27 - * 1Z with S1=0, S0=1 => 1Y1 (output 1, channel 1)
1.28 - * 2Z with S1=0, S0=1 => 2Y1 (output 2, channel 1)
1.29 - *
1.30 - * Connections to the shift register (channel 0):
1.31 +/* Pin assignments:
1.32 *
1.33 - * Sniffer UBB 74HC4052 #1 M74HC595B1R
1.34 - * ------- --- ----------- -----------
1.35 - * DAT2 DAT2 12 (1Y0) 12 (RCK)
1.36 - * CD DAT3 1 (2Y0) 14 (SI)
1.37 - *
1.38 - * 74HC4052 #2
1.39 - * -----------
1.40 - * DAT0 DAT0 12 (1Y0) 10 (SCLR#)
1.41 - * DAT1 DAT1 1 (2Y0) 11 (SCK)
1.42 - *
1.43 - * Connections to the display board (channel 1):
1.44 - *
1.45 - * Sniffer UBB 74HC4052 #1 EM027AS012
1.46 - * ------- --- ----------- ----------
1.47 - * DAT2 DAT2 14 (1Y1) 4 (MOSI)
1.48 - * CD DAT3 5 (2Y1) 6 (SSEL)
1.49 - *
1.50 - * 74HC4052 #2
1.51 - * -----------
1.52 - * DAT0 DAT0 14 (1Y1) 11 (PWM)
1.53 - * DAT1 DAT1 5 (2Y1) 12 (RESET)
1.54 - *
1.55 - * Connections from the shift register (providing persistent outputs for
1.56 - * channel 0):
1.57 - *
1.58 - * M74HC595B1R EM027AS012
1.59 - * ----------- ----------
1.60 - * 15 (QA) 13 (PANEL)
1.61 - * 1 (QB) 14 (DIS)
1.62 + * Sniffer UBB EM027AS012
1.63 + * ------- ---- -----------
1.64 + * DAT2 DAT2 4 (MOSI)
1.65 + * CD DAT3 6 (SSEL)
1.66 + * CMD CMD 11 (PWM)
1.67 + * VCC VDD 13 (PANEL)
1.68 + * CLK CLK 3 (SCK)
1.69 + * GND GND
1.70 + * DAT0 DAT0 12 (RESET)
1.71 + * DAT1 DAT1 14 (DIS)
1.72 *
1.73 * General connections:
1.74 *
1.75 - * Sniffer UBB 74HC4052 M74HC595B1R
1.76 - * ------- ---- -------- -----------
1.77 - * GND GND 6 (E#) 13 (G#)
1.78 - * 7 (VEE)
1.79 - * 9 (S1)
1.80 + * EM027AS012
1.81 + * ----------
1.82 + * 1 (GND)
1.83 + * 2 (3V3)
1.84 */
1.85
1.86 -/* CMD/S0 = 0 */
1.87 -
1.88 -#define SHIFT_SCLR UBB_DAT0
1.89 -#define SHIFT_SCK UBB_DAT1
1.90 -#define SHIFT_RCK UBB_DAT2
1.91 -#define SHIFT_SI UBB_DAT3
1.92 -
1.93 -/* CMD/S1 = 1 */
1.94 -
1.95 -#define EPD_PWM UBB_DAT0
1.96 -#define EPD_RESET UBB_DAT1
1.97 -#define EPD_MOSI UBB_DAT2
1.98 -#define EPD_SSEL UBB_DAT3
1.99 -
1.100 -/* Channel-insensitive. */
1.101 -
1.102 -#define MUX_S0 UBB_CMD
1.103 -#define EPD_SCK UBB_CLK
1.104 -
1.105 -/* NanoNote-specific functions. */
1.106 -
1.107 -void shift_select();
1.108 -void shift_update();
1.109 -void shift_init();
1.110 -void shift_reinit();
1.111 -void shift_in(uint8_t v);
1.112 -void epd_select();
1.113 +#define EPD_MOSI UBB_DAT2
1.114 +#define EPD_SSEL UBB_DAT3
1.115 +#define EPD_PWM UBB_CMD
1.116 +#define EPD_SCK UBB_CLK
1.117 +#define EPD_RESET UBB_DAT0
1.118 +#define EPD_DIS UBB_DAT1
1.119
1.120 /* Board-specific interface functions. */
1.121