Skip to content

Commit 70b0aca

Browse files
farrenvfarrenv
committed
clean up dead code
1 parent 1f20df9 commit 70b0aca

File tree

2 files changed

+33
-116
lines changed

2 files changed

+33
-116
lines changed

‎targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52840/TARGET_EP_ATLAS/ONBOARD_TELIT_ME310.cpp

Lines changed: 2 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,9 @@
1515
* limitations under the License.
1616
*/
1717

18-
//#if MBED_CONF_NSAPI_PRESENT
19-
20-
//#if EP_ATLAS_ENABLE_CELL
21-
2218
#include "gpio_api.h"
2319
#include "platform/mbed_thread.h"
2420
#include "PinNames.h"
25-
//#include "mbed.h"
26-
2721
#include "BufferedSerial.h"
2822
#include "ONBOARD_TELIT_ME310.h"
2923
#include "ThisThread.h"
@@ -130,53 +124,16 @@ nsapi_error_t ONBOARD_TELIT_ME310::init()
130124
void ONBOARD_TELIT_ME310::press_power_button(int time_ms)
131125
{
132126
gpio_t gpio_CELL_ON_OFF;
133-
//gpio_t gpio_PWR_MON;
134-
// volatile int read_pwr_mon_gpio = 0;
135-
136-
// gpio_init_in(&gpio_PWR_MON, PIN_NAME_CELL_PWRMON);
137-
// read_pwr_mon_gpio = gpio_read(&gpio_PWR_MON);
138-
139-
// if(!(gpio_read(&gpio_PWR_MON)))
140-
// {
141-
// gpio_init_out_ex(&gpio_CELL_ON_OFF, P0_31, 1);
142-
// gpio_write(&gpio_CELL_ON_OFF, 1);
143-
// thread_sleep_for(time_ms);
144-
// gpio_write(&gpio_CELL_ON_OFF, 0);
145-
// }
146-
147-
gpio_init_out_ex(&gpio_CELL_ON_OFF, P0_31, 1);
148-
gpio_write(&gpio_CELL_ON_OFF, 1);
149-
150-
151-
152-
// DigitalIn pwr_mon(PIN_NAME_CELL_PWRMON);
153-
// DigitalInOut cell_on_off(P0_31,PIN_INPUT,PullNone,1);
154-
155-
// if(!pwr_mon.read())
156-
// {
157-
// cell_on_off.output();
158-
// cell_on_off = 0;
159-
// ThisThread::sleep_for(time_ms);
160-
// cell_on_off = 1;
161-
// }
162-
163-
127+
gpio_init_out_ex(&gpio_CELL_ON_OFF, P0_31, 1);
128+
gpio_write(&gpio_CELL_ON_OFF, 1);
164129
}
165130

166131
void ONBOARD_TELIT_ME310::onboard_modem_init()
167132
{
168-
// gpio_t gpio;
169-
170-
// gpio_init_out_ex(&gpio, PIN_NAME_CELL_POWER_ENABLE, 0);
171-
// gpio_write(&gpio, 1);
172133
}
173134

174135
void ONBOARD_TELIT_ME310::onboard_modem_deinit()
175136
{
176-
// gpio_t gpio;
177-
178-
// gpio_init_out_ex(&gpio, PIN_NAME_CELL_POWER_ENABLE, 1);
179-
// gpio_write(&gpio, 0);
180137
}
181138

182139
void ONBOARD_TELIT_ME310::onboard_modem_power_up()
@@ -210,7 +167,3 @@ CellularDevice *CellularDevice::get_target_default_instance()
210167
static ONBOARD_TELIT_ME310 device(&serial);
211168
return &device;
212169
}
213-
214-
//#endif // EP_ATLAS_ENABLE_CELL
215-
216-
//#endif // MBED_CONF_NSAPI_PRESENT

‎targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52840/TARGET_EP_ATLAS/PinNames.h

