Skip to content

Commit 673808c

Browse files
samruddhi-Rahegaonkarsamruddhi-Rahegaonkar
committed
fix : PinLayoutV6
1 parent f908981 commit 673808c

File tree

5 files changed

+37
-37
lines changed

5 files changed

+37
-37
lines changed

‎app/src/main/java/io/pslab/activity/MainActivity.java

+5-3
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public class MainActivity extends AppCompatActivity {
8787
private static final String TAG_INSTRUMENTS = "instruments";
8888
private static final String TAG_ABOUTUS = "aboutUs";
8989
private static final String TAG_PINLAYOUT = "pinLayout";
90-
private static final String TAG_PINLAYOUT_V6 = "PINLAYOUTV6";
90+
private static final String TAG_PINLAYOUT_V6 = "pinlayoutv6";
9191
private static final String TAG_FAQ = "faq";
9292
private static String CURRENT_TAG = TAG_INSTRUMENTS;
9393
private String[] activityTitles;
@@ -441,11 +441,11 @@ public boolean onOptionsItemSelected(MenuItem item) {
441441
displayPSLabPinLayout(TAG_PINLAYOUT);
442442
break;
443443
case R.id.menu_pslab_layout_front_v6:
444-
PSLabPinLayoutFragment_v6.topside=true;
444+
PSLabPinLayoutFragment_v6.topside = true;
445445
displayPSLabPinLayout(TAG_PINLAYOUT_V6);
446446
break;
447447
case R.id.menu_pslab_layout_back_v6:
448-
PSLabPinLayoutFragment_v6.topside=false;
448+
PSLabPinLayoutFragment_v6.topside = false;
449449
displayPSLabPinLayout(TAG_PINLAYOUT_V6);
450450
break;
451451

@@ -589,6 +589,7 @@ public void onReceive(Context context, Intent intent) {
589589
}
590590
}
591591
};
592+
592593
@Override
593594
protected void onNewIntent(Intent intent) {
594595
super.onNewIntent(intent);
@@ -609,6 +610,7 @@ protected void onNewIntent(Intent intent) {
609610
}
610611
}
611612
}
613+
612614
@Override
613615
protected void onPostResume() {
614616
super.onPostResume();

‎app/src/main/java/io/pslab/fragment/PSLabPinLayoutFragment_v6.java

+18-17
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
6666
public void onResume() {
6767
super.onResume();
6868
imgLayout.setImageDrawable(ResourcesCompat.getDrawable(getResources(),
69-
topside ? R.drawable.pslab_v6_bottom : R.drawable.pslab_v6_top, null));
69+
topside ? R.drawable.pslab_v6_top : R.drawable.pslab_v6_bottom, null));
7070
colorMap.setImageDrawable(ResourcesCompat.getDrawable(getResources(),
71-
topside ? R.drawable.pslab_v6_bottom_colormap : R.drawable.pslab_v6_top_colormap, null));
71+
topside ? R.drawable.pslab_v6_top_colormap : R.drawable.pslab_v6_bottom_colormap, null));
7272
imgLayout.setOnTouchListener(this);
7373
populatePinDetails();
7474
}
@@ -119,7 +119,7 @@ private void populatePinDetails() {
119119
pinDetails_v6.add(new PinDetails_v6(getString(R.string.pv1), getString(R.string.pv1_description), getColor(R.color.pv1)));
120120
pinDetails_v6.add(new PinDetails_v6(getString(R.string.pv2), getString(R.string.pv2_description), getColor(R.color.pv2)));
121121
pinDetails_v6.add(new PinDetails_v6(getString(R.string.pv3), getString(R.string.pv3_description), getColor(R.color.pv3)));
122-
pinDetails_v6.add(new PinDetails_v6(getString(R.string.pcs),getString(R.string.pcs_description),getColor(R.color.pcs)));
122+
pinDetails_v6.add(new PinDetails_v6(getString(R.string.pcs), getString(R.string.pcs_description), getColor(R.color.pcs)));
123123

124124
pinDetails_v6.add(new PinDetails_v6(getString(R.string.chip_select), getString(R.string.chip_select_description), getColor(R.color.chip_select)));
125125
pinDetails_v6.add(new PinDetails_v6(getString(R.string.cs1), getString(R.string.cs1_description), getColor(R.color.cs1)));
@@ -133,9 +133,9 @@ private void populatePinDetails() {
133133
pinDetails_v6.add(new PinDetails_v6(getString(R.string.pin_vdd_name), getString(R.string.pin_vdd_description), getColor(R.color.vdd)));
134134
pinDetails_v6.add(new PinDetails_v6(getString(R.string.current_3ma), getString(R.string.current_3ma_description), getColor(R.color.current_3ma)));
135135
pinDetails_v6.add(new PinDetails_v6(getString(R.string.plus_5v), getString(R.string.plus_5v_description), getColor(R.color.plus_5v)));
136-
pinDetails_v6.add(new PinDetails_v6(getString(R.string.voltage_plus_minus_5_0v),getString(R.string.voltage_plus_minus_5_0v_description),getColor(R.color.plus_minus_5v)));
137-
pinDetails_v6.add(new PinDetails_v6(getString(R.string.voltage_plus_3_3v),getString(R.string.voltage_plus_3_3v_description),getColor(R.color.plus_3_3v)));
138-
pinDetails_v6.add(new PinDetails_v6(getString(R.string.voltage_0_3_3v),getString(R.string.voltage_0_3_3v_description),getColor(R.color.range_0_to_3_3v)));
136+
pinDetails_v6.add(new PinDetails_v6(getString(R.string.voltage_plus_minus_5_0v), getString(R.string.voltage_plus_minus_5_0v_description), getColor(R.color.plus_minus_5v)));
137+
pinDetails_v6.add(new PinDetails_v6(getString(R.string.voltage_plus_3_3v), getString(R.string.voltage_plus_3_3v_description), getColor(R.color.plus_3_3v)));
138+
pinDetails_v6.add(new PinDetails_v6(getString(R.string.voltage_0_3_3v), getString(R.string.voltage_0_3_3v_description), getColor(R.color.range_0_to_3_3v)));
139139

140140
pinDetails_v6.add(new PinDetails_v6(getString(R.string.pgc), getString(R.string.pgc_description), getColor(R.color.pgc)));
141141
pinDetails_v6.add(new PinDetails_v6(getString(R.string.pgd), getString(R.string.pgd_description), getColor(R.color.pgd)));
@@ -149,19 +149,20 @@ private void populatePinDetails() {
149149
pinDetails_v6.add(new PinDetails_v6(getString(R.string.si1), getString(R.string.pin_si1_description), getColor(R.color.si1)));
150150
pinDetails_v6.add(new PinDetails_v6(getString(R.string.si2), getString(R.string.pin_si2_description), getColor(R.color.si2)));
151151

152-
pinDetails_v6.add(new PinDetails_v6(getString(R.string.vol),getString(R.string.vol_description),getColor(R.color.vol)));
153-
pinDetails_v6.add(new PinDetails_v6(getString(R.string.res),getString(R.string.res_description),getColor(R.color.res)));
154-
pinDetails_v6.add(new PinDetails_v6(getString(R.string.cap),getString(R.string.cap_v6_description),getColor(R.color.cap)));
155-
pinDetails_v6.add(new PinDetails_v6(getString(R.string.frequency),getString(R.string.frequency_v6_description),getColor(R.color.fqy)));
156-
pinDetails_v6.add(new PinDetails_v6(getString(R.string.mic),getString(R.string.mic_description),getColor(R.color.mic)));
157-
pinDetails_v6.add(new PinDetails_v6(getString(R.string.c3g),getString(R.string.c3g_description),getColor(R.color.c3g)));
152+
pinDetails_v6.add(new PinDetails_v6(getString(R.string.vol), getString(R.string.vol_description), getColor(R.color.vol)));
153+
pinDetails_v6.add(new PinDetails_v6(getString(R.string.res), getString(R.string.res_description), getColor(R.color.res)));
154+
pinDetails_v6.add(new PinDetails_v6(getString(R.string.cap), getString(R.string.cap_v6_description), getColor(R.color.cap)));
155+
pinDetails_v6.add(new PinDetails_v6(getString(R.string.frequency), getString(R.string.frequency_v6_description), getColor(R.color.fqy)));
156+
pinDetails_v6.add(new PinDetails_v6(getString(R.string.mic), getString(R.string.mic_description), getColor(R.color.mic)));
157+
pinDetails_v6.add(new PinDetails_v6(getString(R.string.c3g), getString(R.string.c3g_description), getColor(R.color.c3g)));
158158

159-
pinDetails_v6.add(new PinDetails_v6(getString(R.string.sq1),getString(R.string.sq1_description),getColor(R.color.sq1)));
160-
pinDetails_v6.add(new PinDetails_v6(getString(R.string.sq2),getString(R.string.sq2_description),getColor(R.color.sq2)));
161-
pinDetails_v6.add(new PinDetails_v6(getString(R.string.sq3),getString(R.string.sq3_description),getColor(R.color.sq3)));
162-
pinDetails_v6.add(new PinDetails_v6(getString(R.string.sq4),getString(R.string.sq4_description),getColor(R.color.sq4)));
159+
pinDetails_v6.add(new PinDetails_v6(getString(R.string.sq1), getString(R.string.sq1_description), getColor(R.color.sq1)));
160+
pinDetails_v6.add(new PinDetails_v6(getString(R.string.sq2), getString(R.string.sq2_description), getColor(R.color.sq2)));
161+
pinDetails_v6.add(new PinDetails_v6(getString(R.string.sq3), getString(R.string.sq3_description), getColor(R.color.sq3)));
162+
pinDetails_v6.add(new PinDetails_v6(getString(R.string.sq4), getString(R.string.sq4_description), getColor(R.color.sq4)));
163163

164164
}
165+
165166
private int getColor(int colorId) {
166167
final Context context = getContext();
167168
return context == null ? 0 : context.getColor(colorId);
@@ -269,4 +270,4 @@ private void midPoint(PointF point, MotionEvent event) {
269270
float y = event.getY(0) + event.getY(1);
270271
point.set(x / 2, y / 2);
271272
}
272-
}
273+
}

‎app/src/main/res/drawable/pslab_v6_top_colormap.png

46 Bytes
Loading

‎app/src/main/res/values/colors.xml

+1-4
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
<color name="pin_pgd">#724fff</color>
7171
<color name="pin_nrf">#ffa64f</color>
7272
<color name="pin_usb">#ff2b4f</color>
73-
<color name="pin_vcc">#6b6500</color>
73+
<color name="pin_vcc">#6b6500</color>
7474
<color name="pin_pl5">#765f40</color>
7575
<color name="pin_dpl">#681654</color>
7676
<color name="pin_dmi">#a68b47</color>
@@ -151,7 +151,4 @@
151151
<color name="sq2">#D35FBC</color>
152152
<color name="sq3">#C837AB</color>
153153
<color name="sq4">#A02C89</color>
154-
155-
156-
157154
</resources>

‎app/src/main/res/values/strings.xml

+13-13
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
<string name="nav_share">Share App</string>
1818
<string name="nav_config">Generate Config File</string>
1919
<string name="pslab_pinlayout">PinLayout</string>
20-
<string name="pslab_pinlayout_front_v5">Pin Layout Front v5</string>
21-
<string name="pslab_pinlayout_back_v5">Pin Layout Back v5</string>
22-
<string name="pslab_pinlayout_front_v6">Pin Layout Front v6</string>
23-
<string name="pslab_pinlayout_back_v6">Pin Layout Back v6</string>
20+
<string name="pslab_pinlayout_front_v5">Pin Layout Front (V5)</string>
21+
<string name="pslab_pinlayout_back_v5">Pin Layout Back (V5)</string>
22+
<string name="pslab_pinlayout_front_v6">Pin Layout Front (V6)</string>
23+
<string name="pslab_pinlayout_back_v6">Pin Layout Back (V6)</string>
2424
<string name="bluetooth_connect_menu">Bluetooth Connection</string>
2525
<string name="bluetooth_wifi_connect_option">Connect using Bluetooth or Wi-Fi</string>
2626
<string name="bluetooth">Bluetooth</string>
@@ -1287,7 +1287,7 @@
12871287

12881288
<!-- UART Pins -->
12891289
<string name="txd_description" translatable="false">Transmit data pin for UART communication.</string>
1290-
<string name="cen_description" translatable="false">Central pin for UART control.</string>
1290+
<string name="cen_description" translatable="false">Chip Enable pin for UART control.</string>
12911291
<string name="vcc_description" translatable="false">Voltage supply pin (+5V or +3.3V).</string>
12921292
<string name="gnd_description" translatable="false">Ground pin for system reference.</string>
12931293
<string name="rxd_description" translatable="false">Receive data pin for UART communication.</string>
@@ -1320,9 +1320,9 @@
13201320

13211321
<!-- Measurement Channels -->
13221322
<string name="ac_channel_description" translatable="false">AC measurement channel.</string>
1323-
<string name="channel_1_description" translatable="false">Measurement channel 1.</string>
1324-
<string name="channel_2_description" translatable="false">Measurement channel 2.</string>
1325-
<string name="channel_3_description" translatable="false">Measurement channel 3.</string>
1323+
<string name="channel_1_description" translatable="false">Oscilloscope Channel 1.</string>
1324+
<string name="channel_2_description" translatable="false">Oscilloscope Channel 2.</string>
1325+
<string name="channel_3_description" translatable="false">Oscilloscope Channel 3.</string>
13261326
<string name="ch3_gain_set_description" translatable="false">Channel 3 gain setting.</string>
13271327
<string name="microphone_description" translatable="false">Microphone input pin.</string>
13281328
<string name="frequency_v6_description" translatable="false">Frequency measurement pin.</string>
@@ -1355,9 +1355,9 @@
13551355

13561356
<!-- Voltage Levels -->
13571357
<string name="vdd_3_3v_description" translatable="false">VDD (+3.3V) power supply pin.</string>
1358-
<string name="voltage_0_3_3v_description" translatable="false">Voltage level pin (0-3.3V).</string>
1359-
<string name="voltage_plus_3_3v_description" translatable="false">Positive voltage level (+3.3V).</string>
1360-
<string name="voltage_plus_minus_5_0v_description" translatable="false">Dual voltage supply (±5.0V).</string>
1358+
<string name="voltage_0_3_3v_description" translatable="false">Variable voltage pin (0-3.3V).</string>
1359+
<string name="voltage_plus_3_3v_description" translatable="false">Variable voltage pin (±3.3V)</string>
1360+
<string name="voltage_plus_minus_5_0v_description" translatable="false">Variable voltage (±5.0V).</string>
13611361
<string name="current_3ma_description" translatable="false">Current pin (3mA).</string>
13621362
<string name="plus_5v_description" translatable="false">5V power supply pin.</string>
13631363

@@ -1375,12 +1375,12 @@
13751375
<!-- Additional Pins -->
13761376
<string name="si1_description" translatable="false">Signal Input 1 pin.</string>
13771377
<string name="si2_description" translatable="false">Signal Input 2 pin.</string>
1378-
<string name="pcs_description" translatable="false">Power Control Signal pin.</string>
1378+
<string name="pcs_description" translatable="false">Current Source pin.</string>
13791379
<string name="vol_description" translatable="false">Voltage measurement pin.</string>
13801380
<string name="res_description" translatable="false">Resistance measurement pin.</string>
13811381
<string name="cap_v6_description" translatable="false">Capacitance measurement pin (v6).</string>
13821382
<string name="fqy_description" translatable="false">Frequency measurement pin (v6).</string>
13831383
<string name="mic_description" translatable="false">Microphone input pin (v6).</string>
1384-
<string name="c3g_description" translatable="false">Capacitor 3 Ground pin.</string>
1384+
<string name="c3g_description" translatable="false">Channel 3 Gain Setting.</string>
13851385

13861386
</resources>

0 commit comments

Comments
 (0)