Lines changed: 31 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -182,55 +182,24 @@ typedef enum {
182182
A4 = p30,
183183
A5 = p31,
184184

185-
/**** QSPI pins ****/
186-
// QSPI1_IO0 = P0_20,
187-
// QSPI1_IO1 = P0_21,
188-
// QSPI1_IO2 = P0_22,
189-
// QSPI1_IO3 = P0_23,
190-
// QSPI1_SCK = P0_19,
191-
// QSPI1_CSN = P0_17,
192-
193-
194-
// Battery
195-
// PIN_NAME_BATTERY = P0_2,
196-
// PIN_NAME_BATTERY_MONITOR_ENABLE = P1_11,
197-
198-
// Board ID
199-
// PIN_NAME_BOARD_ID = P0_3,
200-
// PIN_NAME_BOARD_ID_DISABLE = P1_6,
201-
202-
// NFC
203-
// PIN_NAME_NFC1 = P0_9,
204-
// PIN_NAME_NFC2 = P0_10,
205-
206185
// DEBUG UART
207186
PIN_NAME_DEBUG_RX = P0_16,
208187
PIN_NAME_DEBUG_TX = P0_13,
209188

210-
211-
212189
// Cell
213-
//PIN_NAME_CELL_POWER_ENABLE = P0_28,
214190
PIN_NAME_CELL_ON_OFF = P0_31,
215191
PIN_NAME_CELL_HW_SHUTDOWN = P0_24,
216192
PIN_NAME_CELL_RX = P1_1,
217193
PIN_NAME_CELL_TX = P1_3,
218194
PIN_NAME_CELL_DTR = P1_4,
219-
//PIN_NAME_CELL_DSR = P1_3,
220-
//PIN_NAME_CELL_DCD = P0_15,
221195
PIN_NAME_CELL_RTS = P1_8,
222196
PIN_NAME_CELL_CTS = P0_11,
223-
PIN_NAME_CELL_PWRMON = P1_15,//as agora
197+
PIN_NAME_CELL_PWRMON = P1_15,
224198

225199
// Sensors (I2C)
226-
//PIN_NAME_SENSOR_POWER_ENABLE = P0_31,
227200
PIN_NAME_SDA = P0_26,
228201
PIN_NAME_SCL = P0_27,
229202

230-
// Sensor interrupts
231-
//PIN_NAME_INT_ACCEL = P1_5,
232-
//PIN_NAME_INT_LIGHT_TOF = P0_4,
233-
234203
// QSPI
235204
PIN_NAME_QSPI_IO0 = P0_20,
236205
PIN_NAME_QSPI_IO1 = P0_21,
@@ -240,59 +209,54 @@ typedef enum {
240209
PIN_NAME_QSPI_CLK = P0_19,
241210

242211
// Miscellaneous I/O
243-
//PIN_NAME_PUSH_BUTTON = P0_29,
244212
PIN_NAME_LED_RED = P0_8,
245-
PIN_NAME_LED_GREEN = P1_9,
246-
PIN_NAME_LED_BLUE = P0_12,
213+
PIN_NAME_LED_GREEN = P1_9,
214+
PIN_NAME_LED_BLUE = P0_12,
247215
PIN_NAME_GPIO_04 = P1_3,
248216
PIN_NAME_GPIO_01 = P0_4,
249217
PIN_NAME_GPIO_02 = P0_5,
250-
PIN_NAME_TEMP_SENSE = P0_2,
218+
PIN_NAME_TEMP_SENSE = P0_2,
251219

252220
//DF12
253221
IO5 = PIN_NAME_GPIO_04,
254222
AD3 = PIN_NAME_GPIO_02,
255223
AD2 = PIN_NAME_GPIO_01,
256-
//PIN_NAME_BT840_RESETN = P0_18,
257-
//PIN_NAME_BT840_SWO = P1_0,
258224

259-
TEMP_SENSE = PIN_NAME_TEMP_SENSE,
225+
TEMP_SENSE = PIN_NAME_TEMP_SENSE,
260226

261227
/* mbed pins */
262228

263229
// used by mbed for default serial out on printf statements
264-
RX_PIN_NUMBER = PIN_NAME_DEBUG_RX,
265-
TX_PIN_NUMBER = PIN_NAME_DEBUG_TX,
266-
USBRX = PIN_NAME_DEBUG_RX,
267-
USBTX = PIN_NAME_DEBUG_TX,
268-
STDIO_UART_RX = PIN_NAME_DEBUG_RX,
269-
STDIO_UART_TX = PIN_NAME_DEBUG_TX,
270-
271-
MDMTXD = PIN_NAME_CELL_TX,
272-
MDMRXD = PIN_NAME_CELL_RX,
273-
MDMCTS = PIN_NAME_CELL_CTS,
274-
//MDMDCD = PIN_NAME_CELL_DCD,
275-
//MDMDSR = PIN_NAME_CELL_DSR,
276-
MDMDTR = PIN_NAME_CELL_DTR,
277-
MDMRTS = PIN_NAME_CELL_RTS,
230+
RX_PIN_NUMBER = PIN_NAME_DEBUG_RX,
231+
TX_PIN_NUMBER = PIN_NAME_DEBUG_TX,
232+
USBRX = PIN_NAME_DEBUG_RX,
233+
USBTX = PIN_NAME_DEBUG_TX,
234+
STDIO_UART_RX = PIN_NAME_DEBUG_RX,
235+
STDIO_UART_TX = PIN_NAME_DEBUG_TX,
236+
237+
MDMTXD = PIN_NAME_CELL_TX,
238+
MDMRXD = PIN_NAME_CELL_RX,
239+
MDMCTS = PIN_NAME_CELL_CTS,
240+
MDMDTR = PIN_NAME_CELL_DTR,
241+
MDMRTS = PIN_NAME_CELL_RTS,
278242

279243
/**** QSPI FLASH pins ****/
280-
QSPI_FLASH1_IO0 = PIN_NAME_QSPI_IO0,
281-
QSPI_FLASH1_IO1 = PIN_NAME_QSPI_IO1,
282-
QSPI_FLASH1_IO2 = PIN_NAME_QSPI_IO2,
283-
QSPI_FLASH1_IO3 = PIN_NAME_QSPI_IO3,
284-
QSPI_FLASH1_SCK = PIN_NAME_QSPI_CLK,
285-
QSPI_FLASH1_CSN = PIN_NAME_QSPI_CSN,
286-
287-
SPI_MOSI = PIN_NAME_QSPI_IO0,
288-
SPI_MISO = PIN_NAME_QSPI_IO1,
289-
SPI_SCK = PIN_NAME_QSPI_CLK,
290-
SPI_CS = PIN_NAME_QSPI_CSN,
244+
QSPI_FLASH1_IO0 = PIN_NAME_QSPI_IO0,
245+
QSPI_FLASH1_IO1 = PIN_NAME_QSPI_IO1,
246+
QSPI_FLASH1_IO2 = PIN_NAME_QSPI_IO2,
247+
QSPI_FLASH1_IO3 = PIN_NAME_QSPI_IO3,
248+
QSPI_FLASH1_SCK = PIN_NAME_QSPI_CLK,
249+
QSPI_FLASH1_CSN = PIN_NAME_QSPI_CSN,
250+
251+
SPI_MOSI = PIN_NAME_QSPI_IO0,
252+
SPI_MISO = PIN_NAME_QSPI_IO1,
253+
SPI_SCK = PIN_NAME_QSPI_CLK,
254+
SPI_CS = PIN_NAME_QSPI_CSN,
291255

292256
// LED
293-
LED1 = PIN_NAME_LED_RED,
294-
LED2 = PIN_NAME_LED_GREEN,
295-
LED3 = PIN_NAME_LED_BLUE,
257+
LED1 = PIN_NAME_LED_RED,
258+
LED2 = PIN_NAME_LED_GREEN,
259+
LED3 = PIN_NAME_LED_BLUE,
296260

297261
// Not connected
298262
NC = (int)0xFFFFFFFF,

0 commit comments

Comments
 (0)